Проверка по типам вместо instanceof

Author: aNNiMON

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

@@ -42,6 +42,11 @@ public ArrayValue(ArrayValue array) {
         this(array.elements);
     }
 
+    @Override
+    public int type() {
+        return Types.ARRAY;
+    }
+    
     public Value get(int index) {
         return elements[index];
     }

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

@@ -14,6 +14,11 @@ public FunctionValue(Function value) {
         this.value = value;
     }
 
+    @Override
+    public int type() {
+        return Types.FUNCTION;
+    }
+    
     @Override
     public double asNumber() {
         throw new RuntimeException("Cannot cast function to number");

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

@@ -20,6 +20,11 @@ public MapValue(int size) {
     public MapValue(Map<Value, Value> map) {
         this.map = map;
     }
+    
+    @Override
+    public int type() {
+        return Types.MAP;
+    }
 
     public Value get(Value key) {
         return map.get(key);

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

@@ -19,6 +19,11 @@ public NumberValue(double value) {
         this.value = value;
     }
 
+    @Override
+    public int type() {
+        return Types.NUMBER;
+    }
+    
     @Override
     public double asNumber() {
         return value;

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

@@ -14,6 +14,11 @@ public StringValue(String value) {
         this.value = value;
     }
 
+    @Override
+    public int type() {
+        return Types.STRING;
+    }
+    
     @Override
     public double asNumber() {
         try {

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

@@ -0,0 +1,12 @@
+package com.annimon.ownlang.lib;
+
+public final class Types {
+
+    public static final int
+            OBJECT = 0,
+            NUMBER = 1,
+            STRING = 2,
+            ARRAY = 3,
+            MAP = 4,
+            FUNCTION = 5;
+}

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

@@ -9,4 +9,6 @@ public interface Value {
     double asNumber();
 
     String asString();
+    
+    int type();
 }

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

@@ -2,6 +2,7 @@
 
 import com.annimon.ownlang.lib.ArrayValue;
 import com.annimon.ownlang.lib.MapValue;
+import com.annimon.ownlang.lib.Types;
 import com.annimon.ownlang.lib.Value;
 import com.annimon.ownlang.lib.Variables;
 import java.util.List;
@@ -23,7 +24,7 @@ public ArrayAccessExpression(String variable, List<Expression> indices) {
     @Override
     public Value eval() {
         Value container = Variables.get(variable);
-        if (container instanceof ArrayValue) {
+        if (container.type() == Types.ARRAY) {
             return getArray().get(lastIndex());
         }
         return consumeMap(container).get(indices.get(0).eval());
@@ -47,19 +48,17 @@ private int index(int index) {
     }
 
     private ArrayValue consumeArray(Value value) {
-        if (value instanceof ArrayValue) {
-            return (ArrayValue) value;
-        } else {
+        if (value.type() != Types.ARRAY) {
             throw new RuntimeException("Array expected");
         }
+        return (ArrayValue) value;
     }
 
     public MapValue consumeMap(Value value) {
-        if (value instanceof MapValue) {
-            return (MapValue) value;
-        } else {
+        if (value.type() != Types.MAP) {
             throw new RuntimeException("Map expected");
         }
+        return (MapValue) value;
     }
 
     @Override

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

@@ -1,6 +1,6 @@
 package com.annimon.ownlang.parser.ast;
 
-import com.annimon.ownlang.lib.ArrayValue;
+import com.annimon.ownlang.lib.Types;
 import com.annimon.ownlang.lib.Value;
 import com.annimon.ownlang.lib.Variables;
 
@@ -21,7 +21,7 @@ public ArrayAssignmentStatement(ArrayAccessExpression array, Expression expressi
     @Override
     public void execute() {
         final Value container = Variables.get(array.variable);
-        if (container instanceof ArrayValue) {
+        if (container.type() == Types.ARRAY) {
             array.getArray().set(array.lastIndex(), expression.eval());
             return;
         }

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

@@ -3,6 +3,7 @@
 import com.annimon.ownlang.lib.ArrayValue;
 import com.annimon.ownlang.lib.NumberValue;
 import com.annimon.ownlang.lib.StringValue;
+import com.annimon.ownlang.lib.Types;
 import com.annimon.ownlang.lib.Value;
 
 /**
@@ -52,13 +53,15 @@ public Value eval() {
         final Value value1 = expr1.eval();
         final Value value2 = expr2.eval();
 
-        if (value1 instanceof StringValue) {
-            return eval((StringValue) value1, value2);
-        }
-        if (value1 instanceof ArrayValue) {
-            return eval((ArrayValue) value1, value2);
+        switch (value1.type()) {
+            case Types.STRING:
+                return eval((StringValue) value1, value2);
+            case Types.ARRAY:
+                return eval((ArrayValue) value1, value2);
+            case Types.NUMBER:
+            default:
+                return eval(value1, value2);
         }
-        return eval(value1, value2);
     }
 
     private Value eval(StringValue value1, Value value2) {
@@ -81,7 +84,7 @@ private Value eval(StringValue value1, Value value2) {
     private Value eval(ArrayValue value1, Value value2) {
         switch (operation) {
             case LSHIFT:
-                if (!(value2 instanceof ArrayValue))
+                if (value2.type() != Types.ARRAY)
                     throw new RuntimeException("Cannot merge non array value to array");
                 return ArrayValue.merge(value1, (ArrayValue) value2);
             case PUSH: