wip

This reverts commit 11ee24a.

Author: wickwirew

Sources/Compiler/Compiler.swift

@@ -181,6 +181,7 @@ extension CompilerWithSource: StmtSyntaxVisitor {
     mutating func visit(_ stmt: PragmaStmt) -> (Statement, Diagnostics)? {
         pragmas.handle(pragma: stmt)
         // TODO: Figure out what to do with these
+        // TODO: Emit diags from pragmas
         return nil
     }
 

Sources/Compiler/Sema/IsStaticallyTrue.swift

@@ -7,42 +7,73 @@
 
 /// Determines whether a value can be considered `true` at compile time.
 struct IsStaticallyTrue: ExprSyntaxVisitor {
-    let allowOnOff: Bool
+    /// If `true`, text of `on, off, yes and no` are valid values.
+    let allowOnOffYesNo: Bool
 
-    mutating func visit(_ expr: borrowing BindParameterSyntax) -> Bool { false }
+    private(set) var diagnostics = Diagnostics()
+    
+    mutating func isTrue(_ expr: ExprSyntax) -> Bool {
+        return expr.accept(visitor: &self)
+    }
+    
+    mutating func visit(_ expr: borrowing BindParameterSyntax) -> Bool {
+        emitNotBoolDiag(for: expr)
+        return false
+    }
 
     mutating func visit(_ expr: borrowing ColumnExprSyntax) -> Bool {
-        guard allowOnOff, expr.schema == nil, expr.table == nil else {
-            return false
-        }
-        
-        switch expr.column.value.uppercased() {
-        case "ON": return true
-        case "OFF": return false
-        default:
-            return false
-        }
+        return false
     }
 
-    mutating func visit(_ expr: borrowing PrefixExprSyntax) -> Bool { false }
+    mutating func visit(_ expr: borrowing PrefixExprSyntax) -> Bool {
+        emitNotBoolDiag(for: expr)
+        return false
+    }
 
-    mutating func visit(_ expr: borrowing InfixExprSyntax) -> Bool { false }
+    mutating func visit(_ expr: borrowing InfixExprSyntax) -> Bool {
+        emitNotBoolDiag(for: expr)
+        return false
+    }
 
-    mutating func visit(_ expr: borrowing PostfixExprSyntax) -> Bool { false }
+    mutating func visit(_ expr: borrowing PostfixExprSyntax) -> Bool {
+        emitNotBoolDiag(for: expr)
+        return false
+    }
 
-    mutating func visit(_ expr: borrowing BetweenExprSyntax) -> Bool { false }
+    mutating func visit(_ expr: borrowing BetweenExprSyntax) -> Bool {
+        emitNotBoolDiag(for: expr)
+        return false
+    }
 
-    mutating func visit(_ expr: borrowing FunctionExprSyntax) -> Bool { false }
+    mutating func visit(_ expr: borrowing FunctionExprSyntax) -> Bool {
+        emitNotBoolDiag(for: expr)
+        return false
+    }
 
-    mutating func visit(_ expr: borrowing CastExprSyntax) -> Bool { false }
+    mutating func visit(_ expr: borrowing CastExprSyntax) -> Bool {
+        emitNotBoolDiag(for: expr)
+        return false
+    }
 
-    mutating func visit(_ expr: borrowing CaseWhenThenExprSyntax) -> Bool { false }
+    mutating func visit(_ expr: borrowing CaseWhenThenExprSyntax) -> Bool {
+        emitNotBoolDiag(for: expr)
+        return false
+    }
 
-    mutating func visit(_ expr: borrowing GroupedExprSyntax) -> Bool { false }
+    mutating func visit(_ expr: borrowing GroupedExprSyntax) -> Bool {
+        emitNotBoolDiag(for: expr)
+        return false
+    }
 
-    mutating func visit(_ expr: borrowing SelectExprSyntax) -> Bool { false }
+    mutating func visit(_ expr: borrowing SelectExprSyntax) -> Bool {
+        emitNotBoolDiag(for: expr)
+        return false
+    }
 
-    mutating func visit(_ expr: borrowing InvalidExprSyntax) -> Bool { false }
+    mutating func visit(_ expr: borrowing InvalidExprSyntax) -> Bool {
+        emitNotBoolDiag(for: expr)
+        return false
+    }
 
     mutating func visit(_ expr: borrowing LiteralExprSyntax) -> Bool {
         switch expr.kind {
@@ -52,8 +83,29 @@ struct IsStaticallyTrue: ExprSyntaxVisitor {
             return true
         case .false:
             return false
+        case .string(let text):
+            guard allowOnOffYesNo else {
+                emitNotBoolDiag(for: expr)
+                return false
+            }
+            
+            switch text.uppercased() {
+            case "YES", "ON": return true
+            case "NO", "OFF": return false
+            default:
+                emitNotBoolDiag(for: expr)
+                return false
+            }
         default:
+            emitNotBoolDiag(for: expr)
             return false
         }
     }
+    
+    private mutating func emitNotBoolDiag<S: Syntax>(for syntax: S) {
+        diagnostics.add(.init(
+            "Value is not a static boolean, expected TRUE, FALSE, 1 or 0",
+            at: syntax.range
+        ))
+    }
 }

Sources/Compiler/Sema/PragmaAnalyzer.swift

@@ -21,13 +21,17 @@ public struct FeatherPragmas: OptionSet, Sendable {
 
 struct PragmaAnalyzer {
     private(set) var featherPragmas: FeatherPragmas
-    private(set) var diagnostics = Diagnostics()
-    private var isStaticallyTrue = IsStaticallyTrue(allowOnOff: true)
+    private var diagnostics = Diagnostics()
+    private var isStaticallyTrue = IsStaticallyTrue(allowOnOffYesNo: true)
 
     init(featherPragmas: FeatherPragmas = FeatherPragmas()) {
         self.featherPragmas = featherPragmas
     }
 
+    var allDiagnostics: Diagnostics {
+        return diagnostics.merging(isStaticallyTrue.diagnostics)
+    }
+    
     func isOn(_ pragma: FeatherPragmas) -> Bool {
         return featherPragmas.contains(pragma)
     }
@@ -40,7 +44,7 @@ struct PragmaAnalyzer {
                 return
             }
 
-            if isTrue(expr) {
+            if isStaticallyTrue.isTrue(expr) {
                 featherPragmas.insert(.requireStrictTables)
             } else {
                 featherPragmas.remove(.requireStrictTables)
@@ -55,16 +59,4 @@ struct PragmaAnalyzer {
             break
         }
     }
-    
-    private mutating func isTrue(_ expr: ExprSyntax) -> Bool {
-        guard expr.accept(visitor: &isStaticallyTrue) else {
-            diagnostics.add(.init(
-                "Value is not a static boolean, expected TRUE, FALSE, 1 or 0",
-                at: expr.range
-            ))
-            return false
-        }
-        
-        return true
-    }
 }

Tests/CompilerTests/Parser/ParsePragma.sql

@@ -8,7 +8,7 @@ PRAGMA name = 1;
 -- CHECK: PRAGMA_STMT
 -- CHECK:   NAME name
 -- CHECK:   VALUE
--- CHECK:     LITERAL 1.0
+-- CHECK:     LITERAL 0.0
 -- CHECK:   IS_FUNCTION_CALL true
 PRAGMA name(0);