Add MethodTypeParameter

5 files changed, 10 insertions, 5 deletions

diff --git a/src/test/java/org/zwobble/couscous/tests/ValueObjectTests.java b/src/test/java/org/zwobble/couscous/tests/ValueObjectTests.java
index 2a6fd85..0e96500 100644
--- a/src/test/java/org/zwobble/couscous/tests/ValueObjectTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/ValueObjectTests.java
@@ -61,6 +61,7 @@ public class ValueObjectTests {
             {LocalVariableDeclarationNode.class},
             {MethodCallNode.class},
             {MethodNode.class},
+            {MethodTypeParameter.class},
             {OperationNode.class},
             {ParameterizedType.class},
             {ReturnNode.class},
diff --git a/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpMethodRunner.java b/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpMethodRunner.java
index aeeac47..049b8d5 100644
--- a/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpMethodRunner.java
+++ b/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpMethodRunner.java
@@ -61,6 +61,7 @@ public class CsharpMethodRunner implements MethodRunner {
     {
         MethodSignature signature = new MethodSignature(
             methodName,
+            list(),
             eagerMap(arguments, argument -> argument.getType()),
             returnType);
         String csharpMethodName = CsharpCodeGenerator.NAMING.methodName(signature);
diff --git a/src/test/java/org/zwobble/couscous/tests/backends/python/PythonMethodRunner.java b/src/test/java/org/zwobble/couscous/tests/backends/python/PythonMethodRunner.java
index cfc7102..db0e385 100644
--- a/src/test/java/org/zwobble/couscous/tests/backends/python/PythonMethodRunner.java
+++ b/src/test/java/org/zwobble/couscous/tests/backends/python/PythonMethodRunner.java
@@ -21,6 +21,7 @@ import java.util.List;
 
 import static java.lang.Integer.parseInt;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.zwobble.couscous.ast.MethodSignature.signature;
 import static org.zwobble.couscous.tests.util.ExtraFiles.deleteRecursively;
 import static org.zwobble.couscous.util.ExtraLists.eagerMap;
 import static org.zwobble.couscous.util.ExtraLists.list;
@@ -53,7 +54,7 @@ public class PythonMethodRunner implements MethodRunner {
             throws IOException, InterruptedException {
         
         String argumentsString = Joiner.on(", ").join(arguments.stream().map(PythonCodeGenerator::generateCode).map(PythonSerializer::serialize).iterator());
-        MethodSignature signature = new MethodSignature(
+        MethodSignature signature = signature(
             methodName,
             eagerMap(arguments, argument -> argument.getType()),
             returnType);
diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
index 8488e7b..79c082d 100644
--- a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
@@ -32,6 +32,7 @@ import static org.zwobble.couscous.ast.FieldAccessNode.fieldAccess;
 import static org.zwobble.couscous.ast.FormalArgumentNode.formalArg;
 import static org.zwobble.couscous.ast.LiteralNode.literal;
 import static org.zwobble.couscous.ast.MethodCallNode.methodCall;
+import static org.zwobble.couscous.ast.MethodSignature.signature;
 import static org.zwobble.couscous.ast.TernaryConditionalNode.ternaryConditional;
 import static org.zwobble.couscous.ast.VariableDeclaration.var;
 import static org.zwobble.couscous.interpreter.Evaluator.eval;
@@ -72,7 +73,7 @@ public class EvaluatorTests extends BackendEvalTests {
                     "size",
                     list(),
                     Types.INT)));
-        assertEquals(new MethodSignature("size", list(), Types.INT), exception.getSignature());
+        assertEquals(signature("size", list(), Types.INT), exception.getSignature());
     }
     
     @Test
@@ -84,7 +85,7 @@ public class EvaluatorTests extends BackendEvalTests {
                     "substring",
                     list(literal(1)),
                     Types.STRING)));
-        assertEquals(new MethodSignature("substring", list(Types.INT), Types.STRING), exception.getSignature());
+        assertEquals(signature("substring", list(Types.INT), Types.STRING), exception.getSignature());
     }
     
     @Test
@@ -97,7 +98,7 @@ public class EvaluatorTests extends BackendEvalTests {
                     list(literal(0), literal("")),
                     Types.STRING)));
         assertEquals(
-            new MethodSignature("substring", list(Types.INT, Types.STRING), Types.STRING),
+            signature("substring", list(Types.INT, Types.STRING), Types.STRING),
             exception.getSignature());
     }
 
diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java
index 0e644e1..c1a0584 100644
--- a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java
@@ -28,6 +28,7 @@ import static org.zwobble.couscous.ast.FormalArgumentNode.formalArg;
 import static org.zwobble.couscous.ast.LiteralNode.literal;
 import static org.zwobble.couscous.ast.LocalVariableDeclarationNode.localVariableDeclaration;
 import static org.zwobble.couscous.ast.MethodNode.staticMethod;
+import static org.zwobble.couscous.ast.MethodSignature.signature;
 import static org.zwobble.couscous.ast.ReturnNode.returns;
 import static org.zwobble.couscous.ast.VariableDeclaration.var;
 import static org.zwobble.couscous.ast.VariableReferenceNode.reference;
@@ -44,7 +45,7 @@ public class InterpreterMethodTests extends BackendMethodTests {
         NoSuchMethod exception = assertThrows(NoSuchMethod.class,
             () -> runMethod(method, value("hello, world!")));
         
-        assertEquals(new MethodSignature("hello", list(Types.STRING), Types.VOID), exception.getSignature());
+        assertEquals(signature("hello", list(Types.STRING), Types.VOID), exception.getSignature());
     }
     
     @Test