From 0a550c3bb4e624d76b3876e92a2bd0e235301fba Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 9 Apr 2016 14:21:48 +0100
Subject: Remove MethodTypeParameter and adjust Identifier generation

---
 .../zwobble/couscous/backends/csharp/CsharpCodeGenerator.java  | 10 ----------
 .../org/zwobble/couscous/backends/csharp/CsharpSerializer.java |  6 ------
 src/main/java/org/zwobble/couscous/backends/naming/Names.java  |  9 ++-------
 3 files changed, 2 insertions(+), 23 deletions(-)

(limited to 'src/main/java/org/zwobble/couscous/backends')

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 86afe8e..00de205 100644
--- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java
+++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java
@@ -58,11 +58,6 @@ public class CsharpCodeGenerator {
                 }
             }
 
-            @Override
-            public Type visit(MethodTypeParameter parameter) {
-                return parameter;
-            }
-
             @Override
             public TypeParameter visit(TypeParameter parameter) {
                 return parameter;
@@ -118,11 +113,6 @@ public class CsharpCodeGenerator {
                 return ScalarType.of(namespace + "." + type.getQualifiedName());
             }
 
-            @Override
-            public Type visit(MethodTypeParameter parameter) {
-                return parameter;
-            }
-
             @Override
             public TypeParameter visit(TypeParameter parameter) {
                 return parameter;
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 f5f75ec..13c3756 100644
--- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java
+++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java
@@ -536,12 +536,6 @@ public class CsharpSerializer implements NodeVisitor {
                 return null;
             }
 
-            @Override
-            public Void visit(MethodTypeParameter parameter) {
-                writer.writeIdentifier(parameter.getName());
-                return null;
-            }
-
             @Override
             public Void visit(TypeParameter parameter) {
                 writer.writeIdentifier(parameter.getName());
diff --git a/src/main/java/org/zwobble/couscous/backends/naming/Names.java b/src/main/java/org/zwobble/couscous/backends/naming/Names.java
index 537633b..ff671cd 100644
--- a/src/main/java/org/zwobble/couscous/backends/naming/Names.java
+++ b/src/main/java/org/zwobble/couscous/backends/naming/Names.java
@@ -24,15 +24,10 @@ public class Names {
                 return type.getSimpleName();
             }
 
-            @Override
-            public String visit(MethodTypeParameter parameter) {
-                return parameter.getName();
-            }
-
             @Override
             public String visit(TypeParameter parameter) {
-                // TODO
-                Iterable<String> parts = lazyMap(parameter.getDeclaringScope().getParts(), part -> part.replace(".", "_"));
+                // TODO: should we care about the type?
+                Iterable<String> parts = lazyMap(parameter.getDeclaringScope().getParts(), part -> part.getName().replace(".", "_"));
                 return String.join("_", parts) + "_" + parameter.getName();
             }
 
-- 
cgit v1.2.3