munificent / lark / changeset / 5a1839f4cf6b

@@ -16,15 +16,19 @@ public class SpecialForms {
     public static CallableExpr doForm() {
         return new CallableExpr() {
             public Expr call(Interpreter interpreter, Scope scope, Expr argExpr) {
                 // create a new local scope for the body
                 Scope local = scope.create();
                 // if the arg isn't a list, just eval it normally
-                if (!(argExpr instanceof ListExpr)) return interpreter.eval(scope, argExpr);
+                if (!(argExpr instanceof ListExpr)) return interpreter.eval(local, argExpr);
                 // evaluate each item in the arg list in order, returning the last one
                 ListExpr argList = (ListExpr)argExpr;
                 Expr result = null;
                 for (Expr arg : argList.getList()) {
-                    result = interpreter.eval(scope, arg);
+                    result = interpreter.eval(local, arg);
+                }
                 return result;

 # output: ()
 # output: 1
 # output: 2
 # output: 3
 # output: 1
 print a;
 def: a is: 1;
 print a;
 # create a local scope
+{
     def: a is: 2;
     print a;
     def: a is: 3;
     print a;
 };
 print a;

 # output: ()
 # output: 123
 # output: 345
 # output: 345
 print a;
 global: a is: 123;
 print a;
+{
     global: a is: 345;
     print a;
 };
 print a;