Remove writing of sourcenames for JVariable

Sourcenames of current class were written for the variables by Jill
but were never used by Jack.
+ Fixed typo in GENERIC_SIGNATURE token

This should fix the build breakage.

Change-Id: If29c42212127387f1929cce7e98c045ff4661444

3 files changed, 6 insertions, 16 deletions

diff --git a/jill/src/com/android/jill/backend/jayce/Token.java b/jill/src/com/android/jill/backend/jayce/Token.java
index 3dc0786..088c56b 100644
--- a/jill/src/com/android/jill/backend/jayce/Token.java
+++ b/jill/src/com/android/jill/backend/jayce/Token.java
@@ -96,7 +96,7 @@ public enum Token {
   FIELD_REF("field-ref"),
   FLOAT_LITERAL("float"),
   FOR_STATEMENT("for"),
-  GENERIC_SINGATURE("generic-signature"),
+  GENERIC_SIGNATURE("generic-signature"),
   GOTO("goto"),
   GTE_OPERATION(">="),
   GT_OPERATION(">"),
diff --git a/jill/src/com/android/jill/frontend/java/ClassNodeWriter.java b/jill/src/com/android/jill/frontend/java/ClassNodeWriter.java
index ae8523b..70be4da 100644
--- a/jill/src/com/android/jill/frontend/java/ClassNodeWriter.java
+++ b/jill/src/com/android/jill/frontend/java/ClassNodeWriter.java
@@ -179,7 +179,7 @@ public class ClassNodeWriter extends JillWriter {
 
   private void writeGenericSignatureMarker(@Nonnull ClassNode cn) throws IOException {
     if (AsmHelper.isGenericSignature(cn)) {
-      writer.writeKeyword(Token.GENERIC_SINGATURE);
+      writer.writeKeyword(Token.GENERIC_SIGNATURE);
       writer.writeOpen();
       writer.writeString(cn.signature);
       writer.writeClose();
@@ -195,7 +195,7 @@ public class ClassNodeWriter extends JillWriter {
 
   private void writeGenericSignatureMarker(@Nonnull FieldNode fn) throws IOException {
     if (fn.signature != null) {
-      writer.writeKeyword(Token.GENERIC_SINGATURE);
+      writer.writeKeyword(Token.GENERIC_SIGNATURE);
       writer.writeOpen();
       writer.writeString(fn.signature);
       writer.writeClose();
diff --git a/jill/src/com/android/jill/frontend/java/MethodBodyWriter.java b/jill/src/com/android/jill/frontend/java/MethodBodyWriter.java
index 049c437..0559a40 100644
--- a/jill/src/com/android/jill/frontend/java/MethodBodyWriter.java
+++ b/jill/src/com/android/jill/frontend/java/MethodBodyWriter.java
@@ -283,7 +283,7 @@ public class MethodBodyWriter extends JillWriter implements Opcodes {
 
   private void writeOriginalTypeInfoMarker() throws IOException {
     if (currentMethod.signature != null) {
-      writer.writeKeyword(Token.GENERIC_SINGATURE);
+      writer.writeKeyword(Token.GENERIC_SIGNATURE);
       writer.writeOpen();
       writer.writeString(currentMethod.signature);
       writer.writeClose();
@@ -2003,15 +2003,10 @@ public class MethodBodyWriter extends JillWriter implements Opcodes {
     writer.writeCloseNodeList();
     writer.writeOpenNodeList();
     if (v.hasSignature()) {
-      writer.writeKeyword(Token.GENERIC_SINGATURE); // Marker generic signature
+      writer.writeKeyword(Token.GENERIC_SIGNATURE); // Marker generic signature
       writer.writeOpen();
       writer.writeString(v.getSignature());
       writer.writeClose();
-
-      writer.writeKeyword(Token.SOURCE_NAME); // Marker source name
-      writer.writeOpen();
-      writer.writeString(AsmHelper.getSourceName(currentClass));
-      writer.writeClose();
     }
     writer.writeCloseNodeList();
     // TODO(mikaelpeltier): Add debug information.
@@ -2261,15 +2256,10 @@ public class MethodBodyWriter extends JillWriter implements Opcodes {
     annotWriter.writeAnnotations(currentMethod, parameterAnnotationIdx);
     writer.writeOpenNodeList();
     if (param.hasSignature()) {
-      writer.writeKeyword(Token.GENERIC_SINGATURE); // Marker generic signature
+      writer.writeKeyword(Token.GENERIC_SIGNATURE); // Marker generic signature
       writer.writeOpen();
       writer.writeString(param.getSignature());
       writer.writeClose();
-
-      writer.writeKeyword(Token.SOURCE_NAME); // Marker source name
-      writer.writeOpen();
-      writer.writeString(AsmHelper.getSourceName(currentClass));
-      writer.writeClose();
     }
     writer.writeCloseNodeList();
     // TODO(mikaelpeltier) Add debug information of parameter