Remove Identifiers in favour of instance methods

6 files changed, 26 insertions, 34 deletions

diff --git a/src/test/java/org/zwobble/couscous/tests/TestIds.java b/src/test/java/org/zwobble/couscous/tests/TestIds.java
index da3cd09..5a5a3c0 100644
--- a/src/test/java/org/zwobble/couscous/tests/TestIds.java
+++ b/src/test/java/org/zwobble/couscous/tests/TestIds.java
@@ -1,12 +1,11 @@
 package org.zwobble.couscous.tests;
 
 import org.zwobble.couscous.ast.identifiers.Identifier;
-import org.zwobble.couscous.ast.identifiers.Identifiers;
 
 public class TestIds {
-    public static final Identifier ANY_ID = Identifiers.variable(Identifiers.TOP, "[any id]");
+    public static final Identifier ANY_ID = Identifier.TOP.variable("[any id]");
 
     public static Identifier variable(String name) {
-        return Identifiers.variable(ANY_ID, name);
+        return ANY_ID.variable(name);
     }
 }
diff --git a/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpSerializerTests.java b/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpSerializerTests.java
index 2572f8e..e3dc9ba 100644
--- a/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpSerializerTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpSerializerTests.java
@@ -2,7 +2,7 @@ package org.zwobble.couscous.tests.backends.csharp;
 
 import org.junit.Test;
 import org.zwobble.couscous.ast.*;
-import org.zwobble.couscous.ast.identifiers.Identifiers;
+import org.zwobble.couscous.ast.identifiers.Identifier;
 import org.zwobble.couscous.ast.sugar.SwitchNode;
 import org.zwobble.couscous.backends.csharp.CsharpSerializer;
 import org.zwobble.couscous.tests.TestIds;
@@ -168,7 +168,7 @@ public class CsharpSerializerTests {
             list(ScalarType.of("Z")),
             list(),
             ScalarType.of("Y"),
-            signature("y", list(typeParameter(Identifiers.method(Identifiers.forType("X"), "y"), "T")), list(), ScalarType.of("Y"))));
+            signature("y", list(typeParameter(Identifier.forType("X").method("y"), "T")), list(), ScalarType.of("Y"))));
         assertEquals("x.y<Z>()", output);
     }
 
