more error detecting for records

evildickman · Feb 1, 2014 · f747989 · f747989
1 parent 8efacea
commit f747989
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/main/java/org/yinwang/yin/ast/Call.java b/src/main/java/org/yinwang/yin/ast/Call.java
@@ -123,15 +123,27 @@ public Value interp(Scope s) {
 
                 for (String key : template.properties.keySet()) {
                     Object defaultValue = template.properties.lookupPropertyLocal(key, "default");
-                    if (defaultValue instanceof Value) {
+                    if (defaultValue == null) {
+                        continue;
+                    } else if (defaultValue instanceof Value) {
                         values.put(key, (Value) defaultValue);
                     } else {
                         _.abort("default value is not value, shouldn't happen");
                     }
                 }
 
                 for (Map.Entry<String, Node> e : args.keywords.entrySet()) {
-                    values.put(e.getKey(), e.getValue().interp(s));
+                    if (!template.properties.keySet().contains(e.getKey())) {
+                        _.abort(this, "extra keyword argument: " + e.getKey());
+                    } else {
+                        values.put(e.getKey(), e.getValue().interp(s));
+                    }
+                }
+
+                for (String field : template.properties.keySet()) {
+                    if (!values.containsKey(field)) {
+                        _.abort(this, "field is not initialized: " + field);
+                    }
                 }
 
                 // instantiate