M minpkg/core/interpreter.nim → minpkg/core/interpreter.nim

@@ -194,7 +194,7 @@ return v
 
 proc apply*(i: In, op: MinOperator, sym = "") {.gcsafe, effectsOf: op.} =
   if op.kind == minProcOp:
-    if not op.mdl.scope.isNil and not i.scope.hasParent op.mdl.scope:
+    if op.mdl.isDictionary and not op.mdl.scope.isNil and not i.scope.hasParent op.mdl.scope:
       # Capture closures at module level
       let origScope = i.scope
       let origParentScope = i.scope.parent

M minpkg/core/parser.nim → minpkg/core/parser.nim

@@ -762,6 +762,7 @@ result = MinValue(kind: minQuotation, qVal: q)
   of tkBraceLe:
     var scope = newScopeRef(nil)
     var val: MinValue
+    var valSet = false
     discard getToken(p)
     var c = 0
     while p.token != tkBraceRi:
@@ -769,7 +770,7 @@ let v = p.parseMinValue(i)
       if v.isUnknown:
         continue
       c = c+1
-      if val.isUnknown:
+      if not valSet:
         val = v
       elif v.kind == minSymbol:
         let key = v.symVal
@@ -778,7 +779,7 @@ var offset = 0
           if key[1] == '"':
             offset = 1
           scope.symbols[key[1+offset .. key.len-1-offset]] = MinOperator(kind: minValOp, val: val, sealed: false, lambda: key[0] == '^')
-          val = MinValue(kind: minUnknown)
+          valSet = false
         else:
           raiseInvalid("Invalid dictionary key: " & key)
       else: