From fee1878340fe2055f9d5b4c52eb2993c06c25f25 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 30 Oct 2016 20:25:05 +0000 Subject: Store inner classes in ScalarType --- src/main/java/org/zwobble/couscous/ast/ClassNodeBuilder.java | 4 ++-- src/main/java/org/zwobble/couscous/ast/MethodCallNode.java | 4 ++-- src/main/java/org/zwobble/couscous/ast/StaticReceiver.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/ast') diff --git a/src/main/java/org/zwobble/couscous/ast/ClassNodeBuilder.java b/src/main/java/org/zwobble/couscous/ast/ClassNodeBuilder.java index ec17c9b..4d39b01 100644 --- a/src/main/java/org/zwobble/couscous/ast/ClassNodeBuilder.java +++ b/src/main/java/org/zwobble/couscous/ast/ClassNodeBuilder.java @@ -38,7 +38,7 @@ public class ClassNodeBuilder { } public ClassNodeBuilder(String name) { - this(ScalarType.of(name)); + this(ScalarType.topLevel(name)); } public ClassNodeBuilder addTypeParameter(String name) { @@ -47,7 +47,7 @@ public class ClassNodeBuilder { } public ClassNodeBuilder addSuperType(String type) { - this.superTypes.add(ScalarType.of(type)); + this.superTypes.add(ScalarType.topLevel(type)); return this; } diff --git a/src/main/java/org/zwobble/couscous/ast/MethodCallNode.java b/src/main/java/org/zwobble/couscous/ast/MethodCallNode.java index 2a6f408..ece3175 100644 --- a/src/main/java/org/zwobble/couscous/ast/MethodCallNode.java +++ b/src/main/java/org/zwobble/couscous/ast/MethodCallNode.java @@ -19,7 +19,7 @@ public class MethodCallNode implements ExpressionNode { List arguments, Type type) { - return staticMethodCall(ScalarType.of(className), methodName, arguments, type); + return staticMethodCall(ScalarType.topLevel(className), methodName, arguments, type); } public static ExpressionNode staticMethodCall( @@ -29,7 +29,7 @@ public class MethodCallNode implements ExpressionNode { Type returnType, MethodSignature signature) { - return staticMethodCall(ScalarType.of(className), methodName, arguments, returnType, signature); + return staticMethodCall(ScalarType.topLevel(className), methodName, arguments, returnType, signature); } public static ExpressionNode staticMethodCall( diff --git a/src/main/java/org/zwobble/couscous/ast/StaticReceiver.java b/src/main/java/org/zwobble/couscous/ast/StaticReceiver.java index 7ae7ec1..a61a685 100644 --- a/src/main/java/org/zwobble/couscous/ast/StaticReceiver.java +++ b/src/main/java/org/zwobble/couscous/ast/StaticReceiver.java @@ -6,7 +6,7 @@ import org.zwobble.couscous.util.ExtraIterables; public class StaticReceiver implements Receiver { public static Receiver staticReceiver(String type) { - return new StaticReceiver(ScalarType.of(type)); + return new StaticReceiver(ScalarType.topLevel(type)); } public static Receiver staticReceiver(ScalarType type) { -- cgit v1.2.3