Переопределение операторов

Author: aNNiMON

program.own

@@ -234,4 +234,8 @@ xarr[0]++
 println xarr[0]
 
 `extended word variable` = 9
-println `extended word variable`
+println `extended word variable`
+
+// Operator overloading
+def `::`(v1, v2) = string(v1) + string(v2)
+println 1 :: 2 :: 3

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

@@ -3,6 +3,7 @@
 import com.annimon.ownlang.exceptions.OperationIsNotSupportedException;
 import com.annimon.ownlang.exceptions.TypeException;
 import com.annimon.ownlang.lib.ArrayValue;
+import com.annimon.ownlang.lib.Functions;
 import com.annimon.ownlang.lib.NumberValue;
 import com.annimon.ownlang.lib.StringValue;
 import com.annimon.ownlang.lib.Types;
@@ -54,6 +55,17 @@ public BinaryExpression(Operator operation, Expression expr1, Expression expr2)
     public Value eval() {
         final Value value1 = expr1.eval();
         final Value value2 = expr2.eval();
+        try {
+            return eval(value1, value2);
+        } catch (OperationIsNotSupportedException ex) {
+            if (Functions.isExists(operation.toString())) {
+                return Functions.get(operation.toString()).execute(value1, value2);
+            }
+            throw ex;
+        }
+    }
+    
+    private Value eval(Value value1, Value value2) throws OperationIsNotSupportedException {
         switch (operation) {
             case ADD: return add(value1, value2);
             case SUBTRACT: return subtract(value1, value2);
@@ -75,10 +87,10 @@ public Value eval() {
     private Value add(Value value1, Value value2) {
         switch (value1.type()) {
             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.FUNCTION: /* TODO: combining functions */
-            case Types.STRING:
             default:
                 // Concatenation strings
                 return new StringValue(value1.asString() + value2.asString());