Remove separate method names for operators

4 files changed, 17 insertions, 17 deletions

diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/BooleanInterpreterValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/BooleanInterpreterValue.java
index 023f684..bb60863 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/values/BooleanInterpreterValue.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/values/BooleanInterpreterValue.java
@@ -20,15 +20,15 @@ public final class BooleanInterpreterValue implements InterpreterValue {
 
     private static final ConcreteType TYPE = ConcreteType.builder(BooleanInterpreterValue.class, "boolean")
         
-        .method("negate", list(), (environment, arguments) ->
+        .method(Operator.BOOLEAN_NOT.getSymbol(), list(), (environment, arguments) ->
             of(!arguments.getReceiver().getValue()))
 
-        .method(Operator.BOOLEAN_AND.getMethodName(), list(BooleanValue.REF), (environment, arguments) -> {
+        .method(Operator.BOOLEAN_AND.getSymbol(), list(BooleanValue.REF), (environment, arguments) -> {
             BooleanInterpreterValue right = (BooleanInterpreterValue)arguments.get(0);
             return of(arguments.getReceiver().getValue() && right.getValue());
         })
 
-        .method(Operator.BOOLEAN_OR.getMethodName(), list(BooleanValue.REF), (environment, arguments) -> {
+        .method(Operator.BOOLEAN_OR.getSymbol(), list(BooleanValue.REF), (environment, arguments) -> {
             BooleanInterpreterValue right = (BooleanInterpreterValue)arguments.get(0);
             return of(arguments.getReceiver().getValue() || right.getValue());
         })
diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/BoxedIntegerInterpreterValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/BoxedIntegerInterpreterValue.java
index 228dbb7..2aa7024 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/values/BoxedIntegerInterpreterValue.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/values/BoxedIntegerInterpreterValue.java
@@ -1,6 +1,5 @@
 package org.zwobble.couscous.interpreter.values;
 
-import org.zwobble.couscous.ast.Operator;
 import org.zwobble.couscous.values.IntegerValue;
 import org.zwobble.couscous.values.ObjectValues;
 import org.zwobble.couscous.values.StringValue;
@@ -33,7 +32,7 @@ public class BoxedIntegerInterpreterValue {
                 return of(value);
             })
 
-        .method(Operator.EQUALS.getMethodName(), list(ObjectValues.OBJECT),
+        .method("equals", list(ObjectValues.OBJECT),
             (environment, arguments) -> {
                 InterpreterValue right = arguments.getPositionalArguments().get(0);
                 if (right.getType().getName().equals(ObjectValues.BOXED_INT)) {
diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/IntegerInterpreterValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/IntegerInterpreterValue.java
index acd8845..8c6af74 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/values/IntegerInterpreterValue.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/values/IntegerInterpreterValue.java
@@ -14,30 +14,30 @@ import static org.zwobble.couscous.util.ExtraLists.list;
 
 public final class IntegerInterpreterValue implements InterpreterValue {
     public static final ConcreteType TYPE = ConcreteType.builder(IntegerInterpreterValue.class, IntegerValue.REF)
-        .method(Operator.ADD.getMethodName(), list(IntegerValue.REF),
+        .method(Operator.ADD.getSymbol(), list(IntegerValue.REF),
             infixReturningInteger((left, right) -> left + right))
-        .method(Operator.SUBTRACT.getMethodName(), list(IntegerValue.REF),
+        .method(Operator.SUBTRACT.getSymbol(), list(IntegerValue.REF),
             infixReturningInteger((left, right) -> left - right))
-        .method(Operator.MULTIPLY.getMethodName(), list(IntegerValue.REF),
+        .method(Operator.MULTIPLY.getSymbol(), list(IntegerValue.REF),
             infixReturningInteger((left, right) -> left * right))
-        .method(Operator.DIVIDE.getMethodName(), list(IntegerValue.REF),
+        .method(Operator.DIVIDE.getSymbol(), list(IntegerValue.REF),
             infixReturningInteger((left, right) -> left / right))
-        .method(Operator.MOD.getMethodName(), list(IntegerValue.REF),
+        .method(Operator.MOD.getSymbol(), list(IntegerValue.REF),
             infixReturningInteger((left, right) -> left % right))
-        .method(Operator.EQUALS.getMethodName(), list(IntegerValue.REF),
+        .method(Operator.EQUALS.getSymbol(), list(IntegerValue.REF),
             (environment, arguments) -> {
                 IntegerInterpreterValue right = (IntegerInterpreterValue)arguments.getPositionalArguments().get(0);
                 return integerEquals(arguments, right);
             })
-        .method(Operator.NOT_EQUALS.getMethodName(), list(IntegerValue.REF),
+        .method(Operator.NOT_EQUALS.getSymbol(), list(IntegerValue.REF),
             infixReturningBoolean((left, right) -> !left.equals(right)))
-        .method(Operator.GREATER_THAN.getMethodName(), list(IntegerValue.REF),
+        .method(Operator.GREATER_THAN.getSymbol(), list(IntegerValue.REF),
             infixReturningBoolean((left, right) -> left > right))
-        .method(Operator.GREATER_THAN_OR_EQUAL.getMethodName(), list(IntegerValue.REF),
+        .method(Operator.GREATER_THAN_OR_EQUAL.getSymbol(), list(IntegerValue.REF),
             infixReturningBoolean((left, right) -> left >= right))
-        .method(Operator.LESS_THAN.getMethodName(), list(IntegerValue.REF),
+        .method(Operator.LESS_THAN.getSymbol(), list(IntegerValue.REF),
             infixReturningBoolean((left, right) -> left < right))
-        .method(Operator.LESS_THAN_OR_EQUAL.getMethodName(), list(IntegerValue.REF),
+        .method(Operator.LESS_THAN_OR_EQUAL.getSymbol(), list(IntegerValue.REF),
             infixReturningBoolean((left, right) -> left <= right))
         .build();
 
diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/StringInterpreterValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/StringInterpreterValue.java
index f86b343..55a17cc 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/values/StringInterpreterValue.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/values/StringInterpreterValue.java
@@ -1,5 +1,6 @@
 package org.zwobble.couscous.interpreter.values;
 
+import org.zwobble.couscous.ast.Operator;
 import org.zwobble.couscous.interpreter.errors.NoSuchField;
 import org.zwobble.couscous.values.*;
 
@@ -18,7 +19,7 @@ public final class StringInterpreterValue implements InterpreterValue {
             return of(arguments.getReceiver().value.substring(startIndex.getValue(), endIndex.getValue()));
         })
 
-        .method("add", list(StringValue.REF), (environment, arguments) -> {
+        .method(Operator.ADD.getSymbol(), list(StringValue.REF), (environment, arguments) -> {
             StringInterpreterValue right = (StringInterpreterValue)arguments.get(0);
             return of(arguments.getReceiver().value + right.value);
         })