check null properties

tomatofrommars · Feb 4, 2014 · d3f9e21 · d3f9e21
1 parent 3ae9359
commit d3f9e21
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/org/yinwang/yin/ast/Call.java b/src/main/java/org/yinwang/yin/ast/Call.java
@@ -23,12 +23,11 @@ public Call(Node func, Argument args, String file, int start, int end, int line,
     public Value interp(Scope s) {
         Value fun = this.func.interp(s);
         if (fun instanceof Closure) {
-            Fun def = ((Closure) fun).fun;
             Closure closure = (Closure) fun;
             Scope funScope = new Scope(closure.env);
             List<Name> params = closure.fun.params;
 
-            if (def.propertyForm != null) {
+            if (closure.properties != null) {
                 Declare.mergeProperties(closure.properties, funScope);
             }
 

diff --git a/src/main/java/org/yinwang/yin/ast/Fun.java b/src/main/java/org/yinwang/yin/ast/Fun.java
@@ -24,7 +24,7 @@ public Fun(List<Name> params, Scope propertyForm, Node body, String file, int st
 
     public Value interp(Scope s) {
         // evaluate and cache the properties in the closure
-        Scope properties = Declare.evalProperties(propertyForm, s);
+        Scope properties = propertyForm == null ? null : Declare.evalProperties(propertyForm, s);
         return new Closure(this, properties, s);
     }