factor out a bit more things

tomatofrommars · Feb 3, 2014 · 34f28ee · 34f28ee
1 parent 819b8a8
commit 34f28ee
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/src/main/java/org/yinwang/yin/ast/Call.java b/src/main/java/org/yinwang/yin/ast/Call.java
@@ -29,7 +29,7 @@ public Value interp(Scope s) {
             List<Name> params = closure.fun.params;
 
             if (def.properties != null) {
-                Declare.evalProperties(def.properties, funScope);
+                Declare.mergeProperties(def.properties, funScope);
             }
 
             if (!args.positional.isEmpty() && args.keywords.isEmpty()) {

diff --git a/src/main/java/org/yinwang/yin/ast/Declare.java b/src/main/java/org/yinwang/yin/ast/Declare.java
@@ -20,36 +20,24 @@ public Declare(Scope propsNode, String file, int start, int end, int line, int c
 
 
     public Value interp(Scope s) {
-        evalProperties(propsNode, s);
+        mergeProperties(propsNode, s);
         return Value.VOID;
     }
 
 
     // helper
     // evaluate the properties inside propsNode
     // then merge into the Scope s
-    public static void evalProperties(Scope propsNode, Scope s) {
+    public static void mergeProperties(Scope unevaled, Scope s) {
         // evaluate the properties
-        Scope properties = new Scope();
-        for (String field : propsNode.keySet()) {
-            Map<String, Object> props = propsNode.lookupAllProps(field);
-            for (Map.Entry<String, Object> e : props.entrySet()) {
-                Object v = e.getValue();
-                if (v instanceof Node) {
-                    Value vValue = ((Node) v).interp(s);
-                    properties.put(field, e.getKey(), vValue);
-                } else {
-                    _.abort("property is not a node, parser bug: " + v);
-                }
-            }
-        }
+        Scope evaled = evalProperties(unevaled, s);
 
         // merge the properties into current scope
-        s.putAll(properties);
+        s.putAll(evaled);
 
         // set default values for variables
-        for (String key : properties.keySet()) {
-            Object defaultValue = properties.lookupPropertyLocal(key, "default");
+        for (String key : evaled.keySet()) {
+            Object defaultValue = evaled.lookupPropertyLocal(key, "default");
             if (defaultValue == null) {
                 continue;
             } else if (defaultValue instanceof Value) {
@@ -64,6 +52,25 @@ public static void evalProperties(Scope propsNode, Scope s) {
     }
 
 
+    public static Scope evalProperties(Scope unevaled, Scope s) {
+        Scope evaled = new Scope();
+
+        for (String field : unevaled.keySet()) {
+            Map<String, Object> props = unevaled.lookupAllProps(field);
+            for (Map.Entry<String, Object> e : props.entrySet()) {
+                Object v = e.getValue();
+                if (v instanceof Node) {
+                    Value vValue = ((Node) v).interp(s);
+                    evaled.put(field, e.getKey(), vValue);
+                } else {
+                    _.abort("property is not a node, parser bug: " + v);
+                }
+            }
+        }
+        return evaled;
+    }
+
+
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(Constants.TUPLE_BEGIN);