Clean up

johnmai-dev · Oct 1, 2024 · 6a9ba03 · 6a9ba03
1 parent 0a4d414
commit 6a9ba03
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Sources/Ast.swift b/Sources/Ast.swift
@@ -122,5 +122,5 @@ struct KeywordArgumentExpression: Expression {
 }
 
 struct NullLiteral: Literal {
-  var value: Any? = nil
+    var value: Any? = nil
 }
diff --git a/Sources/Environment.swift b/Sources/Environment.swift
@@ -167,15 +167,15 @@ class Environment {
             return ObjectValue(value: object)
         case is NullValue:
             return NullValue()
-        case Optional<Any>.none:
-            return NullValue()
+//        case Optional<Any>.none:
+//            return NullValue()
         default:
             throw JinjaError.runtime("Cannot convert to runtime value: \(input) type:\(type(of: input))")
         }
     }
 
     @discardableResult
-    func set(name: String, value: Any?) throws -> any RuntimeValue {
+    func set(name: String, value: Any) throws -> any RuntimeValue {
         try self.declareVariable(name: name, value: self.convertToRuntimeValues(input: value))
     }
 

diff --git a/Sources/Runtime.swift b/Sources/Runtime.swift
@@ -35,7 +35,7 @@ struct BooleanValue: RuntimeValue {
 }
 
 struct NullValue: RuntimeValue {
-    var value: Any? = nil
+    var value: (any RuntimeValue)?
     var builtins: [String: any RuntimeValue] = [:]
 
     func bool() -> Bool {