Операция слияния объектов

Author: aNNiMON

src/com/annimon/ownlang/lib/MapValue.java

@@ -14,6 +14,13 @@ public class MapValue implements Value, Iterable<Map.Entry<Value, Value>> {
 
     public static final MapValue EMPTY = new MapValue(1);
 
+    public static MapValue merge(MapValue map1, MapValue map2) {
+        final MapValue result = new MapValue(map1.size() + map2.size());
+        result.map.putAll(map1.map);
+        result.map.putAll(map2.map);
+        return result;
+    }
+    
     private final Map<Value, Value> map;
 
     public MapValue(int size) {

src/com/annimon/ownlang/lib/Types.java

@@ -10,7 +10,7 @@ public final class Types {
             MAP = 4,
             FUNCTION = 5;
 
-    private static int FIRST = OBJECT, LAST = FUNCTION;
+    private static final int FIRST = OBJECT, LAST = FUNCTION;
     private static final String[] NAMES = {"object", "number", "string", "array", "map", "function"};
 
     public static String typeToString(int type) {

src/com/annimon/ownlang/parser/ast/BinaryExpression.java

@@ -4,6 +4,7 @@
 import com.annimon.ownlang.exceptions.TypeException;
 import com.annimon.ownlang.lib.ArrayValue;
 import com.annimon.ownlang.lib.Functions;
+import com.annimon.ownlang.lib.MapValue;
 import com.annimon.ownlang.lib.NumberValue;
 import com.annimon.ownlang.lib.StringValue;
 import com.annimon.ownlang.lib.Types;
@@ -89,7 +90,10 @@ private Value add(Value value1, Value value2) {
             case Types.NUMBER: return add((NumberValue) value1, value2);
             case Types.STRING: return new StringValue(value1.asString() + value2.asString());
             case Types.ARRAY: return ArrayValue.add((ArrayValue) value1, value2);
-            case Types.MAP: /* TODO: merge maps */
+            case Types.MAP:
+                if (value2.type() != Types.MAP)
+                    throw new TypeException("Cannot merge non map value to map");
+                return MapValue.merge((MapValue) value1, (MapValue) value2);
             case Types.FUNCTION: /* TODO: combining functions */
             default:
                 // Concatenation strings