@@ -413,8 +413,8 @@ public class CsharpSerializerTests {
     @Test
     public void methodWithTypeParameters() {
         MethodNode methodNode = MethodNode.staticMethod("nothing")
-            .typeParameter(formalTypeParameter(Identifiers.method(Identifiers.forType("com.Example.example"), "nothing"), "T"))
-            .typeParameter(formalTypeParameter(Identifiers.method(Identifiers.forType("com.Example.example"), "nothing"), "U"))
+            .typeParameter(formalTypeParameter(Identifier.forType("com.Example.example").method("nothing"), "T"))
+            .typeParameter(formalTypeParameter(Identifier.forType("com.Example.example").method("nothing"), "U"))
             .returns(ScalarType.of("void"))
             .build();
 
@@ -568,8 +568,8 @@ public class CsharpSerializerTests {
     @Test
     public void interfaceWithMethodWithTypeParameters() {
         MethodNode method = MethodNode.staticMethod("nothing")
-            .typeParameter(formalTypeParameter(Identifiers.method(Identifiers.forType("com.Example.example"), "nothing"), "T"))
-            .typeParameter(formalTypeParameter(Identifiers.method(Identifiers.forType("com.Example.example"), "nothing"), "U"))
+            .typeParameter(formalTypeParameter(Identifier.forType("com.Example.example").method("nothing"), "T"))
+            .typeParameter(formalTypeParameter(Identifier.forType("com.Example.example").method("nothing"), "U"))
             .returns(ScalarType.of("void"))
             .build();
 
diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java
index 585508a..e8b391e 100644
--- a/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java
@@ -2,7 +2,7 @@ package org.zwobble.couscous.tests.frontends.java;
 
 import org.junit.Test;
 import org.zwobble.couscous.ast.*;
-import org.zwobble.couscous.ast.identifiers.Identifiers;
+import org.zwobble.couscous.ast.identifiers.Identifier;
 import org.zwobble.couscous.types.ScalarType;
 import org.zwobble.couscous.types.TypeParameter;
 import org.zwobble.couscous.types.Types;
@@ -233,7 +233,7 @@ public class ExpressionReadingTests {
 
     @Test
     public void canReadMethodCallsWithZeroExpressionsAsVarargs() {
-        TypeParameter typeParameter = typeParameter(Identifiers.method(Identifiers.forType("java.util.Arrays"), "asList"), "T");
+        TypeParameter typeParameter = typeParameter(Identifier.forType("java.util.Arrays").method("asList"), "T");
         assertEquals(
             methodCall(
                 staticReceiver("java.util.Arrays"),
@@ -251,7 +251,7 @@ public class ExpressionReadingTests {
 
     @Test
     public void canReadMethodCallsWithMultipleExpressionsAsVarargs() {
-        TypeParameter typeParameter = typeParameter(Identifiers.method(Identifiers.forType("java.util.Arrays"), "asList"), "T");
+        TypeParameter typeParameter = typeParameter(Identifier.forType("java.util.Arrays").method("asList"), "T");
         assertEquals(
             methodCall(
                 staticReceiver("java.util.Arrays"),
@@ -269,7 +269,7 @@ public class ExpressionReadingTests {
 
     @Test
     public void canReadMethodCallsWithArrayAsVarargs() {
-        TypeParameter typeParameter = typeParameter(Identifiers.method(Identifiers.forType("java.util.Arrays"), "asList"), "T");
+        TypeParameter typeParameter = typeParameter(Identifier.forType("java.util.Arrays").method("asList"), "T");
         assertEquals(
             methodCall(
                 staticReceiver("java.util.Arrays"),
@@ -287,7 +287,7 @@ public class ExpressionReadingTests {
 
     @Test
     public void canReadGenericStaticMethodCallsWithExplicitTypeParameters() {
-        TypeParameter typeParameter = typeParameter(Identifiers.method(Identifiers.forType("java.util.Collections"), "emptyList"), "T");
+        TypeParameter typeParameter = typeParameter(Identifier.forType("java.util.Collections").method("emptyList"), "T");
         assertEquals(
             methodCall(
                 staticReceiver("java.util.Collections"),
@@ -305,7 +305,7 @@ public class ExpressionReadingTests {
 
     @Test
     public void canReadGenericStaticMethodCallsWithImplicitTypeParameters() {
-        TypeParameter typeParameter = typeParameter(Identifiers.method(Identifiers.forType("java.util.Collections"), "emptyList"), "T");
+        TypeParameter typeParameter = typeParameter(Identifier.forType("java.util.Collections").method("emptyList"), "T");
         assertEquals(
             methodCall(
                 staticReceiver("java.util.Collections"),
diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java
index acda60c..c6055e7 100644
--- a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java
@@ -3,7 +3,6 @@ package org.zwobble.couscous.tests.frontends.java;
 import org.junit.Test;
 import org.zwobble.couscous.ast.*;
 import org.zwobble.couscous.ast.identifiers.Identifier;
-import org.zwobble.couscous.ast.identifiers.Identifiers;
 import org.zwobble.couscous.types.ScalarType;
 import org.zwobble.couscous.types.Types;
 
@@ -104,8 +103,8 @@ public class JavaReaderTests {
 
         MethodNode method = classNode.getMethods().get(0);
 
-        Identifier classIdentifier = Identifiers.forType("com.example.Example");
-        Identifier expectedMethodIdentifier = Identifiers.method(classIdentifier, "identity");
+        Identifier classIdentifier = Identifier.forType("com.example.Example");
+        Identifier expectedMethodIdentifier = classIdentifier.method("identity");
         assertThat(method.getTypeParameters(), contains(isFormalTypeParameter(expectedMethodIdentifier, "T")));
         assertThat(
             method.getArguments(),
@@ -215,13 +214,7 @@ public class JavaReaderTests {
     @Test
     public void canReadTryWithResourceWithoutOtherClauses() {
         ScalarType type = ScalarType.of("java.io.ByteArrayOutputStream");
-        Identifier identifier = Identifiers.variable(
-            Identifiers.method(
-                Identifiers.type(Identifiers.TOP, "com.example.Example"),
-                "main"
-            ),
-            "closeable"
-        );
+        Identifier identifier = Identifier.TOP.type("com.example.Example").method("main").variable("closeable");
         LocalVariableDeclarationNode expectedResource = localVariableDeclaration(identifier, "closeable", type, constructorCall(type, list()));
         assertThat(
             readStatements("int", "try(java.io.ByteArrayOutputStream closeable = new java.io.ByteArrayOutputStream()) { return 1; }"),
@@ -395,7 +388,7 @@ public class JavaReaderTests {
         assertThat(classes, hasSize(1));
         ClassNode classNode = (ClassNode) classes.get(0);
         assertEquals(ScalarType.of("com.example.Example"), classNode.getName());
-        assertEquals(list(formalTypeParameter(Identifiers.forType("com.example.Example"), "T")), classNode.getTypeParameters());
+        assertEquals(list(formalTypeParameter(Identifier.forType("com.example.Example"), "T")), classNode.getTypeParameters());
     }
 
     @Test
@@ -406,7 +399,7 @@ public class JavaReaderTests {
         assertThat(classes, hasSize(1));
         InterfaceNode classNode = (InterfaceNode) classes.get(0);
         assertEquals(ScalarType.of("com.example.Example"), classNode.getName());
-        assertEquals(list(formalTypeParameter(Identifiers.forType("com.example.Example"), "T")), classNode.getTypeParameters());
+        assertEquals(list(formalTypeParameter(Identifier.forType("com.example.Example"), "T")), classNode.getTypeParameters());
     }
 
     @Test
diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaTypesTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaTypesTests.java
index 75c3594..f903eeb 100644
--- a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaTypesTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaTypesTests.java
@@ -1,7 +1,7 @@
 package org.zwobble.couscous.tests.frontends.java;
 
 import org.junit.Test;
-import org.zwobble.couscous.ast.identifiers.Identifiers;
+import org.zwobble.couscous.ast.identifiers.Identifier;
 import org.zwobble.couscous.frontends.java.JavaTypes;
 import org.zwobble.couscous.types.ScalarType;
 import org.zwobble.couscous.types.TypeParameter;
@@ -24,7 +24,7 @@ public class JavaTypesTests {
 
     @Test
     public void bindingTypeToGenericTypeParameterReturnsBoundTypeParameter() {
-        TypeParameter typeParameter = typeParameter(Identifiers.forType("List"), "T");
+        TypeParameter typeParameter = typeParameter(Identifier.forType("List"), "T");
         assertEquals(
             boundTypeParameter(typeParameter, INT_TYPE),
             JavaTypes.bind(typeParameter, INT_TYPE));
@@ -33,7 +33,7 @@ public class JavaTypesTests {
     @Test
     public void bindingTypeToParameterizedTypeBindsParameters() {
         ScalarType rawList = ScalarType.of("List");
-        TypeParameter typeParameter = typeParameter(Identifiers.forType("List"), "T");
+        TypeParameter typeParameter = typeParameter(Identifier.forType("List"), "T");
         assertEquals(
             parameterizedType(rawList, list(boundTypeParameter(typeParameter, INT_TYPE))),
             JavaTypes.bind(
diff --git a/src/test/java/org/zwobble/couscous/tests/transforms/DesugarSwitchToIfElseTests.java b/src/test/java/org/zwobble/couscous/tests/transforms/DesugarSwitchToIfElseTests.java
index 9e458e7..f1cb2b4 100644
--- a/src/test/java/org/zwobble/couscous/tests/transforms/DesugarSwitchToIfElseTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/transforms/DesugarSwitchToIfElseTests.java
@@ -3,7 +3,7 @@ package org.zwobble.couscous.tests.transforms;
 import org.junit.Test;
 import org.zwobble.couscous.ast.Operations;
 import org.zwobble.couscous.ast.VariableDeclaration;
-import org.zwobble.couscous.ast.identifiers.Identifiers;
+import org.zwobble.couscous.ast.identifiers.Identifier;
 import org.zwobble.couscous.ast.sugar.SwitchNode;
 import org.zwobble.couscous.frontends.java.Scope;
 import org.zwobble.couscous.transforms.DesugarSwitchToIfElse;
@@ -24,7 +24,7 @@ public class DesugarSwitchToIfElseTests {
     @Test
     public void switchStatementWithoutFallThroughIsReadAsIfElseStatement() {
         VariableDeclaration tmp = var(
-            Identifiers.variable(Identifiers.TOP, "_couscous_tmp_0"),
+            Identifier.TOP.variable("_couscous_tmp_0"),
             "_couscous_tmp_0",
             Types.STRING
         );
@@ -62,7 +62,7 @@ public class DesugarSwitchToIfElseTests {
     @Test
     public void switchStatementWithoutDefaultIsReadAsIfStatementWithoutElseStatement() {
         VariableDeclaration tmp = var(
-            Identifiers.variable(Identifiers.TOP, "_couscous_tmp_0"),
+            Identifier.TOP.variable("_couscous_tmp_0"),
             "_couscous_tmp_0",
             Types.STRING
         );
@@ -90,7 +90,7 @@ public class DesugarSwitchToIfElseTests {
     @Test
     public void casesCanFallthrough() {
         VariableDeclaration tmp = var(
-            Identifiers.variable(Identifiers.TOP, "_couscous_tmp_0"),
+            Identifier.TOP.variable("_couscous_tmp_0"),
             "_couscous_tmp_0",
             Types.STRING
         );