diff options
Diffstat (limited to 'src/main/java/org/zwobble/couscous/backends/csharp')
3 files changed, 14 insertions, 14 deletions
diff --git a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java index 260d7ec..68eaa73 100644 --- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java +++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java @@ -21,14 +21,14 @@ public class CsharpCodeGenerator { public static final Naming NAMING = Naming.noMangling(); private final static Map<ScalarType, ScalarType> PRIMITIVES = ImmutableMap.<ScalarType, ScalarType>builder() - .put(Types.INT, ScalarType.of("int")) - .put(Types.BOXED_INT, ScalarType.of("int")) - .put(Types.STRING, ScalarType.of("string")) - .put(Types.CHAR, ScalarType.of("char")) - .put(Types.BOOLEAN, ScalarType.of("bool")) - .put(Types.BOXED_BOOLEAN, ScalarType.of("bool")) - .put(Types.CLASS, ScalarType.of("System.Type")) - .put(Types.VOID, ScalarType.of("void")) + .put(Types.INT, ScalarType.topLevel("int")) + .put(Types.BOXED_INT, ScalarType.topLevel("int")) + .put(Types.STRING, ScalarType.topLevel("string")) + .put(Types.CHAR, ScalarType.topLevel("char")) + .put(Types.BOOLEAN, ScalarType.topLevel("bool")) + .put(Types.BOXED_BOOLEAN, ScalarType.topLevel("bool")) + .put(Types.CLASS, ScalarType.topLevel("System.Type")) + .put(Types.VOID, ScalarType.topLevel("void")) .put(Types.ARRAY, Types.ARRAY) .build(); @@ -81,7 +81,7 @@ public class CsharpCodeGenerator { @Override public Type visit(ParameterizedType type) { if (type.getRawType().equals(Types.CLASS)) { - return ScalarType.of("System.Type"); + return ScalarType.topLevel("System.Type"); } else { return new ParameterizedType( (ScalarType) transformType(type.getRawType()), @@ -102,7 +102,7 @@ public class CsharpCodeGenerator { return type.accept(new Type.Visitor<Type>() { @Override public ScalarType visit(ScalarType type) { - return ScalarType.of(namespace + "." + type.getQualifiedName()); + return ScalarType.topLevel(namespace + "." + type.getQualifiedName()); } @Override diff --git a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java index c2fa029..4ddeb7c 100644 --- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java +++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java @@ -596,7 +596,7 @@ public class CsharpSerializer { } private void writeInNamespace(TypeNode typeNode, Action writeBody) { - writeInNamespace(typeNode.getName().getQualifier().get(), writeBody); + writeInNamespace(typeNode.getName().getPackage().get(), writeBody); } private void writeInNamespace(String namespace, Action writeBody) { diff --git a/src/main/java/org/zwobble/couscous/backends/csharp/primitives/CsharpPrimitiveMethods.java b/src/main/java/org/zwobble/couscous/backends/csharp/primitives/CsharpPrimitiveMethods.java index 6a5c084..3208e17 100644 --- a/src/main/java/org/zwobble/couscous/backends/csharp/primitives/CsharpPrimitiveMethods.java +++ b/src/main/java/org/zwobble/couscous/backends/csharp/primitives/CsharpPrimitiveMethods.java @@ -135,10 +135,10 @@ public class CsharpPrimitiveMethods { .put("parseInt", new PrimitiveStaticMethod( arguments -> staticMethodCall( - ScalarType.of("int"), + ScalarType.topLevel("int"), "Parse", list(arguments.get(0)), - ScalarType.of("int") + ScalarType.topLevel("int") ), Types.INT )) @@ -155,7 +155,7 @@ public class CsharpPrimitiveMethods { .put("join", new PrimitiveStaticMethod( arguments -> staticMethodCall( - ScalarType.of("java.lang.String"), + ScalarType.topLevel("java.lang.String"), "join", arguments, Types.STRING |