Merge changes from topic 'upgrade-smali'
am: 78cf98bb8c

Change-Id: Ibf365544a6b1dde730e41cda6f1c9b5d78481b77
diff --git a/README.version b/README.version
index 227d2d3..22387f0 100644
--- a/README.version
+++ b/README.version
@@ -1,3 +1,3 @@
-URL: https://bitbucket.org/JesusFreke/smali/downloads/smali-2.0.5.jar
-Version: 2.0.5
+URL: https://bitbucket.org/JesusFreke/smali/downloads/smali-2.2.0.jar
+Version: 2.2.0
 BugComponent: 99143
diff --git a/baksmali/Android.mk b/baksmali/Android.mk
index feaff1d..5e828ed 100644
--- a/baksmali/Android.mk
+++ b/baksmali/Android.mk
@@ -36,7 +36,8 @@
 LOCAL_JAR_MANIFEST := manifest.txt
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-	dexlib2
+	dexlib2 \
+	jcommander-host
 
 #create a new baksmali.properties file using the correct version
 $(intermediates)/resources/baksmali.properties: $(LOCAL_PATH)/../build.gradle
diff --git a/baksmali/manifest.txt b/baksmali/manifest.txt
index ac02629..f769c2d 100644
--- a/baksmali/manifest.txt
+++ b/baksmali/manifest.txt
@@ -1 +1 @@
-Main-Class: org.jf.baksmali.main
+Main-Class: org.jf.baksmali.Main
diff --git a/dexlib2/Android.mk b/dexlib2/Android.mk
index 437ee37..e55aa47 100644
--- a/dexlib2/Android.mk
+++ b/dexlib2/Android.mk
@@ -33,6 +33,7 @@
 LOCAL_STATIC_JAVA_LIBRARIES := \
 	commons-cli-1.2 \
 	guavalib \
+	jcommander-host \
 	jsr305lib
 
 
diff --git a/smali/Android.mk b/smali/Android.mk
index 016707d..1a8d71c 100644
--- a/smali/Android.mk
+++ b/smali/Android.mk
@@ -42,7 +42,8 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
 	antlr-runtime \
-	dexlib2
+	dexlib2 \
+	jcommander-host
 
 #create a new smali.properties file using the correct version
 $(intermediates)/resources/smali.properties: $(LOCAL_PATH)/../build.gradle
diff --git a/smali/manifest.txt b/smali/manifest.txt
index b673fc8..0a58e57 100644
--- a/smali/manifest.txt
+++ b/smali/manifest.txt
@@ -1 +1 @@
-Main-Class: org.jf.smali.main
+Main-Class: org.jf.smali.Main
diff --git a/smali/src/main/java/org/jf/smali/smaliParser.java b/smali/src/main/java/org/jf/smali/smaliParser.java
index de21548..72ef034 100644
--- a/smali/src/main/java/org/jf/smali/smaliParser.java
+++ b/smali/src/main/java/org/jf/smali/smaliParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.5.2 /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g 2016-09-09 13:35:48
+// $ANTLR 3.5.2 smaliParser.g 2017-04-20 15:20:45
 
 package org.jf.smali;
 
@@ -18,61 +18,61 @@
 @SuppressWarnings("all")
 public class smaliParser extends Parser {
 	public static final String[] tokenNames = new String[] {
-		"<invalid>", "<EOR>", "<DOWN>", "<UP>", "ACCESS_SPEC", "ANNOTATION_DIRECTIVE",
-		"ANNOTATION_VISIBILITY", "ARRAY_DATA_DIRECTIVE", "ARRAY_TYPE_PREFIX",
-		"ARROW", "BOOL_LITERAL", "BYTE_LITERAL", "CATCHALL_DIRECTIVE", "CATCH_DIRECTIVE",
-		"CHAR_LITERAL", "CLASS_DESCRIPTOR", "CLASS_DIRECTIVE", "CLOSE_BRACE",
-		"CLOSE_PAREN", "COLON", "COMMA", "DOTDOT", "DOUBLE_LITERAL", "DOUBLE_LITERAL_OR_ID",
-		"END_ANNOTATION_DIRECTIVE", "END_ARRAY_DATA_DIRECTIVE", "END_FIELD_DIRECTIVE",
-		"END_LOCAL_DIRECTIVE", "END_METHOD_DIRECTIVE", "END_PACKED_SWITCH_DIRECTIVE",
-		"END_PARAMETER_DIRECTIVE", "END_SPARSE_SWITCH_DIRECTIVE", "END_SUBANNOTATION_DIRECTIVE",
-		"ENUM_DIRECTIVE", "EPILOGUE_DIRECTIVE", "EQUAL", "FIELD_DIRECTIVE", "FIELD_OFFSET",
-		"FLOAT_LITERAL", "FLOAT_LITERAL_OR_ID", "IMPLEMENTS_DIRECTIVE", "INLINE_INDEX",
-		"INSTRUCTION_FORMAT10t", "INSTRUCTION_FORMAT10x", "INSTRUCTION_FORMAT10x_ODEX",
-		"INSTRUCTION_FORMAT11n", "INSTRUCTION_FORMAT11x", "INSTRUCTION_FORMAT12x",
-		"INSTRUCTION_FORMAT12x_OR_ID", "INSTRUCTION_FORMAT20bc", "INSTRUCTION_FORMAT20t",
-		"INSTRUCTION_FORMAT21c_FIELD", "INSTRUCTION_FORMAT21c_FIELD_ODEX", "INSTRUCTION_FORMAT21c_STRING",
-		"INSTRUCTION_FORMAT21c_TYPE", "INSTRUCTION_FORMAT21ih", "INSTRUCTION_FORMAT21lh",
-		"INSTRUCTION_FORMAT21s", "INSTRUCTION_FORMAT21t", "INSTRUCTION_FORMAT22b",
-		"INSTRUCTION_FORMAT22c_FIELD", "INSTRUCTION_FORMAT22c_FIELD_ODEX", "INSTRUCTION_FORMAT22c_TYPE",
-		"INSTRUCTION_FORMAT22cs_FIELD", "INSTRUCTION_FORMAT22s", "INSTRUCTION_FORMAT22s_OR_ID",
-		"INSTRUCTION_FORMAT22t", "INSTRUCTION_FORMAT22x", "INSTRUCTION_FORMAT23x",
-		"INSTRUCTION_FORMAT30t", "INSTRUCTION_FORMAT31c", "INSTRUCTION_FORMAT31i",
-		"INSTRUCTION_FORMAT31i_OR_ID", "INSTRUCTION_FORMAT31t", "INSTRUCTION_FORMAT32x",
-		"INSTRUCTION_FORMAT35c_METHOD", "INSTRUCTION_FORMAT35c_METHOD_ODEX", "INSTRUCTION_FORMAT35c_TYPE",
-		"INSTRUCTION_FORMAT35mi_METHOD", "INSTRUCTION_FORMAT35ms_METHOD", "INSTRUCTION_FORMAT3rc_METHOD",
-		"INSTRUCTION_FORMAT3rc_METHOD_ODEX", "INSTRUCTION_FORMAT3rc_TYPE", "INSTRUCTION_FORMAT3rmi_METHOD",
-		"INSTRUCTION_FORMAT3rms_METHOD", "INSTRUCTION_FORMAT45cc_METHOD", "INSTRUCTION_FORMAT4rcc_METHOD",
-		"INSTRUCTION_FORMAT51l", "INTEGER_LITERAL", "INVALID_TOKEN", "I_ACCESS_LIST",
-		"I_ANNOTATION", "I_ANNOTATIONS", "I_ANNOTATION_ELEMENT", "I_ARRAY_ELEMENTS",
-		"I_ARRAY_ELEMENT_SIZE", "I_CATCH", "I_CATCHALL", "I_CATCHES", "I_CLASS_DEF",
-		"I_ENCODED_ARRAY", "I_ENCODED_ENUM", "I_ENCODED_FIELD", "I_ENCODED_METHOD",
-		"I_END_LOCAL", "I_EPILOGUE", "I_FIELD", "I_FIELDS", "I_FIELD_INITIAL_VALUE",
-		"I_FIELD_TYPE", "I_IMPLEMENTS", "I_LABEL", "I_LINE", "I_LOCAL", "I_LOCALS",
-		"I_METHOD", "I_METHODS", "I_METHOD_PROTOTYPE", "I_METHOD_RETURN_TYPE",
-		"I_ORDERED_METHOD_ITEMS", "I_PACKED_SWITCH_ELEMENTS", "I_PACKED_SWITCH_START_KEY",
-		"I_PARAMETER", "I_PARAMETERS", "I_PARAMETER_NOT_SPECIFIED", "I_PROLOGUE",
-		"I_REGISTERS", "I_REGISTER_LIST", "I_REGISTER_RANGE", "I_RESTART_LOCAL",
-		"I_SOURCE", "I_SPARSE_SWITCH_ELEMENTS", "I_STATEMENT_ARRAY_DATA", "I_STATEMENT_FORMAT10t",
-		"I_STATEMENT_FORMAT10x", "I_STATEMENT_FORMAT11n", "I_STATEMENT_FORMAT11x",
-		"I_STATEMENT_FORMAT12x", "I_STATEMENT_FORMAT20bc", "I_STATEMENT_FORMAT20t",
-		"I_STATEMENT_FORMAT21c_FIELD", "I_STATEMENT_FORMAT21c_STRING", "I_STATEMENT_FORMAT21c_TYPE",
-		"I_STATEMENT_FORMAT21ih", "I_STATEMENT_FORMAT21lh", "I_STATEMENT_FORMAT21s",
-		"I_STATEMENT_FORMAT21t", "I_STATEMENT_FORMAT22b", "I_STATEMENT_FORMAT22c_FIELD",
-		"I_STATEMENT_FORMAT22c_TYPE", "I_STATEMENT_FORMAT22s", "I_STATEMENT_FORMAT22t",
-		"I_STATEMENT_FORMAT22x", "I_STATEMENT_FORMAT23x", "I_STATEMENT_FORMAT30t",
-		"I_STATEMENT_FORMAT31c", "I_STATEMENT_FORMAT31i", "I_STATEMENT_FORMAT31t",
-		"I_STATEMENT_FORMAT32x", "I_STATEMENT_FORMAT35c_METHOD", "I_STATEMENT_FORMAT35c_TYPE",
-		"I_STATEMENT_FORMAT3rc_METHOD", "I_STATEMENT_FORMAT3rc_TYPE", "I_STATEMENT_FORMAT45cc_METHOD",
-		"I_STATEMENT_FORMAT4rcc_METHOD", "I_STATEMENT_FORMAT51l", "I_STATEMENT_PACKED_SWITCH",
-		"I_STATEMENT_SPARSE_SWITCH", "I_SUBANNOTATION", "I_SUPER", "LINE_COMMENT",
-		"LINE_DIRECTIVE", "LOCALS_DIRECTIVE", "LOCAL_DIRECTIVE", "LONG_LITERAL",
-		"MEMBER_NAME", "METHOD_DIRECTIVE", "NEGATIVE_INTEGER_LITERAL", "NULL_LITERAL",
-		"OPEN_BRACE", "OPEN_PAREN", "PACKED_SWITCH_DIRECTIVE", "PARAMETER_DIRECTIVE",
-		"PARAM_LIST_OR_ID_PRIMITIVE_TYPE", "POSITIVE_INTEGER_LITERAL", "PRIMITIVE_TYPE",
-		"PROLOGUE_DIRECTIVE", "REGISTER", "REGISTERS_DIRECTIVE", "RESTART_LOCAL_DIRECTIVE",
-		"SHORT_LITERAL", "SIMPLE_NAME", "SOURCE_DIRECTIVE", "SPARSE_SWITCH_DIRECTIVE",
-		"STRING_LITERAL", "SUBANNOTATION_DIRECTIVE", "SUPER_DIRECTIVE", "VERIFICATION_ERROR_TYPE",
+		"<invalid>", "<EOR>", "<DOWN>", "<UP>", "ACCESS_SPEC", "ANNOTATION_DIRECTIVE", 
+		"ANNOTATION_VISIBILITY", "ARRAY_DATA_DIRECTIVE", "ARRAY_TYPE_PREFIX", 
+		"ARROW", "BOOL_LITERAL", "BYTE_LITERAL", "CATCHALL_DIRECTIVE", "CATCH_DIRECTIVE", 
+		"CHAR_LITERAL", "CLASS_DESCRIPTOR", "CLASS_DIRECTIVE", "CLOSE_BRACE", 
+		"CLOSE_PAREN", "COLON", "COMMA", "DOTDOT", "DOUBLE_LITERAL", "DOUBLE_LITERAL_OR_ID", 
+		"END_ANNOTATION_DIRECTIVE", "END_ARRAY_DATA_DIRECTIVE", "END_FIELD_DIRECTIVE", 
+		"END_LOCAL_DIRECTIVE", "END_METHOD_DIRECTIVE", "END_PACKED_SWITCH_DIRECTIVE", 
+		"END_PARAMETER_DIRECTIVE", "END_SPARSE_SWITCH_DIRECTIVE", "END_SUBANNOTATION_DIRECTIVE", 
+		"ENUM_DIRECTIVE", "EPILOGUE_DIRECTIVE", "EQUAL", "FIELD_DIRECTIVE", "FIELD_OFFSET", 
+		"FLOAT_LITERAL", "FLOAT_LITERAL_OR_ID", "IMPLEMENTS_DIRECTIVE", "INLINE_INDEX", 
+		"INSTRUCTION_FORMAT10t", "INSTRUCTION_FORMAT10x", "INSTRUCTION_FORMAT10x_ODEX", 
+		"INSTRUCTION_FORMAT11n", "INSTRUCTION_FORMAT11x", "INSTRUCTION_FORMAT12x", 
+		"INSTRUCTION_FORMAT12x_OR_ID", "INSTRUCTION_FORMAT20bc", "INSTRUCTION_FORMAT20t", 
+		"INSTRUCTION_FORMAT21c_FIELD", "INSTRUCTION_FORMAT21c_FIELD_ODEX", "INSTRUCTION_FORMAT21c_STRING", 
+		"INSTRUCTION_FORMAT21c_TYPE", "INSTRUCTION_FORMAT21ih", "INSTRUCTION_FORMAT21lh", 
+		"INSTRUCTION_FORMAT21s", "INSTRUCTION_FORMAT21t", "INSTRUCTION_FORMAT22b", 
+		"INSTRUCTION_FORMAT22c_FIELD", "INSTRUCTION_FORMAT22c_FIELD_ODEX", "INSTRUCTION_FORMAT22c_TYPE", 
+		"INSTRUCTION_FORMAT22cs_FIELD", "INSTRUCTION_FORMAT22s", "INSTRUCTION_FORMAT22s_OR_ID", 
+		"INSTRUCTION_FORMAT22t", "INSTRUCTION_FORMAT22x", "INSTRUCTION_FORMAT23x", 
+		"INSTRUCTION_FORMAT30t", "INSTRUCTION_FORMAT31c", "INSTRUCTION_FORMAT31i", 
+		"INSTRUCTION_FORMAT31i_OR_ID", "INSTRUCTION_FORMAT31t", "INSTRUCTION_FORMAT32x", 
+		"INSTRUCTION_FORMAT35c_METHOD", "INSTRUCTION_FORMAT35c_METHOD_ODEX", "INSTRUCTION_FORMAT35c_TYPE", 
+		"INSTRUCTION_FORMAT35mi_METHOD", "INSTRUCTION_FORMAT35ms_METHOD", "INSTRUCTION_FORMAT3rc_METHOD", 
+		"INSTRUCTION_FORMAT3rc_METHOD_ODEX", "INSTRUCTION_FORMAT3rc_TYPE", "INSTRUCTION_FORMAT3rmi_METHOD", 
+		"INSTRUCTION_FORMAT3rms_METHOD", "INSTRUCTION_FORMAT45cc_METHOD", "INSTRUCTION_FORMAT4rcc_METHOD", 
+		"INSTRUCTION_FORMAT51l", "INTEGER_LITERAL", "INVALID_TOKEN", "I_ACCESS_LIST", 
+		"I_ANNOTATION", "I_ANNOTATIONS", "I_ANNOTATION_ELEMENT", "I_ARRAY_ELEMENTS", 
+		"I_ARRAY_ELEMENT_SIZE", "I_CATCH", "I_CATCHALL", "I_CATCHES", "I_CLASS_DEF", 
+		"I_ENCODED_ARRAY", "I_ENCODED_ENUM", "I_ENCODED_FIELD", "I_ENCODED_METHOD", 
+		"I_END_LOCAL", "I_EPILOGUE", "I_FIELD", "I_FIELDS", "I_FIELD_INITIAL_VALUE", 
+		"I_FIELD_TYPE", "I_IMPLEMENTS", "I_LABEL", "I_LINE", "I_LOCAL", "I_LOCALS", 
+		"I_METHOD", "I_METHODS", "I_METHOD_PROTOTYPE", "I_METHOD_RETURN_TYPE", 
+		"I_ORDERED_METHOD_ITEMS", "I_PACKED_SWITCH_ELEMENTS", "I_PACKED_SWITCH_START_KEY", 
+		"I_PARAMETER", "I_PARAMETERS", "I_PARAMETER_NOT_SPECIFIED", "I_PROLOGUE", 
+		"I_REGISTERS", "I_REGISTER_LIST", "I_REGISTER_RANGE", "I_RESTART_LOCAL", 
+		"I_SOURCE", "I_SPARSE_SWITCH_ELEMENTS", "I_STATEMENT_ARRAY_DATA", "I_STATEMENT_FORMAT10t", 
+		"I_STATEMENT_FORMAT10x", "I_STATEMENT_FORMAT11n", "I_STATEMENT_FORMAT11x", 
+		"I_STATEMENT_FORMAT12x", "I_STATEMENT_FORMAT20bc", "I_STATEMENT_FORMAT20t", 
+		"I_STATEMENT_FORMAT21c_FIELD", "I_STATEMENT_FORMAT21c_STRING", "I_STATEMENT_FORMAT21c_TYPE", 
+		"I_STATEMENT_FORMAT21ih", "I_STATEMENT_FORMAT21lh", "I_STATEMENT_FORMAT21s", 
+		"I_STATEMENT_FORMAT21t", "I_STATEMENT_FORMAT22b", "I_STATEMENT_FORMAT22c_FIELD", 
+		"I_STATEMENT_FORMAT22c_TYPE", "I_STATEMENT_FORMAT22s", "I_STATEMENT_FORMAT22t", 
+		"I_STATEMENT_FORMAT22x", "I_STATEMENT_FORMAT23x", "I_STATEMENT_FORMAT30t", 
+		"I_STATEMENT_FORMAT31c", "I_STATEMENT_FORMAT31i", "I_STATEMENT_FORMAT31t", 
+		"I_STATEMENT_FORMAT32x", "I_STATEMENT_FORMAT35c_METHOD", "I_STATEMENT_FORMAT35c_TYPE", 
+		"I_STATEMENT_FORMAT3rc_METHOD", "I_STATEMENT_FORMAT3rc_TYPE", "I_STATEMENT_FORMAT45cc_METHOD", 
+		"I_STATEMENT_FORMAT4rcc_METHOD", "I_STATEMENT_FORMAT51l", "I_STATEMENT_PACKED_SWITCH", 
+		"I_STATEMENT_SPARSE_SWITCH", "I_SUBANNOTATION", "I_SUPER", "LINE_COMMENT", 
+		"LINE_DIRECTIVE", "LOCALS_DIRECTIVE", "LOCAL_DIRECTIVE", "LONG_LITERAL", 
+		"MEMBER_NAME", "METHOD_DIRECTIVE", "NEGATIVE_INTEGER_LITERAL", "NULL_LITERAL", 
+		"OPEN_BRACE", "OPEN_PAREN", "PACKED_SWITCH_DIRECTIVE", "PARAMETER_DIRECTIVE", 
+		"PARAM_LIST_OR_ID_PRIMITIVE_TYPE", "POSITIVE_INTEGER_LITERAL", "PRIMITIVE_TYPE", 
+		"PROLOGUE_DIRECTIVE", "REGISTER", "REGISTERS_DIRECTIVE", "RESTART_LOCAL_DIRECTIVE", 
+		"SHORT_LITERAL", "SIMPLE_NAME", "SOURCE_DIRECTIVE", "SPARSE_SWITCH_DIRECTIVE", 
+		"STRING_LITERAL", "SUBANNOTATION_DIRECTIVE", "SUPER_DIRECTIVE", "VERIFICATION_ERROR_TYPE", 
 		"VOID_TYPE", "VTABLE_INDEX", "WHITE_SPACE"
 	};
 	public static final int EOF=-1;
@@ -298,7 +298,7 @@
 		return adaptor;
 	}
 	@Override public String[] getTokenNames() { return smaliParser.tokenNames; }
-	@Override public String getGrammarFileName() { return "/ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g"; }
+	@Override public String getGrammarFileName() { return "smaliParser.g"; }
 
 
 	  public static final int ERROR_CHANNEL = 100;
@@ -316,8 +316,8 @@
 	      this.allowOdex = allowOdex;
 	  }
 
-	  public void setApiLevel(int apiLevel, boolean experimental) {
-	      this.opcodes = new Opcodes(apiLevel, experimental);
+	  public void setApiLevel(int apiLevel) {
+	      this.opcodes = Opcodes.forApi(apiLevel);
 	      this.apiLevel = apiLevel;
 	  }
 
@@ -480,7 +480,7 @@
 
 
 	// $ANTLR start "smali_file"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:415:1: smali_file : ({...}? => class_spec |{...}? => super_spec | implements_spec |{...}? => source_spec | method | field | annotation )+ EOF -> ^( I_CLASS_DEF class_spec ( super_spec )? ( implements_spec )* ( source_spec )? ^( I_METHODS ( method )* ) ^( I_FIELDS ( field )* ) ) ;
+	// smaliParser.g:415:1: smali_file : ({...}? => class_spec |{...}? => super_spec | implements_spec |{...}? => source_spec | method | field | annotation )+ EOF -> ^( I_CLASS_DEF class_spec ( super_spec )? ( implements_spec )* ( source_spec )? ^( I_METHODS ( method )* ) ^( I_FIELDS ( field )* ) ) ;
 	public final smaliParser.smali_file_return smali_file() throws RecognitionException {
 		smali_file_stack.push(new smali_file_scope());
 		smaliParser.smali_file_return retval = new smaliParser.smali_file_return();
@@ -509,12 +509,12 @@
 
 		 smali_file_stack.peek().hasClassSpec = smali_file_stack.peek().hasSuperSpec = smali_file_stack.peek().hasSourceSpec = false;
 		    smali_file_stack.peek().classAnnotations = new ArrayList<CommonTree>();
-		
+		  
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:427:3: ( ({...}? => class_spec |{...}? => super_spec | implements_spec |{...}? => source_spec | method | field | annotation )+ EOF -> ^( I_CLASS_DEF class_spec ( super_spec )? ( implements_spec )* ( source_spec )? ^( I_METHODS ( method )* ) ^( I_FIELDS ( field )* ) ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:428:3: ({...}? => class_spec |{...}? => super_spec | implements_spec |{...}? => source_spec | method | field | annotation )+ EOF
+			// smaliParser.g:427:3: ( ({...}? => class_spec |{...}? => super_spec | implements_spec |{...}? => source_spec | method | field | annotation )+ EOF -> ^( I_CLASS_DEF class_spec ( super_spec )? ( implements_spec )* ( source_spec )? ^( I_METHODS ( method )* ) ^( I_FIELDS ( field )* ) ) )
+			// smaliParser.g:428:3: ({...}? => class_spec |{...}? => super_spec | implements_spec |{...}? => source_spec | method | field | annotation )+ EOF
 			{
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:428:3: ({...}? => class_spec |{...}? => super_spec | implements_spec |{...}? => source_spec | method | field | annotation )+
+			// smaliParser.g:428:3: ({...}? => class_spec |{...}? => super_spec | implements_spec |{...}? => source_spec | method | field | annotation )+
 			int cnt1=0;
 			loop1:
 			while (true) {
@@ -544,7 +544,7 @@
 
 				switch (alt1) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:428:5: {...}? => class_spec
+					// smaliParser.g:428:5: {...}? => class_spec
 					{
 					if ( !((!smali_file_stack.peek().hasClassSpec)) ) {
 						throw new FailedPredicateException(input, "smali_file", "!$smali_file::hasClassSpec");
@@ -558,7 +558,7 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:429:5: {...}? => super_spec
+					// smaliParser.g:429:5: {...}? => super_spec
 					{
 					if ( !((!smali_file_stack.peek().hasSuperSpec)) ) {
 						throw new FailedPredicateException(input, "smali_file", "!$smali_file::hasSuperSpec");
@@ -572,7 +572,7 @@
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:430:5: implements_spec
+					// smaliParser.g:430:5: implements_spec
 					{
 					pushFollow(FOLLOW_implements_spec_in_smali_file1094);
 					implements_spec3=implements_spec();
@@ -582,7 +582,7 @@
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:431:5: {...}? => source_spec
+					// smaliParser.g:431:5: {...}? => source_spec
 					{
 					if ( !((!smali_file_stack.peek().hasSourceSpec)) ) {
 						throw new FailedPredicateException(input, "smali_file", "!$smali_file::hasSourceSpec");
@@ -596,7 +596,7 @@
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:432:5: method
+					// smaliParser.g:432:5: method
 					{
 					pushFollow(FOLLOW_method_in_smali_file1111);
 					method5=method();
@@ -606,7 +606,7 @@
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:433:5: field
+					// smaliParser.g:433:5: field
 					{
 					pushFollow(FOLLOW_field_in_smali_file1117);
 					field6=field();
@@ -616,7 +616,7 @@
 					}
 					break;
 				case 7 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:434:5: annotation
+					// smaliParser.g:434:5: annotation
 					{
 					pushFollow(FOLLOW_annotation_in_smali_file1123);
 					annotation7=annotation();
@@ -635,7 +635,7 @@
 				cnt1++;
 			}
 
-			EOF8=(Token)match(input,EOF,FOLLOW_EOF_in_smali_file1134);
+			EOF8=(Token)match(input,EOF,FOLLOW_EOF_in_smali_file1134);  
 			stream_EOF.add(EOF8);
 
 
@@ -648,48 +648,48 @@
 			        throw new SemanticException(input, "The file must contain a .super directive");
 			      }
 			    }
-			
+			  
 			// AST REWRITE
-			// elements: implements_spec, field, class_spec, super_spec, method, source_spec
-			// token labels:
+			// elements: super_spec, method, field, implements_spec, class_spec, source_spec
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 448:3: -> ^( I_CLASS_DEF class_spec ( super_spec )? ( implements_spec )* ( source_spec )? ^( I_METHODS ( method )* ) ^( I_FIELDS ( field )* ) )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:448:6: ^( I_CLASS_DEF class_spec ( super_spec )? ( implements_spec )* ( source_spec )? ^( I_METHODS ( method )* ) ^( I_FIELDS ( field )* ) )
+				// smaliParser.g:448:6: ^( I_CLASS_DEF class_spec ( super_spec )? ( implements_spec )* ( source_spec )? ^( I_METHODS ( method )* ) ^( I_FIELDS ( field )* ) )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_CLASS_DEF, "I_CLASS_DEF"), root_1);
 				adaptor.addChild(root_1, stream_class_spec.nextTree());
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:450:8: ( super_spec )?
+				// smaliParser.g:450:8: ( super_spec )?
 				if ( stream_super_spec.hasNext() ) {
 					adaptor.addChild(root_1, stream_super_spec.nextTree());
 				}
 				stream_super_spec.reset();
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:451:8: ( implements_spec )*
+				// smaliParser.g:451:8: ( implements_spec )*
 				while ( stream_implements_spec.hasNext() ) {
 					adaptor.addChild(root_1, stream_implements_spec.nextTree());
 				}
 				stream_implements_spec.reset();
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:452:8: ( source_spec )?
+				// smaliParser.g:452:8: ( source_spec )?
 				if ( stream_source_spec.hasNext() ) {
 					adaptor.addChild(root_1, stream_source_spec.nextTree());
 				}
 				stream_source_spec.reset();
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:453:8: ^( I_METHODS ( method )* )
+				// smaliParser.g:453:8: ^( I_METHODS ( method )* )
 				{
 				CommonTree root_2 = (CommonTree)adaptor.nil();
 				root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_METHODS, "I_METHODS"), root_2);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:453:20: ( method )*
+				// smaliParser.g:453:20: ( method )*
 				while ( stream_method.hasNext() ) {
 					adaptor.addChild(root_2, stream_method.nextTree());
 				}
@@ -698,11 +698,11 @@
 				adaptor.addChild(root_1, root_2);
 				}
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:453:29: ^( I_FIELDS ( field )* )
+				// smaliParser.g:453:29: ^( I_FIELDS ( field )* )
 				{
 				CommonTree root_2 = (CommonTree)adaptor.nil();
 				root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_FIELDS, "I_FIELDS"), root_2);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:453:40: ( field )*
+				// smaliParser.g:453:40: ( field )*
 				while ( stream_field.hasNext() ) {
 					adaptor.addChild(root_2, stream_field.nextTree());
 				}
@@ -751,7 +751,7 @@
 
 
 	// $ANTLR start "class_spec"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:455:1: class_spec returns [String className] : CLASS_DIRECTIVE access_list CLASS_DESCRIPTOR -> CLASS_DESCRIPTOR access_list ;
+	// smaliParser.g:455:1: class_spec returns [String className] : CLASS_DIRECTIVE access_list CLASS_DESCRIPTOR -> CLASS_DESCRIPTOR access_list ;
 	public final smaliParser.class_spec_return class_spec() throws RecognitionException {
 		smaliParser.class_spec_return retval = new smaliParser.class_spec_return();
 		retval.start = input.LT(1);
@@ -769,10 +769,10 @@
 		RewriteRuleSubtreeStream stream_access_list=new RewriteRuleSubtreeStream(adaptor,"rule access_list");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:456:3: ( CLASS_DIRECTIVE access_list CLASS_DESCRIPTOR -> CLASS_DESCRIPTOR access_list )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:456:5: CLASS_DIRECTIVE access_list CLASS_DESCRIPTOR
+			// smaliParser.g:456:3: ( CLASS_DIRECTIVE access_list CLASS_DESCRIPTOR -> CLASS_DESCRIPTOR access_list )
+			// smaliParser.g:456:5: CLASS_DIRECTIVE access_list CLASS_DESCRIPTOR
 			{
-			CLASS_DIRECTIVE9=(Token)match(input,CLASS_DIRECTIVE,FOLLOW_CLASS_DIRECTIVE_in_class_spec1221);
+			CLASS_DIRECTIVE9=(Token)match(input,CLASS_DIRECTIVE,FOLLOW_CLASS_DIRECTIVE_in_class_spec1221);  
 			stream_CLASS_DIRECTIVE.add(CLASS_DIRECTIVE9);
 
 			pushFollow(FOLLOW_access_list_in_class_spec1223);
@@ -780,17 +780,17 @@
 			state._fsp--;
 
 			stream_access_list.add(access_list10.getTree());
-			CLASS_DESCRIPTOR11=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_class_spec1225);
+			CLASS_DESCRIPTOR11=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_class_spec1225);  
 			stream_CLASS_DESCRIPTOR.add(CLASS_DESCRIPTOR11);
 
 			retval.className = (CLASS_DESCRIPTOR11!=null?CLASS_DESCRIPTOR11.getText():null);
 			// AST REWRITE
-			// elements: CLASS_DESCRIPTOR, access_list
-			// token labels:
+			// elements: access_list, CLASS_DESCRIPTOR
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -833,7 +833,7 @@
 
 
 	// $ANTLR start "super_spec"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:458:1: super_spec : SUPER_DIRECTIVE CLASS_DESCRIPTOR -> ^( I_SUPER[$start, \"I_SUPER\"] CLASS_DESCRIPTOR ) ;
+	// smaliParser.g:458:1: super_spec : SUPER_DIRECTIVE CLASS_DESCRIPTOR -> ^( I_SUPER[$start, \"I_SUPER\"] CLASS_DESCRIPTOR ) ;
 	public final smaliParser.super_spec_return super_spec() throws RecognitionException {
 		smaliParser.super_spec_return retval = new smaliParser.super_spec_return();
 		retval.start = input.LT(1);
@@ -849,29 +849,29 @@
 		RewriteRuleTokenStream stream_SUPER_DIRECTIVE=new RewriteRuleTokenStream(adaptor,"token SUPER_DIRECTIVE");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:459:3: ( SUPER_DIRECTIVE CLASS_DESCRIPTOR -> ^( I_SUPER[$start, \"I_SUPER\"] CLASS_DESCRIPTOR ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:459:5: SUPER_DIRECTIVE CLASS_DESCRIPTOR
+			// smaliParser.g:459:3: ( SUPER_DIRECTIVE CLASS_DESCRIPTOR -> ^( I_SUPER[$start, \"I_SUPER\"] CLASS_DESCRIPTOR ) )
+			// smaliParser.g:459:5: SUPER_DIRECTIVE CLASS_DESCRIPTOR
 			{
-			SUPER_DIRECTIVE12=(Token)match(input,SUPER_DIRECTIVE,FOLLOW_SUPER_DIRECTIVE_in_super_spec1243);
+			SUPER_DIRECTIVE12=(Token)match(input,SUPER_DIRECTIVE,FOLLOW_SUPER_DIRECTIVE_in_super_spec1243);  
 			stream_SUPER_DIRECTIVE.add(SUPER_DIRECTIVE12);
 
-			CLASS_DESCRIPTOR13=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_super_spec1245);
+			CLASS_DESCRIPTOR13=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_super_spec1245);  
 			stream_CLASS_DESCRIPTOR.add(CLASS_DESCRIPTOR13);
 
 			// AST REWRITE
 			// elements: CLASS_DESCRIPTOR
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 459:38: -> ^( I_SUPER[$start, \"I_SUPER\"] CLASS_DESCRIPTOR )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:459:41: ^( I_SUPER[$start, \"I_SUPER\"] CLASS_DESCRIPTOR )
+				// smaliParser.g:459:41: ^( I_SUPER[$start, \"I_SUPER\"] CLASS_DESCRIPTOR )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_SUPER, (retval.start), "I_SUPER"), root_1);
@@ -913,7 +913,7 @@
 
 
 	// $ANTLR start "implements_spec"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:461:1: implements_spec : IMPLEMENTS_DIRECTIVE CLASS_DESCRIPTOR -> ^( I_IMPLEMENTS[$start, \"I_IMPLEMENTS\"] CLASS_DESCRIPTOR ) ;
+	// smaliParser.g:461:1: implements_spec : IMPLEMENTS_DIRECTIVE CLASS_DESCRIPTOR -> ^( I_IMPLEMENTS[$start, \"I_IMPLEMENTS\"] CLASS_DESCRIPTOR ) ;
 	public final smaliParser.implements_spec_return implements_spec() throws RecognitionException {
 		smaliParser.implements_spec_return retval = new smaliParser.implements_spec_return();
 		retval.start = input.LT(1);
@@ -929,29 +929,29 @@
 		RewriteRuleTokenStream stream_CLASS_DESCRIPTOR=new RewriteRuleTokenStream(adaptor,"token CLASS_DESCRIPTOR");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:462:3: ( IMPLEMENTS_DIRECTIVE CLASS_DESCRIPTOR -> ^( I_IMPLEMENTS[$start, \"I_IMPLEMENTS\"] CLASS_DESCRIPTOR ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:462:5: IMPLEMENTS_DIRECTIVE CLASS_DESCRIPTOR
+			// smaliParser.g:462:3: ( IMPLEMENTS_DIRECTIVE CLASS_DESCRIPTOR -> ^( I_IMPLEMENTS[$start, \"I_IMPLEMENTS\"] CLASS_DESCRIPTOR ) )
+			// smaliParser.g:462:5: IMPLEMENTS_DIRECTIVE CLASS_DESCRIPTOR
 			{
-			IMPLEMENTS_DIRECTIVE14=(Token)match(input,IMPLEMENTS_DIRECTIVE,FOLLOW_IMPLEMENTS_DIRECTIVE_in_implements_spec1264);
+			IMPLEMENTS_DIRECTIVE14=(Token)match(input,IMPLEMENTS_DIRECTIVE,FOLLOW_IMPLEMENTS_DIRECTIVE_in_implements_spec1264);  
 			stream_IMPLEMENTS_DIRECTIVE.add(IMPLEMENTS_DIRECTIVE14);
 
-			CLASS_DESCRIPTOR15=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_implements_spec1266);
+			CLASS_DESCRIPTOR15=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_implements_spec1266);  
 			stream_CLASS_DESCRIPTOR.add(CLASS_DESCRIPTOR15);
 
 			// AST REWRITE
 			// elements: CLASS_DESCRIPTOR
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 462:43: -> ^( I_IMPLEMENTS[$start, \"I_IMPLEMENTS\"] CLASS_DESCRIPTOR )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:462:46: ^( I_IMPLEMENTS[$start, \"I_IMPLEMENTS\"] CLASS_DESCRIPTOR )
+				// smaliParser.g:462:46: ^( I_IMPLEMENTS[$start, \"I_IMPLEMENTS\"] CLASS_DESCRIPTOR )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_IMPLEMENTS, (retval.start), "I_IMPLEMENTS"), root_1);
@@ -993,7 +993,7 @@
 
 
 	// $ANTLR start "source_spec"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:464:1: source_spec : SOURCE_DIRECTIVE STRING_LITERAL -> ^( I_SOURCE[$start, \"I_SOURCE\"] STRING_LITERAL ) ;
+	// smaliParser.g:464:1: source_spec : SOURCE_DIRECTIVE STRING_LITERAL -> ^( I_SOURCE[$start, \"I_SOURCE\"] STRING_LITERAL ) ;
 	public final smaliParser.source_spec_return source_spec() throws RecognitionException {
 		smaliParser.source_spec_return retval = new smaliParser.source_spec_return();
 		retval.start = input.LT(1);
@@ -1009,29 +1009,29 @@
 		RewriteRuleTokenStream stream_STRING_LITERAL=new RewriteRuleTokenStream(adaptor,"token STRING_LITERAL");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:465:3: ( SOURCE_DIRECTIVE STRING_LITERAL -> ^( I_SOURCE[$start, \"I_SOURCE\"] STRING_LITERAL ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:465:5: SOURCE_DIRECTIVE STRING_LITERAL
+			// smaliParser.g:465:3: ( SOURCE_DIRECTIVE STRING_LITERAL -> ^( I_SOURCE[$start, \"I_SOURCE\"] STRING_LITERAL ) )
+			// smaliParser.g:465:5: SOURCE_DIRECTIVE STRING_LITERAL
 			{
-			SOURCE_DIRECTIVE16=(Token)match(input,SOURCE_DIRECTIVE,FOLLOW_SOURCE_DIRECTIVE_in_source_spec1285);
+			SOURCE_DIRECTIVE16=(Token)match(input,SOURCE_DIRECTIVE,FOLLOW_SOURCE_DIRECTIVE_in_source_spec1285);  
 			stream_SOURCE_DIRECTIVE.add(SOURCE_DIRECTIVE16);
 
-			STRING_LITERAL17=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_source_spec1287);
+			STRING_LITERAL17=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_source_spec1287);  
 			stream_STRING_LITERAL.add(STRING_LITERAL17);
 
 			// AST REWRITE
 			// elements: STRING_LITERAL
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 465:37: -> ^( I_SOURCE[$start, \"I_SOURCE\"] STRING_LITERAL )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:465:40: ^( I_SOURCE[$start, \"I_SOURCE\"] STRING_LITERAL )
+				// smaliParser.g:465:40: ^( I_SOURCE[$start, \"I_SOURCE\"] STRING_LITERAL )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_SOURCE, (retval.start), "I_SOURCE"), root_1);
@@ -1073,7 +1073,7 @@
 
 
 	// $ANTLR start "access_list"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:467:1: access_list : ( ACCESS_SPEC )* -> ^( I_ACCESS_LIST[$start,\"I_ACCESS_LIST\"] ( ACCESS_SPEC )* ) ;
+	// smaliParser.g:467:1: access_list : ( ACCESS_SPEC )* -> ^( I_ACCESS_LIST[$start,\"I_ACCESS_LIST\"] ( ACCESS_SPEC )* ) ;
 	public final smaliParser.access_list_return access_list() throws RecognitionException {
 		smaliParser.access_list_return retval = new smaliParser.access_list_return();
 		retval.start = input.LT(1);
@@ -1086,10 +1086,10 @@
 		RewriteRuleTokenStream stream_ACCESS_SPEC=new RewriteRuleTokenStream(adaptor,"token ACCESS_SPEC");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:468:3: ( ( ACCESS_SPEC )* -> ^( I_ACCESS_LIST[$start,\"I_ACCESS_LIST\"] ( ACCESS_SPEC )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:468:5: ( ACCESS_SPEC )*
+			// smaliParser.g:468:3: ( ( ACCESS_SPEC )* -> ^( I_ACCESS_LIST[$start,\"I_ACCESS_LIST\"] ( ACCESS_SPEC )* ) )
+			// smaliParser.g:468:5: ( ACCESS_SPEC )*
 			{
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:468:5: ( ACCESS_SPEC )*
+			// smaliParser.g:468:5: ( ACCESS_SPEC )*
 			loop2:
 			while (true) {
 				int alt2=2;
@@ -1104,9 +1104,9 @@
 
 				switch (alt2) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:468:5: ACCESS_SPEC
+					// smaliParser.g:468:5: ACCESS_SPEC
 					{
-					ACCESS_SPEC18=(Token)match(input,ACCESS_SPEC,FOLLOW_ACCESS_SPEC_in_access_list1306);
+					ACCESS_SPEC18=(Token)match(input,ACCESS_SPEC,FOLLOW_ACCESS_SPEC_in_access_list1306);  
 					stream_ACCESS_SPEC.add(ACCESS_SPEC18);
 
 					}
@@ -1119,22 +1119,22 @@
 
 			// AST REWRITE
 			// elements: ACCESS_SPEC
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 468:18: -> ^( I_ACCESS_LIST[$start,\"I_ACCESS_LIST\"] ( ACCESS_SPEC )* )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:468:21: ^( I_ACCESS_LIST[$start,\"I_ACCESS_LIST\"] ( ACCESS_SPEC )* )
+				// smaliParser.g:468:21: ^( I_ACCESS_LIST[$start,\"I_ACCESS_LIST\"] ( ACCESS_SPEC )* )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ACCESS_LIST, (retval.start), "I_ACCESS_LIST"), root_1);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:468:61: ( ACCESS_SPEC )*
+				// smaliParser.g:468:61: ( ACCESS_SPEC )*
 				while ( stream_ACCESS_SPEC.hasNext() ) {
 					adaptor.addChild(root_1, stream_ACCESS_SPEC.nextNode());
 				}
@@ -1177,7 +1177,7 @@
 
 
 	// $ANTLR start "field"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:475:1: field : FIELD_DIRECTIVE access_list member_name COLON nonvoid_type_descriptor ( EQUAL literal )? ( ({...}? annotation )* ( END_FIELD_DIRECTIVE -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) ) ) ) ;
+	// smaliParser.g:475:1: field : FIELD_DIRECTIVE access_list member_name COLON nonvoid_type_descriptor ( EQUAL literal )? ( ({...}? annotation )* ( END_FIELD_DIRECTIVE -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) ) ) ) ;
 	public final smaliParser.field_return field() throws RecognitionException {
 		smaliParser.field_return retval = new smaliParser.field_return();
 		retval.start = input.LT(1);
@@ -1210,10 +1210,10 @@
 
 		List<CommonTree> annotations = new ArrayList<CommonTree>();
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:477:3: ( FIELD_DIRECTIVE access_list member_name COLON nonvoid_type_descriptor ( EQUAL literal )? ( ({...}? annotation )* ( END_FIELD_DIRECTIVE -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) ) ) ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:477:5: FIELD_DIRECTIVE access_list member_name COLON nonvoid_type_descriptor ( EQUAL literal )? ( ({...}? annotation )* ( END_FIELD_DIRECTIVE -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) ) ) )
+			// smaliParser.g:477:3: ( FIELD_DIRECTIVE access_list member_name COLON nonvoid_type_descriptor ( EQUAL literal )? ( ({...}? annotation )* ( END_FIELD_DIRECTIVE -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) ) ) ) )
+			// smaliParser.g:477:5: FIELD_DIRECTIVE access_list member_name COLON nonvoid_type_descriptor ( EQUAL literal )? ( ({...}? annotation )* ( END_FIELD_DIRECTIVE -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) ) ) )
 			{
-			FIELD_DIRECTIVE19=(Token)match(input,FIELD_DIRECTIVE,FOLLOW_FIELD_DIRECTIVE_in_field1337);
+			FIELD_DIRECTIVE19=(Token)match(input,FIELD_DIRECTIVE,FOLLOW_FIELD_DIRECTIVE_in_field1337);  
 			stream_FIELD_DIRECTIVE.add(FIELD_DIRECTIVE19);
 
 			pushFollow(FOLLOW_access_list_in_field1339);
@@ -1226,7 +1226,7 @@
 			state._fsp--;
 
 			stream_member_name.add(member_name21.getTree());
-			COLON22=(Token)match(input,COLON,FOLLOW_COLON_in_field1343);
+			COLON22=(Token)match(input,COLON,FOLLOW_COLON_in_field1343);  
 			stream_COLON.add(COLON22);
 
 			pushFollow(FOLLOW_nonvoid_type_descriptor_in_field1345);
@@ -1234,7 +1234,7 @@
 			state._fsp--;
 
 			stream_nonvoid_type_descriptor.add(nonvoid_type_descriptor23.getTree());
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:477:75: ( EQUAL literal )?
+			// smaliParser.g:477:75: ( EQUAL literal )?
 			int alt3=2;
 			int LA3_0 = input.LA(1);
 			if ( (LA3_0==EQUAL) ) {
@@ -1242,9 +1242,9 @@
 			}
 			switch (alt3) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:477:76: EQUAL literal
+					// smaliParser.g:477:76: EQUAL literal
 					{
-					EQUAL24=(Token)match(input,EQUAL,FOLLOW_EQUAL_in_field1348);
+					EQUAL24=(Token)match(input,EQUAL,FOLLOW_EQUAL_in_field1348);  
 					stream_EQUAL.add(EQUAL24);
 
 					pushFollow(FOLLOW_literal_in_field1350);
@@ -1257,10 +1257,10 @@
 
 			}
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:478:5: ( ({...}? annotation )* ( END_FIELD_DIRECTIVE -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) ) ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:478:7: ({...}? annotation )* ( END_FIELD_DIRECTIVE -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) ) )
+			// smaliParser.g:478:5: ( ({...}? annotation )* ( END_FIELD_DIRECTIVE -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) ) ) )
+			// smaliParser.g:478:7: ({...}? annotation )* ( END_FIELD_DIRECTIVE -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) ) )
 			{
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:478:7: ({...}? annotation )*
+			// smaliParser.g:478:7: ({...}? annotation )*
 			loop4:
 			while (true) {
 				int alt4=2;
@@ -1275,7 +1275,7 @@
 
 				switch (alt4) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:478:8: {...}? annotation
+					// smaliParser.g:478:8: {...}? annotation
 					{
 					if ( !((input.LA(1) == ANNOTATION_DIRECTIVE)) ) {
 						throw new FailedPredicateException(input, "field", "input.LA(1) == ANNOTATION_DIRECTIVE");
@@ -1294,7 +1294,7 @@
 				}
 			}
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:479:7: ( END_FIELD_DIRECTIVE -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) ) )
+			// smaliParser.g:479:7: ( END_FIELD_DIRECTIVE -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) ) )
 			int alt5=2;
 			int LA5_0 = input.LA(1);
 			if ( (LA5_0==END_FIELD_DIRECTIVE) ) {
@@ -1312,31 +1312,31 @@
 
 			switch (alt5) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:479:9: END_FIELD_DIRECTIVE
+					// smaliParser.g:479:9: END_FIELD_DIRECTIVE
 					{
-					END_FIELD_DIRECTIVE27=(Token)match(input,END_FIELD_DIRECTIVE,FOLLOW_END_FIELD_DIRECTIVE_in_field1377);
+					END_FIELD_DIRECTIVE27=(Token)match(input,END_FIELD_DIRECTIVE,FOLLOW_END_FIELD_DIRECTIVE_in_field1377);  
 					stream_END_FIELD_DIRECTIVE.add(END_FIELD_DIRECTIVE27);
 
 					// AST REWRITE
-					// elements: nonvoid_type_descriptor, literal, access_list, member_name, annotation
-					// token labels:
+					// elements: access_list, nonvoid_type_descriptor, annotation, member_name, literal
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 					root_0 = (CommonTree)adaptor.nil();
 					// 480:9: -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) )
 					{
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:480:12: ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) )
+						// smaliParser.g:480:12: ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ( annotation )* ) )
 						{
 						CommonTree root_1 = (CommonTree)adaptor.nil();
 						root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_FIELD, (retval.start), "I_FIELD"), root_1);
 						adaptor.addChild(root_1, stream_member_name.nextTree());
 						adaptor.addChild(root_1, stream_access_list.nextTree());
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:480:65: ^( I_FIELD_TYPE nonvoid_type_descriptor )
+						// smaliParser.g:480:65: ^( I_FIELD_TYPE nonvoid_type_descriptor )
 						{
 						CommonTree root_2 = (CommonTree)adaptor.nil();
 						root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_FIELD_TYPE, "I_FIELD_TYPE"), root_2);
@@ -1344,9 +1344,9 @@
 						adaptor.addChild(root_1, root_2);
 						}
 
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:480:105: ( ^( I_FIELD_INITIAL_VALUE literal ) )?
+						// smaliParser.g:480:105: ( ^( I_FIELD_INITIAL_VALUE literal ) )?
 						if ( stream_literal.hasNext() ) {
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:480:105: ^( I_FIELD_INITIAL_VALUE literal )
+							// smaliParser.g:480:105: ^( I_FIELD_INITIAL_VALUE literal )
 							{
 							CommonTree root_2 = (CommonTree)adaptor.nil();
 							root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_FIELD_INITIAL_VALUE, "I_FIELD_INITIAL_VALUE"), root_2);
@@ -1357,11 +1357,11 @@
 						}
 						stream_literal.reset();
 
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:480:139: ^( I_ANNOTATIONS ( annotation )* )
+						// smaliParser.g:480:139: ^( I_ANNOTATIONS ( annotation )* )
 						{
 						CommonTree root_2 = (CommonTree)adaptor.nil();
 						root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ANNOTATIONS, "I_ANNOTATIONS"), root_2);
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:480:155: ( annotation )*
+						// smaliParser.g:480:155: ( annotation )*
 						while ( stream_annotation.hasNext() ) {
 							adaptor.addChild(root_2, stream_annotation.nextTree());
 						}
@@ -1381,29 +1381,29 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:481:21:
+					// smaliParser.g:481:21: 
 					{
 					smali_file_stack.peek().classAnnotations.addAll(annotations);
 					// AST REWRITE
-					// elements: literal, nonvoid_type_descriptor, member_name, access_list
-					// token labels:
+					// elements: member_name, access_list, literal, nonvoid_type_descriptor
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 					root_0 = (CommonTree)adaptor.nil();
 					// 482:9: -> ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) )
 					{
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:482:12: ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) )
+						// smaliParser.g:482:12: ^( I_FIELD[$start, \"I_FIELD\"] member_name access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) ( ^( I_FIELD_INITIAL_VALUE literal ) )? ^( I_ANNOTATIONS ) )
 						{
 						CommonTree root_1 = (CommonTree)adaptor.nil();
 						root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_FIELD, (retval.start), "I_FIELD"), root_1);
 						adaptor.addChild(root_1, stream_member_name.nextTree());
 						adaptor.addChild(root_1, stream_access_list.nextTree());
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:482:65: ^( I_FIELD_TYPE nonvoid_type_descriptor )
+						// smaliParser.g:482:65: ^( I_FIELD_TYPE nonvoid_type_descriptor )
 						{
 						CommonTree root_2 = (CommonTree)adaptor.nil();
 						root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_FIELD_TYPE, "I_FIELD_TYPE"), root_2);
@@ -1411,9 +1411,9 @@
 						adaptor.addChild(root_1, root_2);
 						}
 
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:482:105: ( ^( I_FIELD_INITIAL_VALUE literal ) )?
+						// smaliParser.g:482:105: ( ^( I_FIELD_INITIAL_VALUE literal ) )?
 						if ( stream_literal.hasNext() ) {
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:482:105: ^( I_FIELD_INITIAL_VALUE literal )
+							// smaliParser.g:482:105: ^( I_FIELD_INITIAL_VALUE literal )
 							{
 							CommonTree root_2 = (CommonTree)adaptor.nil();
 							root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_FIELD_INITIAL_VALUE, "I_FIELD_INITIAL_VALUE"), root_2);
@@ -1424,7 +1424,7 @@
 						}
 						stream_literal.reset();
 
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:482:139: ^( I_ANNOTATIONS )
+						// smaliParser.g:482:139: ^( I_ANNOTATIONS )
 						{
 						CommonTree root_2 = (CommonTree)adaptor.nil();
 						root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ANNOTATIONS, "I_ANNOTATIONS"), root_2);
@@ -1475,7 +1475,7 @@
 
 
 	// $ANTLR start "method"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:486:1: method : METHOD_DIRECTIVE access_list member_name method_prototype statements_and_directives END_METHOD_DIRECTIVE -> ^( I_METHOD[$start, \"I_METHOD\"] member_name method_prototype access_list statements_and_directives ) ;
+	// smaliParser.g:486:1: method : METHOD_DIRECTIVE access_list member_name method_prototype statements_and_directives END_METHOD_DIRECTIVE -> ^( I_METHOD[$start, \"I_METHOD\"] member_name method_prototype access_list statements_and_directives ) ;
 	public final smaliParser.method_return method() throws RecognitionException {
 		smaliParser.method_return retval = new smaliParser.method_return();
 		retval.start = input.LT(1);
@@ -1499,10 +1499,10 @@
 		RewriteRuleSubtreeStream stream_statements_and_directives=new RewriteRuleSubtreeStream(adaptor,"rule statements_and_directives");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:487:3: ( METHOD_DIRECTIVE access_list member_name method_prototype statements_and_directives END_METHOD_DIRECTIVE -> ^( I_METHOD[$start, \"I_METHOD\"] member_name method_prototype access_list statements_and_directives ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:487:5: METHOD_DIRECTIVE access_list member_name method_prototype statements_and_directives END_METHOD_DIRECTIVE
+			// smaliParser.g:487:3: ( METHOD_DIRECTIVE access_list member_name method_prototype statements_and_directives END_METHOD_DIRECTIVE -> ^( I_METHOD[$start, \"I_METHOD\"] member_name method_prototype access_list statements_and_directives ) )
+			// smaliParser.g:487:5: METHOD_DIRECTIVE access_list member_name method_prototype statements_and_directives END_METHOD_DIRECTIVE
 			{
-			METHOD_DIRECTIVE28=(Token)match(input,METHOD_DIRECTIVE,FOLLOW_METHOD_DIRECTIVE_in_method1488);
+			METHOD_DIRECTIVE28=(Token)match(input,METHOD_DIRECTIVE,FOLLOW_METHOD_DIRECTIVE_in_method1488);  
 			stream_METHOD_DIRECTIVE.add(METHOD_DIRECTIVE28);
 
 			pushFollow(FOLLOW_access_list_in_method1490);
@@ -1525,23 +1525,23 @@
 			state._fsp--;
 
 			stream_statements_and_directives.add(statements_and_directives32.getTree());
-			END_METHOD_DIRECTIVE33=(Token)match(input,END_METHOD_DIRECTIVE,FOLLOW_END_METHOD_DIRECTIVE_in_method1502);
+			END_METHOD_DIRECTIVE33=(Token)match(input,END_METHOD_DIRECTIVE,FOLLOW_END_METHOD_DIRECTIVE_in_method1502);  
 			stream_END_METHOD_DIRECTIVE.add(END_METHOD_DIRECTIVE33);
 
 			// AST REWRITE
-			// elements: access_list, member_name, method_prototype, statements_and_directives
-			// token labels:
+			// elements: method_prototype, access_list, member_name, statements_and_directives
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 489:5: -> ^( I_METHOD[$start, \"I_METHOD\"] member_name method_prototype access_list statements_and_directives )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:489:8: ^( I_METHOD[$start, \"I_METHOD\"] member_name method_prototype access_list statements_and_directives )
+				// smaliParser.g:489:8: ^( I_METHOD[$start, \"I_METHOD\"] member_name method_prototype access_list statements_and_directives )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_METHOD, (retval.start), "I_METHOD"), root_1);
@@ -1592,7 +1592,7 @@
 
 
 	// $ANTLR start "statements_and_directives"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:491:1: statements_and_directives : ( ordered_method_item | registers_directive | catch_directive | catchall_directive | parameter_directive | annotation )* -> ( registers_directive )? ^( I_ORDERED_METHOD_ITEMS ( ordered_method_item )* ) ^( I_CATCHES ( catch_directive )* ( catchall_directive )* ) ^( I_PARAMETERS ( parameter_directive )* ) ;
+	// smaliParser.g:491:1: statements_and_directives : ( ordered_method_item | registers_directive | catch_directive | catchall_directive | parameter_directive | annotation )* -> ( registers_directive )? ^( I_ORDERED_METHOD_ITEMS ( ordered_method_item )* ) ^( I_CATCHES ( catch_directive )* ( catchall_directive )* ) ^( I_PARAMETERS ( parameter_directive )* ) ;
 	public final smaliParser.statements_and_directives_return statements_and_directives() throws RecognitionException {
 		statements_and_directives_stack.push(new statements_and_directives_scope());
 		smaliParser.statements_and_directives_return retval = new smaliParser.statements_and_directives_return();
@@ -1615,14 +1615,14 @@
 		RewriteRuleSubtreeStream stream_parameter_directive=new RewriteRuleSubtreeStream(adaptor,"rule parameter_directive");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:497:3: ( ( ordered_method_item | registers_directive | catch_directive | catchall_directive | parameter_directive | annotation )* -> ( registers_directive )? ^( I_ORDERED_METHOD_ITEMS ( ordered_method_item )* ) ^( I_CATCHES ( catch_directive )* ( catchall_directive )* ) ^( I_PARAMETERS ( parameter_directive )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:497:5: ( ordered_method_item | registers_directive | catch_directive | catchall_directive | parameter_directive | annotation )*
+			// smaliParser.g:497:3: ( ( ordered_method_item | registers_directive | catch_directive | catchall_directive | parameter_directive | annotation )* -> ( registers_directive )? ^( I_ORDERED_METHOD_ITEMS ( ordered_method_item )* ) ^( I_CATCHES ( catch_directive )* ( catchall_directive )* ) ^( I_PARAMETERS ( parameter_directive )* ) )
+			// smaliParser.g:497:5: ( ordered_method_item | registers_directive | catch_directive | catchall_directive | parameter_directive | annotation )*
 			{
 
 			      statements_and_directives_stack.peek().hasRegistersDirective = false;
 			      statements_and_directives_stack.peek().methodAnnotations = new ArrayList<CommonTree>();
-			
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:501:5: ( ordered_method_item | registers_directive | catch_directive | catchall_directive | parameter_directive | annotation )*
+			    
+			// smaliParser.g:501:5: ( ordered_method_item | registers_directive | catch_directive | catchall_directive | parameter_directive | annotation )*
 			loop6:
 			while (true) {
 				int alt6=7;
@@ -1717,7 +1717,7 @@
 				}
 				switch (alt6) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:501:7: ordered_method_item
+					// smaliParser.g:501:7: ordered_method_item
 					{
 					pushFollow(FOLLOW_ordered_method_item_in_statements_and_directives1547);
 					ordered_method_item34=ordered_method_item();
@@ -1727,7 +1727,7 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:502:7: registers_directive
+					// smaliParser.g:502:7: registers_directive
 					{
 					pushFollow(FOLLOW_registers_directive_in_statements_and_directives1555);
 					registers_directive35=registers_directive();
@@ -1737,7 +1737,7 @@
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:503:7: catch_directive
+					// smaliParser.g:503:7: catch_directive
 					{
 					pushFollow(FOLLOW_catch_directive_in_statements_and_directives1563);
 					catch_directive36=catch_directive();
@@ -1747,7 +1747,7 @@
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:504:7: catchall_directive
+					// smaliParser.g:504:7: catchall_directive
 					{
 					pushFollow(FOLLOW_catchall_directive_in_statements_and_directives1571);
 					catchall_directive37=catchall_directive();
@@ -1757,7 +1757,7 @@
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:505:7: parameter_directive
+					// smaliParser.g:505:7: parameter_directive
 					{
 					pushFollow(FOLLOW_parameter_directive_in_statements_and_directives1579);
 					parameter_directive38=parameter_directive();
@@ -1767,7 +1767,7 @@
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:506:7: annotation
+					// smaliParser.g:506:7: annotation
 					{
 					pushFollow(FOLLOW_annotation_in_statements_and_directives1587);
 					annotation39=annotation();
@@ -1784,29 +1784,29 @@
 			}
 
 			// AST REWRITE
-			// elements: parameter_directive, catch_directive, catchall_directive, ordered_method_item, registers_directive
-			// token labels:
+			// elements: ordered_method_item, catch_directive, catchall_directive, parameter_directive, registers_directive
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 508:5: -> ( registers_directive )? ^( I_ORDERED_METHOD_ITEMS ( ordered_method_item )* ) ^( I_CATCHES ( catch_directive )* ( catchall_directive )* ) ^( I_PARAMETERS ( parameter_directive )* )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:508:8: ( registers_directive )?
+				// smaliParser.g:508:8: ( registers_directive )?
 				if ( stream_registers_directive.hasNext() ) {
 					adaptor.addChild(root_0, stream_registers_directive.nextTree());
 				}
 				stream_registers_directive.reset();
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:509:8: ^( I_ORDERED_METHOD_ITEMS ( ordered_method_item )* )
+				// smaliParser.g:509:8: ^( I_ORDERED_METHOD_ITEMS ( ordered_method_item )* )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ORDERED_METHOD_ITEMS, "I_ORDERED_METHOD_ITEMS"), root_1);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:509:33: ( ordered_method_item )*
+				// smaliParser.g:509:33: ( ordered_method_item )*
 				while ( stream_ordered_method_item.hasNext() ) {
 					adaptor.addChild(root_1, stream_ordered_method_item.nextTree());
 				}
@@ -1815,17 +1815,17 @@
 				adaptor.addChild(root_0, root_1);
 				}
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:510:8: ^( I_CATCHES ( catch_directive )* ( catchall_directive )* )
+				// smaliParser.g:510:8: ^( I_CATCHES ( catch_directive )* ( catchall_directive )* )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_CATCHES, "I_CATCHES"), root_1);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:510:20: ( catch_directive )*
+				// smaliParser.g:510:20: ( catch_directive )*
 				while ( stream_catch_directive.hasNext() ) {
 					adaptor.addChild(root_1, stream_catch_directive.nextTree());
 				}
 				stream_catch_directive.reset();
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:510:37: ( catchall_directive )*
+				// smaliParser.g:510:37: ( catchall_directive )*
 				while ( stream_catchall_directive.hasNext() ) {
 					adaptor.addChild(root_1, stream_catchall_directive.nextTree());
 				}
@@ -1834,11 +1834,11 @@
 				adaptor.addChild(root_0, root_1);
 				}
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:511:8: ^( I_PARAMETERS ( parameter_directive )* )
+				// smaliParser.g:511:8: ^( I_PARAMETERS ( parameter_directive )* )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_PARAMETERS, "I_PARAMETERS"), root_1);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:511:23: ( parameter_directive )*
+				// smaliParser.g:511:23: ( parameter_directive )*
 				while ( stream_parameter_directive.hasNext() ) {
 					adaptor.addChild(root_1, stream_parameter_directive.nextTree());
 				}
@@ -1883,7 +1883,7 @@
 
 
 	// $ANTLR start "ordered_method_item"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:515:1: ordered_method_item : ( label | instruction | debug_directive );
+	// smaliParser.g:515:1: ordered_method_item : ( label | instruction | debug_directive );
 	public final smaliParser.ordered_method_item_return ordered_method_item() throws RecognitionException {
 		smaliParser.ordered_method_item_return retval = new smaliParser.ordered_method_item_return();
 		retval.start = input.LT(1);
@@ -1896,7 +1896,7 @@
 
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:516:3: ( label | instruction | debug_directive )
+			// smaliParser.g:516:3: ( label | instruction | debug_directive )
 			int alt7=3;
 			switch ( input.LA(1) ) {
 			case COLON:
@@ -1975,7 +1975,7 @@
 			}
 			switch (alt7) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:516:5: label
+					// smaliParser.g:516:5: label
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -1989,7 +1989,7 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:517:5: instruction
+					// smaliParser.g:517:5: instruction
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -2003,7 +2003,7 @@
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:518:5: debug_directive
+					// smaliParser.g:518:5: debug_directive
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -2045,7 +2045,7 @@
 
 
 	// $ANTLR start "registers_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:520:1: registers_directive : (directive= REGISTERS_DIRECTIVE regCount= integral_literal -> ^( I_REGISTERS[$REGISTERS_DIRECTIVE, \"I_REGISTERS\"] $regCount) |directive= LOCALS_DIRECTIVE regCount2= integral_literal -> ^( I_LOCALS[$LOCALS_DIRECTIVE, \"I_LOCALS\"] $regCount2) ) ;
+	// smaliParser.g:520:1: registers_directive : (directive= REGISTERS_DIRECTIVE regCount= integral_literal -> ^( I_REGISTERS[$REGISTERS_DIRECTIVE, \"I_REGISTERS\"] $regCount) |directive= LOCALS_DIRECTIVE regCount2= integral_literal -> ^( I_LOCALS[$LOCALS_DIRECTIVE, \"I_LOCALS\"] $regCount2) ) ;
 	public final smaliParser.registers_directive_return registers_directive() throws RecognitionException {
 		smaliParser.registers_directive_return retval = new smaliParser.registers_directive_return();
 		retval.start = input.LT(1);
@@ -2062,10 +2062,10 @@
 		RewriteRuleSubtreeStream stream_integral_literal=new RewriteRuleSubtreeStream(adaptor,"rule integral_literal");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:521:3: ( (directive= REGISTERS_DIRECTIVE regCount= integral_literal -> ^( I_REGISTERS[$REGISTERS_DIRECTIVE, \"I_REGISTERS\"] $regCount) |directive= LOCALS_DIRECTIVE regCount2= integral_literal -> ^( I_LOCALS[$LOCALS_DIRECTIVE, \"I_LOCALS\"] $regCount2) ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:521:5: (directive= REGISTERS_DIRECTIVE regCount= integral_literal -> ^( I_REGISTERS[$REGISTERS_DIRECTIVE, \"I_REGISTERS\"] $regCount) |directive= LOCALS_DIRECTIVE regCount2= integral_literal -> ^( I_LOCALS[$LOCALS_DIRECTIVE, \"I_LOCALS\"] $regCount2) )
+			// smaliParser.g:521:3: ( (directive= REGISTERS_DIRECTIVE regCount= integral_literal -> ^( I_REGISTERS[$REGISTERS_DIRECTIVE, \"I_REGISTERS\"] $regCount) |directive= LOCALS_DIRECTIVE regCount2= integral_literal -> ^( I_LOCALS[$LOCALS_DIRECTIVE, \"I_LOCALS\"] $regCount2) ) )
+			// smaliParser.g:521:5: (directive= REGISTERS_DIRECTIVE regCount= integral_literal -> ^( I_REGISTERS[$REGISTERS_DIRECTIVE, \"I_REGISTERS\"] $regCount) |directive= LOCALS_DIRECTIVE regCount2= integral_literal -> ^( I_LOCALS[$LOCALS_DIRECTIVE, \"I_LOCALS\"] $regCount2) )
 			{
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:521:5: (directive= REGISTERS_DIRECTIVE regCount= integral_literal -> ^( I_REGISTERS[$REGISTERS_DIRECTIVE, \"I_REGISTERS\"] $regCount) |directive= LOCALS_DIRECTIVE regCount2= integral_literal -> ^( I_LOCALS[$LOCALS_DIRECTIVE, \"I_LOCALS\"] $regCount2) )
+			// smaliParser.g:521:5: (directive= REGISTERS_DIRECTIVE regCount= integral_literal -> ^( I_REGISTERS[$REGISTERS_DIRECTIVE, \"I_REGISTERS\"] $regCount) |directive= LOCALS_DIRECTIVE regCount2= integral_literal -> ^( I_LOCALS[$LOCALS_DIRECTIVE, \"I_LOCALS\"] $regCount2) )
 			int alt8=2;
 			int LA8_0 = input.LA(1);
 			if ( (LA8_0==REGISTERS_DIRECTIVE) ) {
@@ -2083,9 +2083,9 @@
 
 			switch (alt8) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:522:7: directive= REGISTERS_DIRECTIVE regCount= integral_literal
+					// smaliParser.g:522:7: directive= REGISTERS_DIRECTIVE regCount= integral_literal
 					{
-					directive=(Token)match(input,REGISTERS_DIRECTIVE,FOLLOW_REGISTERS_DIRECTIVE_in_registers_directive1704);
+					directive=(Token)match(input,REGISTERS_DIRECTIVE,FOLLOW_REGISTERS_DIRECTIVE_in_registers_directive1704);  
 					stream_REGISTERS_DIRECTIVE.add(directive);
 
 					pushFollow(FOLLOW_integral_literal_in_registers_directive1708);
@@ -2095,11 +2095,11 @@
 					stream_integral_literal.add(regCount.getTree());
 					// AST REWRITE
 					// elements: regCount
-					// token labels:
+					// token labels: 
 					// rule labels: regCount, retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_regCount=new RewriteRuleSubtreeStream(adaptor,"rule regCount",regCount!=null?regCount.getTree():null);
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
@@ -2107,7 +2107,7 @@
 					root_0 = (CommonTree)adaptor.nil();
 					// 522:63: -> ^( I_REGISTERS[$REGISTERS_DIRECTIVE, \"I_REGISTERS\"] $regCount)
 					{
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:522:66: ^( I_REGISTERS[$REGISTERS_DIRECTIVE, \"I_REGISTERS\"] $regCount)
+						// smaliParser.g:522:66: ^( I_REGISTERS[$REGISTERS_DIRECTIVE, \"I_REGISTERS\"] $regCount)
 						{
 						CommonTree root_1 = (CommonTree)adaptor.nil();
 						root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_REGISTERS, directive, "I_REGISTERS"), root_1);
@@ -2123,9 +2123,9 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:523:7: directive= LOCALS_DIRECTIVE regCount2= integral_literal
+					// smaliParser.g:523:7: directive= LOCALS_DIRECTIVE regCount2= integral_literal
 					{
-					directive=(Token)match(input,LOCALS_DIRECTIVE,FOLLOW_LOCALS_DIRECTIVE_in_registers_directive1728);
+					directive=(Token)match(input,LOCALS_DIRECTIVE,FOLLOW_LOCALS_DIRECTIVE_in_registers_directive1728);  
 					stream_LOCALS_DIRECTIVE.add(directive);
 
 					pushFollow(FOLLOW_integral_literal_in_registers_directive1732);
@@ -2135,11 +2135,11 @@
 					stream_integral_literal.add(regCount2.getTree());
 					// AST REWRITE
 					// elements: regCount2
-					// token labels:
+					// token labels: 
 					// rule labels: regCount2, retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_regCount2=new RewriteRuleSubtreeStream(adaptor,"rule regCount2",regCount2!=null?regCount2.getTree():null);
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
@@ -2147,7 +2147,7 @@
 					root_0 = (CommonTree)adaptor.nil();
 					// 523:61: -> ^( I_LOCALS[$LOCALS_DIRECTIVE, \"I_LOCALS\"] $regCount2)
 					{
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:523:64: ^( I_LOCALS[$LOCALS_DIRECTIVE, \"I_LOCALS\"] $regCount2)
+						// smaliParser.g:523:64: ^( I_LOCALS[$LOCALS_DIRECTIVE, \"I_LOCALS\"] $regCount2)
 						{
 						CommonTree root_1 = (CommonTree)adaptor.nil();
 						root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_LOCALS, directive, "I_LOCALS"), root_1);
@@ -2170,7 +2170,7 @@
 			        throw new SemanticException(input, directive, "There can only be a single .registers or .locals directive in a method");
 			      }
 			      statements_and_directives_stack.peek().hasRegistersDirective =true;
-			
+			    
 			}
 
 			retval.stop = input.LT(-1);
@@ -2200,7 +2200,7 @@
 
 
 	// $ANTLR start "param_list_or_id"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:532:1: param_list_or_id : ( PARAM_LIST_OR_ID_PRIMITIVE_TYPE )+ ;
+	// smaliParser.g:532:1: param_list_or_id : ( PARAM_LIST_OR_ID_PRIMITIVE_TYPE )+ ;
 	public final smaliParser.param_list_or_id_return param_list_or_id() throws RecognitionException {
 		smaliParser.param_list_or_id_return retval = new smaliParser.param_list_or_id_return();
 		retval.start = input.LT(1);
@@ -2212,13 +2212,13 @@
 		CommonTree PARAM_LIST_OR_ID_PRIMITIVE_TYPE43_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:533:3: ( ( PARAM_LIST_OR_ID_PRIMITIVE_TYPE )+ )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:533:5: ( PARAM_LIST_OR_ID_PRIMITIVE_TYPE )+
+			// smaliParser.g:533:3: ( ( PARAM_LIST_OR_ID_PRIMITIVE_TYPE )+ )
+			// smaliParser.g:533:5: ( PARAM_LIST_OR_ID_PRIMITIVE_TYPE )+
 			{
 			root_0 = (CommonTree)adaptor.nil();
 
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:533:5: ( PARAM_LIST_OR_ID_PRIMITIVE_TYPE )+
+			// smaliParser.g:533:5: ( PARAM_LIST_OR_ID_PRIMITIVE_TYPE )+
 			int cnt9=0;
 			loop9:
 			while (true) {
@@ -2230,9 +2230,9 @@
 
 				switch (alt9) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:533:5: PARAM_LIST_OR_ID_PRIMITIVE_TYPE
+					// smaliParser.g:533:5: PARAM_LIST_OR_ID_PRIMITIVE_TYPE
 					{
-					PARAM_LIST_OR_ID_PRIMITIVE_TYPE43=(Token)match(input,PARAM_LIST_OR_ID_PRIMITIVE_TYPE,FOLLOW_PARAM_LIST_OR_ID_PRIMITIVE_TYPE_in_param_list_or_id1764);
+					PARAM_LIST_OR_ID_PRIMITIVE_TYPE43=(Token)match(input,PARAM_LIST_OR_ID_PRIMITIVE_TYPE,FOLLOW_PARAM_LIST_OR_ID_PRIMITIVE_TYPE_in_param_list_or_id1764); 
 					PARAM_LIST_OR_ID_PRIMITIVE_TYPE43_tree = (CommonTree)adaptor.create(PARAM_LIST_OR_ID_PRIMITIVE_TYPE43);
 					adaptor.addChild(root_0, PARAM_LIST_OR_ID_PRIMITIVE_TYPE43_tree);
 
@@ -2276,7 +2276,7 @@
 
 
 	// $ANTLR start "simple_name"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:537:1: simple_name : ( SIMPLE_NAME | ACCESS_SPEC -> SIMPLE_NAME[$ACCESS_SPEC] | VERIFICATION_ERROR_TYPE -> SIMPLE_NAME[$VERIFICATION_ERROR_TYPE] | POSITIVE_INTEGER_LITERAL -> SIMPLE_NAME[$POSITIVE_INTEGER_LITERAL] | NEGATIVE_INTEGER_LITERAL -> SIMPLE_NAME[$NEGATIVE_INTEGER_LITERAL] | FLOAT_LITERAL_OR_ID -> SIMPLE_NAME[$FLOAT_LITERAL_OR_ID] | DOUBLE_LITERAL_OR_ID -> SIMPLE_NAME[$DOUBLE_LITERAL_OR_ID] | BOOL_LITERAL -> SIMPLE_NAME[$BOOL_LITERAL] | NULL_LITERAL -> SIMPLE_NAME[$NULL_LITERAL] | REGISTER -> SIMPLE_NAME[$REGISTER] | param_list_or_id ->| PRIMITIVE_TYPE -> SIMPLE_NAME[$PRIMITIVE_TYPE] | VOID_TYPE -> SIMPLE_NAME[$VOID_TYPE] | ANNOTATION_VISIBILITY -> SIMPLE_NAME[$ANNOTATION_VISIBILITY] | INSTRUCTION_FORMAT10t -> SIMPLE_NAME[$INSTRUCTION_FORMAT10t] | INSTRUCTION_FORMAT10x -> SIMPLE_NAME[$INSTRUCTION_FORMAT10x] | INSTRUCTION_FORMAT10x_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT10x_ODEX] | INSTRUCTION_FORMAT11x -> SIMPLE_NAME[$INSTRUCTION_FORMAT11x] | INSTRUCTION_FORMAT12x_OR_ID -> SIMPLE_NAME[$INSTRUCTION_FORMAT12x_OR_ID] | INSTRUCTION_FORMAT21c_FIELD -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_FIELD] | INSTRUCTION_FORMAT21c_FIELD_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_FIELD_ODEX] | INSTRUCTION_FORMAT21c_STRING -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_STRING] | INSTRUCTION_FORMAT21c_TYPE -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_TYPE] | INSTRUCTION_FORMAT21t -> SIMPLE_NAME[$INSTRUCTION_FORMAT21t] | INSTRUCTION_FORMAT22c_FIELD -> SIMPLE_NAME[$INSTRUCTION_FORMAT22c_FIELD] | INSTRUCTION_FORMAT22c_FIELD_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT22c_FIELD_ODEX] | INSTRUCTION_FORMAT22c_TYPE -> SIMPLE_NAME[$INSTRUCTION_FORMAT22c_TYPE] | INSTRUCTION_FORMAT22cs_FIELD -> SIMPLE_NAME[$INSTRUCTION_FORMAT22cs_FIELD] | INSTRUCTION_FORMAT22s_OR_ID -> SIMPLE_NAME[$INSTRUCTION_FORMAT22s_OR_ID] | INSTRUCTION_FORMAT22t -> SIMPLE_NAME[$INSTRUCTION_FORMAT22t] | INSTRUCTION_FORMAT23x -> SIMPLE_NAME[$INSTRUCTION_FORMAT23x] | INSTRUCTION_FORMAT31i_OR_ID -> SIMPLE_NAME[$INSTRUCTION_FORMAT31i_OR_ID] | INSTRUCTION_FORMAT31t -> SIMPLE_NAME[$INSTRUCTION_FORMAT31t] | INSTRUCTION_FORMAT35c_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT35c_METHOD] | INSTRUCTION_FORMAT35c_METHOD_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT35c_METHOD_ODEX] | INSTRUCTION_FORMAT35c_TYPE -> SIMPLE_NAME[$INSTRUCTION_FORMAT35c_TYPE] | INSTRUCTION_FORMAT35mi_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT35mi_METHOD] | INSTRUCTION_FORMAT35ms_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT35ms_METHOD] | INSTRUCTION_FORMAT45cc_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT45cc_METHOD] | INSTRUCTION_FORMAT4rcc_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT4rcc_METHOD] | INSTRUCTION_FORMAT51l -> SIMPLE_NAME[$INSTRUCTION_FORMAT51l] );
+	// smaliParser.g:537:1: simple_name : ( SIMPLE_NAME | ACCESS_SPEC -> SIMPLE_NAME[$ACCESS_SPEC] | VERIFICATION_ERROR_TYPE -> SIMPLE_NAME[$VERIFICATION_ERROR_TYPE] | POSITIVE_INTEGER_LITERAL -> SIMPLE_NAME[$POSITIVE_INTEGER_LITERAL] | NEGATIVE_INTEGER_LITERAL -> SIMPLE_NAME[$NEGATIVE_INTEGER_LITERAL] | FLOAT_LITERAL_OR_ID -> SIMPLE_NAME[$FLOAT_LITERAL_OR_ID] | DOUBLE_LITERAL_OR_ID -> SIMPLE_NAME[$DOUBLE_LITERAL_OR_ID] | BOOL_LITERAL -> SIMPLE_NAME[$BOOL_LITERAL] | NULL_LITERAL -> SIMPLE_NAME[$NULL_LITERAL] | REGISTER -> SIMPLE_NAME[$REGISTER] | param_list_or_id ->| PRIMITIVE_TYPE -> SIMPLE_NAME[$PRIMITIVE_TYPE] | VOID_TYPE -> SIMPLE_NAME[$VOID_TYPE] | ANNOTATION_VISIBILITY -> SIMPLE_NAME[$ANNOTATION_VISIBILITY] | INSTRUCTION_FORMAT10t -> SIMPLE_NAME[$INSTRUCTION_FORMAT10t] | INSTRUCTION_FORMAT10x -> SIMPLE_NAME[$INSTRUCTION_FORMAT10x] | INSTRUCTION_FORMAT10x_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT10x_ODEX] | INSTRUCTION_FORMAT11x -> SIMPLE_NAME[$INSTRUCTION_FORMAT11x] | INSTRUCTION_FORMAT12x_OR_ID -> SIMPLE_NAME[$INSTRUCTION_FORMAT12x_OR_ID] | INSTRUCTION_FORMAT21c_FIELD -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_FIELD] | INSTRUCTION_FORMAT21c_FIELD_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_FIELD_ODEX] | INSTRUCTION_FORMAT21c_STRING -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_STRING] | INSTRUCTION_FORMAT21c_TYPE -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_TYPE] | INSTRUCTION_FORMAT21t -> SIMPLE_NAME[$INSTRUCTION_FORMAT21t] | INSTRUCTION_FORMAT22c_FIELD -> SIMPLE_NAME[$INSTRUCTION_FORMAT22c_FIELD] | INSTRUCTION_FORMAT22c_FIELD_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT22c_FIELD_ODEX] | INSTRUCTION_FORMAT22c_TYPE -> SIMPLE_NAME[$INSTRUCTION_FORMAT22c_TYPE] | INSTRUCTION_FORMAT22cs_FIELD -> SIMPLE_NAME[$INSTRUCTION_FORMAT22cs_FIELD] | INSTRUCTION_FORMAT22s_OR_ID -> SIMPLE_NAME[$INSTRUCTION_FORMAT22s_OR_ID] | INSTRUCTION_FORMAT22t -> SIMPLE_NAME[$INSTRUCTION_FORMAT22t] | INSTRUCTION_FORMAT23x -> SIMPLE_NAME[$INSTRUCTION_FORMAT23x] | INSTRUCTION_FORMAT31i_OR_ID -> SIMPLE_NAME[$INSTRUCTION_FORMAT31i_OR_ID] | INSTRUCTION_FORMAT31t -> SIMPLE_NAME[$INSTRUCTION_FORMAT31t] | INSTRUCTION_FORMAT35c_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT35c_METHOD] | INSTRUCTION_FORMAT35c_METHOD_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT35c_METHOD_ODEX] | INSTRUCTION_FORMAT35c_TYPE -> SIMPLE_NAME[$INSTRUCTION_FORMAT35c_TYPE] | INSTRUCTION_FORMAT35mi_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT35mi_METHOD] | INSTRUCTION_FORMAT35ms_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT35ms_METHOD] | INSTRUCTION_FORMAT45cc_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT45cc_METHOD] | INSTRUCTION_FORMAT4rcc_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT4rcc_METHOD] | INSTRUCTION_FORMAT51l -> SIMPLE_NAME[$INSTRUCTION_FORMAT51l] );
 	public final smaliParser.simple_name_return simple_name() throws RecognitionException {
 		smaliParser.simple_name_return retval = new smaliParser.simple_name_return();
 		retval.start = input.LT(1);
@@ -2407,7 +2407,7 @@
 		RewriteRuleSubtreeStream stream_param_list_or_id=new RewriteRuleSubtreeStream(adaptor,"rule param_list_or_id");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:538:3: ( SIMPLE_NAME | ACCESS_SPEC -> SIMPLE_NAME[$ACCESS_SPEC] | VERIFICATION_ERROR_TYPE -> SIMPLE_NAME[$VERIFICATION_ERROR_TYPE] | POSITIVE_INTEGER_LITERAL -> SIMPLE_NAME[$POSITIVE_INTEGER_LITERAL] | NEGATIVE_INTEGER_LITERAL -> SIMPLE_NAME[$NEGATIVE_INTEGER_LITERAL] | FLOAT_LITERAL_OR_ID -> SIMPLE_NAME[$FLOAT_LITERAL_OR_ID] | DOUBLE_LITERAL_OR_ID -> SIMPLE_NAME[$DOUBLE_LITERAL_OR_ID] | BOOL_LITERAL -> SIMPLE_NAME[$BOOL_LITERAL] | NULL_LITERAL -> SIMPLE_NAME[$NULL_LITERAL] | REGISTER -> SIMPLE_NAME[$REGISTER] | param_list_or_id ->| PRIMITIVE_TYPE -> SIMPLE_NAME[$PRIMITIVE_TYPE] | VOID_TYPE -> SIMPLE_NAME[$VOID_TYPE] | ANNOTATION_VISIBILITY -> SIMPLE_NAME[$ANNOTATION_VISIBILITY] | INSTRUCTION_FORMAT10t -> SIMPLE_NAME[$INSTRUCTION_FORMAT10t] | INSTRUCTION_FORMAT10x -> SIMPLE_NAME[$INSTRUCTION_FORMAT10x] | INSTRUCTION_FORMAT10x_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT10x_ODEX] | INSTRUCTION_FORMAT11x -> SIMPLE_NAME[$INSTRUCTION_FORMAT11x] | INSTRUCTION_FORMAT12x_OR_ID -> SIMPLE_NAME[$INSTRUCTION_FORMAT12x_OR_ID] | INSTRUCTION_FORMAT21c_FIELD -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_FIELD] | INSTRUCTION_FORMAT21c_FIELD_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_FIELD_ODEX] | INSTRUCTION_FORMAT21c_STRING -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_STRING] | INSTRUCTION_FORMAT21c_TYPE -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_TYPE] | INSTRUCTION_FORMAT21t -> SIMPLE_NAME[$INSTRUCTION_FORMAT21t] | INSTRUCTION_FORMAT22c_FIELD -> SIMPLE_NAME[$INSTRUCTION_FORMAT22c_FIELD] | INSTRUCTION_FORMAT22c_FIELD_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT22c_FIELD_ODEX] | INSTRUCTION_FORMAT22c_TYPE -> SIMPLE_NAME[$INSTRUCTION_FORMAT22c_TYPE] | INSTRUCTION_FORMAT22cs_FIELD -> SIMPLE_NAME[$INSTRUCTION_FORMAT22cs_FIELD] | INSTRUCTION_FORMAT22s_OR_ID -> SIMPLE_NAME[$INSTRUCTION_FORMAT22s_OR_ID] | INSTRUCTION_FORMAT22t -> SIMPLE_NAME[$INSTRUCTION_FORMAT22t] | INSTRUCTION_FORMAT23x -> SIMPLE_NAME[$INSTRUCTION_FORMAT23x] | INSTRUCTION_FORMAT31i_OR_ID -> SIMPLE_NAME[$INSTRUCTION_FORMAT31i_OR_ID] | INSTRUCTION_FORMAT31t -> SIMPLE_NAME[$INSTRUCTION_FORMAT31t] | INSTRUCTION_FORMAT35c_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT35c_METHOD] | INSTRUCTION_FORMAT35c_METHOD_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT35c_METHOD_ODEX] | INSTRUCTION_FORMAT35c_TYPE -> SIMPLE_NAME[$INSTRUCTION_FORMAT35c_TYPE] | INSTRUCTION_FORMAT35mi_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT35mi_METHOD] | INSTRUCTION_FORMAT35ms_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT35ms_METHOD] | INSTRUCTION_FORMAT45cc_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT45cc_METHOD] | INSTRUCTION_FORMAT4rcc_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT4rcc_METHOD] | INSTRUCTION_FORMAT51l -> SIMPLE_NAME[$INSTRUCTION_FORMAT51l] )
+			// smaliParser.g:538:3: ( SIMPLE_NAME | ACCESS_SPEC -> SIMPLE_NAME[$ACCESS_SPEC] | VERIFICATION_ERROR_TYPE -> SIMPLE_NAME[$VERIFICATION_ERROR_TYPE] | POSITIVE_INTEGER_LITERAL -> SIMPLE_NAME[$POSITIVE_INTEGER_LITERAL] | NEGATIVE_INTEGER_LITERAL -> SIMPLE_NAME[$NEGATIVE_INTEGER_LITERAL] | FLOAT_LITERAL_OR_ID -> SIMPLE_NAME[$FLOAT_LITERAL_OR_ID] | DOUBLE_LITERAL_OR_ID -> SIMPLE_NAME[$DOUBLE_LITERAL_OR_ID] | BOOL_LITERAL -> SIMPLE_NAME[$BOOL_LITERAL] | NULL_LITERAL -> SIMPLE_NAME[$NULL_LITERAL] | REGISTER -> SIMPLE_NAME[$REGISTER] | param_list_or_id ->| PRIMITIVE_TYPE -> SIMPLE_NAME[$PRIMITIVE_TYPE] | VOID_TYPE -> SIMPLE_NAME[$VOID_TYPE] | ANNOTATION_VISIBILITY -> SIMPLE_NAME[$ANNOTATION_VISIBILITY] | INSTRUCTION_FORMAT10t -> SIMPLE_NAME[$INSTRUCTION_FORMAT10t] | INSTRUCTION_FORMAT10x -> SIMPLE_NAME[$INSTRUCTION_FORMAT10x] | INSTRUCTION_FORMAT10x_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT10x_ODEX] | INSTRUCTION_FORMAT11x -> SIMPLE_NAME[$INSTRUCTION_FORMAT11x] | INSTRUCTION_FORMAT12x_OR_ID -> SIMPLE_NAME[$INSTRUCTION_FORMAT12x_OR_ID] | INSTRUCTION_FORMAT21c_FIELD -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_FIELD] | INSTRUCTION_FORMAT21c_FIELD_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_FIELD_ODEX] | INSTRUCTION_FORMAT21c_STRING -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_STRING] | INSTRUCTION_FORMAT21c_TYPE -> SIMPLE_NAME[$INSTRUCTION_FORMAT21c_TYPE] | INSTRUCTION_FORMAT21t -> SIMPLE_NAME[$INSTRUCTION_FORMAT21t] | INSTRUCTION_FORMAT22c_FIELD -> SIMPLE_NAME[$INSTRUCTION_FORMAT22c_FIELD] | INSTRUCTION_FORMAT22c_FIELD_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT22c_FIELD_ODEX] | INSTRUCTION_FORMAT22c_TYPE -> SIMPLE_NAME[$INSTRUCTION_FORMAT22c_TYPE] | INSTRUCTION_FORMAT22cs_FIELD -> SIMPLE_NAME[$INSTRUCTION_FORMAT22cs_FIELD] | INSTRUCTION_FORMAT22s_OR_ID -> SIMPLE_NAME[$INSTRUCTION_FORMAT22s_OR_ID] | INSTRUCTION_FORMAT22t -> SIMPLE_NAME[$INSTRUCTION_FORMAT22t] | INSTRUCTION_FORMAT23x -> SIMPLE_NAME[$INSTRUCTION_FORMAT23x] | INSTRUCTION_FORMAT31i_OR_ID -> SIMPLE_NAME[$INSTRUCTION_FORMAT31i_OR_ID] | INSTRUCTION_FORMAT31t -> SIMPLE_NAME[$INSTRUCTION_FORMAT31t] | INSTRUCTION_FORMAT35c_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT35c_METHOD] | INSTRUCTION_FORMAT35c_METHOD_ODEX -> SIMPLE_NAME[$INSTRUCTION_FORMAT35c_METHOD_ODEX] | INSTRUCTION_FORMAT35c_TYPE -> SIMPLE_NAME[$INSTRUCTION_FORMAT35c_TYPE] | INSTRUCTION_FORMAT35mi_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT35mi_METHOD] | INSTRUCTION_FORMAT35ms_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT35ms_METHOD] | INSTRUCTION_FORMAT45cc_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT45cc_METHOD] | INSTRUCTION_FORMAT4rcc_METHOD -> SIMPLE_NAME[$INSTRUCTION_FORMAT4rcc_METHOD] | INSTRUCTION_FORMAT51l -> SIMPLE_NAME[$INSTRUCTION_FORMAT51l] )
 			int alt10=41;
 			switch ( input.LA(1) ) {
 			case SIMPLE_NAME:
@@ -2622,30 +2622,30 @@
 			}
 			switch (alt10) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:538:5: SIMPLE_NAME
+					// smaliParser.g:538:5: SIMPLE_NAME
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					SIMPLE_NAME44=(Token)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_simple_name1777);
+					SIMPLE_NAME44=(Token)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_simple_name1777); 
 					SIMPLE_NAME44_tree = (CommonTree)adaptor.create(SIMPLE_NAME44);
 					adaptor.addChild(root_0, SIMPLE_NAME44_tree);
 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:539:5: ACCESS_SPEC
+					// smaliParser.g:539:5: ACCESS_SPEC
 					{
-					ACCESS_SPEC45=(Token)match(input,ACCESS_SPEC,FOLLOW_ACCESS_SPEC_in_simple_name1783);
+					ACCESS_SPEC45=(Token)match(input,ACCESS_SPEC,FOLLOW_ACCESS_SPEC_in_simple_name1783);  
 					stream_ACCESS_SPEC.add(ACCESS_SPEC45);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -2661,18 +2661,18 @@
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:540:5: VERIFICATION_ERROR_TYPE
+					// smaliParser.g:540:5: VERIFICATION_ERROR_TYPE
 					{
-					VERIFICATION_ERROR_TYPE46=(Token)match(input,VERIFICATION_ERROR_TYPE,FOLLOW_VERIFICATION_ERROR_TYPE_in_simple_name1794);
+					VERIFICATION_ERROR_TYPE46=(Token)match(input,VERIFICATION_ERROR_TYPE,FOLLOW_VERIFICATION_ERROR_TYPE_in_simple_name1794);  
 					stream_VERIFICATION_ERROR_TYPE.add(VERIFICATION_ERROR_TYPE46);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -2688,18 +2688,18 @@
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:541:5: POSITIVE_INTEGER_LITERAL
+					// smaliParser.g:541:5: POSITIVE_INTEGER_LITERAL
 					{
-					POSITIVE_INTEGER_LITERAL47=(Token)match(input,POSITIVE_INTEGER_LITERAL,FOLLOW_POSITIVE_INTEGER_LITERAL_in_simple_name1805);
+					POSITIVE_INTEGER_LITERAL47=(Token)match(input,POSITIVE_INTEGER_LITERAL,FOLLOW_POSITIVE_INTEGER_LITERAL_in_simple_name1805);  
 					stream_POSITIVE_INTEGER_LITERAL.add(POSITIVE_INTEGER_LITERAL47);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -2715,18 +2715,18 @@
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:542:5: NEGATIVE_INTEGER_LITERAL
+					// smaliParser.g:542:5: NEGATIVE_INTEGER_LITERAL
 					{
-					NEGATIVE_INTEGER_LITERAL48=(Token)match(input,NEGATIVE_INTEGER_LITERAL,FOLLOW_NEGATIVE_INTEGER_LITERAL_in_simple_name1816);
+					NEGATIVE_INTEGER_LITERAL48=(Token)match(input,NEGATIVE_INTEGER_LITERAL,FOLLOW_NEGATIVE_INTEGER_LITERAL_in_simple_name1816);  
 					stream_NEGATIVE_INTEGER_LITERAL.add(NEGATIVE_INTEGER_LITERAL48);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -2742,18 +2742,18 @@
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:543:5: FLOAT_LITERAL_OR_ID
+					// smaliParser.g:543:5: FLOAT_LITERAL_OR_ID
 					{
-					FLOAT_LITERAL_OR_ID49=(Token)match(input,FLOAT_LITERAL_OR_ID,FOLLOW_FLOAT_LITERAL_OR_ID_in_simple_name1827);
+					FLOAT_LITERAL_OR_ID49=(Token)match(input,FLOAT_LITERAL_OR_ID,FOLLOW_FLOAT_LITERAL_OR_ID_in_simple_name1827);  
 					stream_FLOAT_LITERAL_OR_ID.add(FLOAT_LITERAL_OR_ID49);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -2769,18 +2769,18 @@
 					}
 					break;
 				case 7 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:544:5: DOUBLE_LITERAL_OR_ID
+					// smaliParser.g:544:5: DOUBLE_LITERAL_OR_ID
 					{
-					DOUBLE_LITERAL_OR_ID50=(Token)match(input,DOUBLE_LITERAL_OR_ID,FOLLOW_DOUBLE_LITERAL_OR_ID_in_simple_name1838);
+					DOUBLE_LITERAL_OR_ID50=(Token)match(input,DOUBLE_LITERAL_OR_ID,FOLLOW_DOUBLE_LITERAL_OR_ID_in_simple_name1838);  
 					stream_DOUBLE_LITERAL_OR_ID.add(DOUBLE_LITERAL_OR_ID50);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -2796,18 +2796,18 @@
 					}
 					break;
 				case 8 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:545:5: BOOL_LITERAL
+					// smaliParser.g:545:5: BOOL_LITERAL
 					{
-					BOOL_LITERAL51=(Token)match(input,BOOL_LITERAL,FOLLOW_BOOL_LITERAL_in_simple_name1849);
+					BOOL_LITERAL51=(Token)match(input,BOOL_LITERAL,FOLLOW_BOOL_LITERAL_in_simple_name1849);  
 					stream_BOOL_LITERAL.add(BOOL_LITERAL51);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -2823,18 +2823,18 @@
 					}
 					break;
 				case 9 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:546:5: NULL_LITERAL
+					// smaliParser.g:546:5: NULL_LITERAL
 					{
-					NULL_LITERAL52=(Token)match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_simple_name1860);
+					NULL_LITERAL52=(Token)match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_simple_name1860);  
 					stream_NULL_LITERAL.add(NULL_LITERAL52);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -2850,18 +2850,18 @@
 					}
 					break;
 				case 10 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:547:5: REGISTER
+					// smaliParser.g:547:5: REGISTER
 					{
-					REGISTER53=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_simple_name1871);
+					REGISTER53=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_simple_name1871);  
 					stream_REGISTER.add(REGISTER53);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -2877,7 +2877,7 @@
 					}
 					break;
 				case 11 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:548:5: param_list_or_id
+					// smaliParser.g:548:5: param_list_or_id
 					{
 					pushFollow(FOLLOW_param_list_or_id_in_simple_name1882);
 					param_list_or_id54=param_list_or_id();
@@ -2885,12 +2885,12 @@
 
 					stream_param_list_or_id.add(param_list_or_id54.getTree());
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -2906,18 +2906,18 @@
 					}
 					break;
 				case 12 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:549:5: PRIMITIVE_TYPE
+					// smaliParser.g:549:5: PRIMITIVE_TYPE
 					{
-					PRIMITIVE_TYPE55=(Token)match(input,PRIMITIVE_TYPE,FOLLOW_PRIMITIVE_TYPE_in_simple_name1892);
+					PRIMITIVE_TYPE55=(Token)match(input,PRIMITIVE_TYPE,FOLLOW_PRIMITIVE_TYPE_in_simple_name1892);  
 					stream_PRIMITIVE_TYPE.add(PRIMITIVE_TYPE55);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -2933,18 +2933,18 @@
 					}
 					break;
 				case 13 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:550:5: VOID_TYPE
+					// smaliParser.g:550:5: VOID_TYPE
 					{
-					VOID_TYPE56=(Token)match(input,VOID_TYPE,FOLLOW_VOID_TYPE_in_simple_name1903);
+					VOID_TYPE56=(Token)match(input,VOID_TYPE,FOLLOW_VOID_TYPE_in_simple_name1903);  
 					stream_VOID_TYPE.add(VOID_TYPE56);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -2960,18 +2960,18 @@
 					}
 					break;
 				case 14 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:551:5: ANNOTATION_VISIBILITY
+					// smaliParser.g:551:5: ANNOTATION_VISIBILITY
 					{
-					ANNOTATION_VISIBILITY57=(Token)match(input,ANNOTATION_VISIBILITY,FOLLOW_ANNOTATION_VISIBILITY_in_simple_name1914);
+					ANNOTATION_VISIBILITY57=(Token)match(input,ANNOTATION_VISIBILITY,FOLLOW_ANNOTATION_VISIBILITY_in_simple_name1914);  
 					stream_ANNOTATION_VISIBILITY.add(ANNOTATION_VISIBILITY57);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -2987,18 +2987,18 @@
 					}
 					break;
 				case 15 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:552:5: INSTRUCTION_FORMAT10t
+					// smaliParser.g:552:5: INSTRUCTION_FORMAT10t
 					{
-					INSTRUCTION_FORMAT10t58=(Token)match(input,INSTRUCTION_FORMAT10t,FOLLOW_INSTRUCTION_FORMAT10t_in_simple_name1925);
+					INSTRUCTION_FORMAT10t58=(Token)match(input,INSTRUCTION_FORMAT10t,FOLLOW_INSTRUCTION_FORMAT10t_in_simple_name1925);  
 					stream_INSTRUCTION_FORMAT10t.add(INSTRUCTION_FORMAT10t58);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3014,18 +3014,18 @@
 					}
 					break;
 				case 16 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:553:5: INSTRUCTION_FORMAT10x
+					// smaliParser.g:553:5: INSTRUCTION_FORMAT10x
 					{
-					INSTRUCTION_FORMAT10x59=(Token)match(input,INSTRUCTION_FORMAT10x,FOLLOW_INSTRUCTION_FORMAT10x_in_simple_name1936);
+					INSTRUCTION_FORMAT10x59=(Token)match(input,INSTRUCTION_FORMAT10x,FOLLOW_INSTRUCTION_FORMAT10x_in_simple_name1936);  
 					stream_INSTRUCTION_FORMAT10x.add(INSTRUCTION_FORMAT10x59);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3041,18 +3041,18 @@
 					}
 					break;
 				case 17 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:554:5: INSTRUCTION_FORMAT10x_ODEX
+					// smaliParser.g:554:5: INSTRUCTION_FORMAT10x_ODEX
 					{
-					INSTRUCTION_FORMAT10x_ODEX60=(Token)match(input,INSTRUCTION_FORMAT10x_ODEX,FOLLOW_INSTRUCTION_FORMAT10x_ODEX_in_simple_name1947);
+					INSTRUCTION_FORMAT10x_ODEX60=(Token)match(input,INSTRUCTION_FORMAT10x_ODEX,FOLLOW_INSTRUCTION_FORMAT10x_ODEX_in_simple_name1947);  
 					stream_INSTRUCTION_FORMAT10x_ODEX.add(INSTRUCTION_FORMAT10x_ODEX60);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3068,18 +3068,18 @@
 					}
 					break;
 				case 18 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:555:5: INSTRUCTION_FORMAT11x
+					// smaliParser.g:555:5: INSTRUCTION_FORMAT11x
 					{
-					INSTRUCTION_FORMAT11x61=(Token)match(input,INSTRUCTION_FORMAT11x,FOLLOW_INSTRUCTION_FORMAT11x_in_simple_name1958);
+					INSTRUCTION_FORMAT11x61=(Token)match(input,INSTRUCTION_FORMAT11x,FOLLOW_INSTRUCTION_FORMAT11x_in_simple_name1958);  
 					stream_INSTRUCTION_FORMAT11x.add(INSTRUCTION_FORMAT11x61);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3095,18 +3095,18 @@
 					}
 					break;
 				case 19 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:556:5: INSTRUCTION_FORMAT12x_OR_ID
+					// smaliParser.g:556:5: INSTRUCTION_FORMAT12x_OR_ID
 					{
-					INSTRUCTION_FORMAT12x_OR_ID62=(Token)match(input,INSTRUCTION_FORMAT12x_OR_ID,FOLLOW_INSTRUCTION_FORMAT12x_OR_ID_in_simple_name1969);
+					INSTRUCTION_FORMAT12x_OR_ID62=(Token)match(input,INSTRUCTION_FORMAT12x_OR_ID,FOLLOW_INSTRUCTION_FORMAT12x_OR_ID_in_simple_name1969);  
 					stream_INSTRUCTION_FORMAT12x_OR_ID.add(INSTRUCTION_FORMAT12x_OR_ID62);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3122,18 +3122,18 @@
 					}
 					break;
 				case 20 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:557:5: INSTRUCTION_FORMAT21c_FIELD
+					// smaliParser.g:557:5: INSTRUCTION_FORMAT21c_FIELD
 					{
-					INSTRUCTION_FORMAT21c_FIELD63=(Token)match(input,INSTRUCTION_FORMAT21c_FIELD,FOLLOW_INSTRUCTION_FORMAT21c_FIELD_in_simple_name1980);
+					INSTRUCTION_FORMAT21c_FIELD63=(Token)match(input,INSTRUCTION_FORMAT21c_FIELD,FOLLOW_INSTRUCTION_FORMAT21c_FIELD_in_simple_name1980);  
 					stream_INSTRUCTION_FORMAT21c_FIELD.add(INSTRUCTION_FORMAT21c_FIELD63);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3149,18 +3149,18 @@
 					}
 					break;
 				case 21 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:558:5: INSTRUCTION_FORMAT21c_FIELD_ODEX
+					// smaliParser.g:558:5: INSTRUCTION_FORMAT21c_FIELD_ODEX
 					{
-					INSTRUCTION_FORMAT21c_FIELD_ODEX64=(Token)match(input,INSTRUCTION_FORMAT21c_FIELD_ODEX,FOLLOW_INSTRUCTION_FORMAT21c_FIELD_ODEX_in_simple_name1991);
+					INSTRUCTION_FORMAT21c_FIELD_ODEX64=(Token)match(input,INSTRUCTION_FORMAT21c_FIELD_ODEX,FOLLOW_INSTRUCTION_FORMAT21c_FIELD_ODEX_in_simple_name1991);  
 					stream_INSTRUCTION_FORMAT21c_FIELD_ODEX.add(INSTRUCTION_FORMAT21c_FIELD_ODEX64);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3176,18 +3176,18 @@
 					}
 					break;
 				case 22 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:559:5: INSTRUCTION_FORMAT21c_STRING
+					// smaliParser.g:559:5: INSTRUCTION_FORMAT21c_STRING
 					{
-					INSTRUCTION_FORMAT21c_STRING65=(Token)match(input,INSTRUCTION_FORMAT21c_STRING,FOLLOW_INSTRUCTION_FORMAT21c_STRING_in_simple_name2002);
+					INSTRUCTION_FORMAT21c_STRING65=(Token)match(input,INSTRUCTION_FORMAT21c_STRING,FOLLOW_INSTRUCTION_FORMAT21c_STRING_in_simple_name2002);  
 					stream_INSTRUCTION_FORMAT21c_STRING.add(INSTRUCTION_FORMAT21c_STRING65);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3203,18 +3203,18 @@
 					}
 					break;
 				case 23 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:560:5: INSTRUCTION_FORMAT21c_TYPE
+					// smaliParser.g:560:5: INSTRUCTION_FORMAT21c_TYPE
 					{
-					INSTRUCTION_FORMAT21c_TYPE66=(Token)match(input,INSTRUCTION_FORMAT21c_TYPE,FOLLOW_INSTRUCTION_FORMAT21c_TYPE_in_simple_name2013);
+					INSTRUCTION_FORMAT21c_TYPE66=(Token)match(input,INSTRUCTION_FORMAT21c_TYPE,FOLLOW_INSTRUCTION_FORMAT21c_TYPE_in_simple_name2013);  
 					stream_INSTRUCTION_FORMAT21c_TYPE.add(INSTRUCTION_FORMAT21c_TYPE66);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3230,18 +3230,18 @@
 					}
 					break;
 				case 24 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:561:5: INSTRUCTION_FORMAT21t
+					// smaliParser.g:561:5: INSTRUCTION_FORMAT21t
 					{
-					INSTRUCTION_FORMAT21t67=(Token)match(input,INSTRUCTION_FORMAT21t,FOLLOW_INSTRUCTION_FORMAT21t_in_simple_name2024);
+					INSTRUCTION_FORMAT21t67=(Token)match(input,INSTRUCTION_FORMAT21t,FOLLOW_INSTRUCTION_FORMAT21t_in_simple_name2024);  
 					stream_INSTRUCTION_FORMAT21t.add(INSTRUCTION_FORMAT21t67);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3257,18 +3257,18 @@
 					}
 					break;
 				case 25 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:562:5: INSTRUCTION_FORMAT22c_FIELD
+					// smaliParser.g:562:5: INSTRUCTION_FORMAT22c_FIELD
 					{
-					INSTRUCTION_FORMAT22c_FIELD68=(Token)match(input,INSTRUCTION_FORMAT22c_FIELD,FOLLOW_INSTRUCTION_FORMAT22c_FIELD_in_simple_name2035);
+					INSTRUCTION_FORMAT22c_FIELD68=(Token)match(input,INSTRUCTION_FORMAT22c_FIELD,FOLLOW_INSTRUCTION_FORMAT22c_FIELD_in_simple_name2035);  
 					stream_INSTRUCTION_FORMAT22c_FIELD.add(INSTRUCTION_FORMAT22c_FIELD68);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3284,18 +3284,18 @@
 					}
 					break;
 				case 26 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:563:5: INSTRUCTION_FORMAT22c_FIELD_ODEX
+					// smaliParser.g:563:5: INSTRUCTION_FORMAT22c_FIELD_ODEX
 					{
-					INSTRUCTION_FORMAT22c_FIELD_ODEX69=(Token)match(input,INSTRUCTION_FORMAT22c_FIELD_ODEX,FOLLOW_INSTRUCTION_FORMAT22c_FIELD_ODEX_in_simple_name2046);
+					INSTRUCTION_FORMAT22c_FIELD_ODEX69=(Token)match(input,INSTRUCTION_FORMAT22c_FIELD_ODEX,FOLLOW_INSTRUCTION_FORMAT22c_FIELD_ODEX_in_simple_name2046);  
 					stream_INSTRUCTION_FORMAT22c_FIELD_ODEX.add(INSTRUCTION_FORMAT22c_FIELD_ODEX69);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3311,18 +3311,18 @@
 					}
 					break;
 				case 27 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:564:5: INSTRUCTION_FORMAT22c_TYPE
+					// smaliParser.g:564:5: INSTRUCTION_FORMAT22c_TYPE
 					{
-					INSTRUCTION_FORMAT22c_TYPE70=(Token)match(input,INSTRUCTION_FORMAT22c_TYPE,FOLLOW_INSTRUCTION_FORMAT22c_TYPE_in_simple_name2057);
+					INSTRUCTION_FORMAT22c_TYPE70=(Token)match(input,INSTRUCTION_FORMAT22c_TYPE,FOLLOW_INSTRUCTION_FORMAT22c_TYPE_in_simple_name2057);  
 					stream_INSTRUCTION_FORMAT22c_TYPE.add(INSTRUCTION_FORMAT22c_TYPE70);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3338,18 +3338,18 @@
 					}
 					break;
 				case 28 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:565:5: INSTRUCTION_FORMAT22cs_FIELD
+					// smaliParser.g:565:5: INSTRUCTION_FORMAT22cs_FIELD
 					{
-					INSTRUCTION_FORMAT22cs_FIELD71=(Token)match(input,INSTRUCTION_FORMAT22cs_FIELD,FOLLOW_INSTRUCTION_FORMAT22cs_FIELD_in_simple_name2068);
+					INSTRUCTION_FORMAT22cs_FIELD71=(Token)match(input,INSTRUCTION_FORMAT22cs_FIELD,FOLLOW_INSTRUCTION_FORMAT22cs_FIELD_in_simple_name2068);  
 					stream_INSTRUCTION_FORMAT22cs_FIELD.add(INSTRUCTION_FORMAT22cs_FIELD71);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3365,18 +3365,18 @@
 					}
 					break;
 				case 29 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:566:5: INSTRUCTION_FORMAT22s_OR_ID
+					// smaliParser.g:566:5: INSTRUCTION_FORMAT22s_OR_ID
 					{
-					INSTRUCTION_FORMAT22s_OR_ID72=(Token)match(input,INSTRUCTION_FORMAT22s_OR_ID,FOLLOW_INSTRUCTION_FORMAT22s_OR_ID_in_simple_name2079);
+					INSTRUCTION_FORMAT22s_OR_ID72=(Token)match(input,INSTRUCTION_FORMAT22s_OR_ID,FOLLOW_INSTRUCTION_FORMAT22s_OR_ID_in_simple_name2079);  
 					stream_INSTRUCTION_FORMAT22s_OR_ID.add(INSTRUCTION_FORMAT22s_OR_ID72);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3392,18 +3392,18 @@
 					}
 					break;
 				case 30 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:567:5: INSTRUCTION_FORMAT22t
+					// smaliParser.g:567:5: INSTRUCTION_FORMAT22t
 					{
-					INSTRUCTION_FORMAT22t73=(Token)match(input,INSTRUCTION_FORMAT22t,FOLLOW_INSTRUCTION_FORMAT22t_in_simple_name2090);
+					INSTRUCTION_FORMAT22t73=(Token)match(input,INSTRUCTION_FORMAT22t,FOLLOW_INSTRUCTION_FORMAT22t_in_simple_name2090);  
 					stream_INSTRUCTION_FORMAT22t.add(INSTRUCTION_FORMAT22t73);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3419,18 +3419,18 @@
 					}
 					break;
 				case 31 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:568:5: INSTRUCTION_FORMAT23x
+					// smaliParser.g:568:5: INSTRUCTION_FORMAT23x
 					{
-					INSTRUCTION_FORMAT23x74=(Token)match(input,INSTRUCTION_FORMAT23x,FOLLOW_INSTRUCTION_FORMAT23x_in_simple_name2101);
+					INSTRUCTION_FORMAT23x74=(Token)match(input,INSTRUCTION_FORMAT23x,FOLLOW_INSTRUCTION_FORMAT23x_in_simple_name2101);  
 					stream_INSTRUCTION_FORMAT23x.add(INSTRUCTION_FORMAT23x74);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3446,18 +3446,18 @@
 					}
 					break;
 				case 32 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:569:5: INSTRUCTION_FORMAT31i_OR_ID
+					// smaliParser.g:569:5: INSTRUCTION_FORMAT31i_OR_ID
 					{
-					INSTRUCTION_FORMAT31i_OR_ID75=(Token)match(input,INSTRUCTION_FORMAT31i_OR_ID,FOLLOW_INSTRUCTION_FORMAT31i_OR_ID_in_simple_name2112);
+					INSTRUCTION_FORMAT31i_OR_ID75=(Token)match(input,INSTRUCTION_FORMAT31i_OR_ID,FOLLOW_INSTRUCTION_FORMAT31i_OR_ID_in_simple_name2112);  
 					stream_INSTRUCTION_FORMAT31i_OR_ID.add(INSTRUCTION_FORMAT31i_OR_ID75);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3473,18 +3473,18 @@
 					}
 					break;
 				case 33 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:570:5: INSTRUCTION_FORMAT31t
+					// smaliParser.g:570:5: INSTRUCTION_FORMAT31t
 					{
-					INSTRUCTION_FORMAT31t76=(Token)match(input,INSTRUCTION_FORMAT31t,FOLLOW_INSTRUCTION_FORMAT31t_in_simple_name2123);
+					INSTRUCTION_FORMAT31t76=(Token)match(input,INSTRUCTION_FORMAT31t,FOLLOW_INSTRUCTION_FORMAT31t_in_simple_name2123);  
 					stream_INSTRUCTION_FORMAT31t.add(INSTRUCTION_FORMAT31t76);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3500,18 +3500,18 @@
 					}
 					break;
 				case 34 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:571:5: INSTRUCTION_FORMAT35c_METHOD
+					// smaliParser.g:571:5: INSTRUCTION_FORMAT35c_METHOD
 					{
-					INSTRUCTION_FORMAT35c_METHOD77=(Token)match(input,INSTRUCTION_FORMAT35c_METHOD,FOLLOW_INSTRUCTION_FORMAT35c_METHOD_in_simple_name2134);
+					INSTRUCTION_FORMAT35c_METHOD77=(Token)match(input,INSTRUCTION_FORMAT35c_METHOD,FOLLOW_INSTRUCTION_FORMAT35c_METHOD_in_simple_name2134);  
 					stream_INSTRUCTION_FORMAT35c_METHOD.add(INSTRUCTION_FORMAT35c_METHOD77);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3527,18 +3527,18 @@
 					}
 					break;
 				case 35 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:572:5: INSTRUCTION_FORMAT35c_METHOD_ODEX
+					// smaliParser.g:572:5: INSTRUCTION_FORMAT35c_METHOD_ODEX
 					{
-					INSTRUCTION_FORMAT35c_METHOD_ODEX78=(Token)match(input,INSTRUCTION_FORMAT35c_METHOD_ODEX,FOLLOW_INSTRUCTION_FORMAT35c_METHOD_ODEX_in_simple_name2145);
+					INSTRUCTION_FORMAT35c_METHOD_ODEX78=(Token)match(input,INSTRUCTION_FORMAT35c_METHOD_ODEX,FOLLOW_INSTRUCTION_FORMAT35c_METHOD_ODEX_in_simple_name2145);  
 					stream_INSTRUCTION_FORMAT35c_METHOD_ODEX.add(INSTRUCTION_FORMAT35c_METHOD_ODEX78);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3554,18 +3554,18 @@
 					}
 					break;
 				case 36 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:573:5: INSTRUCTION_FORMAT35c_TYPE
+					// smaliParser.g:573:5: INSTRUCTION_FORMAT35c_TYPE
 					{
-					INSTRUCTION_FORMAT35c_TYPE79=(Token)match(input,INSTRUCTION_FORMAT35c_TYPE,FOLLOW_INSTRUCTION_FORMAT35c_TYPE_in_simple_name2156);
+					INSTRUCTION_FORMAT35c_TYPE79=(Token)match(input,INSTRUCTION_FORMAT35c_TYPE,FOLLOW_INSTRUCTION_FORMAT35c_TYPE_in_simple_name2156);  
 					stream_INSTRUCTION_FORMAT35c_TYPE.add(INSTRUCTION_FORMAT35c_TYPE79);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3581,18 +3581,18 @@
 					}
 					break;
 				case 37 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:574:5: INSTRUCTION_FORMAT35mi_METHOD
+					// smaliParser.g:574:5: INSTRUCTION_FORMAT35mi_METHOD
 					{
-					INSTRUCTION_FORMAT35mi_METHOD80=(Token)match(input,INSTRUCTION_FORMAT35mi_METHOD,FOLLOW_INSTRUCTION_FORMAT35mi_METHOD_in_simple_name2167);
+					INSTRUCTION_FORMAT35mi_METHOD80=(Token)match(input,INSTRUCTION_FORMAT35mi_METHOD,FOLLOW_INSTRUCTION_FORMAT35mi_METHOD_in_simple_name2167);  
 					stream_INSTRUCTION_FORMAT35mi_METHOD.add(INSTRUCTION_FORMAT35mi_METHOD80);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3608,18 +3608,18 @@
 					}
 					break;
 				case 38 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:575:5: INSTRUCTION_FORMAT35ms_METHOD
+					// smaliParser.g:575:5: INSTRUCTION_FORMAT35ms_METHOD
 					{
-					INSTRUCTION_FORMAT35ms_METHOD81=(Token)match(input,INSTRUCTION_FORMAT35ms_METHOD,FOLLOW_INSTRUCTION_FORMAT35ms_METHOD_in_simple_name2178);
+					INSTRUCTION_FORMAT35ms_METHOD81=(Token)match(input,INSTRUCTION_FORMAT35ms_METHOD,FOLLOW_INSTRUCTION_FORMAT35ms_METHOD_in_simple_name2178);  
 					stream_INSTRUCTION_FORMAT35ms_METHOD.add(INSTRUCTION_FORMAT35ms_METHOD81);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3635,18 +3635,18 @@
 					}
 					break;
 				case 39 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:576:5: INSTRUCTION_FORMAT45cc_METHOD
+					// smaliParser.g:576:5: INSTRUCTION_FORMAT45cc_METHOD
 					{
-					INSTRUCTION_FORMAT45cc_METHOD82=(Token)match(input,INSTRUCTION_FORMAT45cc_METHOD,FOLLOW_INSTRUCTION_FORMAT45cc_METHOD_in_simple_name2189);
+					INSTRUCTION_FORMAT45cc_METHOD82=(Token)match(input,INSTRUCTION_FORMAT45cc_METHOD,FOLLOW_INSTRUCTION_FORMAT45cc_METHOD_in_simple_name2189);  
 					stream_INSTRUCTION_FORMAT45cc_METHOD.add(INSTRUCTION_FORMAT45cc_METHOD82);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3662,18 +3662,18 @@
 					}
 					break;
 				case 40 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:577:5: INSTRUCTION_FORMAT4rcc_METHOD
+					// smaliParser.g:577:5: INSTRUCTION_FORMAT4rcc_METHOD
 					{
-					INSTRUCTION_FORMAT4rcc_METHOD83=(Token)match(input,INSTRUCTION_FORMAT4rcc_METHOD,FOLLOW_INSTRUCTION_FORMAT4rcc_METHOD_in_simple_name2200);
+					INSTRUCTION_FORMAT4rcc_METHOD83=(Token)match(input,INSTRUCTION_FORMAT4rcc_METHOD,FOLLOW_INSTRUCTION_FORMAT4rcc_METHOD_in_simple_name2200);  
 					stream_INSTRUCTION_FORMAT4rcc_METHOD.add(INSTRUCTION_FORMAT4rcc_METHOD83);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3689,18 +3689,18 @@
 					}
 					break;
 				case 41 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:578:5: INSTRUCTION_FORMAT51l
+					// smaliParser.g:578:5: INSTRUCTION_FORMAT51l
 					{
-					INSTRUCTION_FORMAT51l84=(Token)match(input,INSTRUCTION_FORMAT51l,FOLLOW_INSTRUCTION_FORMAT51l_in_simple_name2211);
+					INSTRUCTION_FORMAT51l84=(Token)match(input,INSTRUCTION_FORMAT51l,FOLLOW_INSTRUCTION_FORMAT51l_in_simple_name2211);  
 					stream_INSTRUCTION_FORMAT51l.add(INSTRUCTION_FORMAT51l84);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3744,7 +3744,7 @@
 
 
 	// $ANTLR start "member_name"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:580:1: member_name : ( simple_name | MEMBER_NAME -> SIMPLE_NAME[$MEMBER_NAME] );
+	// smaliParser.g:580:1: member_name : ( simple_name | MEMBER_NAME -> SIMPLE_NAME[$MEMBER_NAME] );
 	public final smaliParser.member_name_return member_name() throws RecognitionException {
 		smaliParser.member_name_return retval = new smaliParser.member_name_return();
 		retval.start = input.LT(1);
@@ -3758,7 +3758,7 @@
 		RewriteRuleTokenStream stream_MEMBER_NAME=new RewriteRuleTokenStream(adaptor,"token MEMBER_NAME");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:581:3: ( simple_name | MEMBER_NAME -> SIMPLE_NAME[$MEMBER_NAME] )
+			// smaliParser.g:581:3: ( simple_name | MEMBER_NAME -> SIMPLE_NAME[$MEMBER_NAME] )
 			int alt11=2;
 			int LA11_0 = input.LA(1);
 			if ( (LA11_0==ACCESS_SPEC||LA11_0==ANNOTATION_VISIBILITY||LA11_0==BOOL_LITERAL||LA11_0==DOUBLE_LITERAL_OR_ID||LA11_0==FLOAT_LITERAL_OR_ID||(LA11_0 >= INSTRUCTION_FORMAT10t && LA11_0 <= INSTRUCTION_FORMAT10x_ODEX)||LA11_0==INSTRUCTION_FORMAT11x||LA11_0==INSTRUCTION_FORMAT12x_OR_ID||(LA11_0 >= INSTRUCTION_FORMAT21c_FIELD && LA11_0 <= INSTRUCTION_FORMAT21c_TYPE)||LA11_0==INSTRUCTION_FORMAT21t||(LA11_0 >= INSTRUCTION_FORMAT22c_FIELD && LA11_0 <= INSTRUCTION_FORMAT22cs_FIELD)||(LA11_0 >= INSTRUCTION_FORMAT22s_OR_ID && LA11_0 <= INSTRUCTION_FORMAT22t)||LA11_0==INSTRUCTION_FORMAT23x||(LA11_0 >= INSTRUCTION_FORMAT31i_OR_ID && LA11_0 <= INSTRUCTION_FORMAT31t)||(LA11_0 >= INSTRUCTION_FORMAT35c_METHOD && LA11_0 <= INSTRUCTION_FORMAT35ms_METHOD)||(LA11_0 >= INSTRUCTION_FORMAT45cc_METHOD && LA11_0 <= INSTRUCTION_FORMAT51l)||(LA11_0 >= NEGATIVE_INTEGER_LITERAL && LA11_0 <= NULL_LITERAL)||(LA11_0 >= PARAM_LIST_OR_ID_PRIMITIVE_TYPE && LA11_0 <= PRIMITIVE_TYPE)||LA11_0==REGISTER||LA11_0==SIMPLE_NAME||(LA11_0 >= VERIFICATION_ERROR_TYPE && LA11_0 <= VOID_TYPE)) ) {
@@ -3776,7 +3776,7 @@
 
 			switch (alt11) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:581:5: simple_name
+					// smaliParser.g:581:5: simple_name
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -3790,18 +3790,18 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:582:5: MEMBER_NAME
+					// smaliParser.g:582:5: MEMBER_NAME
 					{
-					MEMBER_NAME86=(Token)match(input,MEMBER_NAME,FOLLOW_MEMBER_NAME_in_member_name2232);
+					MEMBER_NAME86=(Token)match(input,MEMBER_NAME,FOLLOW_MEMBER_NAME_in_member_name2232);  
 					stream_MEMBER_NAME.add(MEMBER_NAME86);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -3845,7 +3845,7 @@
 
 
 	// $ANTLR start "method_prototype"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:584:1: method_prototype : OPEN_PAREN param_list CLOSE_PAREN type_descriptor -> ^( I_METHOD_PROTOTYPE[$start, \"I_METHOD_PROTOTYPE\"] ^( I_METHOD_RETURN_TYPE type_descriptor ) ( param_list )? ) ;
+	// smaliParser.g:584:1: method_prototype : OPEN_PAREN param_list CLOSE_PAREN type_descriptor -> ^( I_METHOD_PROTOTYPE[$start, \"I_METHOD_PROTOTYPE\"] ^( I_METHOD_RETURN_TYPE type_descriptor ) ( param_list )? ) ;
 	public final smaliParser.method_prototype_return method_prototype() throws RecognitionException {
 		smaliParser.method_prototype_return retval = new smaliParser.method_prototype_return();
 		retval.start = input.LT(1);
@@ -3865,10 +3865,10 @@
 		RewriteRuleSubtreeStream stream_param_list=new RewriteRuleSubtreeStream(adaptor,"rule param_list");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:585:3: ( OPEN_PAREN param_list CLOSE_PAREN type_descriptor -> ^( I_METHOD_PROTOTYPE[$start, \"I_METHOD_PROTOTYPE\"] ^( I_METHOD_RETURN_TYPE type_descriptor ) ( param_list )? ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:585:5: OPEN_PAREN param_list CLOSE_PAREN type_descriptor
+			// smaliParser.g:585:3: ( OPEN_PAREN param_list CLOSE_PAREN type_descriptor -> ^( I_METHOD_PROTOTYPE[$start, \"I_METHOD_PROTOTYPE\"] ^( I_METHOD_RETURN_TYPE type_descriptor ) ( param_list )? ) )
+			// smaliParser.g:585:5: OPEN_PAREN param_list CLOSE_PAREN type_descriptor
 			{
-			OPEN_PAREN87=(Token)match(input,OPEN_PAREN,FOLLOW_OPEN_PAREN_in_method_prototype2247);
+			OPEN_PAREN87=(Token)match(input,OPEN_PAREN,FOLLOW_OPEN_PAREN_in_method_prototype2247);  
 			stream_OPEN_PAREN.add(OPEN_PAREN87);
 
 			pushFollow(FOLLOW_param_list_in_method_prototype2249);
@@ -3876,7 +3876,7 @@
 			state._fsp--;
 
 			stream_param_list.add(param_list88.getTree());
-			CLOSE_PAREN89=(Token)match(input,CLOSE_PAREN,FOLLOW_CLOSE_PAREN_in_method_prototype2251);
+			CLOSE_PAREN89=(Token)match(input,CLOSE_PAREN,FOLLOW_CLOSE_PAREN_in_method_prototype2251);  
 			stream_CLOSE_PAREN.add(CLOSE_PAREN89);
 
 			pushFollow(FOLLOW_type_descriptor_in_method_prototype2253);
@@ -3885,23 +3885,23 @@
 
 			stream_type_descriptor.add(type_descriptor90.getTree());
 			// AST REWRITE
-			// elements: param_list, type_descriptor
-			// token labels:
+			// elements: type_descriptor, param_list
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 586:5: -> ^( I_METHOD_PROTOTYPE[$start, \"I_METHOD_PROTOTYPE\"] ^( I_METHOD_RETURN_TYPE type_descriptor ) ( param_list )? )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:586:8: ^( I_METHOD_PROTOTYPE[$start, \"I_METHOD_PROTOTYPE\"] ^( I_METHOD_RETURN_TYPE type_descriptor ) ( param_list )? )
+				// smaliParser.g:586:8: ^( I_METHOD_PROTOTYPE[$start, \"I_METHOD_PROTOTYPE\"] ^( I_METHOD_RETURN_TYPE type_descriptor ) ( param_list )? )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_METHOD_PROTOTYPE, (retval.start), "I_METHOD_PROTOTYPE"), root_1);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:586:59: ^( I_METHOD_RETURN_TYPE type_descriptor )
+				// smaliParser.g:586:59: ^( I_METHOD_RETURN_TYPE type_descriptor )
 				{
 				CommonTree root_2 = (CommonTree)adaptor.nil();
 				root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_METHOD_RETURN_TYPE, "I_METHOD_RETURN_TYPE"), root_2);
@@ -3909,7 +3909,7 @@
 				adaptor.addChild(root_1, root_2);
 				}
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:586:99: ( param_list )?
+				// smaliParser.g:586:99: ( param_list )?
 				if ( stream_param_list.hasNext() ) {
 					adaptor.addChild(root_1, stream_param_list.nextTree());
 				}
@@ -3952,7 +3952,7 @@
 
 
 	// $ANTLR start "param_list_or_id_primitive_type"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:588:1: param_list_or_id_primitive_type : PARAM_LIST_OR_ID_PRIMITIVE_TYPE -> PRIMITIVE_TYPE[$PARAM_LIST_OR_ID_PRIMITIVE_TYPE] ;
+	// smaliParser.g:588:1: param_list_or_id_primitive_type : PARAM_LIST_OR_ID_PRIMITIVE_TYPE -> PRIMITIVE_TYPE[$PARAM_LIST_OR_ID_PRIMITIVE_TYPE] ;
 	public final smaliParser.param_list_or_id_primitive_type_return param_list_or_id_primitive_type() throws RecognitionException {
 		smaliParser.param_list_or_id_primitive_type_return retval = new smaliParser.param_list_or_id_primitive_type_return();
 		retval.start = input.LT(1);
@@ -3965,19 +3965,19 @@
 		RewriteRuleTokenStream stream_PARAM_LIST_OR_ID_PRIMITIVE_TYPE=new RewriteRuleTokenStream(adaptor,"token PARAM_LIST_OR_ID_PRIMITIVE_TYPE");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:589:3: ( PARAM_LIST_OR_ID_PRIMITIVE_TYPE -> PRIMITIVE_TYPE[$PARAM_LIST_OR_ID_PRIMITIVE_TYPE] )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:589:5: PARAM_LIST_OR_ID_PRIMITIVE_TYPE
+			// smaliParser.g:589:3: ( PARAM_LIST_OR_ID_PRIMITIVE_TYPE -> PRIMITIVE_TYPE[$PARAM_LIST_OR_ID_PRIMITIVE_TYPE] )
+			// smaliParser.g:589:5: PARAM_LIST_OR_ID_PRIMITIVE_TYPE
 			{
-			PARAM_LIST_OR_ID_PRIMITIVE_TYPE91=(Token)match(input,PARAM_LIST_OR_ID_PRIMITIVE_TYPE,FOLLOW_PARAM_LIST_OR_ID_PRIMITIVE_TYPE_in_param_list_or_id_primitive_type2283);
+			PARAM_LIST_OR_ID_PRIMITIVE_TYPE91=(Token)match(input,PARAM_LIST_OR_ID_PRIMITIVE_TYPE,FOLLOW_PARAM_LIST_OR_ID_PRIMITIVE_TYPE_in_param_list_or_id_primitive_type2283);  
 			stream_PARAM_LIST_OR_ID_PRIMITIVE_TYPE.add(PARAM_LIST_OR_ID_PRIMITIVE_TYPE91);
 
 			// AST REWRITE
-			// elements:
-			// token labels:
+			// elements: 
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -4019,7 +4019,7 @@
 
 
 	// $ANTLR start "param_list"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:591:1: param_list : ( ( param_list_or_id_primitive_type )+ | ( nonvoid_type_descriptor )* );
+	// smaliParser.g:591:1: param_list : ( ( param_list_or_id_primitive_type )+ | ( nonvoid_type_descriptor )* );
 	public final smaliParser.param_list_return param_list() throws RecognitionException {
 		smaliParser.param_list_return retval = new smaliParser.param_list_return();
 		retval.start = input.LT(1);
@@ -4031,7 +4031,7 @@
 
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:592:3: ( ( param_list_or_id_primitive_type )+ | ( nonvoid_type_descriptor )* )
+			// smaliParser.g:592:3: ( ( param_list_or_id_primitive_type )+ | ( nonvoid_type_descriptor )* )
 			int alt14=2;
 			int LA14_0 = input.LA(1);
 			if ( (LA14_0==PARAM_LIST_OR_ID_PRIMITIVE_TYPE) ) {
@@ -4049,12 +4049,12 @@
 
 			switch (alt14) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:592:5: ( param_list_or_id_primitive_type )+
+					// smaliParser.g:592:5: ( param_list_or_id_primitive_type )+
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:592:5: ( param_list_or_id_primitive_type )+
+					// smaliParser.g:592:5: ( param_list_or_id_primitive_type )+
 					int cnt12=0;
 					loop12:
 					while (true) {
@@ -4066,7 +4066,7 @@
 
 						switch (alt12) {
 						case 1 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:592:5: param_list_or_id_primitive_type
+							// smaliParser.g:592:5: param_list_or_id_primitive_type
 							{
 							pushFollow(FOLLOW_param_list_or_id_primitive_type_in_param_list2298);
 							param_list_or_id_primitive_type92=param_list_or_id_primitive_type();
@@ -4088,12 +4088,12 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:593:5: ( nonvoid_type_descriptor )*
+					// smaliParser.g:593:5: ( nonvoid_type_descriptor )*
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:593:5: ( nonvoid_type_descriptor )*
+					// smaliParser.g:593:5: ( nonvoid_type_descriptor )*
 					loop13:
 					while (true) {
 						int alt13=2;
@@ -4104,7 +4104,7 @@
 
 						switch (alt13) {
 						case 1 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:593:5: nonvoid_type_descriptor
+							// smaliParser.g:593:5: nonvoid_type_descriptor
 							{
 							pushFollow(FOLLOW_nonvoid_type_descriptor_in_param_list2305);
 							nonvoid_type_descriptor93=nonvoid_type_descriptor();
@@ -4151,7 +4151,7 @@
 
 
 	// $ANTLR start "array_descriptor"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:595:1: array_descriptor : ARRAY_TYPE_PREFIX ( PRIMITIVE_TYPE | CLASS_DESCRIPTOR ) ;
+	// smaliParser.g:595:1: array_descriptor : ARRAY_TYPE_PREFIX ( PRIMITIVE_TYPE | CLASS_DESCRIPTOR ) ;
 	public final smaliParser.array_descriptor_return array_descriptor() throws RecognitionException {
 		smaliParser.array_descriptor_return retval = new smaliParser.array_descriptor_return();
 		retval.start = input.LT(1);
@@ -4165,13 +4165,13 @@
 		CommonTree set95_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:596:3: ( ARRAY_TYPE_PREFIX ( PRIMITIVE_TYPE | CLASS_DESCRIPTOR ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:596:5: ARRAY_TYPE_PREFIX ( PRIMITIVE_TYPE | CLASS_DESCRIPTOR )
+			// smaliParser.g:596:3: ( ARRAY_TYPE_PREFIX ( PRIMITIVE_TYPE | CLASS_DESCRIPTOR ) )
+			// smaliParser.g:596:5: ARRAY_TYPE_PREFIX ( PRIMITIVE_TYPE | CLASS_DESCRIPTOR )
 			{
 			root_0 = (CommonTree)adaptor.nil();
 
 
-			ARRAY_TYPE_PREFIX94=(Token)match(input,ARRAY_TYPE_PREFIX,FOLLOW_ARRAY_TYPE_PREFIX_in_array_descriptor2316);
+			ARRAY_TYPE_PREFIX94=(Token)match(input,ARRAY_TYPE_PREFIX,FOLLOW_ARRAY_TYPE_PREFIX_in_array_descriptor2316); 
 			ARRAY_TYPE_PREFIX94_tree = (CommonTree)adaptor.create(ARRAY_TYPE_PREFIX94);
 			adaptor.addChild(root_0, ARRAY_TYPE_PREFIX94_tree);
 
@@ -4214,7 +4214,7 @@
 
 
 	// $ANTLR start "type_descriptor"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:598:1: type_descriptor : ( VOID_TYPE | PRIMITIVE_TYPE | CLASS_DESCRIPTOR | array_descriptor );
+	// smaliParser.g:598:1: type_descriptor : ( VOID_TYPE | PRIMITIVE_TYPE | CLASS_DESCRIPTOR | array_descriptor );
 	public final smaliParser.type_descriptor_return type_descriptor() throws RecognitionException {
 		smaliParser.type_descriptor_return retval = new smaliParser.type_descriptor_return();
 		retval.start = input.LT(1);
@@ -4231,7 +4231,7 @@
 		CommonTree CLASS_DESCRIPTOR98_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:599:3: ( VOID_TYPE | PRIMITIVE_TYPE | CLASS_DESCRIPTOR | array_descriptor )
+			// smaliParser.g:599:3: ( VOID_TYPE | PRIMITIVE_TYPE | CLASS_DESCRIPTOR | array_descriptor )
 			int alt15=4;
 			switch ( input.LA(1) ) {
 			case VOID_TYPE:
@@ -4261,43 +4261,43 @@
 			}
 			switch (alt15) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:599:5: VOID_TYPE
+					// smaliParser.g:599:5: VOID_TYPE
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					VOID_TYPE96=(Token)match(input,VOID_TYPE,FOLLOW_VOID_TYPE_in_type_descriptor2334);
+					VOID_TYPE96=(Token)match(input,VOID_TYPE,FOLLOW_VOID_TYPE_in_type_descriptor2334); 
 					VOID_TYPE96_tree = (CommonTree)adaptor.create(VOID_TYPE96);
 					adaptor.addChild(root_0, VOID_TYPE96_tree);
 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:600:5: PRIMITIVE_TYPE
+					// smaliParser.g:600:5: PRIMITIVE_TYPE
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					PRIMITIVE_TYPE97=(Token)match(input,PRIMITIVE_TYPE,FOLLOW_PRIMITIVE_TYPE_in_type_descriptor2340);
+					PRIMITIVE_TYPE97=(Token)match(input,PRIMITIVE_TYPE,FOLLOW_PRIMITIVE_TYPE_in_type_descriptor2340); 
 					PRIMITIVE_TYPE97_tree = (CommonTree)adaptor.create(PRIMITIVE_TYPE97);
 					adaptor.addChild(root_0, PRIMITIVE_TYPE97_tree);
 
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:601:5: CLASS_DESCRIPTOR
+					// smaliParser.g:601:5: CLASS_DESCRIPTOR
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					CLASS_DESCRIPTOR98=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_type_descriptor2346);
+					CLASS_DESCRIPTOR98=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_type_descriptor2346); 
 					CLASS_DESCRIPTOR98_tree = (CommonTree)adaptor.create(CLASS_DESCRIPTOR98);
 					adaptor.addChild(root_0, CLASS_DESCRIPTOR98_tree);
 
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:602:5: array_descriptor
+					// smaliParser.g:602:5: array_descriptor
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -4339,7 +4339,7 @@
 
 
 	// $ANTLR start "nonvoid_type_descriptor"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:604:1: nonvoid_type_descriptor : ( PRIMITIVE_TYPE | CLASS_DESCRIPTOR | array_descriptor );
+	// smaliParser.g:604:1: nonvoid_type_descriptor : ( PRIMITIVE_TYPE | CLASS_DESCRIPTOR | array_descriptor );
 	public final smaliParser.nonvoid_type_descriptor_return nonvoid_type_descriptor() throws RecognitionException {
 		smaliParser.nonvoid_type_descriptor_return retval = new smaliParser.nonvoid_type_descriptor_return();
 		retval.start = input.LT(1);
@@ -4354,7 +4354,7 @@
 		CommonTree CLASS_DESCRIPTOR101_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:605:3: ( PRIMITIVE_TYPE | CLASS_DESCRIPTOR | array_descriptor )
+			// smaliParser.g:605:3: ( PRIMITIVE_TYPE | CLASS_DESCRIPTOR | array_descriptor )
 			int alt16=3;
 			switch ( input.LA(1) ) {
 			case PRIMITIVE_TYPE:
@@ -4379,31 +4379,31 @@
 			}
 			switch (alt16) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:605:5: PRIMITIVE_TYPE
+					// smaliParser.g:605:5: PRIMITIVE_TYPE
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					PRIMITIVE_TYPE100=(Token)match(input,PRIMITIVE_TYPE,FOLLOW_PRIMITIVE_TYPE_in_nonvoid_type_descriptor2362);
+					PRIMITIVE_TYPE100=(Token)match(input,PRIMITIVE_TYPE,FOLLOW_PRIMITIVE_TYPE_in_nonvoid_type_descriptor2362); 
 					PRIMITIVE_TYPE100_tree = (CommonTree)adaptor.create(PRIMITIVE_TYPE100);
 					adaptor.addChild(root_0, PRIMITIVE_TYPE100_tree);
 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:606:5: CLASS_DESCRIPTOR
+					// smaliParser.g:606:5: CLASS_DESCRIPTOR
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					CLASS_DESCRIPTOR101=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_nonvoid_type_descriptor2368);
+					CLASS_DESCRIPTOR101=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_nonvoid_type_descriptor2368); 
 					CLASS_DESCRIPTOR101_tree = (CommonTree)adaptor.create(CLASS_DESCRIPTOR101);
 					adaptor.addChild(root_0, CLASS_DESCRIPTOR101_tree);
 
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:607:5: array_descriptor
+					// smaliParser.g:607:5: array_descriptor
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -4445,7 +4445,7 @@
 
 
 	// $ANTLR start "reference_type_descriptor"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:609:1: reference_type_descriptor : ( CLASS_DESCRIPTOR | array_descriptor );
+	// smaliParser.g:609:1: reference_type_descriptor : ( CLASS_DESCRIPTOR | array_descriptor );
 	public final smaliParser.reference_type_descriptor_return reference_type_descriptor() throws RecognitionException {
 		smaliParser.reference_type_descriptor_return retval = new smaliParser.reference_type_descriptor_return();
 		retval.start = input.LT(1);
@@ -4458,7 +4458,7 @@
 		CommonTree CLASS_DESCRIPTOR103_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:610:3: ( CLASS_DESCRIPTOR | array_descriptor )
+			// smaliParser.g:610:3: ( CLASS_DESCRIPTOR | array_descriptor )
 			int alt17=2;
 			int LA17_0 = input.LA(1);
 			if ( (LA17_0==CLASS_DESCRIPTOR) ) {
@@ -4476,19 +4476,19 @@
 
 			switch (alt17) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:610:5: CLASS_DESCRIPTOR
+					// smaliParser.g:610:5: CLASS_DESCRIPTOR
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					CLASS_DESCRIPTOR103=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_reference_type_descriptor2384);
+					CLASS_DESCRIPTOR103=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_reference_type_descriptor2384); 
 					CLASS_DESCRIPTOR103_tree = (CommonTree)adaptor.create(CLASS_DESCRIPTOR103);
 					adaptor.addChild(root_0, CLASS_DESCRIPTOR103_tree);
 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:611:5: array_descriptor
+					// smaliParser.g:611:5: array_descriptor
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -4530,7 +4530,7 @@
 
 
 	// $ANTLR start "integer_literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:613:1: integer_literal : ( POSITIVE_INTEGER_LITERAL -> INTEGER_LITERAL[$POSITIVE_INTEGER_LITERAL] | NEGATIVE_INTEGER_LITERAL -> INTEGER_LITERAL[$NEGATIVE_INTEGER_LITERAL] );
+	// smaliParser.g:613:1: integer_literal : ( POSITIVE_INTEGER_LITERAL -> INTEGER_LITERAL[$POSITIVE_INTEGER_LITERAL] | NEGATIVE_INTEGER_LITERAL -> INTEGER_LITERAL[$NEGATIVE_INTEGER_LITERAL] );
 	public final smaliParser.integer_literal_return integer_literal() throws RecognitionException {
 		smaliParser.integer_literal_return retval = new smaliParser.integer_literal_return();
 		retval.start = input.LT(1);
@@ -4546,7 +4546,7 @@
 		RewriteRuleTokenStream stream_POSITIVE_INTEGER_LITERAL=new RewriteRuleTokenStream(adaptor,"token POSITIVE_INTEGER_LITERAL");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:614:3: ( POSITIVE_INTEGER_LITERAL -> INTEGER_LITERAL[$POSITIVE_INTEGER_LITERAL] | NEGATIVE_INTEGER_LITERAL -> INTEGER_LITERAL[$NEGATIVE_INTEGER_LITERAL] )
+			// smaliParser.g:614:3: ( POSITIVE_INTEGER_LITERAL -> INTEGER_LITERAL[$POSITIVE_INTEGER_LITERAL] | NEGATIVE_INTEGER_LITERAL -> INTEGER_LITERAL[$NEGATIVE_INTEGER_LITERAL] )
 			int alt18=2;
 			int LA18_0 = input.LA(1);
 			if ( (LA18_0==POSITIVE_INTEGER_LITERAL) ) {
@@ -4564,18 +4564,18 @@
 
 			switch (alt18) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:614:5: POSITIVE_INTEGER_LITERAL
+					// smaliParser.g:614:5: POSITIVE_INTEGER_LITERAL
 					{
-					POSITIVE_INTEGER_LITERAL105=(Token)match(input,POSITIVE_INTEGER_LITERAL,FOLLOW_POSITIVE_INTEGER_LITERAL_in_integer_literal2400);
+					POSITIVE_INTEGER_LITERAL105=(Token)match(input,POSITIVE_INTEGER_LITERAL,FOLLOW_POSITIVE_INTEGER_LITERAL_in_integer_literal2400);  
 					stream_POSITIVE_INTEGER_LITERAL.add(POSITIVE_INTEGER_LITERAL105);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -4591,18 +4591,18 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:615:5: NEGATIVE_INTEGER_LITERAL
+					// smaliParser.g:615:5: NEGATIVE_INTEGER_LITERAL
 					{
-					NEGATIVE_INTEGER_LITERAL106=(Token)match(input,NEGATIVE_INTEGER_LITERAL,FOLLOW_NEGATIVE_INTEGER_LITERAL_in_integer_literal2411);
+					NEGATIVE_INTEGER_LITERAL106=(Token)match(input,NEGATIVE_INTEGER_LITERAL,FOLLOW_NEGATIVE_INTEGER_LITERAL_in_integer_literal2411);  
 					stream_NEGATIVE_INTEGER_LITERAL.add(NEGATIVE_INTEGER_LITERAL106);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -4646,7 +4646,7 @@
 
 
 	// $ANTLR start "float_literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:617:1: float_literal : ( FLOAT_LITERAL_OR_ID -> FLOAT_LITERAL[$FLOAT_LITERAL_OR_ID] | FLOAT_LITERAL );
+	// smaliParser.g:617:1: float_literal : ( FLOAT_LITERAL_OR_ID -> FLOAT_LITERAL[$FLOAT_LITERAL_OR_ID] | FLOAT_LITERAL );
 	public final smaliParser.float_literal_return float_literal() throws RecognitionException {
 		smaliParser.float_literal_return retval = new smaliParser.float_literal_return();
 		retval.start = input.LT(1);
@@ -4661,7 +4661,7 @@
 		RewriteRuleTokenStream stream_FLOAT_LITERAL_OR_ID=new RewriteRuleTokenStream(adaptor,"token FLOAT_LITERAL_OR_ID");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:618:3: ( FLOAT_LITERAL_OR_ID -> FLOAT_LITERAL[$FLOAT_LITERAL_OR_ID] | FLOAT_LITERAL )
+			// smaliParser.g:618:3: ( FLOAT_LITERAL_OR_ID -> FLOAT_LITERAL[$FLOAT_LITERAL_OR_ID] | FLOAT_LITERAL )
 			int alt19=2;
 			int LA19_0 = input.LA(1);
 			if ( (LA19_0==FLOAT_LITERAL_OR_ID) ) {
@@ -4679,18 +4679,18 @@
 
 			switch (alt19) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:618:5: FLOAT_LITERAL_OR_ID
+					// smaliParser.g:618:5: FLOAT_LITERAL_OR_ID
 					{
-					FLOAT_LITERAL_OR_ID107=(Token)match(input,FLOAT_LITERAL_OR_ID,FOLLOW_FLOAT_LITERAL_OR_ID_in_float_literal2426);
+					FLOAT_LITERAL_OR_ID107=(Token)match(input,FLOAT_LITERAL_OR_ID,FOLLOW_FLOAT_LITERAL_OR_ID_in_float_literal2426);  
 					stream_FLOAT_LITERAL_OR_ID.add(FLOAT_LITERAL_OR_ID107);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -4706,12 +4706,12 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:619:5: FLOAT_LITERAL
+					// smaliParser.g:619:5: FLOAT_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					FLOAT_LITERAL108=(Token)match(input,FLOAT_LITERAL,FOLLOW_FLOAT_LITERAL_in_float_literal2437);
+					FLOAT_LITERAL108=(Token)match(input,FLOAT_LITERAL,FOLLOW_FLOAT_LITERAL_in_float_literal2437); 
 					FLOAT_LITERAL108_tree = (CommonTree)adaptor.create(FLOAT_LITERAL108);
 					adaptor.addChild(root_0, FLOAT_LITERAL108_tree);
 
@@ -4746,7 +4746,7 @@
 
 
 	// $ANTLR start "double_literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:621:1: double_literal : ( DOUBLE_LITERAL_OR_ID -> DOUBLE_LITERAL[$DOUBLE_LITERAL_OR_ID] | DOUBLE_LITERAL );
+	// smaliParser.g:621:1: double_literal : ( DOUBLE_LITERAL_OR_ID -> DOUBLE_LITERAL[$DOUBLE_LITERAL_OR_ID] | DOUBLE_LITERAL );
 	public final smaliParser.double_literal_return double_literal() throws RecognitionException {
 		smaliParser.double_literal_return retval = new smaliParser.double_literal_return();
 		retval.start = input.LT(1);
@@ -4761,7 +4761,7 @@
 		RewriteRuleTokenStream stream_DOUBLE_LITERAL_OR_ID=new RewriteRuleTokenStream(adaptor,"token DOUBLE_LITERAL_OR_ID");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:622:3: ( DOUBLE_LITERAL_OR_ID -> DOUBLE_LITERAL[$DOUBLE_LITERAL_OR_ID] | DOUBLE_LITERAL )
+			// smaliParser.g:622:3: ( DOUBLE_LITERAL_OR_ID -> DOUBLE_LITERAL[$DOUBLE_LITERAL_OR_ID] | DOUBLE_LITERAL )
 			int alt20=2;
 			int LA20_0 = input.LA(1);
 			if ( (LA20_0==DOUBLE_LITERAL_OR_ID) ) {
@@ -4779,18 +4779,18 @@
 
 			switch (alt20) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:622:5: DOUBLE_LITERAL_OR_ID
+					// smaliParser.g:622:5: DOUBLE_LITERAL_OR_ID
 					{
-					DOUBLE_LITERAL_OR_ID109=(Token)match(input,DOUBLE_LITERAL_OR_ID,FOLLOW_DOUBLE_LITERAL_OR_ID_in_double_literal2447);
+					DOUBLE_LITERAL_OR_ID109=(Token)match(input,DOUBLE_LITERAL_OR_ID,FOLLOW_DOUBLE_LITERAL_OR_ID_in_double_literal2447);  
 					stream_DOUBLE_LITERAL_OR_ID.add(DOUBLE_LITERAL_OR_ID109);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -4806,12 +4806,12 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:623:5: DOUBLE_LITERAL
+					// smaliParser.g:623:5: DOUBLE_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					DOUBLE_LITERAL110=(Token)match(input,DOUBLE_LITERAL,FOLLOW_DOUBLE_LITERAL_in_double_literal2458);
+					DOUBLE_LITERAL110=(Token)match(input,DOUBLE_LITERAL,FOLLOW_DOUBLE_LITERAL_in_double_literal2458); 
 					DOUBLE_LITERAL110_tree = (CommonTree)adaptor.create(DOUBLE_LITERAL110);
 					adaptor.addChild(root_0, DOUBLE_LITERAL110_tree);
 
@@ -4846,7 +4846,7 @@
 
 
 	// $ANTLR start "literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:625:1: literal : ( LONG_LITERAL | integer_literal | SHORT_LITERAL | BYTE_LITERAL | float_literal | double_literal | CHAR_LITERAL | STRING_LITERAL | BOOL_LITERAL | NULL_LITERAL | array_literal | subannotation | type_field_method_literal | enum_literal );
+	// smaliParser.g:625:1: literal : ( LONG_LITERAL | integer_literal | SHORT_LITERAL | BYTE_LITERAL | float_literal | double_literal | CHAR_LITERAL | STRING_LITERAL | BOOL_LITERAL | NULL_LITERAL | array_literal | subannotation | type_field_method_literal | enum_literal );
 	public final smaliParser.literal_return literal() throws RecognitionException {
 		smaliParser.literal_return retval = new smaliParser.literal_return();
 		retval.start = input.LT(1);
@@ -4877,7 +4877,7 @@
 		CommonTree NULL_LITERAL120_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:626:3: ( LONG_LITERAL | integer_literal | SHORT_LITERAL | BYTE_LITERAL | float_literal | double_literal | CHAR_LITERAL | STRING_LITERAL | BOOL_LITERAL | NULL_LITERAL | array_literal | subannotation | type_field_method_literal | enum_literal )
+			// smaliParser.g:626:3: ( LONG_LITERAL | integer_literal | SHORT_LITERAL | BYTE_LITERAL | float_literal | double_literal | CHAR_LITERAL | STRING_LITERAL | BOOL_LITERAL | NULL_LITERAL | array_literal | subannotation | type_field_method_literal | enum_literal )
 			int alt21=14;
 			switch ( input.LA(1) ) {
 			case LONG_LITERAL:
@@ -5123,19 +5123,19 @@
 			}
 			switch (alt21) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:626:5: LONG_LITERAL
+					// smaliParser.g:626:5: LONG_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					LONG_LITERAL111=(Token)match(input,LONG_LITERAL,FOLLOW_LONG_LITERAL_in_literal2468);
+					LONG_LITERAL111=(Token)match(input,LONG_LITERAL,FOLLOW_LONG_LITERAL_in_literal2468); 
 					LONG_LITERAL111_tree = (CommonTree)adaptor.create(LONG_LITERAL111);
 					adaptor.addChild(root_0, LONG_LITERAL111_tree);
 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:627:5: integer_literal
+					// smaliParser.g:627:5: integer_literal
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -5149,31 +5149,31 @@
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:628:5: SHORT_LITERAL
+					// smaliParser.g:628:5: SHORT_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					SHORT_LITERAL113=(Token)match(input,SHORT_LITERAL,FOLLOW_SHORT_LITERAL_in_literal2480);
+					SHORT_LITERAL113=(Token)match(input,SHORT_LITERAL,FOLLOW_SHORT_LITERAL_in_literal2480); 
 					SHORT_LITERAL113_tree = (CommonTree)adaptor.create(SHORT_LITERAL113);
 					adaptor.addChild(root_0, SHORT_LITERAL113_tree);
 
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:629:5: BYTE_LITERAL
+					// smaliParser.g:629:5: BYTE_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					BYTE_LITERAL114=(Token)match(input,BYTE_LITERAL,FOLLOW_BYTE_LITERAL_in_literal2486);
+					BYTE_LITERAL114=(Token)match(input,BYTE_LITERAL,FOLLOW_BYTE_LITERAL_in_literal2486); 
 					BYTE_LITERAL114_tree = (CommonTree)adaptor.create(BYTE_LITERAL114);
 					adaptor.addChild(root_0, BYTE_LITERAL114_tree);
 
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:630:5: float_literal
+					// smaliParser.g:630:5: float_literal
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -5187,7 +5187,7 @@
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:631:5: double_literal
+					// smaliParser.g:631:5: double_literal
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -5201,55 +5201,55 @@
 					}
 					break;
 				case 7 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:632:5: CHAR_LITERAL
+					// smaliParser.g:632:5: CHAR_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					CHAR_LITERAL117=(Token)match(input,CHAR_LITERAL,FOLLOW_CHAR_LITERAL_in_literal2504);
+					CHAR_LITERAL117=(Token)match(input,CHAR_LITERAL,FOLLOW_CHAR_LITERAL_in_literal2504); 
 					CHAR_LITERAL117_tree = (CommonTree)adaptor.create(CHAR_LITERAL117);
 					adaptor.addChild(root_0, CHAR_LITERAL117_tree);
 
 					}
 					break;
 				case 8 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:633:5: STRING_LITERAL
+					// smaliParser.g:633:5: STRING_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					STRING_LITERAL118=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_literal2510);
+					STRING_LITERAL118=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_literal2510); 
 					STRING_LITERAL118_tree = (CommonTree)adaptor.create(STRING_LITERAL118);
 					adaptor.addChild(root_0, STRING_LITERAL118_tree);
 
 					}
 					break;
 				case 9 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:634:5: BOOL_LITERAL
+					// smaliParser.g:634:5: BOOL_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					BOOL_LITERAL119=(Token)match(input,BOOL_LITERAL,FOLLOW_BOOL_LITERAL_in_literal2516);
+					BOOL_LITERAL119=(Token)match(input,BOOL_LITERAL,FOLLOW_BOOL_LITERAL_in_literal2516); 
 					BOOL_LITERAL119_tree = (CommonTree)adaptor.create(BOOL_LITERAL119);
 					adaptor.addChild(root_0, BOOL_LITERAL119_tree);
 
 					}
 					break;
 				case 10 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:635:5: NULL_LITERAL
+					// smaliParser.g:635:5: NULL_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					NULL_LITERAL120=(Token)match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal2522);
+					NULL_LITERAL120=(Token)match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal2522); 
 					NULL_LITERAL120_tree = (CommonTree)adaptor.create(NULL_LITERAL120);
 					adaptor.addChild(root_0, NULL_LITERAL120_tree);
 
 					}
 					break;
 				case 11 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:636:5: array_literal
+					// smaliParser.g:636:5: array_literal
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -5263,7 +5263,7 @@
 					}
 					break;
 				case 12 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:637:5: subannotation
+					// smaliParser.g:637:5: subannotation
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -5277,7 +5277,7 @@
 					}
 					break;
 				case 13 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:638:5: type_field_method_literal
+					// smaliParser.g:638:5: type_field_method_literal
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -5291,7 +5291,7 @@
 					}
 					break;
 				case 14 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:639:5: enum_literal
+					// smaliParser.g:639:5: enum_literal
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -5334,7 +5334,7 @@
 
 
 	// $ANTLR start "parsed_integer_literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:641:1: parsed_integer_literal returns [int value] : integer_literal ;
+	// smaliParser.g:641:1: parsed_integer_literal returns [int value] : integer_literal ;
 	public final smaliParser.parsed_integer_literal_return parsed_integer_literal() throws RecognitionException {
 		smaliParser.parsed_integer_literal_return retval = new smaliParser.parsed_integer_literal_return();
 		retval.start = input.LT(1);
@@ -5345,8 +5345,8 @@
 
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:642:3: ( integer_literal )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:642:5: integer_literal
+			// smaliParser.g:642:3: ( integer_literal )
+			// smaliParser.g:642:5: integer_literal
 			{
 			root_0 = (CommonTree)adaptor.nil();
 
@@ -5357,7 +5357,7 @@
 
 			adaptor.addChild(root_0, integer_literal125.getTree());
 
-			 retval.value = LiteralTools.parseInt((integer_literal125!=null?input.toString(integer_literal125.start,integer_literal125.stop):null));
+			 retval.value = LiteralTools.parseInt((integer_literal125!=null?input.toString(integer_literal125.start,integer_literal125.stop):null)); 
 			}
 
 			retval.stop = input.LT(-1);
@@ -5387,7 +5387,7 @@
 
 
 	// $ANTLR start "integral_literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:644:1: integral_literal : ( LONG_LITERAL | integer_literal | SHORT_LITERAL | CHAR_LITERAL | BYTE_LITERAL );
+	// smaliParser.g:644:1: integral_literal : ( LONG_LITERAL | integer_literal | SHORT_LITERAL | CHAR_LITERAL | BYTE_LITERAL );
 	public final smaliParser.integral_literal_return integral_literal() throws RecognitionException {
 		smaliParser.integral_literal_return retval = new smaliParser.integral_literal_return();
 		retval.start = input.LT(1);
@@ -5406,7 +5406,7 @@
 		CommonTree BYTE_LITERAL130_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:645:3: ( LONG_LITERAL | integer_literal | SHORT_LITERAL | CHAR_LITERAL | BYTE_LITERAL )
+			// smaliParser.g:645:3: ( LONG_LITERAL | integer_literal | SHORT_LITERAL | CHAR_LITERAL | BYTE_LITERAL )
 			int alt22=5;
 			switch ( input.LA(1) ) {
 			case LONG_LITERAL:
@@ -5442,19 +5442,19 @@
 			}
 			switch (alt22) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:645:5: LONG_LITERAL
+					// smaliParser.g:645:5: LONG_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					LONG_LITERAL126=(Token)match(input,LONG_LITERAL,FOLLOW_LONG_LITERAL_in_integral_literal2571);
+					LONG_LITERAL126=(Token)match(input,LONG_LITERAL,FOLLOW_LONG_LITERAL_in_integral_literal2571); 
 					LONG_LITERAL126_tree = (CommonTree)adaptor.create(LONG_LITERAL126);
 					adaptor.addChild(root_0, LONG_LITERAL126_tree);
 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:646:5: integer_literal
+					// smaliParser.g:646:5: integer_literal
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -5468,36 +5468,36 @@
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:647:5: SHORT_LITERAL
+					// smaliParser.g:647:5: SHORT_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					SHORT_LITERAL128=(Token)match(input,SHORT_LITERAL,FOLLOW_SHORT_LITERAL_in_integral_literal2583);
+					SHORT_LITERAL128=(Token)match(input,SHORT_LITERAL,FOLLOW_SHORT_LITERAL_in_integral_literal2583); 
 					SHORT_LITERAL128_tree = (CommonTree)adaptor.create(SHORT_LITERAL128);
 					adaptor.addChild(root_0, SHORT_LITERAL128_tree);
 
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:648:5: CHAR_LITERAL
+					// smaliParser.g:648:5: CHAR_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					CHAR_LITERAL129=(Token)match(input,CHAR_LITERAL,FOLLOW_CHAR_LITERAL_in_integral_literal2589);
+					CHAR_LITERAL129=(Token)match(input,CHAR_LITERAL,FOLLOW_CHAR_LITERAL_in_integral_literal2589); 
 					CHAR_LITERAL129_tree = (CommonTree)adaptor.create(CHAR_LITERAL129);
 					adaptor.addChild(root_0, CHAR_LITERAL129_tree);
 
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:649:5: BYTE_LITERAL
+					// smaliParser.g:649:5: BYTE_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					BYTE_LITERAL130=(Token)match(input,BYTE_LITERAL,FOLLOW_BYTE_LITERAL_in_integral_literal2595);
+					BYTE_LITERAL130=(Token)match(input,BYTE_LITERAL,FOLLOW_BYTE_LITERAL_in_integral_literal2595); 
 					BYTE_LITERAL130_tree = (CommonTree)adaptor.create(BYTE_LITERAL130);
 					adaptor.addChild(root_0, BYTE_LITERAL130_tree);
 
@@ -5532,7 +5532,7 @@
 
 
 	// $ANTLR start "fixed_32bit_literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:651:1: fixed_32bit_literal : ( LONG_LITERAL | integer_literal | SHORT_LITERAL | BYTE_LITERAL | float_literal | CHAR_LITERAL | BOOL_LITERAL );
+	// smaliParser.g:651:1: fixed_32bit_literal : ( LONG_LITERAL | integer_literal | SHORT_LITERAL | BYTE_LITERAL | float_literal | CHAR_LITERAL | BOOL_LITERAL );
 	public final smaliParser.fixed_32bit_literal_return fixed_32bit_literal() throws RecognitionException {
 		smaliParser.fixed_32bit_literal_return retval = new smaliParser.fixed_32bit_literal_return();
 		retval.start = input.LT(1);
@@ -5554,7 +5554,7 @@
 		CommonTree BOOL_LITERAL137_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:652:3: ( LONG_LITERAL | integer_literal | SHORT_LITERAL | BYTE_LITERAL | float_literal | CHAR_LITERAL | BOOL_LITERAL )
+			// smaliParser.g:652:3: ( LONG_LITERAL | integer_literal | SHORT_LITERAL | BYTE_LITERAL | float_literal | CHAR_LITERAL | BOOL_LITERAL )
 			int alt23=7;
 			switch ( input.LA(1) ) {
 			case LONG_LITERAL:
@@ -5601,19 +5601,19 @@
 			}
 			switch (alt23) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:652:5: LONG_LITERAL
+					// smaliParser.g:652:5: LONG_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					LONG_LITERAL131=(Token)match(input,LONG_LITERAL,FOLLOW_LONG_LITERAL_in_fixed_32bit_literal2605);
+					LONG_LITERAL131=(Token)match(input,LONG_LITERAL,FOLLOW_LONG_LITERAL_in_fixed_32bit_literal2605); 
 					LONG_LITERAL131_tree = (CommonTree)adaptor.create(LONG_LITERAL131);
 					adaptor.addChild(root_0, LONG_LITERAL131_tree);
 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:653:5: integer_literal
+					// smaliParser.g:653:5: integer_literal
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -5627,31 +5627,31 @@
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:654:5: SHORT_LITERAL
+					// smaliParser.g:654:5: SHORT_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					SHORT_LITERAL133=(Token)match(input,SHORT_LITERAL,FOLLOW_SHORT_LITERAL_in_fixed_32bit_literal2617);
+					SHORT_LITERAL133=(Token)match(input,SHORT_LITERAL,FOLLOW_SHORT_LITERAL_in_fixed_32bit_literal2617); 
 					SHORT_LITERAL133_tree = (CommonTree)adaptor.create(SHORT_LITERAL133);
 					adaptor.addChild(root_0, SHORT_LITERAL133_tree);
 
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:655:5: BYTE_LITERAL
+					// smaliParser.g:655:5: BYTE_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					BYTE_LITERAL134=(Token)match(input,BYTE_LITERAL,FOLLOW_BYTE_LITERAL_in_fixed_32bit_literal2623);
+					BYTE_LITERAL134=(Token)match(input,BYTE_LITERAL,FOLLOW_BYTE_LITERAL_in_fixed_32bit_literal2623); 
 					BYTE_LITERAL134_tree = (CommonTree)adaptor.create(BYTE_LITERAL134);
 					adaptor.addChild(root_0, BYTE_LITERAL134_tree);
 
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:656:5: float_literal
+					// smaliParser.g:656:5: float_literal
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -5665,24 +5665,24 @@
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:657:5: CHAR_LITERAL
+					// smaliParser.g:657:5: CHAR_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					CHAR_LITERAL136=(Token)match(input,CHAR_LITERAL,FOLLOW_CHAR_LITERAL_in_fixed_32bit_literal2635);
+					CHAR_LITERAL136=(Token)match(input,CHAR_LITERAL,FOLLOW_CHAR_LITERAL_in_fixed_32bit_literal2635); 
 					CHAR_LITERAL136_tree = (CommonTree)adaptor.create(CHAR_LITERAL136);
 					adaptor.addChild(root_0, CHAR_LITERAL136_tree);
 
 					}
 					break;
 				case 7 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:658:5: BOOL_LITERAL
+					// smaliParser.g:658:5: BOOL_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					BOOL_LITERAL137=(Token)match(input,BOOL_LITERAL,FOLLOW_BOOL_LITERAL_in_fixed_32bit_literal2641);
+					BOOL_LITERAL137=(Token)match(input,BOOL_LITERAL,FOLLOW_BOOL_LITERAL_in_fixed_32bit_literal2641); 
 					BOOL_LITERAL137_tree = (CommonTree)adaptor.create(BOOL_LITERAL137);
 					adaptor.addChild(root_0, BOOL_LITERAL137_tree);
 
@@ -5717,7 +5717,7 @@
 
 
 	// $ANTLR start "fixed_literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:660:1: fixed_literal : ( integer_literal | LONG_LITERAL | SHORT_LITERAL | BYTE_LITERAL | float_literal | double_literal | CHAR_LITERAL | BOOL_LITERAL );
+	// smaliParser.g:660:1: fixed_literal : ( integer_literal | LONG_LITERAL | SHORT_LITERAL | BYTE_LITERAL | float_literal | double_literal | CHAR_LITERAL | BOOL_LITERAL );
 	public final smaliParser.fixed_literal_return fixed_literal() throws RecognitionException {
 		smaliParser.fixed_literal_return retval = new smaliParser.fixed_literal_return();
 		retval.start = input.LT(1);
@@ -5740,7 +5740,7 @@
 		CommonTree BOOL_LITERAL145_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:661:3: ( integer_literal | LONG_LITERAL | SHORT_LITERAL | BYTE_LITERAL | float_literal | double_literal | CHAR_LITERAL | BOOL_LITERAL )
+			// smaliParser.g:661:3: ( integer_literal | LONG_LITERAL | SHORT_LITERAL | BYTE_LITERAL | float_literal | double_literal | CHAR_LITERAL | BOOL_LITERAL )
 			int alt24=8;
 			switch ( input.LA(1) ) {
 			case NEGATIVE_INTEGER_LITERAL:
@@ -5793,7 +5793,7 @@
 			}
 			switch (alt24) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:661:5: integer_literal
+					// smaliParser.g:661:5: integer_literal
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -5807,43 +5807,43 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:662:5: LONG_LITERAL
+					// smaliParser.g:662:5: LONG_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					LONG_LITERAL139=(Token)match(input,LONG_LITERAL,FOLLOW_LONG_LITERAL_in_fixed_literal2657);
+					LONG_LITERAL139=(Token)match(input,LONG_LITERAL,FOLLOW_LONG_LITERAL_in_fixed_literal2657); 
 					LONG_LITERAL139_tree = (CommonTree)adaptor.create(LONG_LITERAL139);
 					adaptor.addChild(root_0, LONG_LITERAL139_tree);
 
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:663:5: SHORT_LITERAL
+					// smaliParser.g:663:5: SHORT_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					SHORT_LITERAL140=(Token)match(input,SHORT_LITERAL,FOLLOW_SHORT_LITERAL_in_fixed_literal2663);
+					SHORT_LITERAL140=(Token)match(input,SHORT_LITERAL,FOLLOW_SHORT_LITERAL_in_fixed_literal2663); 
 					SHORT_LITERAL140_tree = (CommonTree)adaptor.create(SHORT_LITERAL140);
 					adaptor.addChild(root_0, SHORT_LITERAL140_tree);
 
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:664:5: BYTE_LITERAL
+					// smaliParser.g:664:5: BYTE_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					BYTE_LITERAL141=(Token)match(input,BYTE_LITERAL,FOLLOW_BYTE_LITERAL_in_fixed_literal2669);
+					BYTE_LITERAL141=(Token)match(input,BYTE_LITERAL,FOLLOW_BYTE_LITERAL_in_fixed_literal2669); 
 					BYTE_LITERAL141_tree = (CommonTree)adaptor.create(BYTE_LITERAL141);
 					adaptor.addChild(root_0, BYTE_LITERAL141_tree);
 
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:665:5: float_literal
+					// smaliParser.g:665:5: float_literal
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -5857,7 +5857,7 @@
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:666:5: double_literal
+					// smaliParser.g:666:5: double_literal
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -5871,24 +5871,24 @@
 					}
 					break;
 				case 7 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:667:5: CHAR_LITERAL
+					// smaliParser.g:667:5: CHAR_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					CHAR_LITERAL144=(Token)match(input,CHAR_LITERAL,FOLLOW_CHAR_LITERAL_in_fixed_literal2687);
+					CHAR_LITERAL144=(Token)match(input,CHAR_LITERAL,FOLLOW_CHAR_LITERAL_in_fixed_literal2687); 
 					CHAR_LITERAL144_tree = (CommonTree)adaptor.create(CHAR_LITERAL144);
 					adaptor.addChild(root_0, CHAR_LITERAL144_tree);
 
 					}
 					break;
 				case 8 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:668:5: BOOL_LITERAL
+					// smaliParser.g:668:5: BOOL_LITERAL
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					BOOL_LITERAL145=(Token)match(input,BOOL_LITERAL,FOLLOW_BOOL_LITERAL_in_fixed_literal2693);
+					BOOL_LITERAL145=(Token)match(input,BOOL_LITERAL,FOLLOW_BOOL_LITERAL_in_fixed_literal2693); 
 					BOOL_LITERAL145_tree = (CommonTree)adaptor.create(BOOL_LITERAL145);
 					adaptor.addChild(root_0, BOOL_LITERAL145_tree);
 
@@ -5923,7 +5923,7 @@
 
 
 	// $ANTLR start "array_literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:670:1: array_literal : OPEN_BRACE ( literal ( COMMA literal )* |) CLOSE_BRACE -> ^( I_ENCODED_ARRAY[$start, \"I_ENCODED_ARRAY\"] ( literal )* ) ;
+	// smaliParser.g:670:1: array_literal : OPEN_BRACE ( literal ( COMMA literal )* |) CLOSE_BRACE -> ^( I_ENCODED_ARRAY[$start, \"I_ENCODED_ARRAY\"] ( literal )* ) ;
 	public final smaliParser.array_literal_return array_literal() throws RecognitionException {
 		smaliParser.array_literal_return retval = new smaliParser.array_literal_return();
 		retval.start = input.LT(1);
@@ -5945,13 +5945,13 @@
 		RewriteRuleSubtreeStream stream_literal=new RewriteRuleSubtreeStream(adaptor,"rule literal");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:671:3: ( OPEN_BRACE ( literal ( COMMA literal )* |) CLOSE_BRACE -> ^( I_ENCODED_ARRAY[$start, \"I_ENCODED_ARRAY\"] ( literal )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:671:5: OPEN_BRACE ( literal ( COMMA literal )* |) CLOSE_BRACE
+			// smaliParser.g:671:3: ( OPEN_BRACE ( literal ( COMMA literal )* |) CLOSE_BRACE -> ^( I_ENCODED_ARRAY[$start, \"I_ENCODED_ARRAY\"] ( literal )* ) )
+			// smaliParser.g:671:5: OPEN_BRACE ( literal ( COMMA literal )* |) CLOSE_BRACE
 			{
-			OPEN_BRACE146=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_array_literal2703);
+			OPEN_BRACE146=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_array_literal2703);  
 			stream_OPEN_BRACE.add(OPEN_BRACE146);
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:671:16: ( literal ( COMMA literal )* |)
+			// smaliParser.g:671:16: ( literal ( COMMA literal )* |)
 			int alt26=2;
 			int LA26_0 = input.LA(1);
 			if ( (LA26_0==ACCESS_SPEC||LA26_0==ANNOTATION_VISIBILITY||LA26_0==ARRAY_TYPE_PREFIX||(LA26_0 >= BOOL_LITERAL && LA26_0 <= BYTE_LITERAL)||(LA26_0 >= CHAR_LITERAL && LA26_0 <= CLASS_DESCRIPTOR)||(LA26_0 >= DOUBLE_LITERAL && LA26_0 <= DOUBLE_LITERAL_OR_ID)||LA26_0==ENUM_DIRECTIVE||(LA26_0 >= FLOAT_LITERAL && LA26_0 <= FLOAT_LITERAL_OR_ID)||(LA26_0 >= INSTRUCTION_FORMAT10t && LA26_0 <= INSTRUCTION_FORMAT10x_ODEX)||LA26_0==INSTRUCTION_FORMAT11x||LA26_0==INSTRUCTION_FORMAT12x_OR_ID||(LA26_0 >= INSTRUCTION_FORMAT21c_FIELD && LA26_0 <= INSTRUCTION_FORMAT21c_TYPE)||LA26_0==INSTRUCTION_FORMAT21t||(LA26_0 >= INSTRUCTION_FORMAT22c_FIELD && LA26_0 <= INSTRUCTION_FORMAT22cs_FIELD)||(LA26_0 >= INSTRUCTION_FORMAT22s_OR_ID && LA26_0 <= INSTRUCTION_FORMAT22t)||LA26_0==INSTRUCTION_FORMAT23x||(LA26_0 >= INSTRUCTION_FORMAT31i_OR_ID && LA26_0 <= INSTRUCTION_FORMAT31t)||(LA26_0 >= INSTRUCTION_FORMAT35c_METHOD && LA26_0 <= INSTRUCTION_FORMAT35ms_METHOD)||(LA26_0 >= INSTRUCTION_FORMAT45cc_METHOD && LA26_0 <= INSTRUCTION_FORMAT51l)||(LA26_0 >= LONG_LITERAL && LA26_0 <= MEMBER_NAME)||(LA26_0 >= NEGATIVE_INTEGER_LITERAL && LA26_0 <= OPEN_BRACE)||(LA26_0 >= PARAM_LIST_OR_ID_PRIMITIVE_TYPE && LA26_0 <= PRIMITIVE_TYPE)||LA26_0==REGISTER||(LA26_0 >= SHORT_LITERAL && LA26_0 <= SIMPLE_NAME)||(LA26_0 >= STRING_LITERAL && LA26_0 <= SUBANNOTATION_DIRECTIVE)||(LA26_0 >= VERIFICATION_ERROR_TYPE && LA26_0 <= VOID_TYPE)) ) {
@@ -5969,14 +5969,14 @@
 
 			switch (alt26) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:671:17: literal ( COMMA literal )*
+					// smaliParser.g:671:17: literal ( COMMA literal )*
 					{
 					pushFollow(FOLLOW_literal_in_array_literal2706);
 					literal147=literal();
 					state._fsp--;
 
 					stream_literal.add(literal147.getTree());
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:671:25: ( COMMA literal )*
+					// smaliParser.g:671:25: ( COMMA literal )*
 					loop25:
 					while (true) {
 						int alt25=2;
@@ -5987,9 +5987,9 @@
 
 						switch (alt25) {
 						case 1 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:671:26: COMMA literal
+							// smaliParser.g:671:26: COMMA literal
 							{
-							COMMA148=(Token)match(input,COMMA,FOLLOW_COMMA_in_array_literal2709);
+							COMMA148=(Token)match(input,COMMA,FOLLOW_COMMA_in_array_literal2709);  
 							stream_COMMA.add(COMMA148);
 
 							pushFollow(FOLLOW_literal_in_array_literal2711);
@@ -6008,34 +6008,34 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:671:44:
+					// smaliParser.g:671:44: 
 					{
 					}
 					break;
 
 			}
 
-			CLOSE_BRACE150=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_array_literal2719);
+			CLOSE_BRACE150=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_array_literal2719);  
 			stream_CLOSE_BRACE.add(CLOSE_BRACE150);
 
 			// AST REWRITE
 			// elements: literal
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 672:5: -> ^( I_ENCODED_ARRAY[$start, \"I_ENCODED_ARRAY\"] ( literal )* )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:672:8: ^( I_ENCODED_ARRAY[$start, \"I_ENCODED_ARRAY\"] ( literal )* )
+				// smaliParser.g:672:8: ^( I_ENCODED_ARRAY[$start, \"I_ENCODED_ARRAY\"] ( literal )* )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ENCODED_ARRAY, (retval.start), "I_ENCODED_ARRAY"), root_1);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:672:53: ( literal )*
+				// smaliParser.g:672:53: ( literal )*
 				while ( stream_literal.hasNext() ) {
 					adaptor.addChild(root_1, stream_literal.nextTree());
 				}
@@ -6078,7 +6078,7 @@
 
 
 	// $ANTLR start "annotation_element"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:674:1: annotation_element : simple_name EQUAL literal -> ^( I_ANNOTATION_ELEMENT[$start, \"I_ANNOTATION_ELEMENT\"] simple_name literal ) ;
+	// smaliParser.g:674:1: annotation_element : simple_name EQUAL literal -> ^( I_ANNOTATION_ELEMENT[$start, \"I_ANNOTATION_ELEMENT\"] simple_name literal ) ;
 	public final smaliParser.annotation_element_return annotation_element() throws RecognitionException {
 		smaliParser.annotation_element_return retval = new smaliParser.annotation_element_return();
 		retval.start = input.LT(1);
@@ -6095,15 +6095,15 @@
 		RewriteRuleSubtreeStream stream_literal=new RewriteRuleSubtreeStream(adaptor,"rule literal");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:675:3: ( simple_name EQUAL literal -> ^( I_ANNOTATION_ELEMENT[$start, \"I_ANNOTATION_ELEMENT\"] simple_name literal ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:675:5: simple_name EQUAL literal
+			// smaliParser.g:675:3: ( simple_name EQUAL literal -> ^( I_ANNOTATION_ELEMENT[$start, \"I_ANNOTATION_ELEMENT\"] simple_name literal ) )
+			// smaliParser.g:675:5: simple_name EQUAL literal
 			{
 			pushFollow(FOLLOW_simple_name_in_annotation_element2743);
 			simple_name151=simple_name();
 			state._fsp--;
 
 			stream_simple_name.add(simple_name151.getTree());
-			EQUAL152=(Token)match(input,EQUAL,FOLLOW_EQUAL_in_annotation_element2745);
+			EQUAL152=(Token)match(input,EQUAL,FOLLOW_EQUAL_in_annotation_element2745);  
 			stream_EQUAL.add(EQUAL152);
 
 			pushFollow(FOLLOW_literal_in_annotation_element2747);
@@ -6113,18 +6113,18 @@
 			stream_literal.add(literal153.getTree());
 			// AST REWRITE
 			// elements: simple_name, literal
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 676:5: -> ^( I_ANNOTATION_ELEMENT[$start, \"I_ANNOTATION_ELEMENT\"] simple_name literal )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:676:8: ^( I_ANNOTATION_ELEMENT[$start, \"I_ANNOTATION_ELEMENT\"] simple_name literal )
+				// smaliParser.g:676:8: ^( I_ANNOTATION_ELEMENT[$start, \"I_ANNOTATION_ELEMENT\"] simple_name literal )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ANNOTATION_ELEMENT, (retval.start), "I_ANNOTATION_ELEMENT"), root_1);
@@ -6167,7 +6167,7 @@
 
 
 	// $ANTLR start "annotation"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:678:1: annotation : ANNOTATION_DIRECTIVE ANNOTATION_VISIBILITY CLASS_DESCRIPTOR ( annotation_element )* END_ANNOTATION_DIRECTIVE -> ^( I_ANNOTATION[$start, \"I_ANNOTATION\"] ANNOTATION_VISIBILITY ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* ) ) ;
+	// smaliParser.g:678:1: annotation : ANNOTATION_DIRECTIVE ANNOTATION_VISIBILITY CLASS_DESCRIPTOR ( annotation_element )* END_ANNOTATION_DIRECTIVE -> ^( I_ANNOTATION[$start, \"I_ANNOTATION\"] ANNOTATION_VISIBILITY ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* ) ) ;
 	public final smaliParser.annotation_return annotation() throws RecognitionException {
 		smaliParser.annotation_return retval = new smaliParser.annotation_return();
 		retval.start = input.LT(1);
@@ -6191,19 +6191,19 @@
 		RewriteRuleSubtreeStream stream_annotation_element=new RewriteRuleSubtreeStream(adaptor,"rule annotation_element");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:679:3: ( ANNOTATION_DIRECTIVE ANNOTATION_VISIBILITY CLASS_DESCRIPTOR ( annotation_element )* END_ANNOTATION_DIRECTIVE -> ^( I_ANNOTATION[$start, \"I_ANNOTATION\"] ANNOTATION_VISIBILITY ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* ) ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:679:5: ANNOTATION_DIRECTIVE ANNOTATION_VISIBILITY CLASS_DESCRIPTOR ( annotation_element )* END_ANNOTATION_DIRECTIVE
+			// smaliParser.g:679:3: ( ANNOTATION_DIRECTIVE ANNOTATION_VISIBILITY CLASS_DESCRIPTOR ( annotation_element )* END_ANNOTATION_DIRECTIVE -> ^( I_ANNOTATION[$start, \"I_ANNOTATION\"] ANNOTATION_VISIBILITY ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* ) ) )
+			// smaliParser.g:679:5: ANNOTATION_DIRECTIVE ANNOTATION_VISIBILITY CLASS_DESCRIPTOR ( annotation_element )* END_ANNOTATION_DIRECTIVE
 			{
-			ANNOTATION_DIRECTIVE154=(Token)match(input,ANNOTATION_DIRECTIVE,FOLLOW_ANNOTATION_DIRECTIVE_in_annotation2772);
+			ANNOTATION_DIRECTIVE154=(Token)match(input,ANNOTATION_DIRECTIVE,FOLLOW_ANNOTATION_DIRECTIVE_in_annotation2772);  
 			stream_ANNOTATION_DIRECTIVE.add(ANNOTATION_DIRECTIVE154);
 
-			ANNOTATION_VISIBILITY155=(Token)match(input,ANNOTATION_VISIBILITY,FOLLOW_ANNOTATION_VISIBILITY_in_annotation2774);
+			ANNOTATION_VISIBILITY155=(Token)match(input,ANNOTATION_VISIBILITY,FOLLOW_ANNOTATION_VISIBILITY_in_annotation2774);  
 			stream_ANNOTATION_VISIBILITY.add(ANNOTATION_VISIBILITY155);
 
-			CLASS_DESCRIPTOR156=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_annotation2776);
+			CLASS_DESCRIPTOR156=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_annotation2776);  
 			stream_CLASS_DESCRIPTOR.add(CLASS_DESCRIPTOR156);
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:680:5: ( annotation_element )*
+			// smaliParser.g:680:5: ( annotation_element )*
 			loop27:
 			while (true) {
 				int alt27=2;
@@ -6214,7 +6214,7 @@
 
 				switch (alt27) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:680:5: annotation_element
+					// smaliParser.g:680:5: annotation_element
 					{
 					pushFollow(FOLLOW_annotation_element_in_annotation2782);
 					annotation_element157=annotation_element();
@@ -6229,33 +6229,33 @@
 				}
 			}
 
-			END_ANNOTATION_DIRECTIVE158=(Token)match(input,END_ANNOTATION_DIRECTIVE,FOLLOW_END_ANNOTATION_DIRECTIVE_in_annotation2785);
+			END_ANNOTATION_DIRECTIVE158=(Token)match(input,END_ANNOTATION_DIRECTIVE,FOLLOW_END_ANNOTATION_DIRECTIVE_in_annotation2785);  
 			stream_END_ANNOTATION_DIRECTIVE.add(END_ANNOTATION_DIRECTIVE158);
 
 			// AST REWRITE
-			// elements: CLASS_DESCRIPTOR, ANNOTATION_VISIBILITY, annotation_element
-			// token labels:
+			// elements: CLASS_DESCRIPTOR, annotation_element, ANNOTATION_VISIBILITY
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 681:5: -> ^( I_ANNOTATION[$start, \"I_ANNOTATION\"] ANNOTATION_VISIBILITY ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* ) )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:681:8: ^( I_ANNOTATION[$start, \"I_ANNOTATION\"] ANNOTATION_VISIBILITY ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* ) )
+				// smaliParser.g:681:8: ^( I_ANNOTATION[$start, \"I_ANNOTATION\"] ANNOTATION_VISIBILITY ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* ) )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ANNOTATION, (retval.start), "I_ANNOTATION"), root_1);
 				adaptor.addChild(root_1, stream_ANNOTATION_VISIBILITY.nextNode());
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:681:69: ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* )
+				// smaliParser.g:681:69: ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* )
 				{
 				CommonTree root_2 = (CommonTree)adaptor.nil();
 				root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_SUBANNOTATION, (retval.start), "I_SUBANNOTATION"), root_2);
 				adaptor.addChild(root_2, stream_CLASS_DESCRIPTOR.nextNode());
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:681:131: ( annotation_element )*
+				// smaliParser.g:681:131: ( annotation_element )*
 				while ( stream_annotation_element.hasNext() ) {
 					adaptor.addChild(root_2, stream_annotation_element.nextTree());
 				}
@@ -6301,7 +6301,7 @@
 
 
 	// $ANTLR start "subannotation"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:683:1: subannotation : SUBANNOTATION_DIRECTIVE CLASS_DESCRIPTOR ( annotation_element )* END_SUBANNOTATION_DIRECTIVE -> ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* ) ;
+	// smaliParser.g:683:1: subannotation : SUBANNOTATION_DIRECTIVE CLASS_DESCRIPTOR ( annotation_element )* END_SUBANNOTATION_DIRECTIVE -> ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* ) ;
 	public final smaliParser.subannotation_return subannotation() throws RecognitionException {
 		smaliParser.subannotation_return retval = new smaliParser.subannotation_return();
 		retval.start = input.LT(1);
@@ -6322,16 +6322,16 @@
 		RewriteRuleSubtreeStream stream_annotation_element=new RewriteRuleSubtreeStream(adaptor,"rule annotation_element");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:684:3: ( SUBANNOTATION_DIRECTIVE CLASS_DESCRIPTOR ( annotation_element )* END_SUBANNOTATION_DIRECTIVE -> ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:684:5: SUBANNOTATION_DIRECTIVE CLASS_DESCRIPTOR ( annotation_element )* END_SUBANNOTATION_DIRECTIVE
+			// smaliParser.g:684:3: ( SUBANNOTATION_DIRECTIVE CLASS_DESCRIPTOR ( annotation_element )* END_SUBANNOTATION_DIRECTIVE -> ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* ) )
+			// smaliParser.g:684:5: SUBANNOTATION_DIRECTIVE CLASS_DESCRIPTOR ( annotation_element )* END_SUBANNOTATION_DIRECTIVE
 			{
-			SUBANNOTATION_DIRECTIVE159=(Token)match(input,SUBANNOTATION_DIRECTIVE,FOLLOW_SUBANNOTATION_DIRECTIVE_in_subannotation2818);
+			SUBANNOTATION_DIRECTIVE159=(Token)match(input,SUBANNOTATION_DIRECTIVE,FOLLOW_SUBANNOTATION_DIRECTIVE_in_subannotation2818);  
 			stream_SUBANNOTATION_DIRECTIVE.add(SUBANNOTATION_DIRECTIVE159);
 
-			CLASS_DESCRIPTOR160=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_subannotation2820);
+			CLASS_DESCRIPTOR160=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_subannotation2820);  
 			stream_CLASS_DESCRIPTOR.add(CLASS_DESCRIPTOR160);
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:684:46: ( annotation_element )*
+			// smaliParser.g:684:46: ( annotation_element )*
 			loop28:
 			while (true) {
 				int alt28=2;
@@ -6342,7 +6342,7 @@
 
 				switch (alt28) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:684:46: annotation_element
+					// smaliParser.g:684:46: annotation_element
 					{
 					pushFollow(FOLLOW_annotation_element_in_subannotation2822);
 					annotation_element161=annotation_element();
@@ -6357,28 +6357,28 @@
 				}
 			}
 
-			END_SUBANNOTATION_DIRECTIVE162=(Token)match(input,END_SUBANNOTATION_DIRECTIVE,FOLLOW_END_SUBANNOTATION_DIRECTIVE_in_subannotation2825);
+			END_SUBANNOTATION_DIRECTIVE162=(Token)match(input,END_SUBANNOTATION_DIRECTIVE,FOLLOW_END_SUBANNOTATION_DIRECTIVE_in_subannotation2825);  
 			stream_END_SUBANNOTATION_DIRECTIVE.add(END_SUBANNOTATION_DIRECTIVE162);
 
 			// AST REWRITE
-			// elements: annotation_element, CLASS_DESCRIPTOR
-			// token labels:
+			// elements: CLASS_DESCRIPTOR, annotation_element
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 685:5: -> ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:685:8: ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* )
+				// smaliParser.g:685:8: ^( I_SUBANNOTATION[$start, \"I_SUBANNOTATION\"] CLASS_DESCRIPTOR ( annotation_element )* )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_SUBANNOTATION, (retval.start), "I_SUBANNOTATION"), root_1);
 				adaptor.addChild(root_1, stream_CLASS_DESCRIPTOR.nextNode());
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:685:70: ( annotation_element )*
+				// smaliParser.g:685:70: ( annotation_element )*
 				while ( stream_annotation_element.hasNext() ) {
 					adaptor.addChild(root_1, stream_annotation_element.nextTree());
 				}
@@ -6421,7 +6421,7 @@
 
 
 	// $ANTLR start "enum_literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:688:1: enum_literal : ENUM_DIRECTIVE field_reference -> ^( I_ENCODED_ENUM field_reference ) ;
+	// smaliParser.g:688:1: enum_literal : ENUM_DIRECTIVE field_reference -> ^( I_ENCODED_ENUM field_reference ) ;
 	public final smaliParser.enum_literal_return enum_literal() throws RecognitionException {
 		smaliParser.enum_literal_return retval = new smaliParser.enum_literal_return();
 		retval.start = input.LT(1);
@@ -6436,10 +6436,10 @@
 		RewriteRuleSubtreeStream stream_field_reference=new RewriteRuleSubtreeStream(adaptor,"rule field_reference");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:689:3: ( ENUM_DIRECTIVE field_reference -> ^( I_ENCODED_ENUM field_reference ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:689:5: ENUM_DIRECTIVE field_reference
+			// smaliParser.g:689:3: ( ENUM_DIRECTIVE field_reference -> ^( I_ENCODED_ENUM field_reference ) )
+			// smaliParser.g:689:5: ENUM_DIRECTIVE field_reference
 			{
-			ENUM_DIRECTIVE163=(Token)match(input,ENUM_DIRECTIVE,FOLLOW_ENUM_DIRECTIVE_in_enum_literal2852);
+			ENUM_DIRECTIVE163=(Token)match(input,ENUM_DIRECTIVE,FOLLOW_ENUM_DIRECTIVE_in_enum_literal2852);  
 			stream_ENUM_DIRECTIVE.add(ENUM_DIRECTIVE163);
 
 			pushFollow(FOLLOW_field_reference_in_enum_literal2854);
@@ -6449,18 +6449,18 @@
 			stream_field_reference.add(field_reference164.getTree());
 			// AST REWRITE
 			// elements: field_reference
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 690:3: -> ^( I_ENCODED_ENUM field_reference )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:690:6: ^( I_ENCODED_ENUM field_reference )
+				// smaliParser.g:690:6: ^( I_ENCODED_ENUM field_reference )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ENCODED_ENUM, "I_ENCODED_ENUM"), root_1);
@@ -6502,7 +6502,7 @@
 
 
 	// $ANTLR start "type_field_method_literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:692:1: type_field_method_literal : ( reference_type_descriptor | ( ( reference_type_descriptor ARROW )? ( member_name COLON nonvoid_type_descriptor -> ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor ) | member_name method_prototype -> ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype ) ) ) | PRIMITIVE_TYPE | VOID_TYPE );
+	// smaliParser.g:692:1: type_field_method_literal : ( reference_type_descriptor | ( ( reference_type_descriptor ARROW )? ( member_name COLON nonvoid_type_descriptor -> ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor ) | member_name method_prototype -> ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype ) ) ) | PRIMITIVE_TYPE | VOID_TYPE );
 	public final smaliParser.type_field_method_literal_return type_field_method_literal() throws RecognitionException {
 		smaliParser.type_field_method_literal_return retval = new smaliParser.type_field_method_literal_return();
 		retval.start = input.LT(1);
@@ -6532,7 +6532,7 @@
 		RewriteRuleSubtreeStream stream_reference_type_descriptor=new RewriteRuleSubtreeStream(adaptor,"rule reference_type_descriptor");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:693:3: ( reference_type_descriptor | ( ( reference_type_descriptor ARROW )? ( member_name COLON nonvoid_type_descriptor -> ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor ) | member_name method_prototype -> ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype ) ) ) | PRIMITIVE_TYPE | VOID_TYPE )
+			// smaliParser.g:693:3: ( reference_type_descriptor | ( ( reference_type_descriptor ARROW )? ( member_name COLON nonvoid_type_descriptor -> ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor ) | member_name method_prototype -> ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype ) ) ) | PRIMITIVE_TYPE | VOID_TYPE )
 			int alt31=4;
 			switch ( input.LA(1) ) {
 			case CLASS_DESCRIPTOR:
@@ -6700,7 +6700,7 @@
 			}
 			switch (alt31) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:693:5: reference_type_descriptor
+					// smaliParser.g:693:5: reference_type_descriptor
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -6714,12 +6714,12 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:694:5: ( ( reference_type_descriptor ARROW )? ( member_name COLON nonvoid_type_descriptor -> ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor ) | member_name method_prototype -> ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype ) ) )
+					// smaliParser.g:694:5: ( ( reference_type_descriptor ARROW )? ( member_name COLON nonvoid_type_descriptor -> ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor ) | member_name method_prototype -> ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype ) ) )
 					{
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:694:5: ( ( reference_type_descriptor ARROW )? ( member_name COLON nonvoid_type_descriptor -> ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor ) | member_name method_prototype -> ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype ) ) )
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:694:7: ( reference_type_descriptor ARROW )? ( member_name COLON nonvoid_type_descriptor -> ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor ) | member_name method_prototype -> ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype ) )
+					// smaliParser.g:694:5: ( ( reference_type_descriptor ARROW )? ( member_name COLON nonvoid_type_descriptor -> ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor ) | member_name method_prototype -> ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype ) ) )
+					// smaliParser.g:694:7: ( reference_type_descriptor ARROW )? ( member_name COLON nonvoid_type_descriptor -> ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor ) | member_name method_prototype -> ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype ) )
 					{
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:694:7: ( reference_type_descriptor ARROW )?
+					// smaliParser.g:694:7: ( reference_type_descriptor ARROW )?
 					int alt29=2;
 					int LA29_0 = input.LA(1);
 					if ( (LA29_0==ARRAY_TYPE_PREFIX||LA29_0==CLASS_DESCRIPTOR) ) {
@@ -6727,14 +6727,14 @@
 					}
 					switch (alt29) {
 						case 1 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:694:8: reference_type_descriptor ARROW
+							// smaliParser.g:694:8: reference_type_descriptor ARROW
 							{
 							pushFollow(FOLLOW_reference_type_descriptor_in_type_field_method_literal2883);
 							reference_type_descriptor166=reference_type_descriptor();
 							state._fsp--;
 
 							stream_reference_type_descriptor.add(reference_type_descriptor166.getTree());
-							ARROW167=(Token)match(input,ARROW,FOLLOW_ARROW_in_type_field_method_literal2885);
+							ARROW167=(Token)match(input,ARROW,FOLLOW_ARROW_in_type_field_method_literal2885);  
 							stream_ARROW.add(ARROW167);
 
 							}
@@ -6742,19 +6742,19 @@
 
 					}
 
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:695:7: ( member_name COLON nonvoid_type_descriptor -> ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor ) | member_name method_prototype -> ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype ) )
+					// smaliParser.g:695:7: ( member_name COLON nonvoid_type_descriptor -> ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor ) | member_name method_prototype -> ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype ) )
 					int alt30=2;
 					alt30 = dfa30.predict(input);
 					switch (alt30) {
 						case 1 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:695:9: member_name COLON nonvoid_type_descriptor
+							// smaliParser.g:695:9: member_name COLON nonvoid_type_descriptor
 							{
 							pushFollow(FOLLOW_member_name_in_type_field_method_literal2897);
 							member_name168=member_name();
 							state._fsp--;
 
 							stream_member_name.add(member_name168.getTree());
-							COLON169=(Token)match(input,COLON,FOLLOW_COLON_in_type_field_method_literal2899);
+							COLON169=(Token)match(input,COLON,FOLLOW_COLON_in_type_field_method_literal2899);  
 							stream_COLON.add(COLON169);
 
 							pushFollow(FOLLOW_nonvoid_type_descriptor_in_type_field_method_literal2901);
@@ -6763,23 +6763,23 @@
 
 							stream_nonvoid_type_descriptor.add(nonvoid_type_descriptor170.getTree());
 							// AST REWRITE
-							// elements: member_name, nonvoid_type_descriptor, reference_type_descriptor
-							// token labels:
+							// elements: reference_type_descriptor, member_name, nonvoid_type_descriptor
+							// token labels: 
 							// rule labels: retval
-							// token list labels:
-							// rule list labels:
-							// wildcard labels:
+							// token list labels: 
+							// rule list labels: 
+							// wildcard labels: 
 							retval.tree = root_0;
 							RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 							root_0 = (CommonTree)adaptor.nil();
 							// 695:51: -> ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor )
 							{
-								// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:695:54: ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor )
+								// smaliParser.g:695:54: ^( I_ENCODED_FIELD ( reference_type_descriptor )? member_name nonvoid_type_descriptor )
 								{
 								CommonTree root_1 = (CommonTree)adaptor.nil();
 								root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ENCODED_FIELD, "I_ENCODED_FIELD"), root_1);
-								// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:695:72: ( reference_type_descriptor )?
+								// smaliParser.g:695:72: ( reference_type_descriptor )?
 								if ( stream_reference_type_descriptor.hasNext() ) {
 									adaptor.addChild(root_1, stream_reference_type_descriptor.nextTree());
 								}
@@ -6798,7 +6798,7 @@
 							}
 							break;
 						case 2 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:696:9: member_name method_prototype
+							// smaliParser.g:696:9: member_name method_prototype
 							{
 							pushFollow(FOLLOW_member_name_in_type_field_method_literal2924);
 							member_name171=member_name();
@@ -6811,23 +6811,23 @@
 
 							stream_method_prototype.add(method_prototype172.getTree());
 							// AST REWRITE
-							// elements: reference_type_descriptor, method_prototype, member_name
-							// token labels:
+							// elements: member_name, method_prototype, reference_type_descriptor
+							// token labels: 
 							// rule labels: retval
-							// token list labels:
-							// rule list labels:
-							// wildcard labels:
+							// token list labels: 
+							// rule list labels: 
+							// wildcard labels: 
 							retval.tree = root_0;
 							RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 							root_0 = (CommonTree)adaptor.nil();
 							// 696:38: -> ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype )
 							{
-								// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:696:41: ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype )
+								// smaliParser.g:696:41: ^( I_ENCODED_METHOD ( reference_type_descriptor )? member_name method_prototype )
 								{
 								CommonTree root_1 = (CommonTree)adaptor.nil();
 								root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ENCODED_METHOD, "I_ENCODED_METHOD"), root_1);
-								// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:696:60: ( reference_type_descriptor )?
+								// smaliParser.g:696:60: ( reference_type_descriptor )?
 								if ( stream_reference_type_descriptor.hasNext() ) {
 									adaptor.addChild(root_1, stream_reference_type_descriptor.nextTree());
 								}
@@ -6853,24 +6853,24 @@
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:699:5: PRIMITIVE_TYPE
+					// smaliParser.g:699:5: PRIMITIVE_TYPE
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					PRIMITIVE_TYPE173=(Token)match(input,PRIMITIVE_TYPE,FOLLOW_PRIMITIVE_TYPE_in_type_field_method_literal2959);
+					PRIMITIVE_TYPE173=(Token)match(input,PRIMITIVE_TYPE,FOLLOW_PRIMITIVE_TYPE_in_type_field_method_literal2959); 
 					PRIMITIVE_TYPE173_tree = (CommonTree)adaptor.create(PRIMITIVE_TYPE173);
 					adaptor.addChild(root_0, PRIMITIVE_TYPE173_tree);
 
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:700:5: VOID_TYPE
+					// smaliParser.g:700:5: VOID_TYPE
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					VOID_TYPE174=(Token)match(input,VOID_TYPE,FOLLOW_VOID_TYPE_in_type_field_method_literal2965);
+					VOID_TYPE174=(Token)match(input,VOID_TYPE,FOLLOW_VOID_TYPE_in_type_field_method_literal2965); 
 					VOID_TYPE174_tree = (CommonTree)adaptor.create(VOID_TYPE174);
 					adaptor.addChild(root_0, VOID_TYPE174_tree);
 
@@ -6905,7 +6905,7 @@
 
 
 	// $ANTLR start "method_reference"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:702:1: method_reference : ( reference_type_descriptor ARROW )? member_name method_prototype -> ( reference_type_descriptor )? member_name method_prototype ;
+	// smaliParser.g:702:1: method_reference : ( reference_type_descriptor ARROW )? member_name method_prototype -> ( reference_type_descriptor )? member_name method_prototype ;
 	public final smaliParser.method_reference_return method_reference() throws RecognitionException {
 		smaliParser.method_reference_return retval = new smaliParser.method_reference_return();
 		retval.start = input.LT(1);
@@ -6924,10 +6924,10 @@
 		RewriteRuleSubtreeStream stream_reference_type_descriptor=new RewriteRuleSubtreeStream(adaptor,"rule reference_type_descriptor");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:703:3: ( ( reference_type_descriptor ARROW )? member_name method_prototype -> ( reference_type_descriptor )? member_name method_prototype )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:703:5: ( reference_type_descriptor ARROW )? member_name method_prototype
+			// smaliParser.g:703:3: ( ( reference_type_descriptor ARROW )? member_name method_prototype -> ( reference_type_descriptor )? member_name method_prototype )
+			// smaliParser.g:703:5: ( reference_type_descriptor ARROW )? member_name method_prototype
 			{
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:703:5: ( reference_type_descriptor ARROW )?
+			// smaliParser.g:703:5: ( reference_type_descriptor ARROW )?
 			int alt32=2;
 			int LA32_0 = input.LA(1);
 			if ( (LA32_0==ARRAY_TYPE_PREFIX||LA32_0==CLASS_DESCRIPTOR) ) {
@@ -6935,14 +6935,14 @@
 			}
 			switch (alt32) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:703:6: reference_type_descriptor ARROW
+					// smaliParser.g:703:6: reference_type_descriptor ARROW
 					{
 					pushFollow(FOLLOW_reference_type_descriptor_in_method_reference2976);
 					reference_type_descriptor175=reference_type_descriptor();
 					state._fsp--;
 
 					stream_reference_type_descriptor.add(reference_type_descriptor175.getTree());
-					ARROW176=(Token)match(input,ARROW,FOLLOW_ARROW_in_method_reference2978);
+					ARROW176=(Token)match(input,ARROW,FOLLOW_ARROW_in_method_reference2978);  
 					stream_ARROW.add(ARROW176);
 
 					}
@@ -6961,19 +6961,19 @@
 
 			stream_method_prototype.add(method_prototype178.getTree());
 			// AST REWRITE
-			// elements: method_prototype, member_name, reference_type_descriptor
-			// token labels:
+			// elements: method_prototype, reference_type_descriptor, member_name
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 704:3: -> ( reference_type_descriptor )? member_name method_prototype
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:704:6: ( reference_type_descriptor )?
+				// smaliParser.g:704:6: ( reference_type_descriptor )?
 				if ( stream_reference_type_descriptor.hasNext() ) {
 					adaptor.addChild(root_0, stream_reference_type_descriptor.nextTree());
 				}
@@ -7015,7 +7015,7 @@
 
 
 	// $ANTLR start "field_reference"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:706:1: field_reference : ( reference_type_descriptor ARROW )? member_name COLON nonvoid_type_descriptor -> ( reference_type_descriptor )? member_name nonvoid_type_descriptor ;
+	// smaliParser.g:706:1: field_reference : ( reference_type_descriptor ARROW )? member_name COLON nonvoid_type_descriptor -> ( reference_type_descriptor )? member_name nonvoid_type_descriptor ;
 	public final smaliParser.field_reference_return field_reference() throws RecognitionException {
 		smaliParser.field_reference_return retval = new smaliParser.field_reference_return();
 		retval.start = input.LT(1);
@@ -7037,10 +7037,10 @@
 		RewriteRuleSubtreeStream stream_reference_type_descriptor=new RewriteRuleSubtreeStream(adaptor,"rule reference_type_descriptor");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:707:3: ( ( reference_type_descriptor ARROW )? member_name COLON nonvoid_type_descriptor -> ( reference_type_descriptor )? member_name nonvoid_type_descriptor )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:707:5: ( reference_type_descriptor ARROW )? member_name COLON nonvoid_type_descriptor
+			// smaliParser.g:707:3: ( ( reference_type_descriptor ARROW )? member_name COLON nonvoid_type_descriptor -> ( reference_type_descriptor )? member_name nonvoid_type_descriptor )
+			// smaliParser.g:707:5: ( reference_type_descriptor ARROW )? member_name COLON nonvoid_type_descriptor
 			{
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:707:5: ( reference_type_descriptor ARROW )?
+			// smaliParser.g:707:5: ( reference_type_descriptor ARROW )?
 			int alt33=2;
 			int LA33_0 = input.LA(1);
 			if ( (LA33_0==ARRAY_TYPE_PREFIX||LA33_0==CLASS_DESCRIPTOR) ) {
@@ -7048,14 +7048,14 @@
 			}
 			switch (alt33) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:707:6: reference_type_descriptor ARROW
+					// smaliParser.g:707:6: reference_type_descriptor ARROW
 					{
 					pushFollow(FOLLOW_reference_type_descriptor_in_field_reference3006);
 					reference_type_descriptor179=reference_type_descriptor();
 					state._fsp--;
 
 					stream_reference_type_descriptor.add(reference_type_descriptor179.getTree());
-					ARROW180=(Token)match(input,ARROW,FOLLOW_ARROW_in_field_reference3008);
+					ARROW180=(Token)match(input,ARROW,FOLLOW_ARROW_in_field_reference3008);  
 					stream_ARROW.add(ARROW180);
 
 					}
@@ -7068,7 +7068,7 @@
 			state._fsp--;
 
 			stream_member_name.add(member_name181.getTree());
-			COLON182=(Token)match(input,COLON,FOLLOW_COLON_in_field_reference3014);
+			COLON182=(Token)match(input,COLON,FOLLOW_COLON_in_field_reference3014);  
 			stream_COLON.add(COLON182);
 
 			pushFollow(FOLLOW_nonvoid_type_descriptor_in_field_reference3016);
@@ -7077,19 +7077,19 @@
 
 			stream_nonvoid_type_descriptor.add(nonvoid_type_descriptor183.getTree());
 			// AST REWRITE
-			// elements: nonvoid_type_descriptor, member_name, reference_type_descriptor
-			// token labels:
+			// elements: reference_type_descriptor, nonvoid_type_descriptor, member_name
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 708:3: -> ( reference_type_descriptor )? member_name nonvoid_type_descriptor
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:708:6: ( reference_type_descriptor )?
+				// smaliParser.g:708:6: ( reference_type_descriptor )?
 				if ( stream_reference_type_descriptor.hasNext() ) {
 					adaptor.addChild(root_0, stream_reference_type_descriptor.nextTree());
 				}
@@ -7131,7 +7131,7 @@
 
 
 	// $ANTLR start "label"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:710:1: label : COLON simple_name -> ^( I_LABEL[$COLON, \"I_LABEL\"] simple_name ) ;
+	// smaliParser.g:710:1: label : COLON simple_name -> ^( I_LABEL[$COLON, \"I_LABEL\"] simple_name ) ;
 	public final smaliParser.label_return label() throws RecognitionException {
 		smaliParser.label_return retval = new smaliParser.label_return();
 		retval.start = input.LT(1);
@@ -7146,10 +7146,10 @@
 		RewriteRuleSubtreeStream stream_simple_name=new RewriteRuleSubtreeStream(adaptor,"rule simple_name");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:711:3: ( COLON simple_name -> ^( I_LABEL[$COLON, \"I_LABEL\"] simple_name ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:711:5: COLON simple_name
+			// smaliParser.g:711:3: ( COLON simple_name -> ^( I_LABEL[$COLON, \"I_LABEL\"] simple_name ) )
+			// smaliParser.g:711:5: COLON simple_name
 			{
-			COLON184=(Token)match(input,COLON,FOLLOW_COLON_in_label3037);
+			COLON184=(Token)match(input,COLON,FOLLOW_COLON_in_label3037);  
 			stream_COLON.add(COLON184);
 
 			pushFollow(FOLLOW_simple_name_in_label3039);
@@ -7159,18 +7159,18 @@
 			stream_simple_name.add(simple_name185.getTree());
 			// AST REWRITE
 			// elements: simple_name
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 711:23: -> ^( I_LABEL[$COLON, \"I_LABEL\"] simple_name )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:711:26: ^( I_LABEL[$COLON, \"I_LABEL\"] simple_name )
+				// smaliParser.g:711:26: ^( I_LABEL[$COLON, \"I_LABEL\"] simple_name )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_LABEL, COLON184, "I_LABEL"), root_1);
@@ -7212,7 +7212,7 @@
 
 
 	// $ANTLR start "label_ref"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:713:1: label_ref : COLON simple_name -> simple_name ;
+	// smaliParser.g:713:1: label_ref : COLON simple_name -> simple_name ;
 	public final smaliParser.label_ref_return label_ref() throws RecognitionException {
 		smaliParser.label_ref_return retval = new smaliParser.label_ref_return();
 		retval.start = input.LT(1);
@@ -7227,10 +7227,10 @@
 		RewriteRuleSubtreeStream stream_simple_name=new RewriteRuleSubtreeStream(adaptor,"rule simple_name");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:714:3: ( COLON simple_name -> simple_name )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:714:5: COLON simple_name
+			// smaliParser.g:714:3: ( COLON simple_name -> simple_name )
+			// smaliParser.g:714:5: COLON simple_name
 			{
-			COLON186=(Token)match(input,COLON,FOLLOW_COLON_in_label_ref3058);
+			COLON186=(Token)match(input,COLON,FOLLOW_COLON_in_label_ref3058);  
 			stream_COLON.add(COLON186);
 
 			pushFollow(FOLLOW_simple_name_in_label_ref3060);
@@ -7240,11 +7240,11 @@
 			stream_simple_name.add(simple_name187.getTree());
 			// AST REWRITE
 			// elements: simple_name
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -7286,7 +7286,7 @@
 
 
 	// $ANTLR start "register_list"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:716:1: register_list : ( REGISTER ( COMMA REGISTER )* -> ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] ( REGISTER )* ) | -> ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] ) );
+	// smaliParser.g:716:1: register_list : ( REGISTER ( COMMA REGISTER )* -> ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] ( REGISTER )* ) | -> ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] ) );
 	public final smaliParser.register_list_return register_list() throws RecognitionException {
 		smaliParser.register_list_return retval = new smaliParser.register_list_return();
 		retval.start = input.LT(1);
@@ -7304,7 +7304,7 @@
 		RewriteRuleTokenStream stream_REGISTER=new RewriteRuleTokenStream(adaptor,"token REGISTER");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:717:3: ( REGISTER ( COMMA REGISTER )* -> ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] ( REGISTER )* ) | -> ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] ) )
+			// smaliParser.g:717:3: ( REGISTER ( COMMA REGISTER )* -> ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] ( REGISTER )* ) | -> ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] ) )
 			int alt35=2;
 			int LA35_0 = input.LA(1);
 			if ( (LA35_0==REGISTER) ) {
@@ -7322,12 +7322,12 @@
 
 			switch (alt35) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:717:5: REGISTER ( COMMA REGISTER )*
+					// smaliParser.g:717:5: REGISTER ( COMMA REGISTER )*
 					{
-					REGISTER188=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_register_list3074);
+					REGISTER188=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_register_list3074);  
 					stream_REGISTER.add(REGISTER188);
 
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:717:14: ( COMMA REGISTER )*
+					// smaliParser.g:717:14: ( COMMA REGISTER )*
 					loop34:
 					while (true) {
 						int alt34=2;
@@ -7338,12 +7338,12 @@
 
 						switch (alt34) {
 						case 1 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:717:15: COMMA REGISTER
+							// smaliParser.g:717:15: COMMA REGISTER
 							{
-							COMMA189=(Token)match(input,COMMA,FOLLOW_COMMA_in_register_list3077);
+							COMMA189=(Token)match(input,COMMA,FOLLOW_COMMA_in_register_list3077);  
 							stream_COMMA.add(COMMA189);
 
-							REGISTER190=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_register_list3079);
+							REGISTER190=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_register_list3079);  
 							stream_REGISTER.add(REGISTER190);
 
 							}
@@ -7356,22 +7356,22 @@
 
 					// AST REWRITE
 					// elements: REGISTER
-					// token labels:
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 					root_0 = (CommonTree)adaptor.nil();
 					// 717:32: -> ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] ( REGISTER )* )
 					{
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:717:35: ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] ( REGISTER )* )
+						// smaliParser.g:717:35: ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] ( REGISTER )* )
 						{
 						CommonTree root_1 = (CommonTree)adaptor.nil();
 						root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_REGISTER_LIST, (retval.start), "I_REGISTER_LIST"), root_1);
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:717:80: ( REGISTER )*
+						// smaliParser.g:717:80: ( REGISTER )*
 						while ( stream_REGISTER.hasNext() ) {
 							adaptor.addChild(root_1, stream_REGISTER.nextNode());
 						}
@@ -7388,22 +7388,22 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:718:5:
+					// smaliParser.g:718:5: 
 					{
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 					root_0 = (CommonTree)adaptor.nil();
 					// 718:5: -> ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] )
 					{
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:718:7: ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] )
+						// smaliParser.g:718:7: ^( I_REGISTER_LIST[$start, \"I_REGISTER_LIST\"] )
 						{
 						CommonTree root_1 = (CommonTree)adaptor.nil();
 						root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_REGISTER_LIST, (retval.start), "I_REGISTER_LIST"), root_1);
@@ -7446,7 +7446,7 @@
 
 
 	// $ANTLR start "register_range"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:720:1: register_range : (startreg= REGISTER ( DOTDOT endreg= REGISTER )? )? -> ^( I_REGISTER_RANGE[$start, \"I_REGISTER_RANGE\"] ( $startreg)? ( $endreg)? ) ;
+	// smaliParser.g:720:1: register_range : (startreg= REGISTER ( DOTDOT endreg= REGISTER )? )? -> ^( I_REGISTER_RANGE[$start, \"I_REGISTER_RANGE\"] ( $startreg)? ( $endreg)? ) ;
 	public final smaliParser.register_range_return register_range() throws RecognitionException {
 		smaliParser.register_range_return retval = new smaliParser.register_range_return();
 		retval.start = input.LT(1);
@@ -7464,10 +7464,10 @@
 		RewriteRuleTokenStream stream_DOTDOT=new RewriteRuleTokenStream(adaptor,"token DOTDOT");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:721:3: ( (startreg= REGISTER ( DOTDOT endreg= REGISTER )? )? -> ^( I_REGISTER_RANGE[$start, \"I_REGISTER_RANGE\"] ( $startreg)? ( $endreg)? ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:721:5: (startreg= REGISTER ( DOTDOT endreg= REGISTER )? )?
+			// smaliParser.g:721:3: ( (startreg= REGISTER ( DOTDOT endreg= REGISTER )? )? -> ^( I_REGISTER_RANGE[$start, \"I_REGISTER_RANGE\"] ( $startreg)? ( $endreg)? ) )
+			// smaliParser.g:721:5: (startreg= REGISTER ( DOTDOT endreg= REGISTER )? )?
 			{
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:721:5: (startreg= REGISTER ( DOTDOT endreg= REGISTER )? )?
+			// smaliParser.g:721:5: (startreg= REGISTER ( DOTDOT endreg= REGISTER )? )?
 			int alt37=2;
 			int LA37_0 = input.LA(1);
 			if ( (LA37_0==REGISTER) ) {
@@ -7475,12 +7475,12 @@
 			}
 			switch (alt37) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:721:6: startreg= REGISTER ( DOTDOT endreg= REGISTER )?
+					// smaliParser.g:721:6: startreg= REGISTER ( DOTDOT endreg= REGISTER )?
 					{
-					startreg=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_register_range3114);
+					startreg=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_register_range3114);  
 					stream_REGISTER.add(startreg);
 
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:721:24: ( DOTDOT endreg= REGISTER )?
+					// smaliParser.g:721:24: ( DOTDOT endreg= REGISTER )?
 					int alt36=2;
 					int LA36_0 = input.LA(1);
 					if ( (LA36_0==DOTDOT) ) {
@@ -7488,12 +7488,12 @@
 					}
 					switch (alt36) {
 						case 1 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:721:25: DOTDOT endreg= REGISTER
+							// smaliParser.g:721:25: DOTDOT endreg= REGISTER
 							{
-							DOTDOT191=(Token)match(input,DOTDOT,FOLLOW_DOTDOT_in_register_range3117);
+							DOTDOT191=(Token)match(input,DOTDOT,FOLLOW_DOTDOT_in_register_range3117);  
 							stream_DOTDOT.add(DOTDOT191);
 
-							endreg=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_register_range3121);
+							endreg=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_register_range3121);  
 							stream_REGISTER.add(endreg);
 
 							}
@@ -7507,31 +7507,31 @@
 			}
 
 			// AST REWRITE
-			// elements: endreg, startreg
-			// token labels: endreg, startreg
+			// elements: startreg, endreg
+			// token labels: startreg, endreg
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
-			RewriteRuleTokenStream stream_endreg=new RewriteRuleTokenStream(adaptor,"token endreg",endreg);
 			RewriteRuleTokenStream stream_startreg=new RewriteRuleTokenStream(adaptor,"token startreg",startreg);
+			RewriteRuleTokenStream stream_endreg=new RewriteRuleTokenStream(adaptor,"token endreg",endreg);
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 721:52: -> ^( I_REGISTER_RANGE[$start, \"I_REGISTER_RANGE\"] ( $startreg)? ( $endreg)? )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:721:55: ^( I_REGISTER_RANGE[$start, \"I_REGISTER_RANGE\"] ( $startreg)? ( $endreg)? )
+				// smaliParser.g:721:55: ^( I_REGISTER_RANGE[$start, \"I_REGISTER_RANGE\"] ( $startreg)? ( $endreg)? )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_REGISTER_RANGE, (retval.start), "I_REGISTER_RANGE"), root_1);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:721:103: ( $startreg)?
+				// smaliParser.g:721:103: ( $startreg)?
 				if ( stream_startreg.hasNext() ) {
 					adaptor.addChild(root_1, stream_startreg.nextNode());
 				}
 				stream_startreg.reset();
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:721:114: ( $endreg)?
+				// smaliParser.g:721:114: ( $endreg)?
 				if ( stream_endreg.hasNext() ) {
 					adaptor.addChild(root_1, stream_endreg.nextNode());
 				}
@@ -7574,7 +7574,7 @@
 
 
 	// $ANTLR start "verification_error_reference"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:723:1: verification_error_reference : ( CLASS_DESCRIPTOR | field_reference | method_reference );
+	// smaliParser.g:723:1: verification_error_reference : ( CLASS_DESCRIPTOR | field_reference | method_reference );
 	public final smaliParser.verification_error_reference_return verification_error_reference() throws RecognitionException {
 		smaliParser.verification_error_reference_return retval = new smaliParser.verification_error_reference_return();
 		retval.start = input.LT(1);
@@ -7588,24 +7588,24 @@
 		CommonTree CLASS_DESCRIPTOR192_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:724:3: ( CLASS_DESCRIPTOR | field_reference | method_reference )
+			// smaliParser.g:724:3: ( CLASS_DESCRIPTOR | field_reference | method_reference )
 			int alt38=3;
 			alt38 = dfa38.predict(input);
 			switch (alt38) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:724:5: CLASS_DESCRIPTOR
+					// smaliParser.g:724:5: CLASS_DESCRIPTOR
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					CLASS_DESCRIPTOR192=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_verification_error_reference3150);
+					CLASS_DESCRIPTOR192=(Token)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_verification_error_reference3150); 
 					CLASS_DESCRIPTOR192_tree = (CommonTree)adaptor.create(CLASS_DESCRIPTOR192);
 					adaptor.addChild(root_0, CLASS_DESCRIPTOR192_tree);
 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:724:24: field_reference
+					// smaliParser.g:724:24: field_reference
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -7619,7 +7619,7 @@
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:724:42: method_reference
+					// smaliParser.g:724:42: method_reference
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -7661,7 +7661,7 @@
 
 
 	// $ANTLR start "catch_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:726:1: catch_directive : CATCH_DIRECTIVE nonvoid_type_descriptor OPEN_BRACE from= label_ref DOTDOT to= label_ref CLOSE_BRACE using= label_ref -> ^( I_CATCH[$start, \"I_CATCH\"] nonvoid_type_descriptor $from $to $using) ;
+	// smaliParser.g:726:1: catch_directive : CATCH_DIRECTIVE nonvoid_type_descriptor OPEN_BRACE from= label_ref DOTDOT to= label_ref CLOSE_BRACE using= label_ref -> ^( I_CATCH[$start, \"I_CATCH\"] nonvoid_type_descriptor $from $to $using) ;
 	public final smaliParser.catch_directive_return catch_directive() throws RecognitionException {
 		smaliParser.catch_directive_return retval = new smaliParser.catch_directive_return();
 		retval.start = input.LT(1);
@@ -7689,10 +7689,10 @@
 		RewriteRuleSubtreeStream stream_nonvoid_type_descriptor=new RewriteRuleSubtreeStream(adaptor,"rule nonvoid_type_descriptor");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:727:3: ( CATCH_DIRECTIVE nonvoid_type_descriptor OPEN_BRACE from= label_ref DOTDOT to= label_ref CLOSE_BRACE using= label_ref -> ^( I_CATCH[$start, \"I_CATCH\"] nonvoid_type_descriptor $from $to $using) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:727:5: CATCH_DIRECTIVE nonvoid_type_descriptor OPEN_BRACE from= label_ref DOTDOT to= label_ref CLOSE_BRACE using= label_ref
+			// smaliParser.g:727:3: ( CATCH_DIRECTIVE nonvoid_type_descriptor OPEN_BRACE from= label_ref DOTDOT to= label_ref CLOSE_BRACE using= label_ref -> ^( I_CATCH[$start, \"I_CATCH\"] nonvoid_type_descriptor $from $to $using) )
+			// smaliParser.g:727:5: CATCH_DIRECTIVE nonvoid_type_descriptor OPEN_BRACE from= label_ref DOTDOT to= label_ref CLOSE_BRACE using= label_ref
 			{
-			CATCH_DIRECTIVE195=(Token)match(input,CATCH_DIRECTIVE,FOLLOW_CATCH_DIRECTIVE_in_catch_directive3168);
+			CATCH_DIRECTIVE195=(Token)match(input,CATCH_DIRECTIVE,FOLLOW_CATCH_DIRECTIVE_in_catch_directive3168);  
 			stream_CATCH_DIRECTIVE.add(CATCH_DIRECTIVE195);
 
 			pushFollow(FOLLOW_nonvoid_type_descriptor_in_catch_directive3170);
@@ -7700,7 +7700,7 @@
 			state._fsp--;
 
 			stream_nonvoid_type_descriptor.add(nonvoid_type_descriptor196.getTree());
-			OPEN_BRACE197=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_catch_directive3172);
+			OPEN_BRACE197=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_catch_directive3172);  
 			stream_OPEN_BRACE.add(OPEN_BRACE197);
 
 			pushFollow(FOLLOW_label_ref_in_catch_directive3176);
@@ -7708,7 +7708,7 @@
 			state._fsp--;
 
 			stream_label_ref.add(from.getTree());
-			DOTDOT198=(Token)match(input,DOTDOT,FOLLOW_DOTDOT_in_catch_directive3178);
+			DOTDOT198=(Token)match(input,DOTDOT,FOLLOW_DOTDOT_in_catch_directive3178);  
 			stream_DOTDOT.add(DOTDOT198);
 
 			pushFollow(FOLLOW_label_ref_in_catch_directive3182);
@@ -7716,7 +7716,7 @@
 			state._fsp--;
 
 			stream_label_ref.add(to.getTree());
-			CLOSE_BRACE199=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_catch_directive3184);
+			CLOSE_BRACE199=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_catch_directive3184);  
 			stream_CLOSE_BRACE.add(CLOSE_BRACE199);
 
 			pushFollow(FOLLOW_label_ref_in_catch_directive3188);
@@ -7725,12 +7725,12 @@
 
 			stream_label_ref.add(using.getTree());
 			// AST REWRITE
-			// elements: using, to, from, nonvoid_type_descriptor
-			// token labels:
+			// elements: from, nonvoid_type_descriptor, using, to
+			// token labels: 
 			// rule labels: using, from, to, retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_using=new RewriteRuleSubtreeStream(adaptor,"rule using",using!=null?using.getTree():null);
 			RewriteRuleSubtreeStream stream_from=new RewriteRuleSubtreeStream(adaptor,"rule from",from!=null?from.getTree():null);
@@ -7740,7 +7740,7 @@
 			root_0 = (CommonTree)adaptor.nil();
 			// 728:5: -> ^( I_CATCH[$start, \"I_CATCH\"] nonvoid_type_descriptor $from $to $using)
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:728:8: ^( I_CATCH[$start, \"I_CATCH\"] nonvoid_type_descriptor $from $to $using)
+				// smaliParser.g:728:8: ^( I_CATCH[$start, \"I_CATCH\"] nonvoid_type_descriptor $from $to $using)
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_CATCH, (retval.start), "I_CATCH"), root_1);
@@ -7785,7 +7785,7 @@
 
 
 	// $ANTLR start "catchall_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:730:1: catchall_directive : CATCHALL_DIRECTIVE OPEN_BRACE from= label_ref DOTDOT to= label_ref CLOSE_BRACE using= label_ref -> ^( I_CATCHALL[$start, \"I_CATCHALL\"] $from $to $using) ;
+	// smaliParser.g:730:1: catchall_directive : CATCHALL_DIRECTIVE OPEN_BRACE from= label_ref DOTDOT to= label_ref CLOSE_BRACE using= label_ref -> ^( I_CATCHALL[$start, \"I_CATCHALL\"] $from $to $using) ;
 	public final smaliParser.catchall_directive_return catchall_directive() throws RecognitionException {
 		smaliParser.catchall_directive_return retval = new smaliParser.catchall_directive_return();
 		retval.start = input.LT(1);
@@ -7811,13 +7811,13 @@
 		RewriteRuleSubtreeStream stream_label_ref=new RewriteRuleSubtreeStream(adaptor,"rule label_ref");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:731:3: ( CATCHALL_DIRECTIVE OPEN_BRACE from= label_ref DOTDOT to= label_ref CLOSE_BRACE using= label_ref -> ^( I_CATCHALL[$start, \"I_CATCHALL\"] $from $to $using) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:731:5: CATCHALL_DIRECTIVE OPEN_BRACE from= label_ref DOTDOT to= label_ref CLOSE_BRACE using= label_ref
+			// smaliParser.g:731:3: ( CATCHALL_DIRECTIVE OPEN_BRACE from= label_ref DOTDOT to= label_ref CLOSE_BRACE using= label_ref -> ^( I_CATCHALL[$start, \"I_CATCHALL\"] $from $to $using) )
+			// smaliParser.g:731:5: CATCHALL_DIRECTIVE OPEN_BRACE from= label_ref DOTDOT to= label_ref CLOSE_BRACE using= label_ref
 			{
-			CATCHALL_DIRECTIVE200=(Token)match(input,CATCHALL_DIRECTIVE,FOLLOW_CATCHALL_DIRECTIVE_in_catchall_directive3220);
+			CATCHALL_DIRECTIVE200=(Token)match(input,CATCHALL_DIRECTIVE,FOLLOW_CATCHALL_DIRECTIVE_in_catchall_directive3220);  
 			stream_CATCHALL_DIRECTIVE.add(CATCHALL_DIRECTIVE200);
 
-			OPEN_BRACE201=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_catchall_directive3222);
+			OPEN_BRACE201=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_catchall_directive3222);  
 			stream_OPEN_BRACE.add(OPEN_BRACE201);
 
 			pushFollow(FOLLOW_label_ref_in_catchall_directive3226);
@@ -7825,7 +7825,7 @@
 			state._fsp--;
 
 			stream_label_ref.add(from.getTree());
-			DOTDOT202=(Token)match(input,DOTDOT,FOLLOW_DOTDOT_in_catchall_directive3228);
+			DOTDOT202=(Token)match(input,DOTDOT,FOLLOW_DOTDOT_in_catchall_directive3228);  
 			stream_DOTDOT.add(DOTDOT202);
 
 			pushFollow(FOLLOW_label_ref_in_catchall_directive3232);
@@ -7833,7 +7833,7 @@
 			state._fsp--;
 
 			stream_label_ref.add(to.getTree());
-			CLOSE_BRACE203=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_catchall_directive3234);
+			CLOSE_BRACE203=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_catchall_directive3234);  
 			stream_CLOSE_BRACE.add(CLOSE_BRACE203);
 
 			pushFollow(FOLLOW_label_ref_in_catchall_directive3238);
@@ -7842,12 +7842,12 @@
 
 			stream_label_ref.add(using.getTree());
 			// AST REWRITE
-			// elements: using, from, to
-			// token labels:
+			// elements: using, to, from
+			// token labels: 
 			// rule labels: using, from, to, retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_using=new RewriteRuleSubtreeStream(adaptor,"rule using",using!=null?using.getTree():null);
 			RewriteRuleSubtreeStream stream_from=new RewriteRuleSubtreeStream(adaptor,"rule from",from!=null?from.getTree():null);
@@ -7857,7 +7857,7 @@
 			root_0 = (CommonTree)adaptor.nil();
 			// 732:5: -> ^( I_CATCHALL[$start, \"I_CATCHALL\"] $from $to $using)
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:732:8: ^( I_CATCHALL[$start, \"I_CATCHALL\"] $from $to $using)
+				// smaliParser.g:732:8: ^( I_CATCHALL[$start, \"I_CATCHALL\"] $from $to $using)
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_CATCHALL, (retval.start), "I_CATCHALL"), root_1);
@@ -7901,7 +7901,7 @@
 
 
 	// $ANTLR start "parameter_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:738:1: parameter_directive : PARAMETER_DIRECTIVE REGISTER ( COMMA STRING_LITERAL )? ({...}? annotation )* ( END_PARAMETER_DIRECTIVE -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ) ) ) ;
+	// smaliParser.g:738:1: parameter_directive : PARAMETER_DIRECTIVE REGISTER ( COMMA STRING_LITERAL )? ({...}? annotation )* ( END_PARAMETER_DIRECTIVE -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ) ) ) ;
 	public final smaliParser.parameter_directive_return parameter_directive() throws RecognitionException {
 		smaliParser.parameter_directive_return retval = new smaliParser.parameter_directive_return();
 		retval.start = input.LT(1);
@@ -7929,16 +7929,16 @@
 
 		List<CommonTree> annotations = new ArrayList<CommonTree>();
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:740:3: ( PARAMETER_DIRECTIVE REGISTER ( COMMA STRING_LITERAL )? ({...}? annotation )* ( END_PARAMETER_DIRECTIVE -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ) ) ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:740:5: PARAMETER_DIRECTIVE REGISTER ( COMMA STRING_LITERAL )? ({...}? annotation )* ( END_PARAMETER_DIRECTIVE -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ) ) )
+			// smaliParser.g:740:3: ( PARAMETER_DIRECTIVE REGISTER ( COMMA STRING_LITERAL )? ({...}? annotation )* ( END_PARAMETER_DIRECTIVE -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ) ) ) )
+			// smaliParser.g:740:5: PARAMETER_DIRECTIVE REGISTER ( COMMA STRING_LITERAL )? ({...}? annotation )* ( END_PARAMETER_DIRECTIVE -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ) ) )
 			{
-			PARAMETER_DIRECTIVE204=(Token)match(input,PARAMETER_DIRECTIVE,FOLLOW_PARAMETER_DIRECTIVE_in_parameter_directive3277);
+			PARAMETER_DIRECTIVE204=(Token)match(input,PARAMETER_DIRECTIVE,FOLLOW_PARAMETER_DIRECTIVE_in_parameter_directive3277);  
 			stream_PARAMETER_DIRECTIVE.add(PARAMETER_DIRECTIVE204);
 
-			REGISTER205=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_parameter_directive3279);
+			REGISTER205=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_parameter_directive3279);  
 			stream_REGISTER.add(REGISTER205);
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:740:34: ( COMMA STRING_LITERAL )?
+			// smaliParser.g:740:34: ( COMMA STRING_LITERAL )?
 			int alt39=2;
 			int LA39_0 = input.LA(1);
 			if ( (LA39_0==COMMA) ) {
@@ -7946,12 +7946,12 @@
 			}
 			switch (alt39) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:740:35: COMMA STRING_LITERAL
+					// smaliParser.g:740:35: COMMA STRING_LITERAL
 					{
-					COMMA206=(Token)match(input,COMMA,FOLLOW_COMMA_in_parameter_directive3282);
+					COMMA206=(Token)match(input,COMMA,FOLLOW_COMMA_in_parameter_directive3282);  
 					stream_COMMA.add(COMMA206);
 
-					STRING_LITERAL207=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_parameter_directive3284);
+					STRING_LITERAL207=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_parameter_directive3284);  
 					stream_STRING_LITERAL.add(STRING_LITERAL207);
 
 					}
@@ -7959,14 +7959,14 @@
 
 			}
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:741:5: ({...}? annotation )*
+			// smaliParser.g:741:5: ({...}? annotation )*
 			loop40:
 			while (true) {
 				int alt40=2;
 				alt40 = dfa40.predict(input);
 				switch (alt40) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:741:6: {...}? annotation
+					// smaliParser.g:741:6: {...}? annotation
 					{
 					if ( !((input.LA(1) == ANNOTATION_DIRECTIVE)) ) {
 						throw new FailedPredicateException(input, "parameter_directive", "input.LA(1) == ANNOTATION_DIRECTIVE");
@@ -7985,7 +7985,7 @@
 				}
 			}
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:743:5: ( END_PARAMETER_DIRECTIVE -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ) ) )
+			// smaliParser.g:743:5: ( END_PARAMETER_DIRECTIVE -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ( annotation )* ) ) | -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ) ) )
 			int alt41=2;
 			int LA41_0 = input.LA(1);
 			if ( (LA41_0==END_PARAMETER_DIRECTIVE) ) {
@@ -8003,40 +8003,40 @@
 
 			switch (alt41) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:743:7: END_PARAMETER_DIRECTIVE
+					// smaliParser.g:743:7: END_PARAMETER_DIRECTIVE
 					{
-					END_PARAMETER_DIRECTIVE209=(Token)match(input,END_PARAMETER_DIRECTIVE,FOLLOW_END_PARAMETER_DIRECTIVE_in_parameter_directive3308);
+					END_PARAMETER_DIRECTIVE209=(Token)match(input,END_PARAMETER_DIRECTIVE,FOLLOW_END_PARAMETER_DIRECTIVE_in_parameter_directive3308);  
 					stream_END_PARAMETER_DIRECTIVE.add(END_PARAMETER_DIRECTIVE209);
 
 					// AST REWRITE
-					// elements: REGISTER, STRING_LITERAL, annotation
-					// token labels:
+					// elements: STRING_LITERAL, annotation, REGISTER
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 					root_0 = (CommonTree)adaptor.nil();
 					// 744:7: -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ( annotation )* ) )
 					{
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:744:10: ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ( annotation )* ) )
+						// smaliParser.g:744:10: ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ( annotation )* ) )
 						{
 						CommonTree root_1 = (CommonTree)adaptor.nil();
 						root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_PARAMETER, (retval.start), "I_PARAMETER"), root_1);
 						adaptor.addChild(root_1, stream_REGISTER.nextNode());
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:744:56: ( STRING_LITERAL )?
+						// smaliParser.g:744:56: ( STRING_LITERAL )?
 						if ( stream_STRING_LITERAL.hasNext() ) {
 							adaptor.addChild(root_1, stream_STRING_LITERAL.nextNode());
 						}
 						stream_STRING_LITERAL.reset();
 
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:744:72: ^( I_ANNOTATIONS ( annotation )* )
+						// smaliParser.g:744:72: ^( I_ANNOTATIONS ( annotation )* )
 						{
 						CommonTree root_2 = (CommonTree)adaptor.nil();
 						root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ANNOTATIONS, "I_ANNOTATIONS"), root_2);
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:744:88: ( annotation )*
+						// smaliParser.g:744:88: ( annotation )*
 						while ( stream_annotation.hasNext() ) {
 							adaptor.addChild(root_2, stream_annotation.nextTree());
 						}
@@ -8056,34 +8056,34 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:745:19:
+					// smaliParser.g:745:19: 
 					{
 					statements_and_directives_stack.peek().methodAnnotations.addAll(annotations);
 					// AST REWRITE
 					// elements: STRING_LITERAL, REGISTER
-					// token labels:
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 					root_0 = (CommonTree)adaptor.nil();
 					// 746:7: -> ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ) )
 					{
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:746:10: ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ) )
+						// smaliParser.g:746:10: ^( I_PARAMETER[$start, \"I_PARAMETER\"] REGISTER ( STRING_LITERAL )? ^( I_ANNOTATIONS ) )
 						{
 						CommonTree root_1 = (CommonTree)adaptor.nil();
 						root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_PARAMETER, (retval.start), "I_PARAMETER"), root_1);
 						adaptor.addChild(root_1, stream_REGISTER.nextNode());
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:746:56: ( STRING_LITERAL )?
+						// smaliParser.g:746:56: ( STRING_LITERAL )?
 						if ( stream_STRING_LITERAL.hasNext() ) {
 							adaptor.addChild(root_1, stream_STRING_LITERAL.nextNode());
 						}
 						stream_STRING_LITERAL.reset();
 
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:746:72: ^( I_ANNOTATIONS )
+						// smaliParser.g:746:72: ^( I_ANNOTATIONS )
 						{
 						CommonTree root_2 = (CommonTree)adaptor.nil();
 						root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ANNOTATIONS, "I_ANNOTATIONS"), root_2);
@@ -8132,7 +8132,7 @@
 
 
 	// $ANTLR start "debug_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:749:1: debug_directive : ( line_directive | local_directive | end_local_directive | restart_local_directive | prologue_directive | epilogue_directive | source_directive );
+	// smaliParser.g:749:1: debug_directive : ( line_directive | local_directive | end_local_directive | restart_local_directive | prologue_directive | epilogue_directive | source_directive );
 	public final smaliParser.debug_directive_return debug_directive() throws RecognitionException {
 		smaliParser.debug_directive_return retval = new smaliParser.debug_directive_return();
 		retval.start = input.LT(1);
@@ -8149,7 +8149,7 @@
 
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:750:3: ( line_directive | local_directive | end_local_directive | restart_local_directive | prologue_directive | epilogue_directive | source_directive )
+			// smaliParser.g:750:3: ( line_directive | local_directive | end_local_directive | restart_local_directive | prologue_directive | epilogue_directive | source_directive )
 			int alt42=7;
 			switch ( input.LA(1) ) {
 			case LINE_DIRECTIVE:
@@ -8194,7 +8194,7 @@
 			}
 			switch (alt42) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:750:5: line_directive
+					// smaliParser.g:750:5: line_directive
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -8208,7 +8208,7 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:751:5: local_directive
+					// smaliParser.g:751:5: local_directive
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -8222,7 +8222,7 @@
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:752:5: end_local_directive
+					// smaliParser.g:752:5: end_local_directive
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -8236,7 +8236,7 @@
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:753:5: restart_local_directive
+					// smaliParser.g:753:5: restart_local_directive
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -8250,7 +8250,7 @@
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:754:5: prologue_directive
+					// smaliParser.g:754:5: prologue_directive
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -8264,7 +8264,7 @@
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:755:5: epilogue_directive
+					// smaliParser.g:755:5: epilogue_directive
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -8278,7 +8278,7 @@
 					}
 					break;
 				case 7 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:756:5: source_directive
+					// smaliParser.g:756:5: source_directive
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -8320,7 +8320,7 @@
 
 
 	// $ANTLR start "line_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:758:1: line_directive : LINE_DIRECTIVE integral_literal -> ^( I_LINE[$start, \"I_LINE\"] integral_literal ) ;
+	// smaliParser.g:758:1: line_directive : LINE_DIRECTIVE integral_literal -> ^( I_LINE[$start, \"I_LINE\"] integral_literal ) ;
 	public final smaliParser.line_directive_return line_directive() throws RecognitionException {
 		smaliParser.line_directive_return retval = new smaliParser.line_directive_return();
 		retval.start = input.LT(1);
@@ -8335,10 +8335,10 @@
 		RewriteRuleSubtreeStream stream_integral_literal=new RewriteRuleSubtreeStream(adaptor,"rule integral_literal");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:759:3: ( LINE_DIRECTIVE integral_literal -> ^( I_LINE[$start, \"I_LINE\"] integral_literal ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:759:5: LINE_DIRECTIVE integral_literal
+			// smaliParser.g:759:3: ( LINE_DIRECTIVE integral_literal -> ^( I_LINE[$start, \"I_LINE\"] integral_literal ) )
+			// smaliParser.g:759:5: LINE_DIRECTIVE integral_literal
 			{
-			LINE_DIRECTIVE217=(Token)match(input,LINE_DIRECTIVE,FOLLOW_LINE_DIRECTIVE_in_line_directive3427);
+			LINE_DIRECTIVE217=(Token)match(input,LINE_DIRECTIVE,FOLLOW_LINE_DIRECTIVE_in_line_directive3427);  
 			stream_LINE_DIRECTIVE.add(LINE_DIRECTIVE217);
 
 			pushFollow(FOLLOW_integral_literal_in_line_directive3429);
@@ -8348,18 +8348,18 @@
 			stream_integral_literal.add(integral_literal218.getTree());
 			// AST REWRITE
 			// elements: integral_literal
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 760:5: -> ^( I_LINE[$start, \"I_LINE\"] integral_literal )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:760:8: ^( I_LINE[$start, \"I_LINE\"] integral_literal )
+				// smaliParser.g:760:8: ^( I_LINE[$start, \"I_LINE\"] integral_literal )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_LINE, (retval.start), "I_LINE"), root_1);
@@ -8401,7 +8401,7 @@
 
 
 	// $ANTLR start "local_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:762:1: local_directive : LOCAL_DIRECTIVE REGISTER ( COMMA ( NULL_LITERAL |name= STRING_LITERAL ) COLON ( VOID_TYPE | nonvoid_type_descriptor ) ( COMMA signature= STRING_LITERAL )? )? -> ^( I_LOCAL[$start, \"I_LOCAL\"] REGISTER ( NULL_LITERAL )? ( $name)? ( nonvoid_type_descriptor )? ( $signature)? ) ;
+	// smaliParser.g:762:1: local_directive : LOCAL_DIRECTIVE REGISTER ( COMMA ( NULL_LITERAL |name= STRING_LITERAL ) COLON ( VOID_TYPE | nonvoid_type_descriptor ) ( COMMA signature= STRING_LITERAL )? )? -> ^( I_LOCAL[$start, \"I_LOCAL\"] REGISTER ( NULL_LITERAL )? ( $name)? ( nonvoid_type_descriptor )? ( $signature)? ) ;
 	public final smaliParser.local_directive_return local_directive() throws RecognitionException {
 		smaliParser.local_directive_return retval = new smaliParser.local_directive_return();
 		retval.start = input.LT(1);
@@ -8438,16 +8438,16 @@
 		RewriteRuleSubtreeStream stream_nonvoid_type_descriptor=new RewriteRuleSubtreeStream(adaptor,"rule nonvoid_type_descriptor");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:763:3: ( LOCAL_DIRECTIVE REGISTER ( COMMA ( NULL_LITERAL |name= STRING_LITERAL ) COLON ( VOID_TYPE | nonvoid_type_descriptor ) ( COMMA signature= STRING_LITERAL )? )? -> ^( I_LOCAL[$start, \"I_LOCAL\"] REGISTER ( NULL_LITERAL )? ( $name)? ( nonvoid_type_descriptor )? ( $signature)? ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:763:5: LOCAL_DIRECTIVE REGISTER ( COMMA ( NULL_LITERAL |name= STRING_LITERAL ) COLON ( VOID_TYPE | nonvoid_type_descriptor ) ( COMMA signature= STRING_LITERAL )? )?
+			// smaliParser.g:763:3: ( LOCAL_DIRECTIVE REGISTER ( COMMA ( NULL_LITERAL |name= STRING_LITERAL ) COLON ( VOID_TYPE | nonvoid_type_descriptor ) ( COMMA signature= STRING_LITERAL )? )? -> ^( I_LOCAL[$start, \"I_LOCAL\"] REGISTER ( NULL_LITERAL )? ( $name)? ( nonvoid_type_descriptor )? ( $signature)? ) )
+			// smaliParser.g:763:5: LOCAL_DIRECTIVE REGISTER ( COMMA ( NULL_LITERAL |name= STRING_LITERAL ) COLON ( VOID_TYPE | nonvoid_type_descriptor ) ( COMMA signature= STRING_LITERAL )? )?
 			{
-			LOCAL_DIRECTIVE219=(Token)match(input,LOCAL_DIRECTIVE,FOLLOW_LOCAL_DIRECTIVE_in_local_directive3452);
+			LOCAL_DIRECTIVE219=(Token)match(input,LOCAL_DIRECTIVE,FOLLOW_LOCAL_DIRECTIVE_in_local_directive3452);  
 			stream_LOCAL_DIRECTIVE.add(LOCAL_DIRECTIVE219);
 
-			REGISTER220=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_local_directive3454);
+			REGISTER220=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_local_directive3454);  
 			stream_REGISTER.add(REGISTER220);
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:763:30: ( COMMA ( NULL_LITERAL |name= STRING_LITERAL ) COLON ( VOID_TYPE | nonvoid_type_descriptor ) ( COMMA signature= STRING_LITERAL )? )?
+			// smaliParser.g:763:30: ( COMMA ( NULL_LITERAL |name= STRING_LITERAL ) COLON ( VOID_TYPE | nonvoid_type_descriptor ) ( COMMA signature= STRING_LITERAL )? )?
 			int alt46=2;
 			int LA46_0 = input.LA(1);
 			if ( (LA46_0==COMMA) ) {
@@ -8455,12 +8455,12 @@
 			}
 			switch (alt46) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:763:31: COMMA ( NULL_LITERAL |name= STRING_LITERAL ) COLON ( VOID_TYPE | nonvoid_type_descriptor ) ( COMMA signature= STRING_LITERAL )?
+					// smaliParser.g:763:31: COMMA ( NULL_LITERAL |name= STRING_LITERAL ) COLON ( VOID_TYPE | nonvoid_type_descriptor ) ( COMMA signature= STRING_LITERAL )?
 					{
-					COMMA221=(Token)match(input,COMMA,FOLLOW_COMMA_in_local_directive3457);
+					COMMA221=(Token)match(input,COMMA,FOLLOW_COMMA_in_local_directive3457);  
 					stream_COMMA.add(COMMA221);
 
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:763:37: ( NULL_LITERAL |name= STRING_LITERAL )
+					// smaliParser.g:763:37: ( NULL_LITERAL |name= STRING_LITERAL )
 					int alt43=2;
 					int LA43_0 = input.LA(1);
 					if ( (LA43_0==NULL_LITERAL) ) {
@@ -8478,17 +8478,17 @@
 
 					switch (alt43) {
 						case 1 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:763:38: NULL_LITERAL
+							// smaliParser.g:763:38: NULL_LITERAL
 							{
-							NULL_LITERAL222=(Token)match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_local_directive3460);
+							NULL_LITERAL222=(Token)match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_local_directive3460);  
 							stream_NULL_LITERAL.add(NULL_LITERAL222);
 
 							}
 							break;
 						case 2 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:763:53: name= STRING_LITERAL
+							// smaliParser.g:763:53: name= STRING_LITERAL
 							{
-							name=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_local_directive3466);
+							name=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_local_directive3466);  
 							stream_STRING_LITERAL.add(name);
 
 							}
@@ -8496,10 +8496,10 @@
 
 					}
 
-					COLON223=(Token)match(input,COLON,FOLLOW_COLON_in_local_directive3469);
+					COLON223=(Token)match(input,COLON,FOLLOW_COLON_in_local_directive3469);  
 					stream_COLON.add(COLON223);
 
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:763:80: ( VOID_TYPE | nonvoid_type_descriptor )
+					// smaliParser.g:763:80: ( VOID_TYPE | nonvoid_type_descriptor )
 					int alt44=2;
 					int LA44_0 = input.LA(1);
 					if ( (LA44_0==VOID_TYPE) ) {
@@ -8517,15 +8517,15 @@
 
 					switch (alt44) {
 						case 1 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:763:81: VOID_TYPE
+							// smaliParser.g:763:81: VOID_TYPE
 							{
-							VOID_TYPE224=(Token)match(input,VOID_TYPE,FOLLOW_VOID_TYPE_in_local_directive3472);
+							VOID_TYPE224=(Token)match(input,VOID_TYPE,FOLLOW_VOID_TYPE_in_local_directive3472);  
 							stream_VOID_TYPE.add(VOID_TYPE224);
 
 							}
 							break;
 						case 2 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:763:93: nonvoid_type_descriptor
+							// smaliParser.g:763:93: nonvoid_type_descriptor
 							{
 							pushFollow(FOLLOW_nonvoid_type_descriptor_in_local_directive3476);
 							nonvoid_type_descriptor225=nonvoid_type_descriptor();
@@ -8537,7 +8537,7 @@
 
 					}
 
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:764:31: ( COMMA signature= STRING_LITERAL )?
+					// smaliParser.g:764:31: ( COMMA signature= STRING_LITERAL )?
 					int alt45=2;
 					int LA45_0 = input.LA(1);
 					if ( (LA45_0==COMMA) ) {
@@ -8545,12 +8545,12 @@
 					}
 					switch (alt45) {
 						case 1 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:764:32: COMMA signature= STRING_LITERAL
+							// smaliParser.g:764:32: COMMA signature= STRING_LITERAL
 							{
-							COMMA226=(Token)match(input,COMMA,FOLLOW_COMMA_in_local_directive3510);
+							COMMA226=(Token)match(input,COMMA,FOLLOW_COMMA_in_local_directive3510);  
 							stream_COMMA.add(COMMA226);
 
-							signature=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_local_directive3514);
+							signature=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_local_directive3514);  
 							stream_STRING_LITERAL.add(signature);
 
 							}
@@ -8564,12 +8564,12 @@
 			}
 
 			// AST REWRITE
-			// elements: NULL_LITERAL, REGISTER, name, signature, nonvoid_type_descriptor
+			// elements: name, NULL_LITERAL, nonvoid_type_descriptor, REGISTER, signature
 			// token labels: signature, name
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleTokenStream stream_signature=new RewriteRuleTokenStream(adaptor,"token signature",signature);
 			RewriteRuleTokenStream stream_name=new RewriteRuleTokenStream(adaptor,"token name",name);
@@ -8578,30 +8578,30 @@
 			root_0 = (CommonTree)adaptor.nil();
 			// 765:5: -> ^( I_LOCAL[$start, \"I_LOCAL\"] REGISTER ( NULL_LITERAL )? ( $name)? ( nonvoid_type_descriptor )? ( $signature)? )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:765:8: ^( I_LOCAL[$start, \"I_LOCAL\"] REGISTER ( NULL_LITERAL )? ( $name)? ( nonvoid_type_descriptor )? ( $signature)? )
+				// smaliParser.g:765:8: ^( I_LOCAL[$start, \"I_LOCAL\"] REGISTER ( NULL_LITERAL )? ( $name)? ( nonvoid_type_descriptor )? ( $signature)? )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_LOCAL, (retval.start), "I_LOCAL"), root_1);
 				adaptor.addChild(root_1, stream_REGISTER.nextNode());
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:765:46: ( NULL_LITERAL )?
+				// smaliParser.g:765:46: ( NULL_LITERAL )?
 				if ( stream_NULL_LITERAL.hasNext() ) {
 					adaptor.addChild(root_1, stream_NULL_LITERAL.nextNode());
 				}
 				stream_NULL_LITERAL.reset();
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:765:61: ( $name)?
+				// smaliParser.g:765:61: ( $name)?
 				if ( stream_name.hasNext() ) {
 					adaptor.addChild(root_1, stream_name.nextNode());
 				}
 				stream_name.reset();
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:765:67: ( nonvoid_type_descriptor )?
+				// smaliParser.g:765:67: ( nonvoid_type_descriptor )?
 				if ( stream_nonvoid_type_descriptor.hasNext() ) {
 					adaptor.addChild(root_1, stream_nonvoid_type_descriptor.nextTree());
 				}
 				stream_nonvoid_type_descriptor.reset();
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:765:93: ( $signature)?
+				// smaliParser.g:765:93: ( $signature)?
 				if ( stream_signature.hasNext() ) {
 					adaptor.addChild(root_1, stream_signature.nextNode());
 				}
@@ -8644,7 +8644,7 @@
 
 
 	// $ANTLR start "end_local_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:767:1: end_local_directive : END_LOCAL_DIRECTIVE REGISTER -> ^( I_END_LOCAL[$start, \"I_END_LOCAL\"] REGISTER ) ;
+	// smaliParser.g:767:1: end_local_directive : END_LOCAL_DIRECTIVE REGISTER -> ^( I_END_LOCAL[$start, \"I_END_LOCAL\"] REGISTER ) ;
 	public final smaliParser.end_local_directive_return end_local_directive() throws RecognitionException {
 		smaliParser.end_local_directive_return retval = new smaliParser.end_local_directive_return();
 		retval.start = input.LT(1);
@@ -8660,29 +8660,29 @@
 		RewriteRuleTokenStream stream_END_LOCAL_DIRECTIVE=new RewriteRuleTokenStream(adaptor,"token END_LOCAL_DIRECTIVE");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:768:3: ( END_LOCAL_DIRECTIVE REGISTER -> ^( I_END_LOCAL[$start, \"I_END_LOCAL\"] REGISTER ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:768:5: END_LOCAL_DIRECTIVE REGISTER
+			// smaliParser.g:768:3: ( END_LOCAL_DIRECTIVE REGISTER -> ^( I_END_LOCAL[$start, \"I_END_LOCAL\"] REGISTER ) )
+			// smaliParser.g:768:5: END_LOCAL_DIRECTIVE REGISTER
 			{
-			END_LOCAL_DIRECTIVE227=(Token)match(input,END_LOCAL_DIRECTIVE,FOLLOW_END_LOCAL_DIRECTIVE_in_end_local_directive3556);
+			END_LOCAL_DIRECTIVE227=(Token)match(input,END_LOCAL_DIRECTIVE,FOLLOW_END_LOCAL_DIRECTIVE_in_end_local_directive3556);  
 			stream_END_LOCAL_DIRECTIVE.add(END_LOCAL_DIRECTIVE227);
 
-			REGISTER228=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_end_local_directive3558);
+			REGISTER228=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_end_local_directive3558);  
 			stream_REGISTER.add(REGISTER228);
 
 			// AST REWRITE
 			// elements: REGISTER
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 769:5: -> ^( I_END_LOCAL[$start, \"I_END_LOCAL\"] REGISTER )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:769:8: ^( I_END_LOCAL[$start, \"I_END_LOCAL\"] REGISTER )
+				// smaliParser.g:769:8: ^( I_END_LOCAL[$start, \"I_END_LOCAL\"] REGISTER )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_END_LOCAL, (retval.start), "I_END_LOCAL"), root_1);
@@ -8724,7 +8724,7 @@
 
 
 	// $ANTLR start "restart_local_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:771:1: restart_local_directive : RESTART_LOCAL_DIRECTIVE REGISTER -> ^( I_RESTART_LOCAL[$start, \"I_RESTART_LOCAL\"] REGISTER ) ;
+	// smaliParser.g:771:1: restart_local_directive : RESTART_LOCAL_DIRECTIVE REGISTER -> ^( I_RESTART_LOCAL[$start, \"I_RESTART_LOCAL\"] REGISTER ) ;
 	public final smaliParser.restart_local_directive_return restart_local_directive() throws RecognitionException {
 		smaliParser.restart_local_directive_return retval = new smaliParser.restart_local_directive_return();
 		retval.start = input.LT(1);
@@ -8740,29 +8740,29 @@
 		RewriteRuleTokenStream stream_RESTART_LOCAL_DIRECTIVE=new RewriteRuleTokenStream(adaptor,"token RESTART_LOCAL_DIRECTIVE");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:772:3: ( RESTART_LOCAL_DIRECTIVE REGISTER -> ^( I_RESTART_LOCAL[$start, \"I_RESTART_LOCAL\"] REGISTER ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:772:5: RESTART_LOCAL_DIRECTIVE REGISTER
+			// smaliParser.g:772:3: ( RESTART_LOCAL_DIRECTIVE REGISTER -> ^( I_RESTART_LOCAL[$start, \"I_RESTART_LOCAL\"] REGISTER ) )
+			// smaliParser.g:772:5: RESTART_LOCAL_DIRECTIVE REGISTER
 			{
-			RESTART_LOCAL_DIRECTIVE229=(Token)match(input,RESTART_LOCAL_DIRECTIVE,FOLLOW_RESTART_LOCAL_DIRECTIVE_in_restart_local_directive3581);
+			RESTART_LOCAL_DIRECTIVE229=(Token)match(input,RESTART_LOCAL_DIRECTIVE,FOLLOW_RESTART_LOCAL_DIRECTIVE_in_restart_local_directive3581);  
 			stream_RESTART_LOCAL_DIRECTIVE.add(RESTART_LOCAL_DIRECTIVE229);
 
-			REGISTER230=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_restart_local_directive3583);
+			REGISTER230=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_restart_local_directive3583);  
 			stream_REGISTER.add(REGISTER230);
 
 			// AST REWRITE
 			// elements: REGISTER
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 773:5: -> ^( I_RESTART_LOCAL[$start, \"I_RESTART_LOCAL\"] REGISTER )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:773:8: ^( I_RESTART_LOCAL[$start, \"I_RESTART_LOCAL\"] REGISTER )
+				// smaliParser.g:773:8: ^( I_RESTART_LOCAL[$start, \"I_RESTART_LOCAL\"] REGISTER )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_RESTART_LOCAL, (retval.start), "I_RESTART_LOCAL"), root_1);
@@ -8804,7 +8804,7 @@
 
 
 	// $ANTLR start "prologue_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:775:1: prologue_directive : PROLOGUE_DIRECTIVE -> ^( I_PROLOGUE[$start, \"I_PROLOGUE\"] ) ;
+	// smaliParser.g:775:1: prologue_directive : PROLOGUE_DIRECTIVE -> ^( I_PROLOGUE[$start, \"I_PROLOGUE\"] ) ;
 	public final smaliParser.prologue_directive_return prologue_directive() throws RecognitionException {
 		smaliParser.prologue_directive_return retval = new smaliParser.prologue_directive_return();
 		retval.start = input.LT(1);
@@ -8817,26 +8817,26 @@
 		RewriteRuleTokenStream stream_PROLOGUE_DIRECTIVE=new RewriteRuleTokenStream(adaptor,"token PROLOGUE_DIRECTIVE");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:776:3: ( PROLOGUE_DIRECTIVE -> ^( I_PROLOGUE[$start, \"I_PROLOGUE\"] ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:776:5: PROLOGUE_DIRECTIVE
+			// smaliParser.g:776:3: ( PROLOGUE_DIRECTIVE -> ^( I_PROLOGUE[$start, \"I_PROLOGUE\"] ) )
+			// smaliParser.g:776:5: PROLOGUE_DIRECTIVE
 			{
-			PROLOGUE_DIRECTIVE231=(Token)match(input,PROLOGUE_DIRECTIVE,FOLLOW_PROLOGUE_DIRECTIVE_in_prologue_directive3606);
+			PROLOGUE_DIRECTIVE231=(Token)match(input,PROLOGUE_DIRECTIVE,FOLLOW_PROLOGUE_DIRECTIVE_in_prologue_directive3606);  
 			stream_PROLOGUE_DIRECTIVE.add(PROLOGUE_DIRECTIVE231);
 
 			// AST REWRITE
-			// elements:
-			// token labels:
+			// elements: 
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 777:5: -> ^( I_PROLOGUE[$start, \"I_PROLOGUE\"] )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:777:8: ^( I_PROLOGUE[$start, \"I_PROLOGUE\"] )
+				// smaliParser.g:777:8: ^( I_PROLOGUE[$start, \"I_PROLOGUE\"] )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_PROLOGUE, (retval.start), "I_PROLOGUE"), root_1);
@@ -8877,7 +8877,7 @@
 
 
 	// $ANTLR start "epilogue_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:779:1: epilogue_directive : EPILOGUE_DIRECTIVE -> ^( I_EPILOGUE[$start, \"I_EPILOGUE\"] ) ;
+	// smaliParser.g:779:1: epilogue_directive : EPILOGUE_DIRECTIVE -> ^( I_EPILOGUE[$start, \"I_EPILOGUE\"] ) ;
 	public final smaliParser.epilogue_directive_return epilogue_directive() throws RecognitionException {
 		smaliParser.epilogue_directive_return retval = new smaliParser.epilogue_directive_return();
 		retval.start = input.LT(1);
@@ -8890,26 +8890,26 @@
 		RewriteRuleTokenStream stream_EPILOGUE_DIRECTIVE=new RewriteRuleTokenStream(adaptor,"token EPILOGUE_DIRECTIVE");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:780:3: ( EPILOGUE_DIRECTIVE -> ^( I_EPILOGUE[$start, \"I_EPILOGUE\"] ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:780:5: EPILOGUE_DIRECTIVE
+			// smaliParser.g:780:3: ( EPILOGUE_DIRECTIVE -> ^( I_EPILOGUE[$start, \"I_EPILOGUE\"] ) )
+			// smaliParser.g:780:5: EPILOGUE_DIRECTIVE
 			{
-			EPILOGUE_DIRECTIVE232=(Token)match(input,EPILOGUE_DIRECTIVE,FOLLOW_EPILOGUE_DIRECTIVE_in_epilogue_directive3627);
+			EPILOGUE_DIRECTIVE232=(Token)match(input,EPILOGUE_DIRECTIVE,FOLLOW_EPILOGUE_DIRECTIVE_in_epilogue_directive3627);  
 			stream_EPILOGUE_DIRECTIVE.add(EPILOGUE_DIRECTIVE232);
 
 			// AST REWRITE
-			// elements:
-			// token labels:
+			// elements: 
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 781:5: -> ^( I_EPILOGUE[$start, \"I_EPILOGUE\"] )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:781:8: ^( I_EPILOGUE[$start, \"I_EPILOGUE\"] )
+				// smaliParser.g:781:8: ^( I_EPILOGUE[$start, \"I_EPILOGUE\"] )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_EPILOGUE, (retval.start), "I_EPILOGUE"), root_1);
@@ -8950,7 +8950,7 @@
 
 
 	// $ANTLR start "source_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:783:1: source_directive : SOURCE_DIRECTIVE ( STRING_LITERAL )? -> ^( I_SOURCE[$start, \"I_SOURCE\"] ( STRING_LITERAL )? ) ;
+	// smaliParser.g:783:1: source_directive : SOURCE_DIRECTIVE ( STRING_LITERAL )? -> ^( I_SOURCE[$start, \"I_SOURCE\"] ( STRING_LITERAL )? ) ;
 	public final smaliParser.source_directive_return source_directive() throws RecognitionException {
 		smaliParser.source_directive_return retval = new smaliParser.source_directive_return();
 		retval.start = input.LT(1);
@@ -8966,13 +8966,13 @@
 		RewriteRuleTokenStream stream_STRING_LITERAL=new RewriteRuleTokenStream(adaptor,"token STRING_LITERAL");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:784:3: ( SOURCE_DIRECTIVE ( STRING_LITERAL )? -> ^( I_SOURCE[$start, \"I_SOURCE\"] ( STRING_LITERAL )? ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:784:5: SOURCE_DIRECTIVE ( STRING_LITERAL )?
+			// smaliParser.g:784:3: ( SOURCE_DIRECTIVE ( STRING_LITERAL )? -> ^( I_SOURCE[$start, \"I_SOURCE\"] ( STRING_LITERAL )? ) )
+			// smaliParser.g:784:5: SOURCE_DIRECTIVE ( STRING_LITERAL )?
 			{
-			SOURCE_DIRECTIVE233=(Token)match(input,SOURCE_DIRECTIVE,FOLLOW_SOURCE_DIRECTIVE_in_source_directive3648);
+			SOURCE_DIRECTIVE233=(Token)match(input,SOURCE_DIRECTIVE,FOLLOW_SOURCE_DIRECTIVE_in_source_directive3648);  
 			stream_SOURCE_DIRECTIVE.add(SOURCE_DIRECTIVE233);
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:784:22: ( STRING_LITERAL )?
+			// smaliParser.g:784:22: ( STRING_LITERAL )?
 			int alt47=2;
 			int LA47_0 = input.LA(1);
 			if ( (LA47_0==STRING_LITERAL) ) {
@@ -8980,9 +8980,9 @@
 			}
 			switch (alt47) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:784:22: STRING_LITERAL
+					// smaliParser.g:784:22: STRING_LITERAL
 					{
-					STRING_LITERAL234=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_source_directive3650);
+					STRING_LITERAL234=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_source_directive3650);  
 					stream_STRING_LITERAL.add(STRING_LITERAL234);
 
 					}
@@ -8992,22 +8992,22 @@
 
 			// AST REWRITE
 			// elements: STRING_LITERAL
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 785:5: -> ^( I_SOURCE[$start, \"I_SOURCE\"] ( STRING_LITERAL )? )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:785:8: ^( I_SOURCE[$start, \"I_SOURCE\"] ( STRING_LITERAL )? )
+				// smaliParser.g:785:8: ^( I_SOURCE[$start, \"I_SOURCE\"] ( STRING_LITERAL )? )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_SOURCE, (retval.start), "I_SOURCE"), root_1);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:785:39: ( STRING_LITERAL )?
+				// smaliParser.g:785:39: ( STRING_LITERAL )?
 				if ( stream_STRING_LITERAL.hasNext() ) {
 					adaptor.addChild(root_1, stream_STRING_LITERAL.nextNode());
 				}
@@ -9050,7 +9050,7 @@
 
 
 	// $ANTLR start "instruction_format12x"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:787:1: instruction_format12x : ( INSTRUCTION_FORMAT12x | INSTRUCTION_FORMAT12x_OR_ID -> INSTRUCTION_FORMAT12x[$INSTRUCTION_FORMAT12x_OR_ID] );
+	// smaliParser.g:787:1: instruction_format12x : ( INSTRUCTION_FORMAT12x | INSTRUCTION_FORMAT12x_OR_ID -> INSTRUCTION_FORMAT12x[$INSTRUCTION_FORMAT12x_OR_ID] );
 	public final smaliParser.instruction_format12x_return instruction_format12x() throws RecognitionException {
 		smaliParser.instruction_format12x_return retval = new smaliParser.instruction_format12x_return();
 		retval.start = input.LT(1);
@@ -9065,7 +9065,7 @@
 		RewriteRuleTokenStream stream_INSTRUCTION_FORMAT12x_OR_ID=new RewriteRuleTokenStream(adaptor,"token INSTRUCTION_FORMAT12x_OR_ID");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:788:3: ( INSTRUCTION_FORMAT12x | INSTRUCTION_FORMAT12x_OR_ID -> INSTRUCTION_FORMAT12x[$INSTRUCTION_FORMAT12x_OR_ID] )
+			// smaliParser.g:788:3: ( INSTRUCTION_FORMAT12x | INSTRUCTION_FORMAT12x_OR_ID -> INSTRUCTION_FORMAT12x[$INSTRUCTION_FORMAT12x_OR_ID] )
 			int alt48=2;
 			int LA48_0 = input.LA(1);
 			if ( (LA48_0==INSTRUCTION_FORMAT12x) ) {
@@ -9083,30 +9083,30 @@
 
 			switch (alt48) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:788:5: INSTRUCTION_FORMAT12x
+					// smaliParser.g:788:5: INSTRUCTION_FORMAT12x
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					INSTRUCTION_FORMAT12x235=(Token)match(input,INSTRUCTION_FORMAT12x,FOLLOW_INSTRUCTION_FORMAT12x_in_instruction_format12x3675);
+					INSTRUCTION_FORMAT12x235=(Token)match(input,INSTRUCTION_FORMAT12x,FOLLOW_INSTRUCTION_FORMAT12x_in_instruction_format12x3675); 
 					INSTRUCTION_FORMAT12x235_tree = (CommonTree)adaptor.create(INSTRUCTION_FORMAT12x235);
 					adaptor.addChild(root_0, INSTRUCTION_FORMAT12x235_tree);
 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:789:5: INSTRUCTION_FORMAT12x_OR_ID
+					// smaliParser.g:789:5: INSTRUCTION_FORMAT12x_OR_ID
 					{
-					INSTRUCTION_FORMAT12x_OR_ID236=(Token)match(input,INSTRUCTION_FORMAT12x_OR_ID,FOLLOW_INSTRUCTION_FORMAT12x_OR_ID_in_instruction_format12x3681);
+					INSTRUCTION_FORMAT12x_OR_ID236=(Token)match(input,INSTRUCTION_FORMAT12x_OR_ID,FOLLOW_INSTRUCTION_FORMAT12x_OR_ID_in_instruction_format12x3681);  
 					stream_INSTRUCTION_FORMAT12x_OR_ID.add(INSTRUCTION_FORMAT12x_OR_ID236);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -9150,7 +9150,7 @@
 
 
 	// $ANTLR start "instruction_format22s"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:791:1: instruction_format22s : ( INSTRUCTION_FORMAT22s | INSTRUCTION_FORMAT22s_OR_ID -> INSTRUCTION_FORMAT22s[$INSTRUCTION_FORMAT22s_OR_ID] );
+	// smaliParser.g:791:1: instruction_format22s : ( INSTRUCTION_FORMAT22s | INSTRUCTION_FORMAT22s_OR_ID -> INSTRUCTION_FORMAT22s[$INSTRUCTION_FORMAT22s_OR_ID] );
 	public final smaliParser.instruction_format22s_return instruction_format22s() throws RecognitionException {
 		smaliParser.instruction_format22s_return retval = new smaliParser.instruction_format22s_return();
 		retval.start = input.LT(1);
@@ -9165,7 +9165,7 @@
 		RewriteRuleTokenStream stream_INSTRUCTION_FORMAT22s_OR_ID=new RewriteRuleTokenStream(adaptor,"token INSTRUCTION_FORMAT22s_OR_ID");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:792:3: ( INSTRUCTION_FORMAT22s | INSTRUCTION_FORMAT22s_OR_ID -> INSTRUCTION_FORMAT22s[$INSTRUCTION_FORMAT22s_OR_ID] )
+			// smaliParser.g:792:3: ( INSTRUCTION_FORMAT22s | INSTRUCTION_FORMAT22s_OR_ID -> INSTRUCTION_FORMAT22s[$INSTRUCTION_FORMAT22s_OR_ID] )
 			int alt49=2;
 			int LA49_0 = input.LA(1);
 			if ( (LA49_0==INSTRUCTION_FORMAT22s) ) {
@@ -9183,30 +9183,30 @@
 
 			switch (alt49) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:792:5: INSTRUCTION_FORMAT22s
+					// smaliParser.g:792:5: INSTRUCTION_FORMAT22s
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					INSTRUCTION_FORMAT22s237=(Token)match(input,INSTRUCTION_FORMAT22s,FOLLOW_INSTRUCTION_FORMAT22s_in_instruction_format22s3696);
+					INSTRUCTION_FORMAT22s237=(Token)match(input,INSTRUCTION_FORMAT22s,FOLLOW_INSTRUCTION_FORMAT22s_in_instruction_format22s3696); 
 					INSTRUCTION_FORMAT22s237_tree = (CommonTree)adaptor.create(INSTRUCTION_FORMAT22s237);
 					adaptor.addChild(root_0, INSTRUCTION_FORMAT22s237_tree);
 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:793:5: INSTRUCTION_FORMAT22s_OR_ID
+					// smaliParser.g:793:5: INSTRUCTION_FORMAT22s_OR_ID
 					{
-					INSTRUCTION_FORMAT22s_OR_ID238=(Token)match(input,INSTRUCTION_FORMAT22s_OR_ID,FOLLOW_INSTRUCTION_FORMAT22s_OR_ID_in_instruction_format22s3702);
+					INSTRUCTION_FORMAT22s_OR_ID238=(Token)match(input,INSTRUCTION_FORMAT22s_OR_ID,FOLLOW_INSTRUCTION_FORMAT22s_OR_ID_in_instruction_format22s3702);  
 					stream_INSTRUCTION_FORMAT22s_OR_ID.add(INSTRUCTION_FORMAT22s_OR_ID238);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -9250,7 +9250,7 @@
 
 
 	// $ANTLR start "instruction_format31i"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:795:1: instruction_format31i : ( INSTRUCTION_FORMAT31i | INSTRUCTION_FORMAT31i_OR_ID -> INSTRUCTION_FORMAT31i[$INSTRUCTION_FORMAT31i_OR_ID] );
+	// smaliParser.g:795:1: instruction_format31i : ( INSTRUCTION_FORMAT31i | INSTRUCTION_FORMAT31i_OR_ID -> INSTRUCTION_FORMAT31i[$INSTRUCTION_FORMAT31i_OR_ID] );
 	public final smaliParser.instruction_format31i_return instruction_format31i() throws RecognitionException {
 		smaliParser.instruction_format31i_return retval = new smaliParser.instruction_format31i_return();
 		retval.start = input.LT(1);
@@ -9265,7 +9265,7 @@
 		RewriteRuleTokenStream stream_INSTRUCTION_FORMAT31i_OR_ID=new RewriteRuleTokenStream(adaptor,"token INSTRUCTION_FORMAT31i_OR_ID");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:796:3: ( INSTRUCTION_FORMAT31i | INSTRUCTION_FORMAT31i_OR_ID -> INSTRUCTION_FORMAT31i[$INSTRUCTION_FORMAT31i_OR_ID] )
+			// smaliParser.g:796:3: ( INSTRUCTION_FORMAT31i | INSTRUCTION_FORMAT31i_OR_ID -> INSTRUCTION_FORMAT31i[$INSTRUCTION_FORMAT31i_OR_ID] )
 			int alt50=2;
 			int LA50_0 = input.LA(1);
 			if ( (LA50_0==INSTRUCTION_FORMAT31i) ) {
@@ -9283,30 +9283,30 @@
 
 			switch (alt50) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:796:5: INSTRUCTION_FORMAT31i
+					// smaliParser.g:796:5: INSTRUCTION_FORMAT31i
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
 
-					INSTRUCTION_FORMAT31i239=(Token)match(input,INSTRUCTION_FORMAT31i,FOLLOW_INSTRUCTION_FORMAT31i_in_instruction_format31i3717);
+					INSTRUCTION_FORMAT31i239=(Token)match(input,INSTRUCTION_FORMAT31i,FOLLOW_INSTRUCTION_FORMAT31i_in_instruction_format31i3717); 
 					INSTRUCTION_FORMAT31i239_tree = (CommonTree)adaptor.create(INSTRUCTION_FORMAT31i239);
 					adaptor.addChild(root_0, INSTRUCTION_FORMAT31i239_tree);
 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:797:5: INSTRUCTION_FORMAT31i_OR_ID
+					// smaliParser.g:797:5: INSTRUCTION_FORMAT31i_OR_ID
 					{
-					INSTRUCTION_FORMAT31i_OR_ID240=(Token)match(input,INSTRUCTION_FORMAT31i_OR_ID,FOLLOW_INSTRUCTION_FORMAT31i_OR_ID_in_instruction_format31i3723);
+					INSTRUCTION_FORMAT31i_OR_ID240=(Token)match(input,INSTRUCTION_FORMAT31i_OR_ID,FOLLOW_INSTRUCTION_FORMAT31i_OR_ID_in_instruction_format31i3723);  
 					stream_INSTRUCTION_FORMAT31i_OR_ID.add(INSTRUCTION_FORMAT31i_OR_ID240);
 
 					// AST REWRITE
-					// elements:
-					// token labels:
+					// elements: 
+					// token labels: 
 					// rule labels: retval
-					// token list labels:
-					// rule list labels:
-					// wildcard labels:
+					// token list labels: 
+					// rule list labels: 
+					// wildcard labels: 
 					retval.tree = root_0;
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
@@ -9350,7 +9350,7 @@
 
 
 	// $ANTLR start "instruction"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:801:1: instruction : ( insn_format10t | insn_format10x | insn_format10x_odex | insn_format11n | insn_format11x | insn_format12x | insn_format20bc | insn_format20t | insn_format21c_field | insn_format21c_field_odex | insn_format21c_string | insn_format21c_type | insn_format21ih | insn_format21lh | insn_format21s | insn_format21t | insn_format22b | insn_format22c_field | insn_format22c_field_odex | insn_format22c_type | insn_format22cs_field | insn_format22s | insn_format22t | insn_format22x | insn_format23x | insn_format30t | insn_format31c | insn_format31i | insn_format31t | insn_format32x | insn_format35c_method | insn_format35c_type | insn_format35c_method_odex | insn_format35mi_method | insn_format35ms_method | insn_format3rc_method | insn_format3rc_method_odex | insn_format3rc_type | insn_format3rmi_method | insn_format3rms_method | insn_format45cc_method | insn_format4rcc_method | insn_format51l | insn_array_data_directive | insn_packed_switch_directive | insn_sparse_switch_directive );
+	// smaliParser.g:801:1: instruction : ( insn_format10t | insn_format10x | insn_format10x_odex | insn_format11n | insn_format11x | insn_format12x | insn_format20bc | insn_format20t | insn_format21c_field | insn_format21c_field_odex | insn_format21c_string | insn_format21c_type | insn_format21ih | insn_format21lh | insn_format21s | insn_format21t | insn_format22b | insn_format22c_field | insn_format22c_field_odex | insn_format22c_type | insn_format22cs_field | insn_format22s | insn_format22t | insn_format22x | insn_format23x | insn_format30t | insn_format31c | insn_format31i | insn_format31t | insn_format32x | insn_format35c_method | insn_format35c_type | insn_format35c_method_odex | insn_format35mi_method | insn_format35ms_method | insn_format3rc_method | insn_format3rc_method_odex | insn_format3rc_type | insn_format3rmi_method | insn_format3rms_method | insn_format45cc_method | insn_format4rcc_method | insn_format51l | insn_array_data_directive | insn_packed_switch_directive | insn_sparse_switch_directive );
 	public final smaliParser.instruction_return instruction() throws RecognitionException {
 		smaliParser.instruction_return retval = new smaliParser.instruction_return();
 		retval.start = input.LT(1);
@@ -9406,7 +9406,7 @@
 
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:802:3: ( insn_format10t | insn_format10x | insn_format10x_odex | insn_format11n | insn_format11x | insn_format12x | insn_format20bc | insn_format20t | insn_format21c_field | insn_format21c_field_odex | insn_format21c_string | insn_format21c_type | insn_format21ih | insn_format21lh | insn_format21s | insn_format21t | insn_format22b | insn_format22c_field | insn_format22c_field_odex | insn_format22c_type | insn_format22cs_field | insn_format22s | insn_format22t | insn_format22x | insn_format23x | insn_format30t | insn_format31c | insn_format31i | insn_format31t | insn_format32x | insn_format35c_method | insn_format35c_type | insn_format35c_method_odex | insn_format35mi_method | insn_format35ms_method | insn_format3rc_method | insn_format3rc_method_odex | insn_format3rc_type | insn_format3rmi_method | insn_format3rms_method | insn_format45cc_method | insn_format4rcc_method | insn_format51l | insn_array_data_directive | insn_packed_switch_directive | insn_sparse_switch_directive )
+			// smaliParser.g:802:3: ( insn_format10t | insn_format10x | insn_format10x_odex | insn_format11n | insn_format11x | insn_format12x | insn_format20bc | insn_format20t | insn_format21c_field | insn_format21c_field_odex | insn_format21c_string | insn_format21c_type | insn_format21ih | insn_format21lh | insn_format21s | insn_format21t | insn_format22b | insn_format22c_field | insn_format22c_field_odex | insn_format22c_type | insn_format22cs_field | insn_format22s | insn_format22t | insn_format22x | insn_format23x | insn_format30t | insn_format31c | insn_format31i | insn_format31t | insn_format32x | insn_format35c_method | insn_format35c_type | insn_format35c_method_odex | insn_format35mi_method | insn_format35ms_method | insn_format3rc_method | insn_format3rc_method_odex | insn_format3rc_type | insn_format3rmi_method | insn_format3rms_method | insn_format45cc_method | insn_format4rcc_method | insn_format51l | insn_array_data_directive | insn_packed_switch_directive | insn_sparse_switch_directive )
 			int alt51=46;
 			switch ( input.LA(1) ) {
 			case INSTRUCTION_FORMAT10t:
@@ -9649,7 +9649,7 @@
 			}
 			switch (alt51) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:802:5: insn_format10t
+					// smaliParser.g:802:5: insn_format10t
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9663,7 +9663,7 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:803:5: insn_format10x
+					// smaliParser.g:803:5: insn_format10x
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9677,7 +9677,7 @@
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:804:5: insn_format10x_odex
+					// smaliParser.g:804:5: insn_format10x_odex
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9691,7 +9691,7 @@
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:805:5: insn_format11n
+					// smaliParser.g:805:5: insn_format11n
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9705,7 +9705,7 @@
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:806:5: insn_format11x
+					// smaliParser.g:806:5: insn_format11x
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9719,7 +9719,7 @@
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:807:5: insn_format12x
+					// smaliParser.g:807:5: insn_format12x
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9733,7 +9733,7 @@
 					}
 					break;
 				case 7 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:808:5: insn_format20bc
+					// smaliParser.g:808:5: insn_format20bc
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9747,7 +9747,7 @@
 					}
 					break;
 				case 8 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:809:5: insn_format20t
+					// smaliParser.g:809:5: insn_format20t
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9761,7 +9761,7 @@
 					}
 					break;
 				case 9 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:810:5: insn_format21c_field
+					// smaliParser.g:810:5: insn_format21c_field
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9775,7 +9775,7 @@
 					}
 					break;
 				case 10 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:811:5: insn_format21c_field_odex
+					// smaliParser.g:811:5: insn_format21c_field_odex
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9789,7 +9789,7 @@
 					}
 					break;
 				case 11 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:812:5: insn_format21c_string
+					// smaliParser.g:812:5: insn_format21c_string
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9803,7 +9803,7 @@
 					}
 					break;
 				case 12 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:813:5: insn_format21c_type
+					// smaliParser.g:813:5: insn_format21c_type
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9817,7 +9817,7 @@
 					}
 					break;
 				case 13 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:814:5: insn_format21ih
+					// smaliParser.g:814:5: insn_format21ih
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9831,7 +9831,7 @@
 					}
 					break;
 				case 14 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:815:5: insn_format21lh
+					// smaliParser.g:815:5: insn_format21lh
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9845,7 +9845,7 @@
 					}
 					break;
 				case 15 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:816:5: insn_format21s
+					// smaliParser.g:816:5: insn_format21s
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9859,7 +9859,7 @@
 					}
 					break;
 				case 16 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:817:5: insn_format21t
+					// smaliParser.g:817:5: insn_format21t
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9873,7 +9873,7 @@
 					}
 					break;
 				case 17 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:818:5: insn_format22b
+					// smaliParser.g:818:5: insn_format22b
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9887,7 +9887,7 @@
 					}
 					break;
 				case 18 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:819:5: insn_format22c_field
+					// smaliParser.g:819:5: insn_format22c_field
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9901,7 +9901,7 @@
 					}
 					break;
 				case 19 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:820:5: insn_format22c_field_odex
+					// smaliParser.g:820:5: insn_format22c_field_odex
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9915,7 +9915,7 @@
 					}
 					break;
 				case 20 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:821:5: insn_format22c_type
+					// smaliParser.g:821:5: insn_format22c_type
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9929,7 +9929,7 @@
 					}
 					break;
 				case 21 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:822:5: insn_format22cs_field
+					// smaliParser.g:822:5: insn_format22cs_field
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9943,7 +9943,7 @@
 					}
 					break;
 				case 22 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:823:5: insn_format22s
+					// smaliParser.g:823:5: insn_format22s
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9957,7 +9957,7 @@
 					}
 					break;
 				case 23 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:824:5: insn_format22t
+					// smaliParser.g:824:5: insn_format22t
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9971,7 +9971,7 @@
 					}
 					break;
 				case 24 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:825:5: insn_format22x
+					// smaliParser.g:825:5: insn_format22x
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9985,7 +9985,7 @@
 					}
 					break;
 				case 25 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:826:5: insn_format23x
+					// smaliParser.g:826:5: insn_format23x
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -9999,7 +9999,7 @@
 					}
 					break;
 				case 26 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:827:5: insn_format30t
+					// smaliParser.g:827:5: insn_format30t
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10013,7 +10013,7 @@
 					}
 					break;
 				case 27 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:828:5: insn_format31c
+					// smaliParser.g:828:5: insn_format31c
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10027,7 +10027,7 @@
 					}
 					break;
 				case 28 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:829:5: insn_format31i
+					// smaliParser.g:829:5: insn_format31i
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10041,7 +10041,7 @@
 					}
 					break;
 				case 29 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:830:5: insn_format31t
+					// smaliParser.g:830:5: insn_format31t
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10055,7 +10055,7 @@
 					}
 					break;
 				case 30 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:831:5: insn_format32x
+					// smaliParser.g:831:5: insn_format32x
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10069,7 +10069,7 @@
 					}
 					break;
 				case 31 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:832:5: insn_format35c_method
+					// smaliParser.g:832:5: insn_format35c_method
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10083,7 +10083,7 @@
 					}
 					break;
 				case 32 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:833:5: insn_format35c_type
+					// smaliParser.g:833:5: insn_format35c_type
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10097,7 +10097,7 @@
 					}
 					break;
 				case 33 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:834:5: insn_format35c_method_odex
+					// smaliParser.g:834:5: insn_format35c_method_odex
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10111,7 +10111,7 @@
 					}
 					break;
 				case 34 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:835:5: insn_format35mi_method
+					// smaliParser.g:835:5: insn_format35mi_method
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10125,7 +10125,7 @@
 					}
 					break;
 				case 35 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:836:5: insn_format35ms_method
+					// smaliParser.g:836:5: insn_format35ms_method
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10139,7 +10139,7 @@
 					}
 					break;
 				case 36 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:837:5: insn_format3rc_method
+					// smaliParser.g:837:5: insn_format3rc_method
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10153,7 +10153,7 @@
 					}
 					break;
 				case 37 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:838:5: insn_format3rc_method_odex
+					// smaliParser.g:838:5: insn_format3rc_method_odex
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10167,7 +10167,7 @@
 					}
 					break;
 				case 38 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:839:5: insn_format3rc_type
+					// smaliParser.g:839:5: insn_format3rc_type
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10181,7 +10181,7 @@
 					}
 					break;
 				case 39 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:840:5: insn_format3rmi_method
+					// smaliParser.g:840:5: insn_format3rmi_method
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10195,7 +10195,7 @@
 					}
 					break;
 				case 40 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:841:5: insn_format3rms_method
+					// smaliParser.g:841:5: insn_format3rms_method
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10209,7 +10209,7 @@
 					}
 					break;
 				case 41 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:842:5: insn_format45cc_method
+					// smaliParser.g:842:5: insn_format45cc_method
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10223,7 +10223,7 @@
 					}
 					break;
 				case 42 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:843:5: insn_format4rcc_method
+					// smaliParser.g:843:5: insn_format4rcc_method
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10237,7 +10237,7 @@
 					}
 					break;
 				case 43 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:844:5: insn_format51l
+					// smaliParser.g:844:5: insn_format51l
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10251,7 +10251,7 @@
 					}
 					break;
 				case 44 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:845:5: insn_array_data_directive
+					// smaliParser.g:845:5: insn_array_data_directive
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10265,7 +10265,7 @@
 					}
 					break;
 				case 45 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:846:5: insn_packed_switch_directive
+					// smaliParser.g:846:5: insn_packed_switch_directive
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10279,7 +10279,7 @@
 					}
 					break;
 				case 46 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:847:5: insn_sparse_switch_directive
+					// smaliParser.g:847:5: insn_sparse_switch_directive
 					{
 					root_0 = (CommonTree)adaptor.nil();
 
@@ -10321,7 +10321,7 @@
 
 
 	// $ANTLR start "insn_format10t"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:849:1: insn_format10t : INSTRUCTION_FORMAT10t label_ref -> ^( I_STATEMENT_FORMAT10t[$start, \"I_STATEMENT_FORMAT10t\"] INSTRUCTION_FORMAT10t label_ref ) ;
+	// smaliParser.g:849:1: insn_format10t : INSTRUCTION_FORMAT10t label_ref -> ^( I_STATEMENT_FORMAT10t[$start, \"I_STATEMENT_FORMAT10t\"] INSTRUCTION_FORMAT10t label_ref ) ;
 	public final smaliParser.insn_format10t_return insn_format10t() throws RecognitionException {
 		smaliParser.insn_format10t_return retval = new smaliParser.insn_format10t_return();
 		retval.start = input.LT(1);
@@ -10336,10 +10336,10 @@
 		RewriteRuleSubtreeStream stream_label_ref=new RewriteRuleSubtreeStream(adaptor,"rule label_ref");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:850:3: ( INSTRUCTION_FORMAT10t label_ref -> ^( I_STATEMENT_FORMAT10t[$start, \"I_STATEMENT_FORMAT10t\"] INSTRUCTION_FORMAT10t label_ref ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:852:5: INSTRUCTION_FORMAT10t label_ref
+			// smaliParser.g:850:3: ( INSTRUCTION_FORMAT10t label_ref -> ^( I_STATEMENT_FORMAT10t[$start, \"I_STATEMENT_FORMAT10t\"] INSTRUCTION_FORMAT10t label_ref ) )
+			// smaliParser.g:852:5: INSTRUCTION_FORMAT10t label_ref
 			{
-			INSTRUCTION_FORMAT10t287=(Token)match(input,INSTRUCTION_FORMAT10t,FOLLOW_INSTRUCTION_FORMAT10t_in_insn_format10t4030);
+			INSTRUCTION_FORMAT10t287=(Token)match(input,INSTRUCTION_FORMAT10t,FOLLOW_INSTRUCTION_FORMAT10t_in_insn_format10t4030);  
 			stream_INSTRUCTION_FORMAT10t.add(INSTRUCTION_FORMAT10t287);
 
 			pushFollow(FOLLOW_label_ref_in_insn_format10t4032);
@@ -10348,19 +10348,19 @@
 
 			stream_label_ref.add(label_ref288.getTree());
 			// AST REWRITE
-			// elements: label_ref, INSTRUCTION_FORMAT10t
-			// token labels:
+			// elements: INSTRUCTION_FORMAT10t, label_ref
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 853:5: -> ^( I_STATEMENT_FORMAT10t[$start, \"I_STATEMENT_FORMAT10t\"] INSTRUCTION_FORMAT10t label_ref )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:853:8: ^( I_STATEMENT_FORMAT10t[$start, \"I_STATEMENT_FORMAT10t\"] INSTRUCTION_FORMAT10t label_ref )
+				// smaliParser.g:853:8: ^( I_STATEMENT_FORMAT10t[$start, \"I_STATEMENT_FORMAT10t\"] INSTRUCTION_FORMAT10t label_ref )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT10t, (retval.start), "I_STATEMENT_FORMAT10t"), root_1);
@@ -10403,7 +10403,7 @@
 
 
 	// $ANTLR start "insn_format10x"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:855:1: insn_format10x : INSTRUCTION_FORMAT10x -> ^( I_STATEMENT_FORMAT10x[$start, \"I_STATEMENT_FORMAT10x\"] INSTRUCTION_FORMAT10x ) ;
+	// smaliParser.g:855:1: insn_format10x : INSTRUCTION_FORMAT10x -> ^( I_STATEMENT_FORMAT10x[$start, \"I_STATEMENT_FORMAT10x\"] INSTRUCTION_FORMAT10x ) ;
 	public final smaliParser.insn_format10x_return insn_format10x() throws RecognitionException {
 		smaliParser.insn_format10x_return retval = new smaliParser.insn_format10x_return();
 		retval.start = input.LT(1);
@@ -10416,26 +10416,26 @@
 		RewriteRuleTokenStream stream_INSTRUCTION_FORMAT10x=new RewriteRuleTokenStream(adaptor,"token INSTRUCTION_FORMAT10x");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:856:3: ( INSTRUCTION_FORMAT10x -> ^( I_STATEMENT_FORMAT10x[$start, \"I_STATEMENT_FORMAT10x\"] INSTRUCTION_FORMAT10x ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:857:5: INSTRUCTION_FORMAT10x
+			// smaliParser.g:856:3: ( INSTRUCTION_FORMAT10x -> ^( I_STATEMENT_FORMAT10x[$start, \"I_STATEMENT_FORMAT10x\"] INSTRUCTION_FORMAT10x ) )
+			// smaliParser.g:857:5: INSTRUCTION_FORMAT10x
 			{
-			INSTRUCTION_FORMAT10x289=(Token)match(input,INSTRUCTION_FORMAT10x,FOLLOW_INSTRUCTION_FORMAT10x_in_insn_format10x4062);
+			INSTRUCTION_FORMAT10x289=(Token)match(input,INSTRUCTION_FORMAT10x,FOLLOW_INSTRUCTION_FORMAT10x_in_insn_format10x4062);  
 			stream_INSTRUCTION_FORMAT10x.add(INSTRUCTION_FORMAT10x289);
 
 			// AST REWRITE
 			// elements: INSTRUCTION_FORMAT10x
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 858:5: -> ^( I_STATEMENT_FORMAT10x[$start, \"I_STATEMENT_FORMAT10x\"] INSTRUCTION_FORMAT10x )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:858:8: ^( I_STATEMENT_FORMAT10x[$start, \"I_STATEMENT_FORMAT10x\"] INSTRUCTION_FORMAT10x )
+				// smaliParser.g:858:8: ^( I_STATEMENT_FORMAT10x[$start, \"I_STATEMENT_FORMAT10x\"] INSTRUCTION_FORMAT10x )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT10x, (retval.start), "I_STATEMENT_FORMAT10x"), root_1);
@@ -10477,7 +10477,7 @@
 
 
 	// $ANTLR start "insn_format10x_odex"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:860:1: insn_format10x_odex : INSTRUCTION_FORMAT10x_ODEX ;
+	// smaliParser.g:860:1: insn_format10x_odex : INSTRUCTION_FORMAT10x_ODEX ;
 	public final smaliParser.insn_format10x_odex_return insn_format10x_odex() throws RecognitionException {
 		smaliParser.insn_format10x_odex_return retval = new smaliParser.insn_format10x_odex_return();
 		retval.start = input.LT(1);
@@ -10489,19 +10489,19 @@
 		CommonTree INSTRUCTION_FORMAT10x_ODEX290_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:861:3: ( INSTRUCTION_FORMAT10x_ODEX )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:862:5: INSTRUCTION_FORMAT10x_ODEX
+			// smaliParser.g:861:3: ( INSTRUCTION_FORMAT10x_ODEX )
+			// smaliParser.g:862:5: INSTRUCTION_FORMAT10x_ODEX
 			{
 			root_0 = (CommonTree)adaptor.nil();
 
 
-			INSTRUCTION_FORMAT10x_ODEX290=(Token)match(input,INSTRUCTION_FORMAT10x_ODEX,FOLLOW_INSTRUCTION_FORMAT10x_ODEX_in_insn_format10x_odex4090);
+			INSTRUCTION_FORMAT10x_ODEX290=(Token)match(input,INSTRUCTION_FORMAT10x_ODEX,FOLLOW_INSTRUCTION_FORMAT10x_ODEX_in_insn_format10x_odex4090); 
 			INSTRUCTION_FORMAT10x_ODEX290_tree = (CommonTree)adaptor.create(INSTRUCTION_FORMAT10x_ODEX290);
 			adaptor.addChild(root_0, INSTRUCTION_FORMAT10x_ODEX290_tree);
 
 
 			      throwOdexedInstructionException(input, (INSTRUCTION_FORMAT10x_ODEX290!=null?INSTRUCTION_FORMAT10x_ODEX290.getText():null));
-			
+			    
 			}
 
 			retval.stop = input.LT(-1);
@@ -10531,7 +10531,7 @@
 
 
 	// $ANTLR start "insn_format11n"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:867:1: insn_format11n : INSTRUCTION_FORMAT11n REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT11n[$start, \"I_STATEMENT_FORMAT11n\"] INSTRUCTION_FORMAT11n REGISTER integral_literal ) ;
+	// smaliParser.g:867:1: insn_format11n : INSTRUCTION_FORMAT11n REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT11n[$start, \"I_STATEMENT_FORMAT11n\"] INSTRUCTION_FORMAT11n REGISTER integral_literal ) ;
 	public final smaliParser.insn_format11n_return insn_format11n() throws RecognitionException {
 		smaliParser.insn_format11n_return retval = new smaliParser.insn_format11n_return();
 		retval.start = input.LT(1);
@@ -10552,16 +10552,16 @@
 		RewriteRuleSubtreeStream stream_integral_literal=new RewriteRuleSubtreeStream(adaptor,"rule integral_literal");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:868:3: ( INSTRUCTION_FORMAT11n REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT11n[$start, \"I_STATEMENT_FORMAT11n\"] INSTRUCTION_FORMAT11n REGISTER integral_literal ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:869:5: INSTRUCTION_FORMAT11n REGISTER COMMA integral_literal
+			// smaliParser.g:868:3: ( INSTRUCTION_FORMAT11n REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT11n[$start, \"I_STATEMENT_FORMAT11n\"] INSTRUCTION_FORMAT11n REGISTER integral_literal ) )
+			// smaliParser.g:869:5: INSTRUCTION_FORMAT11n REGISTER COMMA integral_literal
 			{
-			INSTRUCTION_FORMAT11n291=(Token)match(input,INSTRUCTION_FORMAT11n,FOLLOW_INSTRUCTION_FORMAT11n_in_insn_format11n4111);
+			INSTRUCTION_FORMAT11n291=(Token)match(input,INSTRUCTION_FORMAT11n,FOLLOW_INSTRUCTION_FORMAT11n_in_insn_format11n4111);  
 			stream_INSTRUCTION_FORMAT11n.add(INSTRUCTION_FORMAT11n291);
 
-			REGISTER292=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format11n4113);
+			REGISTER292=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format11n4113);  
 			stream_REGISTER.add(REGISTER292);
 
-			COMMA293=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format11n4115);
+			COMMA293=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format11n4115);  
 			stream_COMMA.add(COMMA293);
 
 			pushFollow(FOLLOW_integral_literal_in_insn_format11n4117);
@@ -10570,19 +10570,19 @@
 
 			stream_integral_literal.add(integral_literal294.getTree());
 			// AST REWRITE
-			// elements: INSTRUCTION_FORMAT11n, integral_literal, REGISTER
-			// token labels:
+			// elements: integral_literal, INSTRUCTION_FORMAT11n, REGISTER
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 870:5: -> ^( I_STATEMENT_FORMAT11n[$start, \"I_STATEMENT_FORMAT11n\"] INSTRUCTION_FORMAT11n REGISTER integral_literal )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:870:8: ^( I_STATEMENT_FORMAT11n[$start, \"I_STATEMENT_FORMAT11n\"] INSTRUCTION_FORMAT11n REGISTER integral_literal )
+				// smaliParser.g:870:8: ^( I_STATEMENT_FORMAT11n[$start, \"I_STATEMENT_FORMAT11n\"] INSTRUCTION_FORMAT11n REGISTER integral_literal )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT11n, (retval.start), "I_STATEMENT_FORMAT11n"), root_1);
@@ -10626,7 +10626,7 @@
 
 
 	// $ANTLR start "insn_format11x"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:872:1: insn_format11x : INSTRUCTION_FORMAT11x REGISTER -> ^( I_STATEMENT_FORMAT11x[$start, \"I_STATEMENT_FORMAT11x\"] INSTRUCTION_FORMAT11x REGISTER ) ;
+	// smaliParser.g:872:1: insn_format11x : INSTRUCTION_FORMAT11x REGISTER -> ^( I_STATEMENT_FORMAT11x[$start, \"I_STATEMENT_FORMAT11x\"] INSTRUCTION_FORMAT11x REGISTER ) ;
 	public final smaliParser.insn_format11x_return insn_format11x() throws RecognitionException {
 		smaliParser.insn_format11x_return retval = new smaliParser.insn_format11x_return();
 		retval.start = input.LT(1);
@@ -10642,29 +10642,29 @@
 		RewriteRuleTokenStream stream_INSTRUCTION_FORMAT11x=new RewriteRuleTokenStream(adaptor,"token INSTRUCTION_FORMAT11x");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:873:3: ( INSTRUCTION_FORMAT11x REGISTER -> ^( I_STATEMENT_FORMAT11x[$start, \"I_STATEMENT_FORMAT11x\"] INSTRUCTION_FORMAT11x REGISTER ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:874:5: INSTRUCTION_FORMAT11x REGISTER
+			// smaliParser.g:873:3: ( INSTRUCTION_FORMAT11x REGISTER -> ^( I_STATEMENT_FORMAT11x[$start, \"I_STATEMENT_FORMAT11x\"] INSTRUCTION_FORMAT11x REGISTER ) )
+			// smaliParser.g:874:5: INSTRUCTION_FORMAT11x REGISTER
 			{
-			INSTRUCTION_FORMAT11x295=(Token)match(input,INSTRUCTION_FORMAT11x,FOLLOW_INSTRUCTION_FORMAT11x_in_insn_format11x4149);
+			INSTRUCTION_FORMAT11x295=(Token)match(input,INSTRUCTION_FORMAT11x,FOLLOW_INSTRUCTION_FORMAT11x_in_insn_format11x4149);  
 			stream_INSTRUCTION_FORMAT11x.add(INSTRUCTION_FORMAT11x295);
 
-			REGISTER296=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format11x4151);
+			REGISTER296=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format11x4151);  
 			stream_REGISTER.add(REGISTER296);
 
 			// AST REWRITE
-			// elements: INSTRUCTION_FORMAT11x, REGISTER
-			// token labels:
+			// elements: REGISTER, INSTRUCTION_FORMAT11x
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 875:5: -> ^( I_STATEMENT_FORMAT11x[$start, \"I_STATEMENT_FORMAT11x\"] INSTRUCTION_FORMAT11x REGISTER )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:875:8: ^( I_STATEMENT_FORMAT11x[$start, \"I_STATEMENT_FORMAT11x\"] INSTRUCTION_FORMAT11x REGISTER )
+				// smaliParser.g:875:8: ^( I_STATEMENT_FORMAT11x[$start, \"I_STATEMENT_FORMAT11x\"] INSTRUCTION_FORMAT11x REGISTER )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT11x, (retval.start), "I_STATEMENT_FORMAT11x"), root_1);
@@ -10707,7 +10707,7 @@
 
 
 	// $ANTLR start "insn_format12x"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:877:1: insn_format12x : instruction_format12x REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT12x[$start, \"I_STATEMENT_FORMAT12x\"] instruction_format12x REGISTER REGISTER ) ;
+	// smaliParser.g:877:1: insn_format12x : instruction_format12x REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT12x[$start, \"I_STATEMENT_FORMAT12x\"] instruction_format12x REGISTER REGISTER ) ;
 	public final smaliParser.insn_format12x_return insn_format12x() throws RecognitionException {
 		smaliParser.insn_format12x_return retval = new smaliParser.insn_format12x_return();
 		retval.start = input.LT(1);
@@ -10727,37 +10727,37 @@
 		RewriteRuleSubtreeStream stream_instruction_format12x=new RewriteRuleSubtreeStream(adaptor,"rule instruction_format12x");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:878:3: ( instruction_format12x REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT12x[$start, \"I_STATEMENT_FORMAT12x\"] instruction_format12x REGISTER REGISTER ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:879:5: instruction_format12x REGISTER COMMA REGISTER
+			// smaliParser.g:878:3: ( instruction_format12x REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT12x[$start, \"I_STATEMENT_FORMAT12x\"] instruction_format12x REGISTER REGISTER ) )
+			// smaliParser.g:879:5: instruction_format12x REGISTER COMMA REGISTER
 			{
 			pushFollow(FOLLOW_instruction_format12x_in_insn_format12x4181);
 			instruction_format12x297=instruction_format12x();
 			state._fsp--;
 
 			stream_instruction_format12x.add(instruction_format12x297.getTree());
-			REGISTER298=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format12x4183);
+			REGISTER298=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format12x4183);  
 			stream_REGISTER.add(REGISTER298);
 
-			COMMA299=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format12x4185);
+			COMMA299=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format12x4185);  
 			stream_COMMA.add(COMMA299);
 
-			REGISTER300=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format12x4187);
+			REGISTER300=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format12x4187);  
 			stream_REGISTER.add(REGISTER300);
 
 			// AST REWRITE
 			// elements: REGISTER, instruction_format12x, REGISTER
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 880:5: -> ^( I_STATEMENT_FORMAT12x[$start, \"I_STATEMENT_FORMAT12x\"] instruction_format12x REGISTER REGISTER )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:880:8: ^( I_STATEMENT_FORMAT12x[$start, \"I_STATEMENT_FORMAT12x\"] instruction_format12x REGISTER REGISTER )
+				// smaliParser.g:880:8: ^( I_STATEMENT_FORMAT12x[$start, \"I_STATEMENT_FORMAT12x\"] instruction_format12x REGISTER REGISTER )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT12x, (retval.start), "I_STATEMENT_FORMAT12x"), root_1);
@@ -10801,7 +10801,7 @@
 
 
 	// $ANTLR start "insn_format20bc"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:882:1: insn_format20bc : INSTRUCTION_FORMAT20bc VERIFICATION_ERROR_TYPE COMMA verification_error_reference -> ^( I_STATEMENT_FORMAT20bc INSTRUCTION_FORMAT20bc VERIFICATION_ERROR_TYPE verification_error_reference ) ;
+	// smaliParser.g:882:1: insn_format20bc : INSTRUCTION_FORMAT20bc VERIFICATION_ERROR_TYPE COMMA verification_error_reference -> ^( I_STATEMENT_FORMAT20bc INSTRUCTION_FORMAT20bc VERIFICATION_ERROR_TYPE verification_error_reference ) ;
 	public final smaliParser.insn_format20bc_return insn_format20bc() throws RecognitionException {
 		smaliParser.insn_format20bc_return retval = new smaliParser.insn_format20bc_return();
 		retval.start = input.LT(1);
@@ -10822,16 +10822,16 @@
 		RewriteRuleSubtreeStream stream_verification_error_reference=new RewriteRuleSubtreeStream(adaptor,"rule verification_error_reference");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:883:3: ( INSTRUCTION_FORMAT20bc VERIFICATION_ERROR_TYPE COMMA verification_error_reference -> ^( I_STATEMENT_FORMAT20bc INSTRUCTION_FORMAT20bc VERIFICATION_ERROR_TYPE verification_error_reference ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:884:5: INSTRUCTION_FORMAT20bc VERIFICATION_ERROR_TYPE COMMA verification_error_reference
+			// smaliParser.g:883:3: ( INSTRUCTION_FORMAT20bc VERIFICATION_ERROR_TYPE COMMA verification_error_reference -> ^( I_STATEMENT_FORMAT20bc INSTRUCTION_FORMAT20bc VERIFICATION_ERROR_TYPE verification_error_reference ) )
+			// smaliParser.g:884:5: INSTRUCTION_FORMAT20bc VERIFICATION_ERROR_TYPE COMMA verification_error_reference
 			{
-			INSTRUCTION_FORMAT20bc301=(Token)match(input,INSTRUCTION_FORMAT20bc,FOLLOW_INSTRUCTION_FORMAT20bc_in_insn_format20bc4219);
+			INSTRUCTION_FORMAT20bc301=(Token)match(input,INSTRUCTION_FORMAT20bc,FOLLOW_INSTRUCTION_FORMAT20bc_in_insn_format20bc4219);  
 			stream_INSTRUCTION_FORMAT20bc.add(INSTRUCTION_FORMAT20bc301);
 
-			VERIFICATION_ERROR_TYPE302=(Token)match(input,VERIFICATION_ERROR_TYPE,FOLLOW_VERIFICATION_ERROR_TYPE_in_insn_format20bc4221);
+			VERIFICATION_ERROR_TYPE302=(Token)match(input,VERIFICATION_ERROR_TYPE,FOLLOW_VERIFICATION_ERROR_TYPE_in_insn_format20bc4221);  
 			stream_VERIFICATION_ERROR_TYPE.add(VERIFICATION_ERROR_TYPE302);
 
-			COMMA303=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format20bc4223);
+			COMMA303=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format20bc4223);  
 			stream_COMMA.add(COMMA303);
 
 			pushFollow(FOLLOW_verification_error_reference_in_insn_format20bc4225);
@@ -10843,21 +10843,21 @@
 			      if (!allowOdex || opcodes.getOpcodeByName((INSTRUCTION_FORMAT20bc301!=null?INSTRUCTION_FORMAT20bc301.getText():null)) == null || apiLevel >= 14) {
 			        throwOdexedInstructionException(input, (INSTRUCTION_FORMAT20bc301!=null?INSTRUCTION_FORMAT20bc301.getText():null));
 			      }
-			
+			    
 			// AST REWRITE
-			// elements: INSTRUCTION_FORMAT20bc, verification_error_reference, VERIFICATION_ERROR_TYPE
-			// token labels:
+			// elements: VERIFICATION_ERROR_TYPE, verification_error_reference, INSTRUCTION_FORMAT20bc
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 890:5: -> ^( I_STATEMENT_FORMAT20bc INSTRUCTION_FORMAT20bc VERIFICATION_ERROR_TYPE verification_error_reference )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:890:8: ^( I_STATEMENT_FORMAT20bc INSTRUCTION_FORMAT20bc VERIFICATION_ERROR_TYPE verification_error_reference )
+				// smaliParser.g:890:8: ^( I_STATEMENT_FORMAT20bc INSTRUCTION_FORMAT20bc VERIFICATION_ERROR_TYPE verification_error_reference )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT20bc, "I_STATEMENT_FORMAT20bc"), root_1);
@@ -10901,7 +10901,7 @@
 
 
 	// $ANTLR start "insn_format20t"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:892:1: insn_format20t : INSTRUCTION_FORMAT20t label_ref -> ^( I_STATEMENT_FORMAT20t[$start, \"I_STATEMENT_FORMAT20t\"] INSTRUCTION_FORMAT20t label_ref ) ;
+	// smaliParser.g:892:1: insn_format20t : INSTRUCTION_FORMAT20t label_ref -> ^( I_STATEMENT_FORMAT20t[$start, \"I_STATEMENT_FORMAT20t\"] INSTRUCTION_FORMAT20t label_ref ) ;
 	public final smaliParser.insn_format20t_return insn_format20t() throws RecognitionException {
 		smaliParser.insn_format20t_return retval = new smaliParser.insn_format20t_return();
 		retval.start = input.LT(1);
@@ -10916,10 +10916,10 @@
 		RewriteRuleSubtreeStream stream_label_ref=new RewriteRuleSubtreeStream(adaptor,"rule label_ref");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:893:3: ( INSTRUCTION_FORMAT20t label_ref -> ^( I_STATEMENT_FORMAT20t[$start, \"I_STATEMENT_FORMAT20t\"] INSTRUCTION_FORMAT20t label_ref ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:894:5: INSTRUCTION_FORMAT20t label_ref
+			// smaliParser.g:893:3: ( INSTRUCTION_FORMAT20t label_ref -> ^( I_STATEMENT_FORMAT20t[$start, \"I_STATEMENT_FORMAT20t\"] INSTRUCTION_FORMAT20t label_ref ) )
+			// smaliParser.g:894:5: INSTRUCTION_FORMAT20t label_ref
 			{
-			INSTRUCTION_FORMAT20t305=(Token)match(input,INSTRUCTION_FORMAT20t,FOLLOW_INSTRUCTION_FORMAT20t_in_insn_format20t4262);
+			INSTRUCTION_FORMAT20t305=(Token)match(input,INSTRUCTION_FORMAT20t,FOLLOW_INSTRUCTION_FORMAT20t_in_insn_format20t4262);  
 			stream_INSTRUCTION_FORMAT20t.add(INSTRUCTION_FORMAT20t305);
 
 			pushFollow(FOLLOW_label_ref_in_insn_format20t4264);
@@ -10928,19 +10928,19 @@
 
 			stream_label_ref.add(label_ref306.getTree());
 			// AST REWRITE
-			// elements: label_ref, INSTRUCTION_FORMAT20t
-			// token labels:
+			// elements: INSTRUCTION_FORMAT20t, label_ref
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 895:5: -> ^( I_STATEMENT_FORMAT20t[$start, \"I_STATEMENT_FORMAT20t\"] INSTRUCTION_FORMAT20t label_ref )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:895:8: ^( I_STATEMENT_FORMAT20t[$start, \"I_STATEMENT_FORMAT20t\"] INSTRUCTION_FORMAT20t label_ref )
+				// smaliParser.g:895:8: ^( I_STATEMENT_FORMAT20t[$start, \"I_STATEMENT_FORMAT20t\"] INSTRUCTION_FORMAT20t label_ref )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT20t, (retval.start), "I_STATEMENT_FORMAT20t"), root_1);
@@ -10983,7 +10983,7 @@
 
 
 	// $ANTLR start "insn_format21c_field"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:897:1: insn_format21c_field : INSTRUCTION_FORMAT21c_FIELD REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD REGISTER field_reference ) ;
+	// smaliParser.g:897:1: insn_format21c_field : INSTRUCTION_FORMAT21c_FIELD REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD REGISTER field_reference ) ;
 	public final smaliParser.insn_format21c_field_return insn_format21c_field() throws RecognitionException {
 		smaliParser.insn_format21c_field_return retval = new smaliParser.insn_format21c_field_return();
 		retval.start = input.LT(1);
@@ -11004,16 +11004,16 @@
 		RewriteRuleSubtreeStream stream_field_reference=new RewriteRuleSubtreeStream(adaptor,"rule field_reference");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:898:3: ( INSTRUCTION_FORMAT21c_FIELD REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD REGISTER field_reference ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:899:5: INSTRUCTION_FORMAT21c_FIELD REGISTER COMMA field_reference
+			// smaliParser.g:898:3: ( INSTRUCTION_FORMAT21c_FIELD REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD REGISTER field_reference ) )
+			// smaliParser.g:899:5: INSTRUCTION_FORMAT21c_FIELD REGISTER COMMA field_reference
 			{
-			INSTRUCTION_FORMAT21c_FIELD307=(Token)match(input,INSTRUCTION_FORMAT21c_FIELD,FOLLOW_INSTRUCTION_FORMAT21c_FIELD_in_insn_format21c_field4294);
+			INSTRUCTION_FORMAT21c_FIELD307=(Token)match(input,INSTRUCTION_FORMAT21c_FIELD,FOLLOW_INSTRUCTION_FORMAT21c_FIELD_in_insn_format21c_field4294);  
 			stream_INSTRUCTION_FORMAT21c_FIELD.add(INSTRUCTION_FORMAT21c_FIELD307);
 
-			REGISTER308=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21c_field4296);
+			REGISTER308=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21c_field4296);  
 			stream_REGISTER.add(REGISTER308);
 
-			COMMA309=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21c_field4298);
+			COMMA309=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21c_field4298);  
 			stream_COMMA.add(COMMA309);
 
 			pushFollow(FOLLOW_field_reference_in_insn_format21c_field4300);
@@ -11023,18 +11023,18 @@
 			stream_field_reference.add(field_reference310.getTree());
 			// AST REWRITE
 			// elements: REGISTER, INSTRUCTION_FORMAT21c_FIELD, field_reference
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 900:5: -> ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD REGISTER field_reference )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:900:8: ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD REGISTER field_reference )
+				// smaliParser.g:900:8: ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD REGISTER field_reference )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT21c_FIELD, (retval.start), "I_STATEMENT_FORMAT21c_FIELD"), root_1);
@@ -11078,7 +11078,7 @@
 
 
 	// $ANTLR start "insn_format21c_field_odex"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:902:1: insn_format21c_field_odex : INSTRUCTION_FORMAT21c_FIELD_ODEX REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD_ODEX REGISTER field_reference ) ;
+	// smaliParser.g:902:1: insn_format21c_field_odex : INSTRUCTION_FORMAT21c_FIELD_ODEX REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD_ODEX REGISTER field_reference ) ;
 	public final smaliParser.insn_format21c_field_odex_return insn_format21c_field_odex() throws RecognitionException {
 		smaliParser.insn_format21c_field_odex_return retval = new smaliParser.insn_format21c_field_odex_return();
 		retval.start = input.LT(1);
@@ -11099,16 +11099,16 @@
 		RewriteRuleSubtreeStream stream_field_reference=new RewriteRuleSubtreeStream(adaptor,"rule field_reference");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:903:3: ( INSTRUCTION_FORMAT21c_FIELD_ODEX REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD_ODEX REGISTER field_reference ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:904:5: INSTRUCTION_FORMAT21c_FIELD_ODEX REGISTER COMMA field_reference
+			// smaliParser.g:903:3: ( INSTRUCTION_FORMAT21c_FIELD_ODEX REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD_ODEX REGISTER field_reference ) )
+			// smaliParser.g:904:5: INSTRUCTION_FORMAT21c_FIELD_ODEX REGISTER COMMA field_reference
 			{
-			INSTRUCTION_FORMAT21c_FIELD_ODEX311=(Token)match(input,INSTRUCTION_FORMAT21c_FIELD_ODEX,FOLLOW_INSTRUCTION_FORMAT21c_FIELD_ODEX_in_insn_format21c_field_odex4332);
+			INSTRUCTION_FORMAT21c_FIELD_ODEX311=(Token)match(input,INSTRUCTION_FORMAT21c_FIELD_ODEX,FOLLOW_INSTRUCTION_FORMAT21c_FIELD_ODEX_in_insn_format21c_field_odex4332);  
 			stream_INSTRUCTION_FORMAT21c_FIELD_ODEX.add(INSTRUCTION_FORMAT21c_FIELD_ODEX311);
 
-			REGISTER312=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21c_field_odex4334);
+			REGISTER312=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21c_field_odex4334);  
 			stream_REGISTER.add(REGISTER312);
 
-			COMMA313=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21c_field_odex4336);
+			COMMA313=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21c_field_odex4336);  
 			stream_COMMA.add(COMMA313);
 
 			pushFollow(FOLLOW_field_reference_in_insn_format21c_field_odex4338);
@@ -11120,21 +11120,21 @@
 			      if (!allowOdex || opcodes.getOpcodeByName((INSTRUCTION_FORMAT21c_FIELD_ODEX311!=null?INSTRUCTION_FORMAT21c_FIELD_ODEX311.getText():null)) == null || apiLevel >= 14) {
 			        throwOdexedInstructionException(input, (INSTRUCTION_FORMAT21c_FIELD_ODEX311!=null?INSTRUCTION_FORMAT21c_FIELD_ODEX311.getText():null));
 			      }
-			
+			    
 			// AST REWRITE
-			// elements: INSTRUCTION_FORMAT21c_FIELD_ODEX, field_reference, REGISTER
-			// token labels:
+			// elements: INSTRUCTION_FORMAT21c_FIELD_ODEX, REGISTER, field_reference
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 910:5: -> ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD_ODEX REGISTER field_reference )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:910:8: ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD_ODEX REGISTER field_reference )
+				// smaliParser.g:910:8: ^( I_STATEMENT_FORMAT21c_FIELD[$start, \"I_STATEMENT_FORMAT21c_FIELD\"] INSTRUCTION_FORMAT21c_FIELD_ODEX REGISTER field_reference )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT21c_FIELD, (retval.start), "I_STATEMENT_FORMAT21c_FIELD"), root_1);
@@ -11178,7 +11178,7 @@
 
 
 	// $ANTLR start "insn_format21c_string"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:912:1: insn_format21c_string : INSTRUCTION_FORMAT21c_STRING REGISTER COMMA STRING_LITERAL -> ^( I_STATEMENT_FORMAT21c_STRING[$start, \"I_STATEMENT_FORMAT21c_STRING\"] INSTRUCTION_FORMAT21c_STRING REGISTER STRING_LITERAL ) ;
+	// smaliParser.g:912:1: insn_format21c_string : INSTRUCTION_FORMAT21c_STRING REGISTER COMMA STRING_LITERAL -> ^( I_STATEMENT_FORMAT21c_STRING[$start, \"I_STATEMENT_FORMAT21c_STRING\"] INSTRUCTION_FORMAT21c_STRING REGISTER STRING_LITERAL ) ;
 	public final smaliParser.insn_format21c_string_return insn_format21c_string() throws RecognitionException {
 		smaliParser.insn_format21c_string_return retval = new smaliParser.insn_format21c_string_return();
 		retval.start = input.LT(1);
@@ -11200,35 +11200,35 @@
 		RewriteRuleTokenStream stream_INSTRUCTION_FORMAT21c_STRING=new RewriteRuleTokenStream(adaptor,"token INSTRUCTION_FORMAT21c_STRING");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:913:3: ( INSTRUCTION_FORMAT21c_STRING REGISTER COMMA STRING_LITERAL -> ^( I_STATEMENT_FORMAT21c_STRING[$start, \"I_STATEMENT_FORMAT21c_STRING\"] INSTRUCTION_FORMAT21c_STRING REGISTER STRING_LITERAL ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:914:5: INSTRUCTION_FORMAT21c_STRING REGISTER COMMA STRING_LITERAL
+			// smaliParser.g:913:3: ( INSTRUCTION_FORMAT21c_STRING REGISTER COMMA STRING_LITERAL -> ^( I_STATEMENT_FORMAT21c_STRING[$start, \"I_STATEMENT_FORMAT21c_STRING\"] INSTRUCTION_FORMAT21c_STRING REGISTER STRING_LITERAL ) )
+			// smaliParser.g:914:5: INSTRUCTION_FORMAT21c_STRING REGISTER COMMA STRING_LITERAL
 			{
-			INSTRUCTION_FORMAT21c_STRING315=(Token)match(input,INSTRUCTION_FORMAT21c_STRING,FOLLOW_INSTRUCTION_FORMAT21c_STRING_in_insn_format21c_string4376);
+			INSTRUCTION_FORMAT21c_STRING315=(Token)match(input,INSTRUCTION_FORMAT21c_STRING,FOLLOW_INSTRUCTION_FORMAT21c_STRING_in_insn_format21c_string4376);  
 			stream_INSTRUCTION_FORMAT21c_STRING.add(INSTRUCTION_FORMAT21c_STRING315);
 
-			REGISTER316=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21c_string4378);
+			REGISTER316=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21c_string4378);  
 			stream_REGISTER.add(REGISTER316);
 
-			COMMA317=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21c_string4380);
+			COMMA317=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21c_string4380);  
 			stream_COMMA.add(COMMA317);
 
-			STRING_LITERAL318=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_insn_format21c_string4382);
+			STRING_LITERAL318=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_insn_format21c_string4382);  
 			stream_STRING_LITERAL.add(STRING_LITERAL318);
 
 			// AST REWRITE
-			// elements: INSTRUCTION_FORMAT21c_STRING, REGISTER, STRING_LITERAL
-			// token labels:
+			// elements: STRING_LITERAL, REGISTER, INSTRUCTION_FORMAT21c_STRING
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 915:5: -> ^( I_STATEMENT_FORMAT21c_STRING[$start, \"I_STATEMENT_FORMAT21c_STRING\"] INSTRUCTION_FORMAT21c_STRING REGISTER STRING_LITERAL )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:915:8: ^( I_STATEMENT_FORMAT21c_STRING[$start, \"I_STATEMENT_FORMAT21c_STRING\"] INSTRUCTION_FORMAT21c_STRING REGISTER STRING_LITERAL )
+				// smaliParser.g:915:8: ^( I_STATEMENT_FORMAT21c_STRING[$start, \"I_STATEMENT_FORMAT21c_STRING\"] INSTRUCTION_FORMAT21c_STRING REGISTER STRING_LITERAL )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT21c_STRING, (retval.start), "I_STATEMENT_FORMAT21c_STRING"), root_1);
@@ -11272,7 +11272,7 @@
 
 
 	// $ANTLR start "insn_format21c_type"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:917:1: insn_format21c_type : INSTRUCTION_FORMAT21c_TYPE REGISTER COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT21c_TYPE[$start, \"I_STATEMENT_FORMAT21c\"] INSTRUCTION_FORMAT21c_TYPE REGISTER nonvoid_type_descriptor ) ;
+	// smaliParser.g:917:1: insn_format21c_type : INSTRUCTION_FORMAT21c_TYPE REGISTER COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT21c_TYPE[$start, \"I_STATEMENT_FORMAT21c\"] INSTRUCTION_FORMAT21c_TYPE REGISTER nonvoid_type_descriptor ) ;
 	public final smaliParser.insn_format21c_type_return insn_format21c_type() throws RecognitionException {
 		smaliParser.insn_format21c_type_return retval = new smaliParser.insn_format21c_type_return();
 		retval.start = input.LT(1);
@@ -11293,16 +11293,16 @@
 		RewriteRuleSubtreeStream stream_nonvoid_type_descriptor=new RewriteRuleSubtreeStream(adaptor,"rule nonvoid_type_descriptor");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:918:3: ( INSTRUCTION_FORMAT21c_TYPE REGISTER COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT21c_TYPE[$start, \"I_STATEMENT_FORMAT21c\"] INSTRUCTION_FORMAT21c_TYPE REGISTER nonvoid_type_descriptor ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:919:5: INSTRUCTION_FORMAT21c_TYPE REGISTER COMMA nonvoid_type_descriptor
+			// smaliParser.g:918:3: ( INSTRUCTION_FORMAT21c_TYPE REGISTER COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT21c_TYPE[$start, \"I_STATEMENT_FORMAT21c\"] INSTRUCTION_FORMAT21c_TYPE REGISTER nonvoid_type_descriptor ) )
+			// smaliParser.g:919:5: INSTRUCTION_FORMAT21c_TYPE REGISTER COMMA nonvoid_type_descriptor
 			{
-			INSTRUCTION_FORMAT21c_TYPE319=(Token)match(input,INSTRUCTION_FORMAT21c_TYPE,FOLLOW_INSTRUCTION_FORMAT21c_TYPE_in_insn_format21c_type4414);
+			INSTRUCTION_FORMAT21c_TYPE319=(Token)match(input,INSTRUCTION_FORMAT21c_TYPE,FOLLOW_INSTRUCTION_FORMAT21c_TYPE_in_insn_format21c_type4414);  
 			stream_INSTRUCTION_FORMAT21c_TYPE.add(INSTRUCTION_FORMAT21c_TYPE319);
 
-			REGISTER320=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21c_type4416);
+			REGISTER320=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21c_type4416);  
 			stream_REGISTER.add(REGISTER320);
 
-			COMMA321=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21c_type4418);
+			COMMA321=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21c_type4418);  
 			stream_COMMA.add(COMMA321);
 
 			pushFollow(FOLLOW_nonvoid_type_descriptor_in_insn_format21c_type4420);
@@ -11312,18 +11312,18 @@
 			stream_nonvoid_type_descriptor.add(nonvoid_type_descriptor322.getTree());
 			// AST REWRITE
 			// elements: REGISTER, INSTRUCTION_FORMAT21c_TYPE, nonvoid_type_descriptor
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 920:5: -> ^( I_STATEMENT_FORMAT21c_TYPE[$start, \"I_STATEMENT_FORMAT21c\"] INSTRUCTION_FORMAT21c_TYPE REGISTER nonvoid_type_descriptor )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:920:8: ^( I_STATEMENT_FORMAT21c_TYPE[$start, \"I_STATEMENT_FORMAT21c\"] INSTRUCTION_FORMAT21c_TYPE REGISTER nonvoid_type_descriptor )
+				// smaliParser.g:920:8: ^( I_STATEMENT_FORMAT21c_TYPE[$start, \"I_STATEMENT_FORMAT21c\"] INSTRUCTION_FORMAT21c_TYPE REGISTER nonvoid_type_descriptor )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT21c_TYPE, (retval.start), "I_STATEMENT_FORMAT21c"), root_1);
@@ -11367,7 +11367,7 @@
 
 
 	// $ANTLR start "insn_format21ih"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:922:1: insn_format21ih : INSTRUCTION_FORMAT21ih REGISTER COMMA fixed_32bit_literal -> ^( I_STATEMENT_FORMAT21ih[$start, \"I_STATEMENT_FORMAT21ih\"] INSTRUCTION_FORMAT21ih REGISTER fixed_32bit_literal ) ;
+	// smaliParser.g:922:1: insn_format21ih : INSTRUCTION_FORMAT21ih REGISTER COMMA fixed_32bit_literal -> ^( I_STATEMENT_FORMAT21ih[$start, \"I_STATEMENT_FORMAT21ih\"] INSTRUCTION_FORMAT21ih REGISTER fixed_32bit_literal ) ;
 	public final smaliParser.insn_format21ih_return insn_format21ih() throws RecognitionException {
 		smaliParser.insn_format21ih_return retval = new smaliParser.insn_format21ih_return();
 		retval.start = input.LT(1);
@@ -11388,16 +11388,16 @@
 		RewriteRuleSubtreeStream stream_fixed_32bit_literal=new RewriteRuleSubtreeStream(adaptor,"rule fixed_32bit_literal");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:923:3: ( INSTRUCTION_FORMAT21ih REGISTER COMMA fixed_32bit_literal -> ^( I_STATEMENT_FORMAT21ih[$start, \"I_STATEMENT_FORMAT21ih\"] INSTRUCTION_FORMAT21ih REGISTER fixed_32bit_literal ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:924:5: INSTRUCTION_FORMAT21ih REGISTER COMMA fixed_32bit_literal
+			// smaliParser.g:923:3: ( INSTRUCTION_FORMAT21ih REGISTER COMMA fixed_32bit_literal -> ^( I_STATEMENT_FORMAT21ih[$start, \"I_STATEMENT_FORMAT21ih\"] INSTRUCTION_FORMAT21ih REGISTER fixed_32bit_literal ) )
+			// smaliParser.g:924:5: INSTRUCTION_FORMAT21ih REGISTER COMMA fixed_32bit_literal
 			{
-			INSTRUCTION_FORMAT21ih323=(Token)match(input,INSTRUCTION_FORMAT21ih,FOLLOW_INSTRUCTION_FORMAT21ih_in_insn_format21ih4452);
+			INSTRUCTION_FORMAT21ih323=(Token)match(input,INSTRUCTION_FORMAT21ih,FOLLOW_INSTRUCTION_FORMAT21ih_in_insn_format21ih4452);  
 			stream_INSTRUCTION_FORMAT21ih.add(INSTRUCTION_FORMAT21ih323);
 
-			REGISTER324=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21ih4454);
+			REGISTER324=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21ih4454);  
 			stream_REGISTER.add(REGISTER324);
 
-			COMMA325=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21ih4456);
+			COMMA325=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21ih4456);  
 			stream_COMMA.add(COMMA325);
 
 			pushFollow(FOLLOW_fixed_32bit_literal_in_insn_format21ih4458);
@@ -11406,19 +11406,19 @@
 
 			stream_fixed_32bit_literal.add(fixed_32bit_literal326.getTree());
 			// AST REWRITE
-			// elements: fixed_32bit_literal, INSTRUCTION_FORMAT21ih, REGISTER
-			// token labels:
+			// elements: REGISTER, INSTRUCTION_FORMAT21ih, fixed_32bit_literal
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 925:5: -> ^( I_STATEMENT_FORMAT21ih[$start, \"I_STATEMENT_FORMAT21ih\"] INSTRUCTION_FORMAT21ih REGISTER fixed_32bit_literal )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:925:8: ^( I_STATEMENT_FORMAT21ih[$start, \"I_STATEMENT_FORMAT21ih\"] INSTRUCTION_FORMAT21ih REGISTER fixed_32bit_literal )
+				// smaliParser.g:925:8: ^( I_STATEMENT_FORMAT21ih[$start, \"I_STATEMENT_FORMAT21ih\"] INSTRUCTION_FORMAT21ih REGISTER fixed_32bit_literal )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT21ih, (retval.start), "I_STATEMENT_FORMAT21ih"), root_1);
@@ -11462,7 +11462,7 @@
 
 
 	// $ANTLR start "insn_format21lh"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:927:1: insn_format21lh : INSTRUCTION_FORMAT21lh REGISTER COMMA fixed_32bit_literal -> ^( I_STATEMENT_FORMAT21lh[$start, \"I_STATEMENT_FORMAT21lh\"] INSTRUCTION_FORMAT21lh REGISTER fixed_32bit_literal ) ;
+	// smaliParser.g:927:1: insn_format21lh : INSTRUCTION_FORMAT21lh REGISTER COMMA fixed_32bit_literal -> ^( I_STATEMENT_FORMAT21lh[$start, \"I_STATEMENT_FORMAT21lh\"] INSTRUCTION_FORMAT21lh REGISTER fixed_32bit_literal ) ;
 	public final smaliParser.insn_format21lh_return insn_format21lh() throws RecognitionException {
 		smaliParser.insn_format21lh_return retval = new smaliParser.insn_format21lh_return();
 		retval.start = input.LT(1);
@@ -11483,16 +11483,16 @@
 		RewriteRuleSubtreeStream stream_fixed_32bit_literal=new RewriteRuleSubtreeStream(adaptor,"rule fixed_32bit_literal");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:928:3: ( INSTRUCTION_FORMAT21lh REGISTER COMMA fixed_32bit_literal -> ^( I_STATEMENT_FORMAT21lh[$start, \"I_STATEMENT_FORMAT21lh\"] INSTRUCTION_FORMAT21lh REGISTER fixed_32bit_literal ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:929:5: INSTRUCTION_FORMAT21lh REGISTER COMMA fixed_32bit_literal
+			// smaliParser.g:928:3: ( INSTRUCTION_FORMAT21lh REGISTER COMMA fixed_32bit_literal -> ^( I_STATEMENT_FORMAT21lh[$start, \"I_STATEMENT_FORMAT21lh\"] INSTRUCTION_FORMAT21lh REGISTER fixed_32bit_literal ) )
+			// smaliParser.g:929:5: INSTRUCTION_FORMAT21lh REGISTER COMMA fixed_32bit_literal
 			{
-			INSTRUCTION_FORMAT21lh327=(Token)match(input,INSTRUCTION_FORMAT21lh,FOLLOW_INSTRUCTION_FORMAT21lh_in_insn_format21lh4490);
+			INSTRUCTION_FORMAT21lh327=(Token)match(input,INSTRUCTION_FORMAT21lh,FOLLOW_INSTRUCTION_FORMAT21lh_in_insn_format21lh4490);  
 			stream_INSTRUCTION_FORMAT21lh.add(INSTRUCTION_FORMAT21lh327);
 
-			REGISTER328=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21lh4492);
+			REGISTER328=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21lh4492);  
 			stream_REGISTER.add(REGISTER328);
 
-			COMMA329=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21lh4494);
+			COMMA329=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21lh4494);  
 			stream_COMMA.add(COMMA329);
 
 			pushFollow(FOLLOW_fixed_32bit_literal_in_insn_format21lh4496);
@@ -11501,19 +11501,19 @@
 
 			stream_fixed_32bit_literal.add(fixed_32bit_literal330.getTree());
 			// AST REWRITE
-			// elements: fixed_32bit_literal, INSTRUCTION_FORMAT21lh, REGISTER
-			// token labels:
+			// elements: INSTRUCTION_FORMAT21lh, fixed_32bit_literal, REGISTER
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 930:5: -> ^( I_STATEMENT_FORMAT21lh[$start, \"I_STATEMENT_FORMAT21lh\"] INSTRUCTION_FORMAT21lh REGISTER fixed_32bit_literal )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:930:8: ^( I_STATEMENT_FORMAT21lh[$start, \"I_STATEMENT_FORMAT21lh\"] INSTRUCTION_FORMAT21lh REGISTER fixed_32bit_literal )
+				// smaliParser.g:930:8: ^( I_STATEMENT_FORMAT21lh[$start, \"I_STATEMENT_FORMAT21lh\"] INSTRUCTION_FORMAT21lh REGISTER fixed_32bit_literal )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT21lh, (retval.start), "I_STATEMENT_FORMAT21lh"), root_1);
@@ -11557,7 +11557,7 @@
 
 
 	// $ANTLR start "insn_format21s"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:932:1: insn_format21s : INSTRUCTION_FORMAT21s REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT21s[$start, \"I_STATEMENT_FORMAT21s\"] INSTRUCTION_FORMAT21s REGISTER integral_literal ) ;
+	// smaliParser.g:932:1: insn_format21s : INSTRUCTION_FORMAT21s REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT21s[$start, \"I_STATEMENT_FORMAT21s\"] INSTRUCTION_FORMAT21s REGISTER integral_literal ) ;
 	public final smaliParser.insn_format21s_return insn_format21s() throws RecognitionException {
 		smaliParser.insn_format21s_return retval = new smaliParser.insn_format21s_return();
 		retval.start = input.LT(1);
@@ -11578,16 +11578,16 @@
 		RewriteRuleSubtreeStream stream_integral_literal=new RewriteRuleSubtreeStream(adaptor,"rule integral_literal");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:933:3: ( INSTRUCTION_FORMAT21s REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT21s[$start, \"I_STATEMENT_FORMAT21s\"] INSTRUCTION_FORMAT21s REGISTER integral_literal ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:934:5: INSTRUCTION_FORMAT21s REGISTER COMMA integral_literal
+			// smaliParser.g:933:3: ( INSTRUCTION_FORMAT21s REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT21s[$start, \"I_STATEMENT_FORMAT21s\"] INSTRUCTION_FORMAT21s REGISTER integral_literal ) )
+			// smaliParser.g:934:5: INSTRUCTION_FORMAT21s REGISTER COMMA integral_literal
 			{
-			INSTRUCTION_FORMAT21s331=(Token)match(input,INSTRUCTION_FORMAT21s,FOLLOW_INSTRUCTION_FORMAT21s_in_insn_format21s4528);
+			INSTRUCTION_FORMAT21s331=(Token)match(input,INSTRUCTION_FORMAT21s,FOLLOW_INSTRUCTION_FORMAT21s_in_insn_format21s4528);  
 			stream_INSTRUCTION_FORMAT21s.add(INSTRUCTION_FORMAT21s331);
 
-			REGISTER332=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21s4530);
+			REGISTER332=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21s4530);  
 			stream_REGISTER.add(REGISTER332);
 
-			COMMA333=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21s4532);
+			COMMA333=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21s4532);  
 			stream_COMMA.add(COMMA333);
 
 			pushFollow(FOLLOW_integral_literal_in_insn_format21s4534);
@@ -11596,19 +11596,19 @@
 
 			stream_integral_literal.add(integral_literal334.getTree());
 			// AST REWRITE
-			// elements: REGISTER, integral_literal, INSTRUCTION_FORMAT21s
-			// token labels:
+			// elements: integral_literal, REGISTER, INSTRUCTION_FORMAT21s
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 935:5: -> ^( I_STATEMENT_FORMAT21s[$start, \"I_STATEMENT_FORMAT21s\"] INSTRUCTION_FORMAT21s REGISTER integral_literal )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:935:8: ^( I_STATEMENT_FORMAT21s[$start, \"I_STATEMENT_FORMAT21s\"] INSTRUCTION_FORMAT21s REGISTER integral_literal )
+				// smaliParser.g:935:8: ^( I_STATEMENT_FORMAT21s[$start, \"I_STATEMENT_FORMAT21s\"] INSTRUCTION_FORMAT21s REGISTER integral_literal )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT21s, (retval.start), "I_STATEMENT_FORMAT21s"), root_1);
@@ -11652,7 +11652,7 @@
 
 
 	// $ANTLR start "insn_format21t"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:937:1: insn_format21t : INSTRUCTION_FORMAT21t REGISTER COMMA label_ref -> ^( I_STATEMENT_FORMAT21t[$start, \"I_STATEMENT_FORMAT21t\"] INSTRUCTION_FORMAT21t REGISTER label_ref ) ;
+	// smaliParser.g:937:1: insn_format21t : INSTRUCTION_FORMAT21t REGISTER COMMA label_ref -> ^( I_STATEMENT_FORMAT21t[$start, \"I_STATEMENT_FORMAT21t\"] INSTRUCTION_FORMAT21t REGISTER label_ref ) ;
 	public final smaliParser.insn_format21t_return insn_format21t() throws RecognitionException {
 		smaliParser.insn_format21t_return retval = new smaliParser.insn_format21t_return();
 		retval.start = input.LT(1);
@@ -11673,16 +11673,16 @@
 		RewriteRuleSubtreeStream stream_label_ref=new RewriteRuleSubtreeStream(adaptor,"rule label_ref");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:938:3: ( INSTRUCTION_FORMAT21t REGISTER COMMA label_ref -> ^( I_STATEMENT_FORMAT21t[$start, \"I_STATEMENT_FORMAT21t\"] INSTRUCTION_FORMAT21t REGISTER label_ref ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:939:5: INSTRUCTION_FORMAT21t REGISTER COMMA label_ref
+			// smaliParser.g:938:3: ( INSTRUCTION_FORMAT21t REGISTER COMMA label_ref -> ^( I_STATEMENT_FORMAT21t[$start, \"I_STATEMENT_FORMAT21t\"] INSTRUCTION_FORMAT21t REGISTER label_ref ) )
+			// smaliParser.g:939:5: INSTRUCTION_FORMAT21t REGISTER COMMA label_ref
 			{
-			INSTRUCTION_FORMAT21t335=(Token)match(input,INSTRUCTION_FORMAT21t,FOLLOW_INSTRUCTION_FORMAT21t_in_insn_format21t4566);
+			INSTRUCTION_FORMAT21t335=(Token)match(input,INSTRUCTION_FORMAT21t,FOLLOW_INSTRUCTION_FORMAT21t_in_insn_format21t4566);  
 			stream_INSTRUCTION_FORMAT21t.add(INSTRUCTION_FORMAT21t335);
 
-			REGISTER336=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21t4568);
+			REGISTER336=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format21t4568);  
 			stream_REGISTER.add(REGISTER336);
 
-			COMMA337=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21t4570);
+			COMMA337=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format21t4570);  
 			stream_COMMA.add(COMMA337);
 
 			pushFollow(FOLLOW_label_ref_in_insn_format21t4572);
@@ -11691,19 +11691,19 @@
 
 			stream_label_ref.add(label_ref338.getTree());
 			// AST REWRITE
-			// elements: label_ref, REGISTER, INSTRUCTION_FORMAT21t
-			// token labels:
+			// elements: INSTRUCTION_FORMAT21t, label_ref, REGISTER
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 940:5: -> ^( I_STATEMENT_FORMAT21t[$start, \"I_STATEMENT_FORMAT21t\"] INSTRUCTION_FORMAT21t REGISTER label_ref )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:940:8: ^( I_STATEMENT_FORMAT21t[$start, \"I_STATEMENT_FORMAT21t\"] INSTRUCTION_FORMAT21t REGISTER label_ref )
+				// smaliParser.g:940:8: ^( I_STATEMENT_FORMAT21t[$start, \"I_STATEMENT_FORMAT21t\"] INSTRUCTION_FORMAT21t REGISTER label_ref )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT21t, (retval.start), "I_STATEMENT_FORMAT21t"), root_1);
@@ -11747,7 +11747,7 @@
 
 
 	// $ANTLR start "insn_format22b"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:942:1: insn_format22b : INSTRUCTION_FORMAT22b REGISTER COMMA REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT22b[$start, \"I_STATEMENT_FORMAT22b\"] INSTRUCTION_FORMAT22b REGISTER REGISTER integral_literal ) ;
+	// smaliParser.g:942:1: insn_format22b : INSTRUCTION_FORMAT22b REGISTER COMMA REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT22b[$start, \"I_STATEMENT_FORMAT22b\"] INSTRUCTION_FORMAT22b REGISTER REGISTER integral_literal ) ;
 	public final smaliParser.insn_format22b_return insn_format22b() throws RecognitionException {
 		smaliParser.insn_format22b_return retval = new smaliParser.insn_format22b_return();
 		retval.start = input.LT(1);
@@ -11772,22 +11772,22 @@
 		RewriteRuleSubtreeStream stream_integral_literal=new RewriteRuleSubtreeStream(adaptor,"rule integral_literal");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:943:3: ( INSTRUCTION_FORMAT22b REGISTER COMMA REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT22b[$start, \"I_STATEMENT_FORMAT22b\"] INSTRUCTION_FORMAT22b REGISTER REGISTER integral_literal ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:944:5: INSTRUCTION_FORMAT22b REGISTER COMMA REGISTER COMMA integral_literal
+			// smaliParser.g:943:3: ( INSTRUCTION_FORMAT22b REGISTER COMMA REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT22b[$start, \"I_STATEMENT_FORMAT22b\"] INSTRUCTION_FORMAT22b REGISTER REGISTER integral_literal ) )
+			// smaliParser.g:944:5: INSTRUCTION_FORMAT22b REGISTER COMMA REGISTER COMMA integral_literal
 			{
-			INSTRUCTION_FORMAT22b339=(Token)match(input,INSTRUCTION_FORMAT22b,FOLLOW_INSTRUCTION_FORMAT22b_in_insn_format22b4604);
+			INSTRUCTION_FORMAT22b339=(Token)match(input,INSTRUCTION_FORMAT22b,FOLLOW_INSTRUCTION_FORMAT22b_in_insn_format22b4604);  
 			stream_INSTRUCTION_FORMAT22b.add(INSTRUCTION_FORMAT22b339);
 
-			REGISTER340=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22b4606);
+			REGISTER340=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22b4606);  
 			stream_REGISTER.add(REGISTER340);
 
-			COMMA341=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22b4608);
+			COMMA341=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22b4608);  
 			stream_COMMA.add(COMMA341);
 
-			REGISTER342=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22b4610);
+			REGISTER342=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22b4610);  
 			stream_REGISTER.add(REGISTER342);
 
-			COMMA343=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22b4612);
+			COMMA343=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22b4612);  
 			stream_COMMA.add(COMMA343);
 
 			pushFollow(FOLLOW_integral_literal_in_insn_format22b4614);
@@ -11796,19 +11796,19 @@
 
 			stream_integral_literal.add(integral_literal344.getTree());
 			// AST REWRITE
-			// elements: INSTRUCTION_FORMAT22b, REGISTER, integral_literal, REGISTER
-			// token labels:
+			// elements: REGISTER, REGISTER, integral_literal, INSTRUCTION_FORMAT22b
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 945:5: -> ^( I_STATEMENT_FORMAT22b[$start, \"I_STATEMENT_FORMAT22b\"] INSTRUCTION_FORMAT22b REGISTER REGISTER integral_literal )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:945:8: ^( I_STATEMENT_FORMAT22b[$start, \"I_STATEMENT_FORMAT22b\"] INSTRUCTION_FORMAT22b REGISTER REGISTER integral_literal )
+				// smaliParser.g:945:8: ^( I_STATEMENT_FORMAT22b[$start, \"I_STATEMENT_FORMAT22b\"] INSTRUCTION_FORMAT22b REGISTER REGISTER integral_literal )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT22b, (retval.start), "I_STATEMENT_FORMAT22b"), root_1);
@@ -11853,7 +11853,7 @@
 
 
 	// $ANTLR start "insn_format22c_field"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:947:1: insn_format22c_field : INSTRUCTION_FORMAT22c_FIELD REGISTER COMMA REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD REGISTER REGISTER field_reference ) ;
+	// smaliParser.g:947:1: insn_format22c_field : INSTRUCTION_FORMAT22c_FIELD REGISTER COMMA REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD REGISTER REGISTER field_reference ) ;
 	public final smaliParser.insn_format22c_field_return insn_format22c_field() throws RecognitionException {
 		smaliParser.insn_format22c_field_return retval = new smaliParser.insn_format22c_field_return();
 		retval.start = input.LT(1);
@@ -11878,22 +11878,22 @@
 		RewriteRuleSubtreeStream stream_field_reference=new RewriteRuleSubtreeStream(adaptor,"rule field_reference");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:948:3: ( INSTRUCTION_FORMAT22c_FIELD REGISTER COMMA REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD REGISTER REGISTER field_reference ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:949:5: INSTRUCTION_FORMAT22c_FIELD REGISTER COMMA REGISTER COMMA field_reference
+			// smaliParser.g:948:3: ( INSTRUCTION_FORMAT22c_FIELD REGISTER COMMA REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD REGISTER REGISTER field_reference ) )
+			// smaliParser.g:949:5: INSTRUCTION_FORMAT22c_FIELD REGISTER COMMA REGISTER COMMA field_reference
 			{
-			INSTRUCTION_FORMAT22c_FIELD345=(Token)match(input,INSTRUCTION_FORMAT22c_FIELD,FOLLOW_INSTRUCTION_FORMAT22c_FIELD_in_insn_format22c_field4648);
+			INSTRUCTION_FORMAT22c_FIELD345=(Token)match(input,INSTRUCTION_FORMAT22c_FIELD,FOLLOW_INSTRUCTION_FORMAT22c_FIELD_in_insn_format22c_field4648);  
 			stream_INSTRUCTION_FORMAT22c_FIELD.add(INSTRUCTION_FORMAT22c_FIELD345);
 
-			REGISTER346=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22c_field4650);
+			REGISTER346=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22c_field4650);  
 			stream_REGISTER.add(REGISTER346);
 
-			COMMA347=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22c_field4652);
+			COMMA347=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22c_field4652);  
 			stream_COMMA.add(COMMA347);
 
-			REGISTER348=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22c_field4654);
+			REGISTER348=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22c_field4654);  
 			stream_REGISTER.add(REGISTER348);
 
-			COMMA349=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22c_field4656);
+			COMMA349=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22c_field4656);  
 			stream_COMMA.add(COMMA349);
 
 			pushFollow(FOLLOW_field_reference_in_insn_format22c_field4658);
@@ -11902,19 +11902,19 @@
 
 			stream_field_reference.add(field_reference350.getTree());
 			// AST REWRITE
-			// elements: REGISTER, INSTRUCTION_FORMAT22c_FIELD, REGISTER, field_reference
-			// token labels:
+			// elements: INSTRUCTION_FORMAT22c_FIELD, REGISTER, field_reference, REGISTER
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 950:5: -> ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD REGISTER REGISTER field_reference )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:950:8: ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD REGISTER REGISTER field_reference )
+				// smaliParser.g:950:8: ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD REGISTER REGISTER field_reference )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT22c_FIELD, (retval.start), "I_STATEMENT_FORMAT22c_FIELD"), root_1);
@@ -11959,7 +11959,7 @@
 
 
 	// $ANTLR start "insn_format22c_field_odex"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:952:1: insn_format22c_field_odex : INSTRUCTION_FORMAT22c_FIELD_ODEX REGISTER COMMA REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD_ODEX REGISTER REGISTER field_reference ) ;
+	// smaliParser.g:952:1: insn_format22c_field_odex : INSTRUCTION_FORMAT22c_FIELD_ODEX REGISTER COMMA REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD_ODEX REGISTER REGISTER field_reference ) ;
 	public final smaliParser.insn_format22c_field_odex_return insn_format22c_field_odex() throws RecognitionException {
 		smaliParser.insn_format22c_field_odex_return retval = new smaliParser.insn_format22c_field_odex_return();
 		retval.start = input.LT(1);
@@ -11984,22 +11984,22 @@
 		RewriteRuleSubtreeStream stream_field_reference=new RewriteRuleSubtreeStream(adaptor,"rule field_reference");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:953:3: ( INSTRUCTION_FORMAT22c_FIELD_ODEX REGISTER COMMA REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD_ODEX REGISTER REGISTER field_reference ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:954:5: INSTRUCTION_FORMAT22c_FIELD_ODEX REGISTER COMMA REGISTER COMMA field_reference
+			// smaliParser.g:953:3: ( INSTRUCTION_FORMAT22c_FIELD_ODEX REGISTER COMMA REGISTER COMMA field_reference -> ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD_ODEX REGISTER REGISTER field_reference ) )
+			// smaliParser.g:954:5: INSTRUCTION_FORMAT22c_FIELD_ODEX REGISTER COMMA REGISTER COMMA field_reference
 			{
-			INSTRUCTION_FORMAT22c_FIELD_ODEX351=(Token)match(input,INSTRUCTION_FORMAT22c_FIELD_ODEX,FOLLOW_INSTRUCTION_FORMAT22c_FIELD_ODEX_in_insn_format22c_field_odex4692);
+			INSTRUCTION_FORMAT22c_FIELD_ODEX351=(Token)match(input,INSTRUCTION_FORMAT22c_FIELD_ODEX,FOLLOW_INSTRUCTION_FORMAT22c_FIELD_ODEX_in_insn_format22c_field_odex4692);  
 			stream_INSTRUCTION_FORMAT22c_FIELD_ODEX.add(INSTRUCTION_FORMAT22c_FIELD_ODEX351);
 
-			REGISTER352=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22c_field_odex4694);
+			REGISTER352=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22c_field_odex4694);  
 			stream_REGISTER.add(REGISTER352);
 
-			COMMA353=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22c_field_odex4696);
+			COMMA353=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22c_field_odex4696);  
 			stream_COMMA.add(COMMA353);
 
-			REGISTER354=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22c_field_odex4698);
+			REGISTER354=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22c_field_odex4698);  
 			stream_REGISTER.add(REGISTER354);
 
-			COMMA355=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22c_field_odex4700);
+			COMMA355=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22c_field_odex4700);  
 			stream_COMMA.add(COMMA355);
 
 			pushFollow(FOLLOW_field_reference_in_insn_format22c_field_odex4702);
@@ -12011,21 +12011,21 @@
 			      if (!allowOdex || opcodes.getOpcodeByName((INSTRUCTION_FORMAT22c_FIELD_ODEX351!=null?INSTRUCTION_FORMAT22c_FIELD_ODEX351.getText():null)) == null || apiLevel >= 14) {
 			        throwOdexedInstructionException(input, (INSTRUCTION_FORMAT22c_FIELD_ODEX351!=null?INSTRUCTION_FORMAT22c_FIELD_ODEX351.getText():null));
 			      }
-			
+			    
 			// AST REWRITE
-			// elements: REGISTER, REGISTER, field_reference, INSTRUCTION_FORMAT22c_FIELD_ODEX
-			// token labels:
+			// elements: INSTRUCTION_FORMAT22c_FIELD_ODEX, field_reference, REGISTER, REGISTER
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 960:5: -> ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD_ODEX REGISTER REGISTER field_reference )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:960:8: ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD_ODEX REGISTER REGISTER field_reference )
+				// smaliParser.g:960:8: ^( I_STATEMENT_FORMAT22c_FIELD[$start, \"I_STATEMENT_FORMAT22c_FIELD\"] INSTRUCTION_FORMAT22c_FIELD_ODEX REGISTER REGISTER field_reference )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT22c_FIELD, (retval.start), "I_STATEMENT_FORMAT22c_FIELD"), root_1);
@@ -12070,7 +12070,7 @@
 
 
 	// $ANTLR start "insn_format22c_type"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:962:1: insn_format22c_type : INSTRUCTION_FORMAT22c_TYPE REGISTER COMMA REGISTER COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT22c_TYPE[$start, \"I_STATEMENT_FORMAT22c_TYPE\"] INSTRUCTION_FORMAT22c_TYPE REGISTER REGISTER nonvoid_type_descriptor ) ;
+	// smaliParser.g:962:1: insn_format22c_type : INSTRUCTION_FORMAT22c_TYPE REGISTER COMMA REGISTER COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT22c_TYPE[$start, \"I_STATEMENT_FORMAT22c_TYPE\"] INSTRUCTION_FORMAT22c_TYPE REGISTER REGISTER nonvoid_type_descriptor ) ;
 	public final smaliParser.insn_format22c_type_return insn_format22c_type() throws RecognitionException {
 		smaliParser.insn_format22c_type_return retval = new smaliParser.insn_format22c_type_return();
 		retval.start = input.LT(1);
@@ -12095,22 +12095,22 @@
 		RewriteRuleSubtreeStream stream_nonvoid_type_descriptor=new RewriteRuleSubtreeStream(adaptor,"rule nonvoid_type_descriptor");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:963:3: ( INSTRUCTION_FORMAT22c_TYPE REGISTER COMMA REGISTER COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT22c_TYPE[$start, \"I_STATEMENT_FORMAT22c_TYPE\"] INSTRUCTION_FORMAT22c_TYPE REGISTER REGISTER nonvoid_type_descriptor ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:964:5: INSTRUCTION_FORMAT22c_TYPE REGISTER COMMA REGISTER COMMA nonvoid_type_descriptor
+			// smaliParser.g:963:3: ( INSTRUCTION_FORMAT22c_TYPE REGISTER COMMA REGISTER COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT22c_TYPE[$start, \"I_STATEMENT_FORMAT22c_TYPE\"] INSTRUCTION_FORMAT22c_TYPE REGISTER REGISTER nonvoid_type_descriptor ) )
+			// smaliParser.g:964:5: INSTRUCTION_FORMAT22c_TYPE REGISTER COMMA REGISTER COMMA nonvoid_type_descriptor
 			{
-			INSTRUCTION_FORMAT22c_TYPE357=(Token)match(input,INSTRUCTION_FORMAT22c_TYPE,FOLLOW_INSTRUCTION_FORMAT22c_TYPE_in_insn_format22c_type4742);
+			INSTRUCTION_FORMAT22c_TYPE357=(Token)match(input,INSTRUCTION_FORMAT22c_TYPE,FOLLOW_INSTRUCTION_FORMAT22c_TYPE_in_insn_format22c_type4742);  
 			stream_INSTRUCTION_FORMAT22c_TYPE.add(INSTRUCTION_FORMAT22c_TYPE357);
 
-			REGISTER358=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22c_type4744);
+			REGISTER358=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22c_type4744);  
 			stream_REGISTER.add(REGISTER358);
 
-			COMMA359=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22c_type4746);
+			COMMA359=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22c_type4746);  
 			stream_COMMA.add(COMMA359);
 
-			REGISTER360=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22c_type4748);
+			REGISTER360=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22c_type4748);  
 			stream_REGISTER.add(REGISTER360);
 
-			COMMA361=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22c_type4750);
+			COMMA361=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22c_type4750);  
 			stream_COMMA.add(COMMA361);
 
 			pushFollow(FOLLOW_nonvoid_type_descriptor_in_insn_format22c_type4752);
@@ -12119,19 +12119,19 @@
 
 			stream_nonvoid_type_descriptor.add(nonvoid_type_descriptor362.getTree());
 			// AST REWRITE
-			// elements: nonvoid_type_descriptor, REGISTER, INSTRUCTION_FORMAT22c_TYPE, REGISTER
-			// token labels:
+			// elements: REGISTER, REGISTER, nonvoid_type_descriptor, INSTRUCTION_FORMAT22c_TYPE
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 965:5: -> ^( I_STATEMENT_FORMAT22c_TYPE[$start, \"I_STATEMENT_FORMAT22c_TYPE\"] INSTRUCTION_FORMAT22c_TYPE REGISTER REGISTER nonvoid_type_descriptor )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:965:8: ^( I_STATEMENT_FORMAT22c_TYPE[$start, \"I_STATEMENT_FORMAT22c_TYPE\"] INSTRUCTION_FORMAT22c_TYPE REGISTER REGISTER nonvoid_type_descriptor )
+				// smaliParser.g:965:8: ^( I_STATEMENT_FORMAT22c_TYPE[$start, \"I_STATEMENT_FORMAT22c_TYPE\"] INSTRUCTION_FORMAT22c_TYPE REGISTER REGISTER nonvoid_type_descriptor )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT22c_TYPE, (retval.start), "I_STATEMENT_FORMAT22c_TYPE"), root_1);
@@ -12176,7 +12176,7 @@
 
 
 	// $ANTLR start "insn_format22cs_field"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:967:1: insn_format22cs_field : INSTRUCTION_FORMAT22cs_FIELD REGISTER COMMA REGISTER COMMA FIELD_OFFSET ;
+	// smaliParser.g:967:1: insn_format22cs_field : INSTRUCTION_FORMAT22cs_FIELD REGISTER COMMA REGISTER COMMA FIELD_OFFSET ;
 	public final smaliParser.insn_format22cs_field_return insn_format22cs_field() throws RecognitionException {
 		smaliParser.insn_format22cs_field_return retval = new smaliParser.insn_format22cs_field_return();
 		retval.start = input.LT(1);
@@ -12198,39 +12198,39 @@
 		CommonTree FIELD_OFFSET368_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:968:3: ( INSTRUCTION_FORMAT22cs_FIELD REGISTER COMMA REGISTER COMMA FIELD_OFFSET )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:969:5: INSTRUCTION_FORMAT22cs_FIELD REGISTER COMMA REGISTER COMMA FIELD_OFFSET
+			// smaliParser.g:968:3: ( INSTRUCTION_FORMAT22cs_FIELD REGISTER COMMA REGISTER COMMA FIELD_OFFSET )
+			// smaliParser.g:969:5: INSTRUCTION_FORMAT22cs_FIELD REGISTER COMMA REGISTER COMMA FIELD_OFFSET
 			{
 			root_0 = (CommonTree)adaptor.nil();
 
 
-			INSTRUCTION_FORMAT22cs_FIELD363=(Token)match(input,INSTRUCTION_FORMAT22cs_FIELD,FOLLOW_INSTRUCTION_FORMAT22cs_FIELD_in_insn_format22cs_field4786);
+			INSTRUCTION_FORMAT22cs_FIELD363=(Token)match(input,INSTRUCTION_FORMAT22cs_FIELD,FOLLOW_INSTRUCTION_FORMAT22cs_FIELD_in_insn_format22cs_field4786); 
 			INSTRUCTION_FORMAT22cs_FIELD363_tree = (CommonTree)adaptor.create(INSTRUCTION_FORMAT22cs_FIELD363);
 			adaptor.addChild(root_0, INSTRUCTION_FORMAT22cs_FIELD363_tree);
 
-			REGISTER364=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22cs_field4788);
+			REGISTER364=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22cs_field4788); 
 			REGISTER364_tree = (CommonTree)adaptor.create(REGISTER364);
 			adaptor.addChild(root_0, REGISTER364_tree);
 
-			COMMA365=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22cs_field4790);
+			COMMA365=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22cs_field4790); 
 			COMMA365_tree = (CommonTree)adaptor.create(COMMA365);
 			adaptor.addChild(root_0, COMMA365_tree);
 
-			REGISTER366=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22cs_field4792);
+			REGISTER366=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22cs_field4792); 
 			REGISTER366_tree = (CommonTree)adaptor.create(REGISTER366);
 			adaptor.addChild(root_0, REGISTER366_tree);
 
-			COMMA367=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22cs_field4794);
+			COMMA367=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22cs_field4794); 
 			COMMA367_tree = (CommonTree)adaptor.create(COMMA367);
 			adaptor.addChild(root_0, COMMA367_tree);
 
-			FIELD_OFFSET368=(Token)match(input,FIELD_OFFSET,FOLLOW_FIELD_OFFSET_in_insn_format22cs_field4796);
+			FIELD_OFFSET368=(Token)match(input,FIELD_OFFSET,FOLLOW_FIELD_OFFSET_in_insn_format22cs_field4796); 
 			FIELD_OFFSET368_tree = (CommonTree)adaptor.create(FIELD_OFFSET368);
 			adaptor.addChild(root_0, FIELD_OFFSET368_tree);
 
 
 			      throwOdexedInstructionException(input, (INSTRUCTION_FORMAT22cs_FIELD363!=null?INSTRUCTION_FORMAT22cs_FIELD363.getText():null));
-			
+			    
 			}
 
 			retval.stop = input.LT(-1);
@@ -12260,7 +12260,7 @@
 
 
 	// $ANTLR start "insn_format22s"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:974:1: insn_format22s : instruction_format22s REGISTER COMMA REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT22s[$start, \"I_STATEMENT_FORMAT22s\"] instruction_format22s REGISTER REGISTER integral_literal ) ;
+	// smaliParser.g:974:1: insn_format22s : instruction_format22s REGISTER COMMA REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT22s[$start, \"I_STATEMENT_FORMAT22s\"] instruction_format22s REGISTER REGISTER integral_literal ) ;
 	public final smaliParser.insn_format22s_return insn_format22s() throws RecognitionException {
 		smaliParser.insn_format22s_return retval = new smaliParser.insn_format22s_return();
 		retval.start = input.LT(1);
@@ -12284,24 +12284,24 @@
 		RewriteRuleSubtreeStream stream_integral_literal=new RewriteRuleSubtreeStream(adaptor,"rule integral_literal");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:975:3: ( instruction_format22s REGISTER COMMA REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT22s[$start, \"I_STATEMENT_FORMAT22s\"] instruction_format22s REGISTER REGISTER integral_literal ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:976:5: instruction_format22s REGISTER COMMA REGISTER COMMA integral_literal
+			// smaliParser.g:975:3: ( instruction_format22s REGISTER COMMA REGISTER COMMA integral_literal -> ^( I_STATEMENT_FORMAT22s[$start, \"I_STATEMENT_FORMAT22s\"] instruction_format22s REGISTER REGISTER integral_literal ) )
+			// smaliParser.g:976:5: instruction_format22s REGISTER COMMA REGISTER COMMA integral_literal
 			{
 			pushFollow(FOLLOW_instruction_format22s_in_insn_format22s4817);
 			instruction_format22s369=instruction_format22s();
 			state._fsp--;
 
 			stream_instruction_format22s.add(instruction_format22s369.getTree());
-			REGISTER370=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22s4819);
+			REGISTER370=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22s4819);  
 			stream_REGISTER.add(REGISTER370);
 
-			COMMA371=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22s4821);
+			COMMA371=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22s4821);  
 			stream_COMMA.add(COMMA371);
 
-			REGISTER372=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22s4823);
+			REGISTER372=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22s4823);  
 			stream_REGISTER.add(REGISTER372);
 
-			COMMA373=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22s4825);
+			COMMA373=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22s4825);  
 			stream_COMMA.add(COMMA373);
 
 			pushFollow(FOLLOW_integral_literal_in_insn_format22s4827);
@@ -12310,19 +12310,19 @@
 
 			stream_integral_literal.add(integral_literal374.getTree());
 			// AST REWRITE
-			// elements: instruction_format22s, integral_literal, REGISTER, REGISTER
-			// token labels:
+			// elements: REGISTER, REGISTER, instruction_format22s, integral_literal
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 977:5: -> ^( I_STATEMENT_FORMAT22s[$start, \"I_STATEMENT_FORMAT22s\"] instruction_format22s REGISTER REGISTER integral_literal )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:977:8: ^( I_STATEMENT_FORMAT22s[$start, \"I_STATEMENT_FORMAT22s\"] instruction_format22s REGISTER REGISTER integral_literal )
+				// smaliParser.g:977:8: ^( I_STATEMENT_FORMAT22s[$start, \"I_STATEMENT_FORMAT22s\"] instruction_format22s REGISTER REGISTER integral_literal )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT22s, (retval.start), "I_STATEMENT_FORMAT22s"), root_1);
@@ -12367,7 +12367,7 @@
 
 
 	// $ANTLR start "insn_format22t"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:979:1: insn_format22t : INSTRUCTION_FORMAT22t REGISTER COMMA REGISTER COMMA label_ref -> ^( I_STATEMENT_FORMAT22t[$start, \"I_STATEMENT_FFORMAT22t\"] INSTRUCTION_FORMAT22t REGISTER REGISTER label_ref ) ;
+	// smaliParser.g:979:1: insn_format22t : INSTRUCTION_FORMAT22t REGISTER COMMA REGISTER COMMA label_ref -> ^( I_STATEMENT_FORMAT22t[$start, \"I_STATEMENT_FFORMAT22t\"] INSTRUCTION_FORMAT22t REGISTER REGISTER label_ref ) ;
 	public final smaliParser.insn_format22t_return insn_format22t() throws RecognitionException {
 		smaliParser.insn_format22t_return retval = new smaliParser.insn_format22t_return();
 		retval.start = input.LT(1);
@@ -12392,22 +12392,22 @@
 		RewriteRuleSubtreeStream stream_label_ref=new RewriteRuleSubtreeStream(adaptor,"rule label_ref");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:980:3: ( INSTRUCTION_FORMAT22t REGISTER COMMA REGISTER COMMA label_ref -> ^( I_STATEMENT_FORMAT22t[$start, \"I_STATEMENT_FFORMAT22t\"] INSTRUCTION_FORMAT22t REGISTER REGISTER label_ref ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:981:5: INSTRUCTION_FORMAT22t REGISTER COMMA REGISTER COMMA label_ref
+			// smaliParser.g:980:3: ( INSTRUCTION_FORMAT22t REGISTER COMMA REGISTER COMMA label_ref -> ^( I_STATEMENT_FORMAT22t[$start, \"I_STATEMENT_FFORMAT22t\"] INSTRUCTION_FORMAT22t REGISTER REGISTER label_ref ) )
+			// smaliParser.g:981:5: INSTRUCTION_FORMAT22t REGISTER COMMA REGISTER COMMA label_ref
 			{
-			INSTRUCTION_FORMAT22t375=(Token)match(input,INSTRUCTION_FORMAT22t,FOLLOW_INSTRUCTION_FORMAT22t_in_insn_format22t4861);
+			INSTRUCTION_FORMAT22t375=(Token)match(input,INSTRUCTION_FORMAT22t,FOLLOW_INSTRUCTION_FORMAT22t_in_insn_format22t4861);  
 			stream_INSTRUCTION_FORMAT22t.add(INSTRUCTION_FORMAT22t375);
 
-			REGISTER376=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22t4863);
+			REGISTER376=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22t4863);  
 			stream_REGISTER.add(REGISTER376);
 
-			COMMA377=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22t4865);
+			COMMA377=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22t4865);  
 			stream_COMMA.add(COMMA377);
 
-			REGISTER378=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22t4867);
+			REGISTER378=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22t4867);  
 			stream_REGISTER.add(REGISTER378);
 
-			COMMA379=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22t4869);
+			COMMA379=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22t4869);  
 			stream_COMMA.add(COMMA379);
 
 			pushFollow(FOLLOW_label_ref_in_insn_format22t4871);
@@ -12416,19 +12416,19 @@
 
 			stream_label_ref.add(label_ref380.getTree());
 			// AST REWRITE
-			// elements: INSTRUCTION_FORMAT22t, REGISTER, label_ref, REGISTER
-			// token labels:
+			// elements: REGISTER, INSTRUCTION_FORMAT22t, REGISTER, label_ref
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 982:5: -> ^( I_STATEMENT_FORMAT22t[$start, \"I_STATEMENT_FFORMAT22t\"] INSTRUCTION_FORMAT22t REGISTER REGISTER label_ref )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:982:8: ^( I_STATEMENT_FORMAT22t[$start, \"I_STATEMENT_FFORMAT22t\"] INSTRUCTION_FORMAT22t REGISTER REGISTER label_ref )
+				// smaliParser.g:982:8: ^( I_STATEMENT_FORMAT22t[$start, \"I_STATEMENT_FFORMAT22t\"] INSTRUCTION_FORMAT22t REGISTER REGISTER label_ref )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT22t, (retval.start), "I_STATEMENT_FFORMAT22t"), root_1);
@@ -12473,7 +12473,7 @@
 
 
 	// $ANTLR start "insn_format22x"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:984:1: insn_format22x : INSTRUCTION_FORMAT22x REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT22x[$start, \"I_STATEMENT_FORMAT22x\"] INSTRUCTION_FORMAT22x REGISTER REGISTER ) ;
+	// smaliParser.g:984:1: insn_format22x : INSTRUCTION_FORMAT22x REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT22x[$start, \"I_STATEMENT_FORMAT22x\"] INSTRUCTION_FORMAT22x REGISTER REGISTER ) ;
 	public final smaliParser.insn_format22x_return insn_format22x() throws RecognitionException {
 		smaliParser.insn_format22x_return retval = new smaliParser.insn_format22x_return();
 		retval.start = input.LT(1);
@@ -12494,35 +12494,35 @@
 		RewriteRuleTokenStream stream_INSTRUCTION_FORMAT22x=new RewriteRuleTokenStream(adaptor,"token INSTRUCTION_FORMAT22x");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:985:3: ( INSTRUCTION_FORMAT22x REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT22x[$start, \"I_STATEMENT_FORMAT22x\"] INSTRUCTION_FORMAT22x REGISTER REGISTER ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:986:5: INSTRUCTION_FORMAT22x REGISTER COMMA REGISTER
+			// smaliParser.g:985:3: ( INSTRUCTION_FORMAT22x REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT22x[$start, \"I_STATEMENT_FORMAT22x\"] INSTRUCTION_FORMAT22x REGISTER REGISTER ) )
+			// smaliParser.g:986:5: INSTRUCTION_FORMAT22x REGISTER COMMA REGISTER
 			{
-			INSTRUCTION_FORMAT22x381=(Token)match(input,INSTRUCTION_FORMAT22x,FOLLOW_INSTRUCTION_FORMAT22x_in_insn_format22x4905);
+			INSTRUCTION_FORMAT22x381=(Token)match(input,INSTRUCTION_FORMAT22x,FOLLOW_INSTRUCTION_FORMAT22x_in_insn_format22x4905);  
 			stream_INSTRUCTION_FORMAT22x.add(INSTRUCTION_FORMAT22x381);
 
-			REGISTER382=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22x4907);
+			REGISTER382=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22x4907);  
 			stream_REGISTER.add(REGISTER382);
 
-			COMMA383=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22x4909);
+			COMMA383=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format22x4909);  
 			stream_COMMA.add(COMMA383);
 
-			REGISTER384=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22x4911);
+			REGISTER384=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format22x4911);  
 			stream_REGISTER.add(REGISTER384);
 
 			// AST REWRITE
-			// elements: REGISTER, INSTRUCTION_FORMAT22x, REGISTER
-			// token labels:
+			// elements: REGISTER, REGISTER, INSTRUCTION_FORMAT22x
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 987:5: -> ^( I_STATEMENT_FORMAT22x[$start, \"I_STATEMENT_FORMAT22x\"] INSTRUCTION_FORMAT22x REGISTER REGISTER )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:987:8: ^( I_STATEMENT_FORMAT22x[$start, \"I_STATEMENT_FORMAT22x\"] INSTRUCTION_FORMAT22x REGISTER REGISTER )
+				// smaliParser.g:987:8: ^( I_STATEMENT_FORMAT22x[$start, \"I_STATEMENT_FORMAT22x\"] INSTRUCTION_FORMAT22x REGISTER REGISTER )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT22x, (retval.start), "I_STATEMENT_FORMAT22x"), root_1);
@@ -12566,7 +12566,7 @@
 
 
 	// $ANTLR start "insn_format23x"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:989:1: insn_format23x : INSTRUCTION_FORMAT23x REGISTER COMMA REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT23x[$start, \"I_STATEMENT_FORMAT23x\"] INSTRUCTION_FORMAT23x REGISTER REGISTER REGISTER ) ;
+	// smaliParser.g:989:1: insn_format23x : INSTRUCTION_FORMAT23x REGISTER COMMA REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT23x[$start, \"I_STATEMENT_FORMAT23x\"] INSTRUCTION_FORMAT23x REGISTER REGISTER REGISTER ) ;
 	public final smaliParser.insn_format23x_return insn_format23x() throws RecognitionException {
 		smaliParser.insn_format23x_return retval = new smaliParser.insn_format23x_return();
 		retval.start = input.LT(1);
@@ -12591,41 +12591,41 @@
 		RewriteRuleTokenStream stream_INSTRUCTION_FORMAT23x=new RewriteRuleTokenStream(adaptor,"token INSTRUCTION_FORMAT23x");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:990:3: ( INSTRUCTION_FORMAT23x REGISTER COMMA REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT23x[$start, \"I_STATEMENT_FORMAT23x\"] INSTRUCTION_FORMAT23x REGISTER REGISTER REGISTER ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:991:5: INSTRUCTION_FORMAT23x REGISTER COMMA REGISTER COMMA REGISTER
+			// smaliParser.g:990:3: ( INSTRUCTION_FORMAT23x REGISTER COMMA REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT23x[$start, \"I_STATEMENT_FORMAT23x\"] INSTRUCTION_FORMAT23x REGISTER REGISTER REGISTER ) )
+			// smaliParser.g:991:5: INSTRUCTION_FORMAT23x REGISTER COMMA REGISTER COMMA REGISTER
 			{
-			INSTRUCTION_FORMAT23x385=(Token)match(input,INSTRUCTION_FORMAT23x,FOLLOW_INSTRUCTION_FORMAT23x_in_insn_format23x4943);
+			INSTRUCTION_FORMAT23x385=(Token)match(input,INSTRUCTION_FORMAT23x,FOLLOW_INSTRUCTION_FORMAT23x_in_insn_format23x4943);  
 			stream_INSTRUCTION_FORMAT23x.add(INSTRUCTION_FORMAT23x385);
 
-			REGISTER386=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format23x4945);
+			REGISTER386=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format23x4945);  
 			stream_REGISTER.add(REGISTER386);
 
-			COMMA387=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format23x4947);
+			COMMA387=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format23x4947);  
 			stream_COMMA.add(COMMA387);
 
-			REGISTER388=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format23x4949);
+			REGISTER388=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format23x4949);  
 			stream_REGISTER.add(REGISTER388);
 
-			COMMA389=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format23x4951);
+			COMMA389=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format23x4951);  
 			stream_COMMA.add(COMMA389);
 
-			REGISTER390=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format23x4953);
+			REGISTER390=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format23x4953);  
 			stream_REGISTER.add(REGISTER390);
 
 			// AST REWRITE
-			// elements: REGISTER, INSTRUCTION_FORMAT23x, REGISTER, REGISTER
-			// token labels:
+			// elements: REGISTER, REGISTER, INSTRUCTION_FORMAT23x, REGISTER
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 992:5: -> ^( I_STATEMENT_FORMAT23x[$start, \"I_STATEMENT_FORMAT23x\"] INSTRUCTION_FORMAT23x REGISTER REGISTER REGISTER )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:992:8: ^( I_STATEMENT_FORMAT23x[$start, \"I_STATEMENT_FORMAT23x\"] INSTRUCTION_FORMAT23x REGISTER REGISTER REGISTER )
+				// smaliParser.g:992:8: ^( I_STATEMENT_FORMAT23x[$start, \"I_STATEMENT_FORMAT23x\"] INSTRUCTION_FORMAT23x REGISTER REGISTER REGISTER )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT23x, (retval.start), "I_STATEMENT_FORMAT23x"), root_1);
@@ -12670,7 +12670,7 @@
 
 
 	// $ANTLR start "insn_format30t"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:994:1: insn_format30t : INSTRUCTION_FORMAT30t label_ref -> ^( I_STATEMENT_FORMAT30t[$start, \"I_STATEMENT_FORMAT30t\"] INSTRUCTION_FORMAT30t label_ref ) ;
+	// smaliParser.g:994:1: insn_format30t : INSTRUCTION_FORMAT30t label_ref -> ^( I_STATEMENT_FORMAT30t[$start, \"I_STATEMENT_FORMAT30t\"] INSTRUCTION_FORMAT30t label_ref ) ;
 	public final smaliParser.insn_format30t_return insn_format30t() throws RecognitionException {
 		smaliParser.insn_format30t_return retval = new smaliParser.insn_format30t_return();
 		retval.start = input.LT(1);
@@ -12685,10 +12685,10 @@
 		RewriteRuleSubtreeStream stream_label_ref=new RewriteRuleSubtreeStream(adaptor,"rule label_ref");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:995:3: ( INSTRUCTION_FORMAT30t label_ref -> ^( I_STATEMENT_FORMAT30t[$start, \"I_STATEMENT_FORMAT30t\"] INSTRUCTION_FORMAT30t label_ref ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:996:5: INSTRUCTION_FORMAT30t label_ref
+			// smaliParser.g:995:3: ( INSTRUCTION_FORMAT30t label_ref -> ^( I_STATEMENT_FORMAT30t[$start, \"I_STATEMENT_FORMAT30t\"] INSTRUCTION_FORMAT30t label_ref ) )
+			// smaliParser.g:996:5: INSTRUCTION_FORMAT30t label_ref
 			{
-			INSTRUCTION_FORMAT30t391=(Token)match(input,INSTRUCTION_FORMAT30t,FOLLOW_INSTRUCTION_FORMAT30t_in_insn_format30t4987);
+			INSTRUCTION_FORMAT30t391=(Token)match(input,INSTRUCTION_FORMAT30t,FOLLOW_INSTRUCTION_FORMAT30t_in_insn_format30t4987);  
 			stream_INSTRUCTION_FORMAT30t.add(INSTRUCTION_FORMAT30t391);
 
 			pushFollow(FOLLOW_label_ref_in_insn_format30t4989);
@@ -12697,19 +12697,19 @@
 
 			stream_label_ref.add(label_ref392.getTree());
 			// AST REWRITE
-			// elements: label_ref, INSTRUCTION_FORMAT30t
-			// token labels:
+			// elements: INSTRUCTION_FORMAT30t, label_ref
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 997:5: -> ^( I_STATEMENT_FORMAT30t[$start, \"I_STATEMENT_FORMAT30t\"] INSTRUCTION_FORMAT30t label_ref )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:997:8: ^( I_STATEMENT_FORMAT30t[$start, \"I_STATEMENT_FORMAT30t\"] INSTRUCTION_FORMAT30t label_ref )
+				// smaliParser.g:997:8: ^( I_STATEMENT_FORMAT30t[$start, \"I_STATEMENT_FORMAT30t\"] INSTRUCTION_FORMAT30t label_ref )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT30t, (retval.start), "I_STATEMENT_FORMAT30t"), root_1);
@@ -12752,7 +12752,7 @@
 
 
 	// $ANTLR start "insn_format31c"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:999:1: insn_format31c : INSTRUCTION_FORMAT31c REGISTER COMMA STRING_LITERAL -> ^( I_STATEMENT_FORMAT31c[$start, \"I_STATEMENT_FORMAT31c\"] INSTRUCTION_FORMAT31c REGISTER STRING_LITERAL ) ;
+	// smaliParser.g:999:1: insn_format31c : INSTRUCTION_FORMAT31c REGISTER COMMA STRING_LITERAL -> ^( I_STATEMENT_FORMAT31c[$start, \"I_STATEMENT_FORMAT31c\"] INSTRUCTION_FORMAT31c REGISTER STRING_LITERAL ) ;
 	public final smaliParser.insn_format31c_return insn_format31c() throws RecognitionException {
 		smaliParser.insn_format31c_return retval = new smaliParser.insn_format31c_return();
 		retval.start = input.LT(1);
@@ -12774,35 +12774,35 @@
 		RewriteRuleTokenStream stream_STRING_LITERAL=new RewriteRuleTokenStream(adaptor,"token STRING_LITERAL");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1000:3: ( INSTRUCTION_FORMAT31c REGISTER COMMA STRING_LITERAL -> ^( I_STATEMENT_FORMAT31c[$start, \"I_STATEMENT_FORMAT31c\"] INSTRUCTION_FORMAT31c REGISTER STRING_LITERAL ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1001:5: INSTRUCTION_FORMAT31c REGISTER COMMA STRING_LITERAL
+			// smaliParser.g:1000:3: ( INSTRUCTION_FORMAT31c REGISTER COMMA STRING_LITERAL -> ^( I_STATEMENT_FORMAT31c[$start, \"I_STATEMENT_FORMAT31c\"] INSTRUCTION_FORMAT31c REGISTER STRING_LITERAL ) )
+			// smaliParser.g:1001:5: INSTRUCTION_FORMAT31c REGISTER COMMA STRING_LITERAL
 			{
-			INSTRUCTION_FORMAT31c393=(Token)match(input,INSTRUCTION_FORMAT31c,FOLLOW_INSTRUCTION_FORMAT31c_in_insn_format31c5019);
+			INSTRUCTION_FORMAT31c393=(Token)match(input,INSTRUCTION_FORMAT31c,FOLLOW_INSTRUCTION_FORMAT31c_in_insn_format31c5019);  
 			stream_INSTRUCTION_FORMAT31c.add(INSTRUCTION_FORMAT31c393);
 
-			REGISTER394=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format31c5021);
+			REGISTER394=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format31c5021);  
 			stream_REGISTER.add(REGISTER394);
 
-			COMMA395=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format31c5023);
+			COMMA395=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format31c5023);  
 			stream_COMMA.add(COMMA395);
 
-			STRING_LITERAL396=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_insn_format31c5025);
+			STRING_LITERAL396=(Token)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_insn_format31c5025);  
 			stream_STRING_LITERAL.add(STRING_LITERAL396);
 
 			// AST REWRITE
-			// elements: STRING_LITERAL, INSTRUCTION_FORMAT31c, REGISTER
-			// token labels:
+			// elements: REGISTER, STRING_LITERAL, INSTRUCTION_FORMAT31c
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1002:5: -> ^( I_STATEMENT_FORMAT31c[$start, \"I_STATEMENT_FORMAT31c\"] INSTRUCTION_FORMAT31c REGISTER STRING_LITERAL )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1002:7: ^( I_STATEMENT_FORMAT31c[$start, \"I_STATEMENT_FORMAT31c\"] INSTRUCTION_FORMAT31c REGISTER STRING_LITERAL )
+				// smaliParser.g:1002:7: ^( I_STATEMENT_FORMAT31c[$start, \"I_STATEMENT_FORMAT31c\"] INSTRUCTION_FORMAT31c REGISTER STRING_LITERAL )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT31c, (retval.start), "I_STATEMENT_FORMAT31c"), root_1);
@@ -12846,7 +12846,7 @@
 
 
 	// $ANTLR start "insn_format31i"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1004:1: insn_format31i : instruction_format31i REGISTER COMMA fixed_32bit_literal -> ^( I_STATEMENT_FORMAT31i[$start, \"I_STATEMENT_FORMAT31i\"] instruction_format31i REGISTER fixed_32bit_literal ) ;
+	// smaliParser.g:1004:1: insn_format31i : instruction_format31i REGISTER COMMA fixed_32bit_literal -> ^( I_STATEMENT_FORMAT31i[$start, \"I_STATEMENT_FORMAT31i\"] instruction_format31i REGISTER fixed_32bit_literal ) ;
 	public final smaliParser.insn_format31i_return insn_format31i() throws RecognitionException {
 		smaliParser.insn_format31i_return retval = new smaliParser.insn_format31i_return();
 		retval.start = input.LT(1);
@@ -12866,18 +12866,18 @@
 		RewriteRuleSubtreeStream stream_instruction_format31i=new RewriteRuleSubtreeStream(adaptor,"rule instruction_format31i");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1005:3: ( instruction_format31i REGISTER COMMA fixed_32bit_literal -> ^( I_STATEMENT_FORMAT31i[$start, \"I_STATEMENT_FORMAT31i\"] instruction_format31i REGISTER fixed_32bit_literal ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1006:5: instruction_format31i REGISTER COMMA fixed_32bit_literal
+			// smaliParser.g:1005:3: ( instruction_format31i REGISTER COMMA fixed_32bit_literal -> ^( I_STATEMENT_FORMAT31i[$start, \"I_STATEMENT_FORMAT31i\"] instruction_format31i REGISTER fixed_32bit_literal ) )
+			// smaliParser.g:1006:5: instruction_format31i REGISTER COMMA fixed_32bit_literal
 			{
 			pushFollow(FOLLOW_instruction_format31i_in_insn_format31i5056);
 			instruction_format31i397=instruction_format31i();
 			state._fsp--;
 
 			stream_instruction_format31i.add(instruction_format31i397.getTree());
-			REGISTER398=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format31i5058);
+			REGISTER398=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format31i5058);  
 			stream_REGISTER.add(REGISTER398);
 
-			COMMA399=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format31i5060);
+			COMMA399=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format31i5060);  
 			stream_COMMA.add(COMMA399);
 
 			pushFollow(FOLLOW_fixed_32bit_literal_in_insn_format31i5062);
@@ -12886,19 +12886,19 @@
 
 			stream_fixed_32bit_literal.add(fixed_32bit_literal400.getTree());
 			// AST REWRITE
-			// elements: REGISTER, instruction_format31i, fixed_32bit_literal
-			// token labels:
+			// elements: instruction_format31i, REGISTER, fixed_32bit_literal
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1007:5: -> ^( I_STATEMENT_FORMAT31i[$start, \"I_STATEMENT_FORMAT31i\"] instruction_format31i REGISTER fixed_32bit_literal )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1007:8: ^( I_STATEMENT_FORMAT31i[$start, \"I_STATEMENT_FORMAT31i\"] instruction_format31i REGISTER fixed_32bit_literal )
+				// smaliParser.g:1007:8: ^( I_STATEMENT_FORMAT31i[$start, \"I_STATEMENT_FORMAT31i\"] instruction_format31i REGISTER fixed_32bit_literal )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT31i, (retval.start), "I_STATEMENT_FORMAT31i"), root_1);
@@ -12942,7 +12942,7 @@
 
 
 	// $ANTLR start "insn_format31t"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1009:1: insn_format31t : INSTRUCTION_FORMAT31t REGISTER COMMA label_ref -> ^( I_STATEMENT_FORMAT31t[$start, \"I_STATEMENT_FORMAT31t\"] INSTRUCTION_FORMAT31t REGISTER label_ref ) ;
+	// smaliParser.g:1009:1: insn_format31t : INSTRUCTION_FORMAT31t REGISTER COMMA label_ref -> ^( I_STATEMENT_FORMAT31t[$start, \"I_STATEMENT_FORMAT31t\"] INSTRUCTION_FORMAT31t REGISTER label_ref ) ;
 	public final smaliParser.insn_format31t_return insn_format31t() throws RecognitionException {
 		smaliParser.insn_format31t_return retval = new smaliParser.insn_format31t_return();
 		retval.start = input.LT(1);
@@ -12963,16 +12963,16 @@
 		RewriteRuleSubtreeStream stream_label_ref=new RewriteRuleSubtreeStream(adaptor,"rule label_ref");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1010:3: ( INSTRUCTION_FORMAT31t REGISTER COMMA label_ref -> ^( I_STATEMENT_FORMAT31t[$start, \"I_STATEMENT_FORMAT31t\"] INSTRUCTION_FORMAT31t REGISTER label_ref ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1011:5: INSTRUCTION_FORMAT31t REGISTER COMMA label_ref
+			// smaliParser.g:1010:3: ( INSTRUCTION_FORMAT31t REGISTER COMMA label_ref -> ^( I_STATEMENT_FORMAT31t[$start, \"I_STATEMENT_FORMAT31t\"] INSTRUCTION_FORMAT31t REGISTER label_ref ) )
+			// smaliParser.g:1011:5: INSTRUCTION_FORMAT31t REGISTER COMMA label_ref
 			{
-			INSTRUCTION_FORMAT31t401=(Token)match(input,INSTRUCTION_FORMAT31t,FOLLOW_INSTRUCTION_FORMAT31t_in_insn_format31t5094);
+			INSTRUCTION_FORMAT31t401=(Token)match(input,INSTRUCTION_FORMAT31t,FOLLOW_INSTRUCTION_FORMAT31t_in_insn_format31t5094);  
 			stream_INSTRUCTION_FORMAT31t.add(INSTRUCTION_FORMAT31t401);
 
-			REGISTER402=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format31t5096);
+			REGISTER402=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format31t5096);  
 			stream_REGISTER.add(REGISTER402);
 
-			COMMA403=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format31t5098);
+			COMMA403=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format31t5098);  
 			stream_COMMA.add(COMMA403);
 
 			pushFollow(FOLLOW_label_ref_in_insn_format31t5100);
@@ -12981,19 +12981,19 @@
 
 			stream_label_ref.add(label_ref404.getTree());
 			// AST REWRITE
-			// elements: label_ref, REGISTER, INSTRUCTION_FORMAT31t
-			// token labels:
+			// elements: INSTRUCTION_FORMAT31t, REGISTER, label_ref
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1012:5: -> ^( I_STATEMENT_FORMAT31t[$start, \"I_STATEMENT_FORMAT31t\"] INSTRUCTION_FORMAT31t REGISTER label_ref )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1012:8: ^( I_STATEMENT_FORMAT31t[$start, \"I_STATEMENT_FORMAT31t\"] INSTRUCTION_FORMAT31t REGISTER label_ref )
+				// smaliParser.g:1012:8: ^( I_STATEMENT_FORMAT31t[$start, \"I_STATEMENT_FORMAT31t\"] INSTRUCTION_FORMAT31t REGISTER label_ref )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT31t, (retval.start), "I_STATEMENT_FORMAT31t"), root_1);
@@ -13037,7 +13037,7 @@
 
 
 	// $ANTLR start "insn_format32x"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1014:1: insn_format32x : INSTRUCTION_FORMAT32x REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT32x[$start, \"I_STATEMENT_FORMAT32x\"] INSTRUCTION_FORMAT32x REGISTER REGISTER ) ;
+	// smaliParser.g:1014:1: insn_format32x : INSTRUCTION_FORMAT32x REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT32x[$start, \"I_STATEMENT_FORMAT32x\"] INSTRUCTION_FORMAT32x REGISTER REGISTER ) ;
 	public final smaliParser.insn_format32x_return insn_format32x() throws RecognitionException {
 		smaliParser.insn_format32x_return retval = new smaliParser.insn_format32x_return();
 		retval.start = input.LT(1);
@@ -13058,35 +13058,35 @@
 		RewriteRuleTokenStream stream_INSTRUCTION_FORMAT32x=new RewriteRuleTokenStream(adaptor,"token INSTRUCTION_FORMAT32x");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1015:3: ( INSTRUCTION_FORMAT32x REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT32x[$start, \"I_STATEMENT_FORMAT32x\"] INSTRUCTION_FORMAT32x REGISTER REGISTER ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1016:5: INSTRUCTION_FORMAT32x REGISTER COMMA REGISTER
+			// smaliParser.g:1015:3: ( INSTRUCTION_FORMAT32x REGISTER COMMA REGISTER -> ^( I_STATEMENT_FORMAT32x[$start, \"I_STATEMENT_FORMAT32x\"] INSTRUCTION_FORMAT32x REGISTER REGISTER ) )
+			// smaliParser.g:1016:5: INSTRUCTION_FORMAT32x REGISTER COMMA REGISTER
 			{
-			INSTRUCTION_FORMAT32x405=(Token)match(input,INSTRUCTION_FORMAT32x,FOLLOW_INSTRUCTION_FORMAT32x_in_insn_format32x5132);
+			INSTRUCTION_FORMAT32x405=(Token)match(input,INSTRUCTION_FORMAT32x,FOLLOW_INSTRUCTION_FORMAT32x_in_insn_format32x5132);  
 			stream_INSTRUCTION_FORMAT32x.add(INSTRUCTION_FORMAT32x405);
 
-			REGISTER406=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format32x5134);
+			REGISTER406=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format32x5134);  
 			stream_REGISTER.add(REGISTER406);
 
-			COMMA407=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format32x5136);
+			COMMA407=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format32x5136);  
 			stream_COMMA.add(COMMA407);
 
-			REGISTER408=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format32x5138);
+			REGISTER408=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format32x5138);  
 			stream_REGISTER.add(REGISTER408);
 
 			// AST REWRITE
-			// elements: REGISTER, INSTRUCTION_FORMAT32x, REGISTER
-			// token labels:
+			// elements: INSTRUCTION_FORMAT32x, REGISTER, REGISTER
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1017:5: -> ^( I_STATEMENT_FORMAT32x[$start, \"I_STATEMENT_FORMAT32x\"] INSTRUCTION_FORMAT32x REGISTER REGISTER )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1017:8: ^( I_STATEMENT_FORMAT32x[$start, \"I_STATEMENT_FORMAT32x\"] INSTRUCTION_FORMAT32x REGISTER REGISTER )
+				// smaliParser.g:1017:8: ^( I_STATEMENT_FORMAT32x[$start, \"I_STATEMENT_FORMAT32x\"] INSTRUCTION_FORMAT32x REGISTER REGISTER )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT32x, (retval.start), "I_STATEMENT_FORMAT32x"), root_1);
@@ -13130,7 +13130,7 @@
 
 
 	// $ANTLR start "insn_format35c_method"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1019:1: insn_format35c_method : INSTRUCTION_FORMAT35c_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference -> ^( I_STATEMENT_FORMAT35c_METHOD[$start, \"I_STATEMENT_FORMAT35c_METHOD\"] INSTRUCTION_FORMAT35c_METHOD register_list method_reference ) ;
+	// smaliParser.g:1019:1: insn_format35c_method : INSTRUCTION_FORMAT35c_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference -> ^( I_STATEMENT_FORMAT35c_METHOD[$start, \"I_STATEMENT_FORMAT35c_METHOD\"] INSTRUCTION_FORMAT35c_METHOD register_list method_reference ) ;
 	public final smaliParser.insn_format35c_method_return insn_format35c_method() throws RecognitionException {
 		smaliParser.insn_format35c_method_return retval = new smaliParser.insn_format35c_method_return();
 		retval.start = input.LT(1);
@@ -13156,13 +13156,13 @@
 		RewriteRuleSubtreeStream stream_register_list=new RewriteRuleSubtreeStream(adaptor,"rule register_list");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1020:3: ( INSTRUCTION_FORMAT35c_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference -> ^( I_STATEMENT_FORMAT35c_METHOD[$start, \"I_STATEMENT_FORMAT35c_METHOD\"] INSTRUCTION_FORMAT35c_METHOD register_list method_reference ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1021:5: INSTRUCTION_FORMAT35c_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference
+			// smaliParser.g:1020:3: ( INSTRUCTION_FORMAT35c_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference -> ^( I_STATEMENT_FORMAT35c_METHOD[$start, \"I_STATEMENT_FORMAT35c_METHOD\"] INSTRUCTION_FORMAT35c_METHOD register_list method_reference ) )
+			// smaliParser.g:1021:5: INSTRUCTION_FORMAT35c_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference
 			{
-			INSTRUCTION_FORMAT35c_METHOD409=(Token)match(input,INSTRUCTION_FORMAT35c_METHOD,FOLLOW_INSTRUCTION_FORMAT35c_METHOD_in_insn_format35c_method5170);
+			INSTRUCTION_FORMAT35c_METHOD409=(Token)match(input,INSTRUCTION_FORMAT35c_METHOD,FOLLOW_INSTRUCTION_FORMAT35c_METHOD_in_insn_format35c_method5170);  
 			stream_INSTRUCTION_FORMAT35c_METHOD.add(INSTRUCTION_FORMAT35c_METHOD409);
 
-			OPEN_BRACE410=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format35c_method5172);
+			OPEN_BRACE410=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format35c_method5172);  
 			stream_OPEN_BRACE.add(OPEN_BRACE410);
 
 			pushFollow(FOLLOW_register_list_in_insn_format35c_method5174);
@@ -13170,10 +13170,10 @@
 			state._fsp--;
 
 			stream_register_list.add(register_list411.getTree());
-			CLOSE_BRACE412=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format35c_method5176);
+			CLOSE_BRACE412=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format35c_method5176);  
 			stream_CLOSE_BRACE.add(CLOSE_BRACE412);
 
-			COMMA413=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format35c_method5178);
+			COMMA413=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format35c_method5178);  
 			stream_COMMA.add(COMMA413);
 
 			pushFollow(FOLLOW_method_reference_in_insn_format35c_method5180);
@@ -13182,19 +13182,19 @@
 
 			stream_method_reference.add(method_reference414.getTree());
 			// AST REWRITE
-			// elements: INSTRUCTION_FORMAT35c_METHOD, method_reference, register_list
-			// token labels:
+			// elements: INSTRUCTION_FORMAT35c_METHOD, register_list, method_reference
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1022:5: -> ^( I_STATEMENT_FORMAT35c_METHOD[$start, \"I_STATEMENT_FORMAT35c_METHOD\"] INSTRUCTION_FORMAT35c_METHOD register_list method_reference )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1022:8: ^( I_STATEMENT_FORMAT35c_METHOD[$start, \"I_STATEMENT_FORMAT35c_METHOD\"] INSTRUCTION_FORMAT35c_METHOD register_list method_reference )
+				// smaliParser.g:1022:8: ^( I_STATEMENT_FORMAT35c_METHOD[$start, \"I_STATEMENT_FORMAT35c_METHOD\"] INSTRUCTION_FORMAT35c_METHOD register_list method_reference )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT35c_METHOD, (retval.start), "I_STATEMENT_FORMAT35c_METHOD"), root_1);
@@ -13238,7 +13238,7 @@
 
 
 	// $ANTLR start "insn_format35c_type"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1024:1: insn_format35c_type : INSTRUCTION_FORMAT35c_TYPE OPEN_BRACE register_list CLOSE_BRACE COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT35c_TYPE[$start, \"I_STATEMENT_FORMAT35c_TYPE\"] INSTRUCTION_FORMAT35c_TYPE register_list nonvoid_type_descriptor ) ;
+	// smaliParser.g:1024:1: insn_format35c_type : INSTRUCTION_FORMAT35c_TYPE OPEN_BRACE register_list CLOSE_BRACE COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT35c_TYPE[$start, \"I_STATEMENT_FORMAT35c_TYPE\"] INSTRUCTION_FORMAT35c_TYPE register_list nonvoid_type_descriptor ) ;
 	public final smaliParser.insn_format35c_type_return insn_format35c_type() throws RecognitionException {
 		smaliParser.insn_format35c_type_return retval = new smaliParser.insn_format35c_type_return();
 		retval.start = input.LT(1);
@@ -13264,13 +13264,13 @@
 		RewriteRuleSubtreeStream stream_nonvoid_type_descriptor=new RewriteRuleSubtreeStream(adaptor,"rule nonvoid_type_descriptor");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1025:3: ( INSTRUCTION_FORMAT35c_TYPE OPEN_BRACE register_list CLOSE_BRACE COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT35c_TYPE[$start, \"I_STATEMENT_FORMAT35c_TYPE\"] INSTRUCTION_FORMAT35c_TYPE register_list nonvoid_type_descriptor ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1026:5: INSTRUCTION_FORMAT35c_TYPE OPEN_BRACE register_list CLOSE_BRACE COMMA nonvoid_type_descriptor
+			// smaliParser.g:1025:3: ( INSTRUCTION_FORMAT35c_TYPE OPEN_BRACE register_list CLOSE_BRACE COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT35c_TYPE[$start, \"I_STATEMENT_FORMAT35c_TYPE\"] INSTRUCTION_FORMAT35c_TYPE register_list nonvoid_type_descriptor ) )
+			// smaliParser.g:1026:5: INSTRUCTION_FORMAT35c_TYPE OPEN_BRACE register_list CLOSE_BRACE COMMA nonvoid_type_descriptor
 			{
-			INSTRUCTION_FORMAT35c_TYPE415=(Token)match(input,INSTRUCTION_FORMAT35c_TYPE,FOLLOW_INSTRUCTION_FORMAT35c_TYPE_in_insn_format35c_type5212);
+			INSTRUCTION_FORMAT35c_TYPE415=(Token)match(input,INSTRUCTION_FORMAT35c_TYPE,FOLLOW_INSTRUCTION_FORMAT35c_TYPE_in_insn_format35c_type5212);  
 			stream_INSTRUCTION_FORMAT35c_TYPE.add(INSTRUCTION_FORMAT35c_TYPE415);
 
-			OPEN_BRACE416=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format35c_type5214);
+			OPEN_BRACE416=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format35c_type5214);  
 			stream_OPEN_BRACE.add(OPEN_BRACE416);
 
 			pushFollow(FOLLOW_register_list_in_insn_format35c_type5216);
@@ -13278,10 +13278,10 @@
 			state._fsp--;
 
 			stream_register_list.add(register_list417.getTree());
-			CLOSE_BRACE418=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format35c_type5218);
+			CLOSE_BRACE418=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format35c_type5218);  
 			stream_CLOSE_BRACE.add(CLOSE_BRACE418);
 
-			COMMA419=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format35c_type5220);
+			COMMA419=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format35c_type5220);  
 			stream_COMMA.add(COMMA419);
 
 			pushFollow(FOLLOW_nonvoid_type_descriptor_in_insn_format35c_type5222);
@@ -13290,19 +13290,19 @@
 
 			stream_nonvoid_type_descriptor.add(nonvoid_type_descriptor420.getTree());
 			// AST REWRITE
-			// elements: nonvoid_type_descriptor, INSTRUCTION_FORMAT35c_TYPE, register_list
-			// token labels:
+			// elements: register_list, INSTRUCTION_FORMAT35c_TYPE, nonvoid_type_descriptor
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1027:5: -> ^( I_STATEMENT_FORMAT35c_TYPE[$start, \"I_STATEMENT_FORMAT35c_TYPE\"] INSTRUCTION_FORMAT35c_TYPE register_list nonvoid_type_descriptor )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1027:8: ^( I_STATEMENT_FORMAT35c_TYPE[$start, \"I_STATEMENT_FORMAT35c_TYPE\"] INSTRUCTION_FORMAT35c_TYPE register_list nonvoid_type_descriptor )
+				// smaliParser.g:1027:8: ^( I_STATEMENT_FORMAT35c_TYPE[$start, \"I_STATEMENT_FORMAT35c_TYPE\"] INSTRUCTION_FORMAT35c_TYPE register_list nonvoid_type_descriptor )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT35c_TYPE, (retval.start), "I_STATEMENT_FORMAT35c_TYPE"), root_1);
@@ -13346,7 +13346,7 @@
 
 
 	// $ANTLR start "insn_format35c_method_odex"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1029:1: insn_format35c_method_odex : INSTRUCTION_FORMAT35c_METHOD_ODEX OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference ;
+	// smaliParser.g:1029:1: insn_format35c_method_odex : INSTRUCTION_FORMAT35c_METHOD_ODEX OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference ;
 	public final smaliParser.insn_format35c_method_odex_return insn_format35c_method_odex() throws RecognitionException {
 		smaliParser.insn_format35c_method_odex_return retval = new smaliParser.insn_format35c_method_odex_return();
 		retval.start = input.LT(1);
@@ -13366,17 +13366,17 @@
 		CommonTree COMMA425_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1030:3: ( INSTRUCTION_FORMAT35c_METHOD_ODEX OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1031:5: INSTRUCTION_FORMAT35c_METHOD_ODEX OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference
+			// smaliParser.g:1030:3: ( INSTRUCTION_FORMAT35c_METHOD_ODEX OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference )
+			// smaliParser.g:1031:5: INSTRUCTION_FORMAT35c_METHOD_ODEX OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference
 			{
 			root_0 = (CommonTree)adaptor.nil();
 
 
-			INSTRUCTION_FORMAT35c_METHOD_ODEX421=(Token)match(input,INSTRUCTION_FORMAT35c_METHOD_ODEX,FOLLOW_INSTRUCTION_FORMAT35c_METHOD_ODEX_in_insn_format35c_method_odex5254);
+			INSTRUCTION_FORMAT35c_METHOD_ODEX421=(Token)match(input,INSTRUCTION_FORMAT35c_METHOD_ODEX,FOLLOW_INSTRUCTION_FORMAT35c_METHOD_ODEX_in_insn_format35c_method_odex5254); 
 			INSTRUCTION_FORMAT35c_METHOD_ODEX421_tree = (CommonTree)adaptor.create(INSTRUCTION_FORMAT35c_METHOD_ODEX421);
 			adaptor.addChild(root_0, INSTRUCTION_FORMAT35c_METHOD_ODEX421_tree);
 
-			OPEN_BRACE422=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format35c_method_odex5256);
+			OPEN_BRACE422=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format35c_method_odex5256); 
 			OPEN_BRACE422_tree = (CommonTree)adaptor.create(OPEN_BRACE422);
 			adaptor.addChild(root_0, OPEN_BRACE422_tree);
 
@@ -13386,11 +13386,11 @@
 
 			adaptor.addChild(root_0, register_list423.getTree());
 
-			CLOSE_BRACE424=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format35c_method_odex5260);
+			CLOSE_BRACE424=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format35c_method_odex5260); 
 			CLOSE_BRACE424_tree = (CommonTree)adaptor.create(CLOSE_BRACE424);
 			adaptor.addChild(root_0, CLOSE_BRACE424_tree);
 
-			COMMA425=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format35c_method_odex5262);
+			COMMA425=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format35c_method_odex5262); 
 			COMMA425_tree = (CommonTree)adaptor.create(COMMA425);
 			adaptor.addChild(root_0, COMMA425_tree);
 
@@ -13402,7 +13402,7 @@
 
 
 			      throwOdexedInstructionException(input, (INSTRUCTION_FORMAT35c_METHOD_ODEX421!=null?INSTRUCTION_FORMAT35c_METHOD_ODEX421.getText():null));
-			
+			    
 			}
 
 			retval.stop = input.LT(-1);
@@ -13432,7 +13432,7 @@
 
 
 	// $ANTLR start "insn_format35mi_method"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1036:1: insn_format35mi_method : INSTRUCTION_FORMAT35mi_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA INLINE_INDEX ;
+	// smaliParser.g:1036:1: insn_format35mi_method : INSTRUCTION_FORMAT35mi_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA INLINE_INDEX ;
 	public final smaliParser.insn_format35mi_method_return insn_format35mi_method() throws RecognitionException {
 		smaliParser.insn_format35mi_method_return retval = new smaliParser.insn_format35mi_method_return();
 		retval.start = input.LT(1);
@@ -13453,17 +13453,17 @@
 		CommonTree INLINE_INDEX432_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1037:3: ( INSTRUCTION_FORMAT35mi_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA INLINE_INDEX )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1038:5: INSTRUCTION_FORMAT35mi_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA INLINE_INDEX
+			// smaliParser.g:1037:3: ( INSTRUCTION_FORMAT35mi_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA INLINE_INDEX )
+			// smaliParser.g:1038:5: INSTRUCTION_FORMAT35mi_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA INLINE_INDEX
 			{
 			root_0 = (CommonTree)adaptor.nil();
 
 
-			INSTRUCTION_FORMAT35mi_METHOD427=(Token)match(input,INSTRUCTION_FORMAT35mi_METHOD,FOLLOW_INSTRUCTION_FORMAT35mi_METHOD_in_insn_format35mi_method5285);
+			INSTRUCTION_FORMAT35mi_METHOD427=(Token)match(input,INSTRUCTION_FORMAT35mi_METHOD,FOLLOW_INSTRUCTION_FORMAT35mi_METHOD_in_insn_format35mi_method5285); 
 			INSTRUCTION_FORMAT35mi_METHOD427_tree = (CommonTree)adaptor.create(INSTRUCTION_FORMAT35mi_METHOD427);
 			adaptor.addChild(root_0, INSTRUCTION_FORMAT35mi_METHOD427_tree);
 
-			OPEN_BRACE428=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format35mi_method5287);
+			OPEN_BRACE428=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format35mi_method5287); 
 			OPEN_BRACE428_tree = (CommonTree)adaptor.create(OPEN_BRACE428);
 			adaptor.addChild(root_0, OPEN_BRACE428_tree);
 
@@ -13473,21 +13473,21 @@
 
 			adaptor.addChild(root_0, register_list429.getTree());
 
-			CLOSE_BRACE430=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format35mi_method5291);
+			CLOSE_BRACE430=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format35mi_method5291); 
 			CLOSE_BRACE430_tree = (CommonTree)adaptor.create(CLOSE_BRACE430);
 			adaptor.addChild(root_0, CLOSE_BRACE430_tree);
 
-			COMMA431=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format35mi_method5293);
+			COMMA431=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format35mi_method5293); 
 			COMMA431_tree = (CommonTree)adaptor.create(COMMA431);
 			adaptor.addChild(root_0, COMMA431_tree);
 
-			INLINE_INDEX432=(Token)match(input,INLINE_INDEX,FOLLOW_INLINE_INDEX_in_insn_format35mi_method5295);
+			INLINE_INDEX432=(Token)match(input,INLINE_INDEX,FOLLOW_INLINE_INDEX_in_insn_format35mi_method5295); 
 			INLINE_INDEX432_tree = (CommonTree)adaptor.create(INLINE_INDEX432);
 			adaptor.addChild(root_0, INLINE_INDEX432_tree);
 
 
 			      throwOdexedInstructionException(input, (INSTRUCTION_FORMAT35mi_METHOD427!=null?INSTRUCTION_FORMAT35mi_METHOD427.getText():null));
-			
+			    
 			}
 
 			retval.stop = input.LT(-1);
@@ -13517,7 +13517,7 @@
 
 
 	// $ANTLR start "insn_format35ms_method"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1043:1: insn_format35ms_method : INSTRUCTION_FORMAT35ms_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA VTABLE_INDEX ;
+	// smaliParser.g:1043:1: insn_format35ms_method : INSTRUCTION_FORMAT35ms_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA VTABLE_INDEX ;
 	public final smaliParser.insn_format35ms_method_return insn_format35ms_method() throws RecognitionException {
 		smaliParser.insn_format35ms_method_return retval = new smaliParser.insn_format35ms_method_return();
 		retval.start = input.LT(1);
@@ -13538,17 +13538,17 @@
 		CommonTree VTABLE_INDEX438_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1044:3: ( INSTRUCTION_FORMAT35ms_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA VTABLE_INDEX )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1045:5: INSTRUCTION_FORMAT35ms_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA VTABLE_INDEX
+			// smaliParser.g:1044:3: ( INSTRUCTION_FORMAT35ms_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA VTABLE_INDEX )
+			// smaliParser.g:1045:5: INSTRUCTION_FORMAT35ms_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA VTABLE_INDEX
 			{
 			root_0 = (CommonTree)adaptor.nil();
 
 
-			INSTRUCTION_FORMAT35ms_METHOD433=(Token)match(input,INSTRUCTION_FORMAT35ms_METHOD,FOLLOW_INSTRUCTION_FORMAT35ms_METHOD_in_insn_format35ms_method5316);
+			INSTRUCTION_FORMAT35ms_METHOD433=(Token)match(input,INSTRUCTION_FORMAT35ms_METHOD,FOLLOW_INSTRUCTION_FORMAT35ms_METHOD_in_insn_format35ms_method5316); 
 			INSTRUCTION_FORMAT35ms_METHOD433_tree = (CommonTree)adaptor.create(INSTRUCTION_FORMAT35ms_METHOD433);
 			adaptor.addChild(root_0, INSTRUCTION_FORMAT35ms_METHOD433_tree);
 
-			OPEN_BRACE434=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format35ms_method5318);
+			OPEN_BRACE434=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format35ms_method5318); 
 			OPEN_BRACE434_tree = (CommonTree)adaptor.create(OPEN_BRACE434);
 			adaptor.addChild(root_0, OPEN_BRACE434_tree);
 
@@ -13558,21 +13558,21 @@
 
 			adaptor.addChild(root_0, register_list435.getTree());
 
-			CLOSE_BRACE436=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format35ms_method5322);
+			CLOSE_BRACE436=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format35ms_method5322); 
 			CLOSE_BRACE436_tree = (CommonTree)adaptor.create(CLOSE_BRACE436);
 			adaptor.addChild(root_0, CLOSE_BRACE436_tree);
 
-			COMMA437=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format35ms_method5324);
+			COMMA437=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format35ms_method5324); 
 			COMMA437_tree = (CommonTree)adaptor.create(COMMA437);
 			adaptor.addChild(root_0, COMMA437_tree);
 
-			VTABLE_INDEX438=(Token)match(input,VTABLE_INDEX,FOLLOW_VTABLE_INDEX_in_insn_format35ms_method5326);
+			VTABLE_INDEX438=(Token)match(input,VTABLE_INDEX,FOLLOW_VTABLE_INDEX_in_insn_format35ms_method5326); 
 			VTABLE_INDEX438_tree = (CommonTree)adaptor.create(VTABLE_INDEX438);
 			adaptor.addChild(root_0, VTABLE_INDEX438_tree);
 
 
 			      throwOdexedInstructionException(input, (INSTRUCTION_FORMAT35ms_METHOD433!=null?INSTRUCTION_FORMAT35ms_METHOD433.getText():null));
-			
+			    
 			}
 
 			retval.stop = input.LT(-1);
@@ -13602,7 +13602,7 @@
 
 
 	// $ANTLR start "insn_format3rc_method"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1050:1: insn_format3rc_method : INSTRUCTION_FORMAT3rc_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA method_reference -> ^( I_STATEMENT_FORMAT3rc_METHOD[$start, \"I_STATEMENT_FORMAT3rc_METHOD\"] INSTRUCTION_FORMAT3rc_METHOD register_range method_reference ) ;
+	// smaliParser.g:1050:1: insn_format3rc_method : INSTRUCTION_FORMAT3rc_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA method_reference -> ^( I_STATEMENT_FORMAT3rc_METHOD[$start, \"I_STATEMENT_FORMAT3rc_METHOD\"] INSTRUCTION_FORMAT3rc_METHOD register_range method_reference ) ;
 	public final smaliParser.insn_format3rc_method_return insn_format3rc_method() throws RecognitionException {
 		smaliParser.insn_format3rc_method_return retval = new smaliParser.insn_format3rc_method_return();
 		retval.start = input.LT(1);
@@ -13628,13 +13628,13 @@
 		RewriteRuleSubtreeStream stream_register_range=new RewriteRuleSubtreeStream(adaptor,"rule register_range");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1051:3: ( INSTRUCTION_FORMAT3rc_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA method_reference -> ^( I_STATEMENT_FORMAT3rc_METHOD[$start, \"I_STATEMENT_FORMAT3rc_METHOD\"] INSTRUCTION_FORMAT3rc_METHOD register_range method_reference ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1052:5: INSTRUCTION_FORMAT3rc_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA method_reference
+			// smaliParser.g:1051:3: ( INSTRUCTION_FORMAT3rc_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA method_reference -> ^( I_STATEMENT_FORMAT3rc_METHOD[$start, \"I_STATEMENT_FORMAT3rc_METHOD\"] INSTRUCTION_FORMAT3rc_METHOD register_range method_reference ) )
+			// smaliParser.g:1052:5: INSTRUCTION_FORMAT3rc_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA method_reference
 			{
-			INSTRUCTION_FORMAT3rc_METHOD439=(Token)match(input,INSTRUCTION_FORMAT3rc_METHOD,FOLLOW_INSTRUCTION_FORMAT3rc_METHOD_in_insn_format3rc_method5347);
+			INSTRUCTION_FORMAT3rc_METHOD439=(Token)match(input,INSTRUCTION_FORMAT3rc_METHOD,FOLLOW_INSTRUCTION_FORMAT3rc_METHOD_in_insn_format3rc_method5347);  
 			stream_INSTRUCTION_FORMAT3rc_METHOD.add(INSTRUCTION_FORMAT3rc_METHOD439);
 
-			OPEN_BRACE440=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format3rc_method5349);
+			OPEN_BRACE440=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format3rc_method5349);  
 			stream_OPEN_BRACE.add(OPEN_BRACE440);
 
 			pushFollow(FOLLOW_register_range_in_insn_format3rc_method5351);
@@ -13642,10 +13642,10 @@
 			state._fsp--;
 
 			stream_register_range.add(register_range441.getTree());
-			CLOSE_BRACE442=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format3rc_method5353);
+			CLOSE_BRACE442=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format3rc_method5353);  
 			stream_CLOSE_BRACE.add(CLOSE_BRACE442);
 
-			COMMA443=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format3rc_method5355);
+			COMMA443=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format3rc_method5355);  
 			stream_COMMA.add(COMMA443);
 
 			pushFollow(FOLLOW_method_reference_in_insn_format3rc_method5357);
@@ -13654,19 +13654,19 @@
 
 			stream_method_reference.add(method_reference444.getTree());
 			// AST REWRITE
-			// elements: method_reference, INSTRUCTION_FORMAT3rc_METHOD, register_range
-			// token labels:
+			// elements: register_range, INSTRUCTION_FORMAT3rc_METHOD, method_reference
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1053:5: -> ^( I_STATEMENT_FORMAT3rc_METHOD[$start, \"I_STATEMENT_FORMAT3rc_METHOD\"] INSTRUCTION_FORMAT3rc_METHOD register_range method_reference )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1053:8: ^( I_STATEMENT_FORMAT3rc_METHOD[$start, \"I_STATEMENT_FORMAT3rc_METHOD\"] INSTRUCTION_FORMAT3rc_METHOD register_range method_reference )
+				// smaliParser.g:1053:8: ^( I_STATEMENT_FORMAT3rc_METHOD[$start, \"I_STATEMENT_FORMAT3rc_METHOD\"] INSTRUCTION_FORMAT3rc_METHOD register_range method_reference )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT3rc_METHOD, (retval.start), "I_STATEMENT_FORMAT3rc_METHOD"), root_1);
@@ -13710,7 +13710,7 @@
 
 
 	// $ANTLR start "insn_format3rc_method_odex"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1055:1: insn_format3rc_method_odex : INSTRUCTION_FORMAT3rc_METHOD_ODEX OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference ;
+	// smaliParser.g:1055:1: insn_format3rc_method_odex : INSTRUCTION_FORMAT3rc_METHOD_ODEX OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference ;
 	public final smaliParser.insn_format3rc_method_odex_return insn_format3rc_method_odex() throws RecognitionException {
 		smaliParser.insn_format3rc_method_odex_return retval = new smaliParser.insn_format3rc_method_odex_return();
 		retval.start = input.LT(1);
@@ -13730,17 +13730,17 @@
 		CommonTree COMMA449_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1056:3: ( INSTRUCTION_FORMAT3rc_METHOD_ODEX OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1057:5: INSTRUCTION_FORMAT3rc_METHOD_ODEX OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference
+			// smaliParser.g:1056:3: ( INSTRUCTION_FORMAT3rc_METHOD_ODEX OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference )
+			// smaliParser.g:1057:5: INSTRUCTION_FORMAT3rc_METHOD_ODEX OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference
 			{
 			root_0 = (CommonTree)adaptor.nil();
 
 
-			INSTRUCTION_FORMAT3rc_METHOD_ODEX445=(Token)match(input,INSTRUCTION_FORMAT3rc_METHOD_ODEX,FOLLOW_INSTRUCTION_FORMAT3rc_METHOD_ODEX_in_insn_format3rc_method_odex5389);
+			INSTRUCTION_FORMAT3rc_METHOD_ODEX445=(Token)match(input,INSTRUCTION_FORMAT3rc_METHOD_ODEX,FOLLOW_INSTRUCTION_FORMAT3rc_METHOD_ODEX_in_insn_format3rc_method_odex5389); 
 			INSTRUCTION_FORMAT3rc_METHOD_ODEX445_tree = (CommonTree)adaptor.create(INSTRUCTION_FORMAT3rc_METHOD_ODEX445);
 			adaptor.addChild(root_0, INSTRUCTION_FORMAT3rc_METHOD_ODEX445_tree);
 
-			OPEN_BRACE446=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format3rc_method_odex5391);
+			OPEN_BRACE446=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format3rc_method_odex5391); 
 			OPEN_BRACE446_tree = (CommonTree)adaptor.create(OPEN_BRACE446);
 			adaptor.addChild(root_0, OPEN_BRACE446_tree);
 
@@ -13750,11 +13750,11 @@
 
 			adaptor.addChild(root_0, register_list447.getTree());
 
-			CLOSE_BRACE448=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format3rc_method_odex5395);
+			CLOSE_BRACE448=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format3rc_method_odex5395); 
 			CLOSE_BRACE448_tree = (CommonTree)adaptor.create(CLOSE_BRACE448);
 			adaptor.addChild(root_0, CLOSE_BRACE448_tree);
 
-			COMMA449=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format3rc_method_odex5397);
+			COMMA449=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format3rc_method_odex5397); 
 			COMMA449_tree = (CommonTree)adaptor.create(COMMA449);
 			adaptor.addChild(root_0, COMMA449_tree);
 
@@ -13766,7 +13766,7 @@
 
 
 			      throwOdexedInstructionException(input, (INSTRUCTION_FORMAT3rc_METHOD_ODEX445!=null?INSTRUCTION_FORMAT3rc_METHOD_ODEX445.getText():null));
-			
+			    
 			}
 
 			retval.stop = input.LT(-1);
@@ -13796,7 +13796,7 @@
 
 
 	// $ANTLR start "insn_format3rc_type"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1062:1: insn_format3rc_type : INSTRUCTION_FORMAT3rc_TYPE OPEN_BRACE register_range CLOSE_BRACE COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT3rc_TYPE[$start, \"I_STATEMENT_FORMAT3rc_TYPE\"] INSTRUCTION_FORMAT3rc_TYPE register_range nonvoid_type_descriptor ) ;
+	// smaliParser.g:1062:1: insn_format3rc_type : INSTRUCTION_FORMAT3rc_TYPE OPEN_BRACE register_range CLOSE_BRACE COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT3rc_TYPE[$start, \"I_STATEMENT_FORMAT3rc_TYPE\"] INSTRUCTION_FORMAT3rc_TYPE register_range nonvoid_type_descriptor ) ;
 	public final smaliParser.insn_format3rc_type_return insn_format3rc_type() throws RecognitionException {
 		smaliParser.insn_format3rc_type_return retval = new smaliParser.insn_format3rc_type_return();
 		retval.start = input.LT(1);
@@ -13822,13 +13822,13 @@
 		RewriteRuleSubtreeStream stream_register_range=new RewriteRuleSubtreeStream(adaptor,"rule register_range");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1063:3: ( INSTRUCTION_FORMAT3rc_TYPE OPEN_BRACE register_range CLOSE_BRACE COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT3rc_TYPE[$start, \"I_STATEMENT_FORMAT3rc_TYPE\"] INSTRUCTION_FORMAT3rc_TYPE register_range nonvoid_type_descriptor ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1064:5: INSTRUCTION_FORMAT3rc_TYPE OPEN_BRACE register_range CLOSE_BRACE COMMA nonvoid_type_descriptor
+			// smaliParser.g:1063:3: ( INSTRUCTION_FORMAT3rc_TYPE OPEN_BRACE register_range CLOSE_BRACE COMMA nonvoid_type_descriptor -> ^( I_STATEMENT_FORMAT3rc_TYPE[$start, \"I_STATEMENT_FORMAT3rc_TYPE\"] INSTRUCTION_FORMAT3rc_TYPE register_range nonvoid_type_descriptor ) )
+			// smaliParser.g:1064:5: INSTRUCTION_FORMAT3rc_TYPE OPEN_BRACE register_range CLOSE_BRACE COMMA nonvoid_type_descriptor
 			{
-			INSTRUCTION_FORMAT3rc_TYPE451=(Token)match(input,INSTRUCTION_FORMAT3rc_TYPE,FOLLOW_INSTRUCTION_FORMAT3rc_TYPE_in_insn_format3rc_type5420);
+			INSTRUCTION_FORMAT3rc_TYPE451=(Token)match(input,INSTRUCTION_FORMAT3rc_TYPE,FOLLOW_INSTRUCTION_FORMAT3rc_TYPE_in_insn_format3rc_type5420);  
 			stream_INSTRUCTION_FORMAT3rc_TYPE.add(INSTRUCTION_FORMAT3rc_TYPE451);
 
-			OPEN_BRACE452=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format3rc_type5422);
+			OPEN_BRACE452=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format3rc_type5422);  
 			stream_OPEN_BRACE.add(OPEN_BRACE452);
 
 			pushFollow(FOLLOW_register_range_in_insn_format3rc_type5424);
@@ -13836,10 +13836,10 @@
 			state._fsp--;
 
 			stream_register_range.add(register_range453.getTree());
-			CLOSE_BRACE454=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format3rc_type5426);
+			CLOSE_BRACE454=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format3rc_type5426);  
 			stream_CLOSE_BRACE.add(CLOSE_BRACE454);
 
-			COMMA455=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format3rc_type5428);
+			COMMA455=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format3rc_type5428);  
 			stream_COMMA.add(COMMA455);
 
 			pushFollow(FOLLOW_nonvoid_type_descriptor_in_insn_format3rc_type5430);
@@ -13848,19 +13848,19 @@
 
 			stream_nonvoid_type_descriptor.add(nonvoid_type_descriptor456.getTree());
 			// AST REWRITE
-			// elements: nonvoid_type_descriptor, register_range, INSTRUCTION_FORMAT3rc_TYPE
-			// token labels:
+			// elements: nonvoid_type_descriptor, INSTRUCTION_FORMAT3rc_TYPE, register_range
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1065:5: -> ^( I_STATEMENT_FORMAT3rc_TYPE[$start, \"I_STATEMENT_FORMAT3rc_TYPE\"] INSTRUCTION_FORMAT3rc_TYPE register_range nonvoid_type_descriptor )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1065:8: ^( I_STATEMENT_FORMAT3rc_TYPE[$start, \"I_STATEMENT_FORMAT3rc_TYPE\"] INSTRUCTION_FORMAT3rc_TYPE register_range nonvoid_type_descriptor )
+				// smaliParser.g:1065:8: ^( I_STATEMENT_FORMAT3rc_TYPE[$start, \"I_STATEMENT_FORMAT3rc_TYPE\"] INSTRUCTION_FORMAT3rc_TYPE register_range nonvoid_type_descriptor )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT3rc_TYPE, (retval.start), "I_STATEMENT_FORMAT3rc_TYPE"), root_1);
@@ -13904,7 +13904,7 @@
 
 
 	// $ANTLR start "insn_format3rmi_method"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1067:1: insn_format3rmi_method : INSTRUCTION_FORMAT3rmi_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA INLINE_INDEX ;
+	// smaliParser.g:1067:1: insn_format3rmi_method : INSTRUCTION_FORMAT3rmi_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA INLINE_INDEX ;
 	public final smaliParser.insn_format3rmi_method_return insn_format3rmi_method() throws RecognitionException {
 		smaliParser.insn_format3rmi_method_return retval = new smaliParser.insn_format3rmi_method_return();
 		retval.start = input.LT(1);
@@ -13925,17 +13925,17 @@
 		CommonTree INLINE_INDEX462_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1068:3: ( INSTRUCTION_FORMAT3rmi_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA INLINE_INDEX )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1069:5: INSTRUCTION_FORMAT3rmi_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA INLINE_INDEX
+			// smaliParser.g:1068:3: ( INSTRUCTION_FORMAT3rmi_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA INLINE_INDEX )
+			// smaliParser.g:1069:5: INSTRUCTION_FORMAT3rmi_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA INLINE_INDEX
 			{
 			root_0 = (CommonTree)adaptor.nil();
 
 
-			INSTRUCTION_FORMAT3rmi_METHOD457=(Token)match(input,INSTRUCTION_FORMAT3rmi_METHOD,FOLLOW_INSTRUCTION_FORMAT3rmi_METHOD_in_insn_format3rmi_method5462);
+			INSTRUCTION_FORMAT3rmi_METHOD457=(Token)match(input,INSTRUCTION_FORMAT3rmi_METHOD,FOLLOW_INSTRUCTION_FORMAT3rmi_METHOD_in_insn_format3rmi_method5462); 
 			INSTRUCTION_FORMAT3rmi_METHOD457_tree = (CommonTree)adaptor.create(INSTRUCTION_FORMAT3rmi_METHOD457);
 			adaptor.addChild(root_0, INSTRUCTION_FORMAT3rmi_METHOD457_tree);
 
-			OPEN_BRACE458=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format3rmi_method5464);
+			OPEN_BRACE458=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format3rmi_method5464); 
 			OPEN_BRACE458_tree = (CommonTree)adaptor.create(OPEN_BRACE458);
 			adaptor.addChild(root_0, OPEN_BRACE458_tree);
 
@@ -13945,21 +13945,21 @@
 
 			adaptor.addChild(root_0, register_range459.getTree());
 
-			CLOSE_BRACE460=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format3rmi_method5468);
+			CLOSE_BRACE460=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format3rmi_method5468); 
 			CLOSE_BRACE460_tree = (CommonTree)adaptor.create(CLOSE_BRACE460);
 			adaptor.addChild(root_0, CLOSE_BRACE460_tree);
 
-			COMMA461=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format3rmi_method5470);
+			COMMA461=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format3rmi_method5470); 
 			COMMA461_tree = (CommonTree)adaptor.create(COMMA461);
 			adaptor.addChild(root_0, COMMA461_tree);
 
-			INLINE_INDEX462=(Token)match(input,INLINE_INDEX,FOLLOW_INLINE_INDEX_in_insn_format3rmi_method5472);
+			INLINE_INDEX462=(Token)match(input,INLINE_INDEX,FOLLOW_INLINE_INDEX_in_insn_format3rmi_method5472); 
 			INLINE_INDEX462_tree = (CommonTree)adaptor.create(INLINE_INDEX462);
 			adaptor.addChild(root_0, INLINE_INDEX462_tree);
 
 
 			      throwOdexedInstructionException(input, (INSTRUCTION_FORMAT3rmi_METHOD457!=null?INSTRUCTION_FORMAT3rmi_METHOD457.getText():null));
-			
+			    
 			}
 
 			retval.stop = input.LT(-1);
@@ -13989,7 +13989,7 @@
 
 
 	// $ANTLR start "insn_format3rms_method"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1074:1: insn_format3rms_method : INSTRUCTION_FORMAT3rms_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA VTABLE_INDEX ;
+	// smaliParser.g:1074:1: insn_format3rms_method : INSTRUCTION_FORMAT3rms_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA VTABLE_INDEX ;
 	public final smaliParser.insn_format3rms_method_return insn_format3rms_method() throws RecognitionException {
 		smaliParser.insn_format3rms_method_return retval = new smaliParser.insn_format3rms_method_return();
 		retval.start = input.LT(1);
@@ -14010,17 +14010,17 @@
 		CommonTree VTABLE_INDEX468_tree=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1075:3: ( INSTRUCTION_FORMAT3rms_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA VTABLE_INDEX )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1076:5: INSTRUCTION_FORMAT3rms_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA VTABLE_INDEX
+			// smaliParser.g:1075:3: ( INSTRUCTION_FORMAT3rms_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA VTABLE_INDEX )
+			// smaliParser.g:1076:5: INSTRUCTION_FORMAT3rms_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA VTABLE_INDEX
 			{
 			root_0 = (CommonTree)adaptor.nil();
 
 
-			INSTRUCTION_FORMAT3rms_METHOD463=(Token)match(input,INSTRUCTION_FORMAT3rms_METHOD,FOLLOW_INSTRUCTION_FORMAT3rms_METHOD_in_insn_format3rms_method5493);
+			INSTRUCTION_FORMAT3rms_METHOD463=(Token)match(input,INSTRUCTION_FORMAT3rms_METHOD,FOLLOW_INSTRUCTION_FORMAT3rms_METHOD_in_insn_format3rms_method5493); 
 			INSTRUCTION_FORMAT3rms_METHOD463_tree = (CommonTree)adaptor.create(INSTRUCTION_FORMAT3rms_METHOD463);
 			adaptor.addChild(root_0, INSTRUCTION_FORMAT3rms_METHOD463_tree);
 
-			OPEN_BRACE464=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format3rms_method5495);
+			OPEN_BRACE464=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format3rms_method5495); 
 			OPEN_BRACE464_tree = (CommonTree)adaptor.create(OPEN_BRACE464);
 			adaptor.addChild(root_0, OPEN_BRACE464_tree);
 
@@ -14030,21 +14030,21 @@
 
 			adaptor.addChild(root_0, register_range465.getTree());
 
-			CLOSE_BRACE466=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format3rms_method5499);
+			CLOSE_BRACE466=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format3rms_method5499); 
 			CLOSE_BRACE466_tree = (CommonTree)adaptor.create(CLOSE_BRACE466);
 			adaptor.addChild(root_0, CLOSE_BRACE466_tree);
 
-			COMMA467=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format3rms_method5501);
+			COMMA467=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format3rms_method5501); 
 			COMMA467_tree = (CommonTree)adaptor.create(COMMA467);
 			adaptor.addChild(root_0, COMMA467_tree);
 
-			VTABLE_INDEX468=(Token)match(input,VTABLE_INDEX,FOLLOW_VTABLE_INDEX_in_insn_format3rms_method5503);
+			VTABLE_INDEX468=(Token)match(input,VTABLE_INDEX,FOLLOW_VTABLE_INDEX_in_insn_format3rms_method5503); 
 			VTABLE_INDEX468_tree = (CommonTree)adaptor.create(VTABLE_INDEX468);
 			adaptor.addChild(root_0, VTABLE_INDEX468_tree);
 
 
 			      throwOdexedInstructionException(input, (INSTRUCTION_FORMAT3rms_METHOD463!=null?INSTRUCTION_FORMAT3rms_METHOD463.getText():null));
-			
+			    
 			}
 
 			retval.stop = input.LT(-1);
@@ -14074,7 +14074,7 @@
 
 
 	// $ANTLR start "insn_format45cc_method"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1081:1: insn_format45cc_method : INSTRUCTION_FORMAT45cc_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference COMMA method_prototype -> ^( I_STATEMENT_FORMAT45cc_METHOD[$start, \"I_STATEMENT_FORMAT45cc_METHOD\"] INSTRUCTION_FORMAT45cc_METHOD register_list method_reference method_prototype ) ;
+	// smaliParser.g:1081:1: insn_format45cc_method : INSTRUCTION_FORMAT45cc_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference COMMA method_prototype -> ^( I_STATEMENT_FORMAT45cc_METHOD[$start, \"I_STATEMENT_FORMAT45cc_METHOD\"] INSTRUCTION_FORMAT45cc_METHOD register_list method_reference method_prototype ) ;
 	public final smaliParser.insn_format45cc_method_return insn_format45cc_method() throws RecognitionException {
 		smaliParser.insn_format45cc_method_return retval = new smaliParser.insn_format45cc_method_return();
 		retval.start = input.LT(1);
@@ -14104,13 +14104,13 @@
 		RewriteRuleSubtreeStream stream_register_list=new RewriteRuleSubtreeStream(adaptor,"rule register_list");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1082:3: ( INSTRUCTION_FORMAT45cc_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference COMMA method_prototype -> ^( I_STATEMENT_FORMAT45cc_METHOD[$start, \"I_STATEMENT_FORMAT45cc_METHOD\"] INSTRUCTION_FORMAT45cc_METHOD register_list method_reference method_prototype ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1083:5: INSTRUCTION_FORMAT45cc_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference COMMA method_prototype
+			// smaliParser.g:1082:3: ( INSTRUCTION_FORMAT45cc_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference COMMA method_prototype -> ^( I_STATEMENT_FORMAT45cc_METHOD[$start, \"I_STATEMENT_FORMAT45cc_METHOD\"] INSTRUCTION_FORMAT45cc_METHOD register_list method_reference method_prototype ) )
+			// smaliParser.g:1083:5: INSTRUCTION_FORMAT45cc_METHOD OPEN_BRACE register_list CLOSE_BRACE COMMA method_reference COMMA method_prototype
 			{
-			INSTRUCTION_FORMAT45cc_METHOD469=(Token)match(input,INSTRUCTION_FORMAT45cc_METHOD,FOLLOW_INSTRUCTION_FORMAT45cc_METHOD_in_insn_format45cc_method5524);
+			INSTRUCTION_FORMAT45cc_METHOD469=(Token)match(input,INSTRUCTION_FORMAT45cc_METHOD,FOLLOW_INSTRUCTION_FORMAT45cc_METHOD_in_insn_format45cc_method5524);  
 			stream_INSTRUCTION_FORMAT45cc_METHOD.add(INSTRUCTION_FORMAT45cc_METHOD469);
 
-			OPEN_BRACE470=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format45cc_method5526);
+			OPEN_BRACE470=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format45cc_method5526);  
 			stream_OPEN_BRACE.add(OPEN_BRACE470);
 
 			pushFollow(FOLLOW_register_list_in_insn_format45cc_method5528);
@@ -14118,10 +14118,10 @@
 			state._fsp--;
 
 			stream_register_list.add(register_list471.getTree());
-			CLOSE_BRACE472=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format45cc_method5530);
+			CLOSE_BRACE472=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format45cc_method5530);  
 			stream_CLOSE_BRACE.add(CLOSE_BRACE472);
 
-			COMMA473=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format45cc_method5532);
+			COMMA473=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format45cc_method5532);  
 			stream_COMMA.add(COMMA473);
 
 			pushFollow(FOLLOW_method_reference_in_insn_format45cc_method5534);
@@ -14129,7 +14129,7 @@
 			state._fsp--;
 
 			stream_method_reference.add(method_reference474.getTree());
-			COMMA475=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format45cc_method5536);
+			COMMA475=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format45cc_method5536);  
 			stream_COMMA.add(COMMA475);
 
 			pushFollow(FOLLOW_method_prototype_in_insn_format45cc_method5538);
@@ -14138,19 +14138,19 @@
 
 			stream_method_prototype.add(method_prototype476.getTree());
 			// AST REWRITE
-			// elements: INSTRUCTION_FORMAT45cc_METHOD, method_prototype, register_list, method_reference
-			// token labels:
+			// elements: method_reference, method_prototype, INSTRUCTION_FORMAT45cc_METHOD, register_list
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1084:5: -> ^( I_STATEMENT_FORMAT45cc_METHOD[$start, \"I_STATEMENT_FORMAT45cc_METHOD\"] INSTRUCTION_FORMAT45cc_METHOD register_list method_reference method_prototype )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1084:8: ^( I_STATEMENT_FORMAT45cc_METHOD[$start, \"I_STATEMENT_FORMAT45cc_METHOD\"] INSTRUCTION_FORMAT45cc_METHOD register_list method_reference method_prototype )
+				// smaliParser.g:1084:8: ^( I_STATEMENT_FORMAT45cc_METHOD[$start, \"I_STATEMENT_FORMAT45cc_METHOD\"] INSTRUCTION_FORMAT45cc_METHOD register_list method_reference method_prototype )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT45cc_METHOD, (retval.start), "I_STATEMENT_FORMAT45cc_METHOD"), root_1);
@@ -14195,7 +14195,7 @@
 
 
 	// $ANTLR start "insn_format4rcc_method"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1086:1: insn_format4rcc_method : INSTRUCTION_FORMAT4rcc_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA method_reference COMMA method_prototype -> ^( I_STATEMENT_FORMAT4rcc_METHOD[$start, \"I_STATEMENT_FORMAT4rcc_METHOD\"] INSTRUCTION_FORMAT4rcc_METHOD register_range method_reference method_prototype ) ;
+	// smaliParser.g:1086:1: insn_format4rcc_method : INSTRUCTION_FORMAT4rcc_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA method_reference COMMA method_prototype -> ^( I_STATEMENT_FORMAT4rcc_METHOD[$start, \"I_STATEMENT_FORMAT4rcc_METHOD\"] INSTRUCTION_FORMAT4rcc_METHOD register_range method_reference method_prototype ) ;
 	public final smaliParser.insn_format4rcc_method_return insn_format4rcc_method() throws RecognitionException {
 		smaliParser.insn_format4rcc_method_return retval = new smaliParser.insn_format4rcc_method_return();
 		retval.start = input.LT(1);
@@ -14225,13 +14225,13 @@
 		RewriteRuleSubtreeStream stream_register_range=new RewriteRuleSubtreeStream(adaptor,"rule register_range");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1087:3: ( INSTRUCTION_FORMAT4rcc_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA method_reference COMMA method_prototype -> ^( I_STATEMENT_FORMAT4rcc_METHOD[$start, \"I_STATEMENT_FORMAT4rcc_METHOD\"] INSTRUCTION_FORMAT4rcc_METHOD register_range method_reference method_prototype ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1088:5: INSTRUCTION_FORMAT4rcc_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA method_reference COMMA method_prototype
+			// smaliParser.g:1087:3: ( INSTRUCTION_FORMAT4rcc_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA method_reference COMMA method_prototype -> ^( I_STATEMENT_FORMAT4rcc_METHOD[$start, \"I_STATEMENT_FORMAT4rcc_METHOD\"] INSTRUCTION_FORMAT4rcc_METHOD register_range method_reference method_prototype ) )
+			// smaliParser.g:1088:5: INSTRUCTION_FORMAT4rcc_METHOD OPEN_BRACE register_range CLOSE_BRACE COMMA method_reference COMMA method_prototype
 			{
-			INSTRUCTION_FORMAT4rcc_METHOD477=(Token)match(input,INSTRUCTION_FORMAT4rcc_METHOD,FOLLOW_INSTRUCTION_FORMAT4rcc_METHOD_in_insn_format4rcc_method5572);
+			INSTRUCTION_FORMAT4rcc_METHOD477=(Token)match(input,INSTRUCTION_FORMAT4rcc_METHOD,FOLLOW_INSTRUCTION_FORMAT4rcc_METHOD_in_insn_format4rcc_method5572);  
 			stream_INSTRUCTION_FORMAT4rcc_METHOD.add(INSTRUCTION_FORMAT4rcc_METHOD477);
 
-			OPEN_BRACE478=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format4rcc_method5574);
+			OPEN_BRACE478=(Token)match(input,OPEN_BRACE,FOLLOW_OPEN_BRACE_in_insn_format4rcc_method5574);  
 			stream_OPEN_BRACE.add(OPEN_BRACE478);
 
 			pushFollow(FOLLOW_register_range_in_insn_format4rcc_method5576);
@@ -14239,10 +14239,10 @@
 			state._fsp--;
 
 			stream_register_range.add(register_range479.getTree());
-			CLOSE_BRACE480=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format4rcc_method5578);
+			CLOSE_BRACE480=(Token)match(input,CLOSE_BRACE,FOLLOW_CLOSE_BRACE_in_insn_format4rcc_method5578);  
 			stream_CLOSE_BRACE.add(CLOSE_BRACE480);
 
-			COMMA481=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format4rcc_method5580);
+			COMMA481=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format4rcc_method5580);  
 			stream_COMMA.add(COMMA481);
 
 			pushFollow(FOLLOW_method_reference_in_insn_format4rcc_method5582);
@@ -14250,7 +14250,7 @@
 			state._fsp--;
 
 			stream_method_reference.add(method_reference482.getTree());
-			COMMA483=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format4rcc_method5584);
+			COMMA483=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format4rcc_method5584);  
 			stream_COMMA.add(COMMA483);
 
 			pushFollow(FOLLOW_method_prototype_in_insn_format4rcc_method5586);
@@ -14259,19 +14259,19 @@
 
 			stream_method_prototype.add(method_prototype484.getTree());
 			// AST REWRITE
-			// elements: method_reference, INSTRUCTION_FORMAT4rcc_METHOD, register_range, method_prototype
-			// token labels:
+			// elements: register_range, INSTRUCTION_FORMAT4rcc_METHOD, method_reference, method_prototype
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1089:5: -> ^( I_STATEMENT_FORMAT4rcc_METHOD[$start, \"I_STATEMENT_FORMAT4rcc_METHOD\"] INSTRUCTION_FORMAT4rcc_METHOD register_range method_reference method_prototype )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1089:8: ^( I_STATEMENT_FORMAT4rcc_METHOD[$start, \"I_STATEMENT_FORMAT4rcc_METHOD\"] INSTRUCTION_FORMAT4rcc_METHOD register_range method_reference method_prototype )
+				// smaliParser.g:1089:8: ^( I_STATEMENT_FORMAT4rcc_METHOD[$start, \"I_STATEMENT_FORMAT4rcc_METHOD\"] INSTRUCTION_FORMAT4rcc_METHOD register_range method_reference method_prototype )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT4rcc_METHOD, (retval.start), "I_STATEMENT_FORMAT4rcc_METHOD"), root_1);
@@ -14316,7 +14316,7 @@
 
 
 	// $ANTLR start "insn_format51l"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1091:1: insn_format51l : INSTRUCTION_FORMAT51l REGISTER COMMA fixed_literal -> ^( I_STATEMENT_FORMAT51l[$start, \"I_STATEMENT_FORMAT51l\"] INSTRUCTION_FORMAT51l REGISTER fixed_literal ) ;
+	// smaliParser.g:1091:1: insn_format51l : INSTRUCTION_FORMAT51l REGISTER COMMA fixed_literal -> ^( I_STATEMENT_FORMAT51l[$start, \"I_STATEMENT_FORMAT51l\"] INSTRUCTION_FORMAT51l REGISTER fixed_literal ) ;
 	public final smaliParser.insn_format51l_return insn_format51l() throws RecognitionException {
 		smaliParser.insn_format51l_return retval = new smaliParser.insn_format51l_return();
 		retval.start = input.LT(1);
@@ -14337,16 +14337,16 @@
 		RewriteRuleSubtreeStream stream_fixed_literal=new RewriteRuleSubtreeStream(adaptor,"rule fixed_literal");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1092:3: ( INSTRUCTION_FORMAT51l REGISTER COMMA fixed_literal -> ^( I_STATEMENT_FORMAT51l[$start, \"I_STATEMENT_FORMAT51l\"] INSTRUCTION_FORMAT51l REGISTER fixed_literal ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1093:5: INSTRUCTION_FORMAT51l REGISTER COMMA fixed_literal
+			// smaliParser.g:1092:3: ( INSTRUCTION_FORMAT51l REGISTER COMMA fixed_literal -> ^( I_STATEMENT_FORMAT51l[$start, \"I_STATEMENT_FORMAT51l\"] INSTRUCTION_FORMAT51l REGISTER fixed_literal ) )
+			// smaliParser.g:1093:5: INSTRUCTION_FORMAT51l REGISTER COMMA fixed_literal
 			{
-			INSTRUCTION_FORMAT51l485=(Token)match(input,INSTRUCTION_FORMAT51l,FOLLOW_INSTRUCTION_FORMAT51l_in_insn_format51l5620);
+			INSTRUCTION_FORMAT51l485=(Token)match(input,INSTRUCTION_FORMAT51l,FOLLOW_INSTRUCTION_FORMAT51l_in_insn_format51l5620);  
 			stream_INSTRUCTION_FORMAT51l.add(INSTRUCTION_FORMAT51l485);
 
-			REGISTER486=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format51l5622);
+			REGISTER486=(Token)match(input,REGISTER,FOLLOW_REGISTER_in_insn_format51l5622);  
 			stream_REGISTER.add(REGISTER486);
 
-			COMMA487=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format51l5624);
+			COMMA487=(Token)match(input,COMMA,FOLLOW_COMMA_in_insn_format51l5624);  
 			stream_COMMA.add(COMMA487);
 
 			pushFollow(FOLLOW_fixed_literal_in_insn_format51l5626);
@@ -14355,19 +14355,19 @@
 
 			stream_fixed_literal.add(fixed_literal488.getTree());
 			// AST REWRITE
-			// elements: INSTRUCTION_FORMAT51l, REGISTER, fixed_literal
-			// token labels:
+			// elements: REGISTER, INSTRUCTION_FORMAT51l, fixed_literal
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1094:5: -> ^( I_STATEMENT_FORMAT51l[$start, \"I_STATEMENT_FORMAT51l\"] INSTRUCTION_FORMAT51l REGISTER fixed_literal )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1094:8: ^( I_STATEMENT_FORMAT51l[$start, \"I_STATEMENT_FORMAT51l\"] INSTRUCTION_FORMAT51l REGISTER fixed_literal )
+				// smaliParser.g:1094:8: ^( I_STATEMENT_FORMAT51l[$start, \"I_STATEMENT_FORMAT51l\"] INSTRUCTION_FORMAT51l REGISTER fixed_literal )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_FORMAT51l, (retval.start), "I_STATEMENT_FORMAT51l"), root_1);
@@ -14411,7 +14411,7 @@
 
 
 	// $ANTLR start "insn_array_data_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1096:1: insn_array_data_directive : ARRAY_DATA_DIRECTIVE parsed_integer_literal ( fixed_literal )* END_ARRAY_DATA_DIRECTIVE -> ^( I_STATEMENT_ARRAY_DATA[$start, \"I_STATEMENT_ARRAY_DATA\"] ^( I_ARRAY_ELEMENT_SIZE parsed_integer_literal ) ^( I_ARRAY_ELEMENTS ( fixed_literal )* ) ) ;
+	// smaliParser.g:1096:1: insn_array_data_directive : ARRAY_DATA_DIRECTIVE parsed_integer_literal ( fixed_literal )* END_ARRAY_DATA_DIRECTIVE -> ^( I_STATEMENT_ARRAY_DATA[$start, \"I_STATEMENT_ARRAY_DATA\"] ^( I_ARRAY_ELEMENT_SIZE parsed_integer_literal ) ^( I_ARRAY_ELEMENTS ( fixed_literal )* ) ) ;
 	public final smaliParser.insn_array_data_directive_return insn_array_data_directive() throws RecognitionException {
 		smaliParser.insn_array_data_directive_return retval = new smaliParser.insn_array_data_directive_return();
 		retval.start = input.LT(1);
@@ -14431,10 +14431,10 @@
 		RewriteRuleSubtreeStream stream_fixed_literal=new RewriteRuleSubtreeStream(adaptor,"rule fixed_literal");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1097:3: ( ARRAY_DATA_DIRECTIVE parsed_integer_literal ( fixed_literal )* END_ARRAY_DATA_DIRECTIVE -> ^( I_STATEMENT_ARRAY_DATA[$start, \"I_STATEMENT_ARRAY_DATA\"] ^( I_ARRAY_ELEMENT_SIZE parsed_integer_literal ) ^( I_ARRAY_ELEMENTS ( fixed_literal )* ) ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1097:5: ARRAY_DATA_DIRECTIVE parsed_integer_literal ( fixed_literal )* END_ARRAY_DATA_DIRECTIVE
+			// smaliParser.g:1097:3: ( ARRAY_DATA_DIRECTIVE parsed_integer_literal ( fixed_literal )* END_ARRAY_DATA_DIRECTIVE -> ^( I_STATEMENT_ARRAY_DATA[$start, \"I_STATEMENT_ARRAY_DATA\"] ^( I_ARRAY_ELEMENT_SIZE parsed_integer_literal ) ^( I_ARRAY_ELEMENTS ( fixed_literal )* ) ) )
+			// smaliParser.g:1097:5: ARRAY_DATA_DIRECTIVE parsed_integer_literal ( fixed_literal )* END_ARRAY_DATA_DIRECTIVE
 			{
-			ARRAY_DATA_DIRECTIVE489=(Token)match(input,ARRAY_DATA_DIRECTIVE,FOLLOW_ARRAY_DATA_DIRECTIVE_in_insn_array_data_directive5653);
+			ARRAY_DATA_DIRECTIVE489=(Token)match(input,ARRAY_DATA_DIRECTIVE,FOLLOW_ARRAY_DATA_DIRECTIVE_in_insn_array_data_directive5653);  
 			stream_ARRAY_DATA_DIRECTIVE.add(ARRAY_DATA_DIRECTIVE489);
 
 			pushFollow(FOLLOW_parsed_integer_literal_in_insn_array_data_directive5659);
@@ -14447,8 +14447,8 @@
 			        if (elementWidth != 4 && elementWidth != 8 && elementWidth != 1 && elementWidth != 2) {
 			            throw new SemanticException(input, (retval.start), "Invalid element width: %d. Must be 1, 2, 4 or 8", elementWidth);
 			        }
-			
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1105:5: ( fixed_literal )*
+			    
+			// smaliParser.g:1105:5: ( fixed_literal )*
 			loop52:
 			while (true) {
 				int alt52=2;
@@ -14459,7 +14459,7 @@
 
 				switch (alt52) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1105:5: fixed_literal
+					// smaliParser.g:1105:5: fixed_literal
 					{
 					pushFollow(FOLLOW_fixed_literal_in_insn_array_data_directive5671);
 					fixed_literal491=fixed_literal();
@@ -14474,27 +14474,27 @@
 				}
 			}
 
-			END_ARRAY_DATA_DIRECTIVE492=(Token)match(input,END_ARRAY_DATA_DIRECTIVE,FOLLOW_END_ARRAY_DATA_DIRECTIVE_in_insn_array_data_directive5674);
+			END_ARRAY_DATA_DIRECTIVE492=(Token)match(input,END_ARRAY_DATA_DIRECTIVE,FOLLOW_END_ARRAY_DATA_DIRECTIVE_in_insn_array_data_directive5674);  
 			stream_END_ARRAY_DATA_DIRECTIVE.add(END_ARRAY_DATA_DIRECTIVE492);
 
 			// AST REWRITE
 			// elements: parsed_integer_literal, fixed_literal
-			// token labels:
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1107:5: -> ^( I_STATEMENT_ARRAY_DATA[$start, \"I_STATEMENT_ARRAY_DATA\"] ^( I_ARRAY_ELEMENT_SIZE parsed_integer_literal ) ^( I_ARRAY_ELEMENTS ( fixed_literal )* ) )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1107:8: ^( I_STATEMENT_ARRAY_DATA[$start, \"I_STATEMENT_ARRAY_DATA\"] ^( I_ARRAY_ELEMENT_SIZE parsed_integer_literal ) ^( I_ARRAY_ELEMENTS ( fixed_literal )* ) )
+				// smaliParser.g:1107:8: ^( I_STATEMENT_ARRAY_DATA[$start, \"I_STATEMENT_ARRAY_DATA\"] ^( I_ARRAY_ELEMENT_SIZE parsed_integer_literal ) ^( I_ARRAY_ELEMENTS ( fixed_literal )* ) )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_ARRAY_DATA, (retval.start), "I_STATEMENT_ARRAY_DATA"), root_1);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1107:67: ^( I_ARRAY_ELEMENT_SIZE parsed_integer_literal )
+				// smaliParser.g:1107:67: ^( I_ARRAY_ELEMENT_SIZE parsed_integer_literal )
 				{
 				CommonTree root_2 = (CommonTree)adaptor.nil();
 				root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ARRAY_ELEMENT_SIZE, "I_ARRAY_ELEMENT_SIZE"), root_2);
@@ -14502,11 +14502,11 @@
 				adaptor.addChild(root_1, root_2);
 				}
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1108:8: ^( I_ARRAY_ELEMENTS ( fixed_literal )* )
+				// smaliParser.g:1108:8: ^( I_ARRAY_ELEMENTS ( fixed_literal )* )
 				{
 				CommonTree root_2 = (CommonTree)adaptor.nil();
 				root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_ARRAY_ELEMENTS, "I_ARRAY_ELEMENTS"), root_2);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1108:27: ( fixed_literal )*
+				// smaliParser.g:1108:27: ( fixed_literal )*
 				while ( stream_fixed_literal.hasNext() ) {
 					adaptor.addChild(root_2, stream_fixed_literal.nextTree());
 				}
@@ -14552,7 +14552,7 @@
 
 
 	// $ANTLR start "insn_packed_switch_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1110:1: insn_packed_switch_directive : PACKED_SWITCH_DIRECTIVE fixed_32bit_literal ( label_ref )* END_PACKED_SWITCH_DIRECTIVE -> ^( I_STATEMENT_PACKED_SWITCH[$start, \"I_STATEMENT_PACKED_SWITCH\"] ^( I_PACKED_SWITCH_START_KEY[$start, \"I_PACKED_SWITCH_START_KEY\"] fixed_32bit_literal ) ^( I_PACKED_SWITCH_ELEMENTS[$start, \"I_PACKED_SWITCH_ELEMENTS\"] ( label_ref )* ) ) ;
+	// smaliParser.g:1110:1: insn_packed_switch_directive : PACKED_SWITCH_DIRECTIVE fixed_32bit_literal ( label_ref )* END_PACKED_SWITCH_DIRECTIVE -> ^( I_STATEMENT_PACKED_SWITCH[$start, \"I_STATEMENT_PACKED_SWITCH\"] ^( I_PACKED_SWITCH_START_KEY[$start, \"I_PACKED_SWITCH_START_KEY\"] fixed_32bit_literal ) ^( I_PACKED_SWITCH_ELEMENTS[$start, \"I_PACKED_SWITCH_ELEMENTS\"] ( label_ref )* ) ) ;
 	public final smaliParser.insn_packed_switch_directive_return insn_packed_switch_directive() throws RecognitionException {
 		smaliParser.insn_packed_switch_directive_return retval = new smaliParser.insn_packed_switch_directive_return();
 		retval.start = input.LT(1);
@@ -14572,10 +14572,10 @@
 		RewriteRuleSubtreeStream stream_label_ref=new RewriteRuleSubtreeStream(adaptor,"rule label_ref");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1111:5: ( PACKED_SWITCH_DIRECTIVE fixed_32bit_literal ( label_ref )* END_PACKED_SWITCH_DIRECTIVE -> ^( I_STATEMENT_PACKED_SWITCH[$start, \"I_STATEMENT_PACKED_SWITCH\"] ^( I_PACKED_SWITCH_START_KEY[$start, \"I_PACKED_SWITCH_START_KEY\"] fixed_32bit_literal ) ^( I_PACKED_SWITCH_ELEMENTS[$start, \"I_PACKED_SWITCH_ELEMENTS\"] ( label_ref )* ) ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1111:9: PACKED_SWITCH_DIRECTIVE fixed_32bit_literal ( label_ref )* END_PACKED_SWITCH_DIRECTIVE
+			// smaliParser.g:1111:5: ( PACKED_SWITCH_DIRECTIVE fixed_32bit_literal ( label_ref )* END_PACKED_SWITCH_DIRECTIVE -> ^( I_STATEMENT_PACKED_SWITCH[$start, \"I_STATEMENT_PACKED_SWITCH\"] ^( I_PACKED_SWITCH_START_KEY[$start, \"I_PACKED_SWITCH_START_KEY\"] fixed_32bit_literal ) ^( I_PACKED_SWITCH_ELEMENTS[$start, \"I_PACKED_SWITCH_ELEMENTS\"] ( label_ref )* ) ) )
+			// smaliParser.g:1111:9: PACKED_SWITCH_DIRECTIVE fixed_32bit_literal ( label_ref )* END_PACKED_SWITCH_DIRECTIVE
 			{
-			PACKED_SWITCH_DIRECTIVE493=(Token)match(input,PACKED_SWITCH_DIRECTIVE,FOLLOW_PACKED_SWITCH_DIRECTIVE_in_insn_packed_switch_directive5720);
+			PACKED_SWITCH_DIRECTIVE493=(Token)match(input,PACKED_SWITCH_DIRECTIVE,FOLLOW_PACKED_SWITCH_DIRECTIVE_in_insn_packed_switch_directive5720);  
 			stream_PACKED_SWITCH_DIRECTIVE.add(PACKED_SWITCH_DIRECTIVE493);
 
 			pushFollow(FOLLOW_fixed_32bit_literal_in_insn_packed_switch_directive5726);
@@ -14583,7 +14583,7 @@
 			state._fsp--;
 
 			stream_fixed_32bit_literal.add(fixed_32bit_literal494.getTree());
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1113:5: ( label_ref )*
+			// smaliParser.g:1113:5: ( label_ref )*
 			loop53:
 			while (true) {
 				int alt53=2;
@@ -14594,7 +14594,7 @@
 
 				switch (alt53) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1113:5: label_ref
+					// smaliParser.g:1113:5: label_ref
 					{
 					pushFollow(FOLLOW_label_ref_in_insn_packed_switch_directive5732);
 					label_ref495=label_ref();
@@ -14609,27 +14609,27 @@
 				}
 			}
 
-			END_PACKED_SWITCH_DIRECTIVE496=(Token)match(input,END_PACKED_SWITCH_DIRECTIVE,FOLLOW_END_PACKED_SWITCH_DIRECTIVE_in_insn_packed_switch_directive5739);
+			END_PACKED_SWITCH_DIRECTIVE496=(Token)match(input,END_PACKED_SWITCH_DIRECTIVE,FOLLOW_END_PACKED_SWITCH_DIRECTIVE_in_insn_packed_switch_directive5739);  
 			stream_END_PACKED_SWITCH_DIRECTIVE.add(END_PACKED_SWITCH_DIRECTIVE496);
 
 			// AST REWRITE
-			// elements: label_ref, fixed_32bit_literal
-			// token labels:
+			// elements: fixed_32bit_literal, label_ref
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1115:5: -> ^( I_STATEMENT_PACKED_SWITCH[$start, \"I_STATEMENT_PACKED_SWITCH\"] ^( I_PACKED_SWITCH_START_KEY[$start, \"I_PACKED_SWITCH_START_KEY\"] fixed_32bit_literal ) ^( I_PACKED_SWITCH_ELEMENTS[$start, \"I_PACKED_SWITCH_ELEMENTS\"] ( label_ref )* ) )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1115:8: ^( I_STATEMENT_PACKED_SWITCH[$start, \"I_STATEMENT_PACKED_SWITCH\"] ^( I_PACKED_SWITCH_START_KEY[$start, \"I_PACKED_SWITCH_START_KEY\"] fixed_32bit_literal ) ^( I_PACKED_SWITCH_ELEMENTS[$start, \"I_PACKED_SWITCH_ELEMENTS\"] ( label_ref )* ) )
+				// smaliParser.g:1115:8: ^( I_STATEMENT_PACKED_SWITCH[$start, \"I_STATEMENT_PACKED_SWITCH\"] ^( I_PACKED_SWITCH_START_KEY[$start, \"I_PACKED_SWITCH_START_KEY\"] fixed_32bit_literal ) ^( I_PACKED_SWITCH_ELEMENTS[$start, \"I_PACKED_SWITCH_ELEMENTS\"] ( label_ref )* ) )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_PACKED_SWITCH, (retval.start), "I_STATEMENT_PACKED_SWITCH"), root_1);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1116:10: ^( I_PACKED_SWITCH_START_KEY[$start, \"I_PACKED_SWITCH_START_KEY\"] fixed_32bit_literal )
+				// smaliParser.g:1116:10: ^( I_PACKED_SWITCH_START_KEY[$start, \"I_PACKED_SWITCH_START_KEY\"] fixed_32bit_literal )
 				{
 				CommonTree root_2 = (CommonTree)adaptor.nil();
 				root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_PACKED_SWITCH_START_KEY, (retval.start), "I_PACKED_SWITCH_START_KEY"), root_2);
@@ -14637,11 +14637,11 @@
 				adaptor.addChild(root_1, root_2);
 				}
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1117:10: ^( I_PACKED_SWITCH_ELEMENTS[$start, \"I_PACKED_SWITCH_ELEMENTS\"] ( label_ref )* )
+				// smaliParser.g:1117:10: ^( I_PACKED_SWITCH_ELEMENTS[$start, \"I_PACKED_SWITCH_ELEMENTS\"] ( label_ref )* )
 				{
 				CommonTree root_2 = (CommonTree)adaptor.nil();
 				root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_PACKED_SWITCH_ELEMENTS, (retval.start), "I_PACKED_SWITCH_ELEMENTS"), root_2);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1118:11: ( label_ref )*
+				// smaliParser.g:1118:11: ( label_ref )*
 				while ( stream_label_ref.hasNext() ) {
 					adaptor.addChild(root_2, stream_label_ref.nextTree());
 				}
@@ -14687,7 +14687,7 @@
 
 
 	// $ANTLR start "insn_sparse_switch_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1121:1: insn_sparse_switch_directive : SPARSE_SWITCH_DIRECTIVE ( fixed_32bit_literal ARROW label_ref )* END_SPARSE_SWITCH_DIRECTIVE -> ^( I_STATEMENT_SPARSE_SWITCH[$start, \"I_STATEMENT_SPARSE_SWITCH\"] ^( I_SPARSE_SWITCH_ELEMENTS[$start, \"I_SPARSE_SWITCH_ELEMENTS\"] ( fixed_32bit_literal label_ref )* ) ) ;
+	// smaliParser.g:1121:1: insn_sparse_switch_directive : SPARSE_SWITCH_DIRECTIVE ( fixed_32bit_literal ARROW label_ref )* END_SPARSE_SWITCH_DIRECTIVE -> ^( I_STATEMENT_SPARSE_SWITCH[$start, \"I_STATEMENT_SPARSE_SWITCH\"] ^( I_SPARSE_SWITCH_ELEMENTS[$start, \"I_SPARSE_SWITCH_ELEMENTS\"] ( fixed_32bit_literal label_ref )* ) ) ;
 	public final smaliParser.insn_sparse_switch_directive_return insn_sparse_switch_directive() throws RecognitionException {
 		smaliParser.insn_sparse_switch_directive_return retval = new smaliParser.insn_sparse_switch_directive_return();
 		retval.start = input.LT(1);
@@ -14710,13 +14710,13 @@
 		RewriteRuleSubtreeStream stream_label_ref=new RewriteRuleSubtreeStream(adaptor,"rule label_ref");
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1122:3: ( SPARSE_SWITCH_DIRECTIVE ( fixed_32bit_literal ARROW label_ref )* END_SPARSE_SWITCH_DIRECTIVE -> ^( I_STATEMENT_SPARSE_SWITCH[$start, \"I_STATEMENT_SPARSE_SWITCH\"] ^( I_SPARSE_SWITCH_ELEMENTS[$start, \"I_SPARSE_SWITCH_ELEMENTS\"] ( fixed_32bit_literal label_ref )* ) ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1122:7: SPARSE_SWITCH_DIRECTIVE ( fixed_32bit_literal ARROW label_ref )* END_SPARSE_SWITCH_DIRECTIVE
+			// smaliParser.g:1122:3: ( SPARSE_SWITCH_DIRECTIVE ( fixed_32bit_literal ARROW label_ref )* END_SPARSE_SWITCH_DIRECTIVE -> ^( I_STATEMENT_SPARSE_SWITCH[$start, \"I_STATEMENT_SPARSE_SWITCH\"] ^( I_SPARSE_SWITCH_ELEMENTS[$start, \"I_SPARSE_SWITCH_ELEMENTS\"] ( fixed_32bit_literal label_ref )* ) ) )
+			// smaliParser.g:1122:7: SPARSE_SWITCH_DIRECTIVE ( fixed_32bit_literal ARROW label_ref )* END_SPARSE_SWITCH_DIRECTIVE
 			{
-			SPARSE_SWITCH_DIRECTIVE497=(Token)match(input,SPARSE_SWITCH_DIRECTIVE,FOLLOW_SPARSE_SWITCH_DIRECTIVE_in_insn_sparse_switch_directive5813);
+			SPARSE_SWITCH_DIRECTIVE497=(Token)match(input,SPARSE_SWITCH_DIRECTIVE,FOLLOW_SPARSE_SWITCH_DIRECTIVE_in_insn_sparse_switch_directive5813);  
 			stream_SPARSE_SWITCH_DIRECTIVE.add(SPARSE_SWITCH_DIRECTIVE497);
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1123:5: ( fixed_32bit_literal ARROW label_ref )*
+			// smaliParser.g:1123:5: ( fixed_32bit_literal ARROW label_ref )*
 			loop54:
 			while (true) {
 				int alt54=2;
@@ -14727,14 +14727,14 @@
 
 				switch (alt54) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1123:6: fixed_32bit_literal ARROW label_ref
+					// smaliParser.g:1123:6: fixed_32bit_literal ARROW label_ref
 					{
 					pushFollow(FOLLOW_fixed_32bit_literal_in_insn_sparse_switch_directive5820);
 					fixed_32bit_literal498=fixed_32bit_literal();
 					state._fsp--;
 
 					stream_fixed_32bit_literal.add(fixed_32bit_literal498.getTree());
-					ARROW499=(Token)match(input,ARROW,FOLLOW_ARROW_in_insn_sparse_switch_directive5822);
+					ARROW499=(Token)match(input,ARROW,FOLLOW_ARROW_in_insn_sparse_switch_directive5822);  
 					stream_ARROW.add(ARROW499);
 
 					pushFollow(FOLLOW_label_ref_in_insn_sparse_switch_directive5824);
@@ -14750,37 +14750,37 @@
 				}
 			}
 
-			END_SPARSE_SWITCH_DIRECTIVE501=(Token)match(input,END_SPARSE_SWITCH_DIRECTIVE,FOLLOW_END_SPARSE_SWITCH_DIRECTIVE_in_insn_sparse_switch_directive5832);
+			END_SPARSE_SWITCH_DIRECTIVE501=(Token)match(input,END_SPARSE_SWITCH_DIRECTIVE,FOLLOW_END_SPARSE_SWITCH_DIRECTIVE_in_insn_sparse_switch_directive5832);  
 			stream_END_SPARSE_SWITCH_DIRECTIVE.add(END_SPARSE_SWITCH_DIRECTIVE501);
 
 			// AST REWRITE
-			// elements: label_ref, fixed_32bit_literal
-			// token labels:
+			// elements: fixed_32bit_literal, label_ref
+			// token labels: 
 			// rule labels: retval
-			// token list labels:
-			// rule list labels:
-			// wildcard labels:
+			// token list labels: 
+			// rule list labels: 
+			// wildcard labels: 
 			retval.tree = root_0;
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.getTree():null);
 
 			root_0 = (CommonTree)adaptor.nil();
 			// 1125:5: -> ^( I_STATEMENT_SPARSE_SWITCH[$start, \"I_STATEMENT_SPARSE_SWITCH\"] ^( I_SPARSE_SWITCH_ELEMENTS[$start, \"I_SPARSE_SWITCH_ELEMENTS\"] ( fixed_32bit_literal label_ref )* ) )
 			{
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1125:8: ^( I_STATEMENT_SPARSE_SWITCH[$start, \"I_STATEMENT_SPARSE_SWITCH\"] ^( I_SPARSE_SWITCH_ELEMENTS[$start, \"I_SPARSE_SWITCH_ELEMENTS\"] ( fixed_32bit_literal label_ref )* ) )
+				// smaliParser.g:1125:8: ^( I_STATEMENT_SPARSE_SWITCH[$start, \"I_STATEMENT_SPARSE_SWITCH\"] ^( I_SPARSE_SWITCH_ELEMENTS[$start, \"I_SPARSE_SWITCH_ELEMENTS\"] ( fixed_32bit_literal label_ref )* ) )
 				{
 				CommonTree root_1 = (CommonTree)adaptor.nil();
 				root_1 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_STATEMENT_SPARSE_SWITCH, (retval.start), "I_STATEMENT_SPARSE_SWITCH"), root_1);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1126:8: ^( I_SPARSE_SWITCH_ELEMENTS[$start, \"I_SPARSE_SWITCH_ELEMENTS\"] ( fixed_32bit_literal label_ref )* )
+				// smaliParser.g:1126:8: ^( I_SPARSE_SWITCH_ELEMENTS[$start, \"I_SPARSE_SWITCH_ELEMENTS\"] ( fixed_32bit_literal label_ref )* )
 				{
 				CommonTree root_2 = (CommonTree)adaptor.nil();
 				root_2 = (CommonTree)adaptor.becomeRoot((CommonTree)adaptor.create(I_SPARSE_SWITCH_ELEMENTS, (retval.start), "I_SPARSE_SWITCH_ELEMENTS"), root_2);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliParser.g:1126:71: ( fixed_32bit_literal label_ref )*
-				while ( stream_label_ref.hasNext()||stream_fixed_32bit_literal.hasNext() ) {
+				// smaliParser.g:1126:71: ( fixed_32bit_literal label_ref )*
+				while ( stream_fixed_32bit_literal.hasNext()||stream_label_ref.hasNext() ) {
 					adaptor.addChild(root_2, stream_fixed_32bit_literal.nextTree());
 					adaptor.addChild(root_2, stream_label_ref.nextTree());
 				}
-				stream_label_ref.reset();
 				stream_fixed_32bit_literal.reset();
+				stream_label_ref.reset();
 
 				adaptor.addChild(root_1, root_2);
 				}
@@ -15154,15 +15154,15 @@
 			TokenStream input = (TokenStream)_input;
 			int _s = s;
 			switch ( s ) {
-					case 0 :
+					case 0 : 
 						int LA40_65 = input.LA(1);
-						
+						 
 						int index40_65 = input.index();
 						input.rewind();
 						s = -1;
 						if ( ((input.LA(1) == ANNOTATION_DIRECTIVE)) ) {s = 66;}
 						else if ( (true) ) {s = 1;}
-						
+						 
 						input.seek(index40_65);
 						if ( s>=0 ) return s;
 						break;
diff --git a/smali/src/main/java/org/jf/smali/smaliTreeWalker.java b/smali/src/main/java/org/jf/smali/smaliTreeWalker.java
index 667c370..30b93c4 100644
--- a/smali/src/main/java/org/jf/smali/smaliTreeWalker.java
+++ b/smali/src/main/java/org/jf/smali/smaliTreeWalker.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.5.2 /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g 2016-09-09 13:35:49
+// $ANTLR 3.5.2 smaliTreeWalker.g 2017-04-20 15:20:46
 
 package org.jf.smali;
 
@@ -49,61 +49,61 @@
 @SuppressWarnings("all")
 public class smaliTreeWalker extends TreeParser {
 	public static final String[] tokenNames = new String[] {
-		"<invalid>", "<EOR>", "<DOWN>", "<UP>", "ACCESS_SPEC", "ANNOTATION_DIRECTIVE",
-		"ANNOTATION_VISIBILITY", "ARRAY_DATA_DIRECTIVE", "ARRAY_TYPE_PREFIX",
-		"ARROW", "BOOL_LITERAL", "BYTE_LITERAL", "CATCHALL_DIRECTIVE", "CATCH_DIRECTIVE",
-		"CHAR_LITERAL", "CLASS_DESCRIPTOR", "CLASS_DIRECTIVE", "CLOSE_BRACE",
-		"CLOSE_PAREN", "COLON", "COMMA", "DOTDOT", "DOUBLE_LITERAL", "DOUBLE_LITERAL_OR_ID",
-		"END_ANNOTATION_DIRECTIVE", "END_ARRAY_DATA_DIRECTIVE", "END_FIELD_DIRECTIVE",
-		"END_LOCAL_DIRECTIVE", "END_METHOD_DIRECTIVE", "END_PACKED_SWITCH_DIRECTIVE",
-		"END_PARAMETER_DIRECTIVE", "END_SPARSE_SWITCH_DIRECTIVE", "END_SUBANNOTATION_DIRECTIVE",
-		"ENUM_DIRECTIVE", "EPILOGUE_DIRECTIVE", "EQUAL", "FIELD_DIRECTIVE", "FIELD_OFFSET",
-		"FLOAT_LITERAL", "FLOAT_LITERAL_OR_ID", "IMPLEMENTS_DIRECTIVE", "INLINE_INDEX",
-		"INSTRUCTION_FORMAT10t", "INSTRUCTION_FORMAT10x", "INSTRUCTION_FORMAT10x_ODEX",
-		"INSTRUCTION_FORMAT11n", "INSTRUCTION_FORMAT11x", "INSTRUCTION_FORMAT12x",
-		"INSTRUCTION_FORMAT12x_OR_ID", "INSTRUCTION_FORMAT20bc", "INSTRUCTION_FORMAT20t",
-		"INSTRUCTION_FORMAT21c_FIELD", "INSTRUCTION_FORMAT21c_FIELD_ODEX", "INSTRUCTION_FORMAT21c_STRING",
-		"INSTRUCTION_FORMAT21c_TYPE", "INSTRUCTION_FORMAT21ih", "INSTRUCTION_FORMAT21lh",
-		"INSTRUCTION_FORMAT21s", "INSTRUCTION_FORMAT21t", "INSTRUCTION_FORMAT22b",
-		"INSTRUCTION_FORMAT22c_FIELD", "INSTRUCTION_FORMAT22c_FIELD_ODEX", "INSTRUCTION_FORMAT22c_TYPE",
-		"INSTRUCTION_FORMAT22cs_FIELD", "INSTRUCTION_FORMAT22s", "INSTRUCTION_FORMAT22s_OR_ID",
-		"INSTRUCTION_FORMAT22t", "INSTRUCTION_FORMAT22x", "INSTRUCTION_FORMAT23x",
-		"INSTRUCTION_FORMAT30t", "INSTRUCTION_FORMAT31c", "INSTRUCTION_FORMAT31i",
-		"INSTRUCTION_FORMAT31i_OR_ID", "INSTRUCTION_FORMAT31t", "INSTRUCTION_FORMAT32x",
-		"INSTRUCTION_FORMAT35c_METHOD", "INSTRUCTION_FORMAT35c_METHOD_ODEX", "INSTRUCTION_FORMAT35c_TYPE",
-		"INSTRUCTION_FORMAT35mi_METHOD", "INSTRUCTION_FORMAT35ms_METHOD", "INSTRUCTION_FORMAT3rc_METHOD",
-		"INSTRUCTION_FORMAT3rc_METHOD_ODEX", "INSTRUCTION_FORMAT3rc_TYPE", "INSTRUCTION_FORMAT3rmi_METHOD",
-		"INSTRUCTION_FORMAT3rms_METHOD", "INSTRUCTION_FORMAT45cc_METHOD", "INSTRUCTION_FORMAT4rcc_METHOD",
-		"INSTRUCTION_FORMAT51l", "INTEGER_LITERAL", "INVALID_TOKEN", "I_ACCESS_LIST",
-		"I_ANNOTATION", "I_ANNOTATIONS", "I_ANNOTATION_ELEMENT", "I_ARRAY_ELEMENTS",
-		"I_ARRAY_ELEMENT_SIZE", "I_CATCH", "I_CATCHALL", "I_CATCHES", "I_CLASS_DEF",
-		"I_ENCODED_ARRAY", "I_ENCODED_ENUM", "I_ENCODED_FIELD", "I_ENCODED_METHOD",
-		"I_END_LOCAL", "I_EPILOGUE", "I_FIELD", "I_FIELDS", "I_FIELD_INITIAL_VALUE",
-		"I_FIELD_TYPE", "I_IMPLEMENTS", "I_LABEL", "I_LINE", "I_LOCAL", "I_LOCALS",
-		"I_METHOD", "I_METHODS", "I_METHOD_PROTOTYPE", "I_METHOD_RETURN_TYPE",
-		"I_ORDERED_METHOD_ITEMS", "I_PACKED_SWITCH_ELEMENTS", "I_PACKED_SWITCH_START_KEY",
-		"I_PARAMETER", "I_PARAMETERS", "I_PARAMETER_NOT_SPECIFIED", "I_PROLOGUE",
-		"I_REGISTERS", "I_REGISTER_LIST", "I_REGISTER_RANGE", "I_RESTART_LOCAL",
-		"I_SOURCE", "I_SPARSE_SWITCH_ELEMENTS", "I_STATEMENT_ARRAY_DATA", "I_STATEMENT_FORMAT10t",
-		"I_STATEMENT_FORMAT10x", "I_STATEMENT_FORMAT11n", "I_STATEMENT_FORMAT11x",
-		"I_STATEMENT_FORMAT12x", "I_STATEMENT_FORMAT20bc", "I_STATEMENT_FORMAT20t",
-		"I_STATEMENT_FORMAT21c_FIELD", "I_STATEMENT_FORMAT21c_STRING", "I_STATEMENT_FORMAT21c_TYPE",
-		"I_STATEMENT_FORMAT21ih", "I_STATEMENT_FORMAT21lh", "I_STATEMENT_FORMAT21s",
-		"I_STATEMENT_FORMAT21t", "I_STATEMENT_FORMAT22b", "I_STATEMENT_FORMAT22c_FIELD",
-		"I_STATEMENT_FORMAT22c_TYPE", "I_STATEMENT_FORMAT22s", "I_STATEMENT_FORMAT22t",
-		"I_STATEMENT_FORMAT22x", "I_STATEMENT_FORMAT23x", "I_STATEMENT_FORMAT30t",
-		"I_STATEMENT_FORMAT31c", "I_STATEMENT_FORMAT31i", "I_STATEMENT_FORMAT31t",
-		"I_STATEMENT_FORMAT32x", "I_STATEMENT_FORMAT35c_METHOD", "I_STATEMENT_FORMAT35c_TYPE",
-		"I_STATEMENT_FORMAT3rc_METHOD", "I_STATEMENT_FORMAT3rc_TYPE", "I_STATEMENT_FORMAT45cc_METHOD",
-		"I_STATEMENT_FORMAT4rcc_METHOD", "I_STATEMENT_FORMAT51l", "I_STATEMENT_PACKED_SWITCH",
-		"I_STATEMENT_SPARSE_SWITCH", "I_SUBANNOTATION", "I_SUPER", "LINE_COMMENT",
-		"LINE_DIRECTIVE", "LOCALS_DIRECTIVE", "LOCAL_DIRECTIVE", "LONG_LITERAL",
-		"MEMBER_NAME", "METHOD_DIRECTIVE", "NEGATIVE_INTEGER_LITERAL", "NULL_LITERAL",
-		"OPEN_BRACE", "OPEN_PAREN", "PACKED_SWITCH_DIRECTIVE", "PARAMETER_DIRECTIVE",
-		"PARAM_LIST_OR_ID_PRIMITIVE_TYPE", "POSITIVE_INTEGER_LITERAL", "PRIMITIVE_TYPE",
-		"PROLOGUE_DIRECTIVE", "REGISTER", "REGISTERS_DIRECTIVE", "RESTART_LOCAL_DIRECTIVE",
-		"SHORT_LITERAL", "SIMPLE_NAME", "SOURCE_DIRECTIVE", "SPARSE_SWITCH_DIRECTIVE",
-		"STRING_LITERAL", "SUBANNOTATION_DIRECTIVE", "SUPER_DIRECTIVE", "VERIFICATION_ERROR_TYPE",
+		"<invalid>", "<EOR>", "<DOWN>", "<UP>", "ACCESS_SPEC", "ANNOTATION_DIRECTIVE", 
+		"ANNOTATION_VISIBILITY", "ARRAY_DATA_DIRECTIVE", "ARRAY_TYPE_PREFIX", 
+		"ARROW", "BOOL_LITERAL", "BYTE_LITERAL", "CATCHALL_DIRECTIVE", "CATCH_DIRECTIVE", 
+		"CHAR_LITERAL", "CLASS_DESCRIPTOR", "CLASS_DIRECTIVE", "CLOSE_BRACE", 
+		"CLOSE_PAREN", "COLON", "COMMA", "DOTDOT", "DOUBLE_LITERAL", "DOUBLE_LITERAL_OR_ID", 
+		"END_ANNOTATION_DIRECTIVE", "END_ARRAY_DATA_DIRECTIVE", "END_FIELD_DIRECTIVE", 
+		"END_LOCAL_DIRECTIVE", "END_METHOD_DIRECTIVE", "END_PACKED_SWITCH_DIRECTIVE", 
+		"END_PARAMETER_DIRECTIVE", "END_SPARSE_SWITCH_DIRECTIVE", "END_SUBANNOTATION_DIRECTIVE", 
+		"ENUM_DIRECTIVE", "EPILOGUE_DIRECTIVE", "EQUAL", "FIELD_DIRECTIVE", "FIELD_OFFSET", 
+		"FLOAT_LITERAL", "FLOAT_LITERAL_OR_ID", "IMPLEMENTS_DIRECTIVE", "INLINE_INDEX", 
+		"INSTRUCTION_FORMAT10t", "INSTRUCTION_FORMAT10x", "INSTRUCTION_FORMAT10x_ODEX", 
+		"INSTRUCTION_FORMAT11n", "INSTRUCTION_FORMAT11x", "INSTRUCTION_FORMAT12x", 
+		"INSTRUCTION_FORMAT12x_OR_ID", "INSTRUCTION_FORMAT20bc", "INSTRUCTION_FORMAT20t", 
+		"INSTRUCTION_FORMAT21c_FIELD", "INSTRUCTION_FORMAT21c_FIELD_ODEX", "INSTRUCTION_FORMAT21c_STRING", 
+		"INSTRUCTION_FORMAT21c_TYPE", "INSTRUCTION_FORMAT21ih", "INSTRUCTION_FORMAT21lh", 
+		"INSTRUCTION_FORMAT21s", "INSTRUCTION_FORMAT21t", "INSTRUCTION_FORMAT22b", 
+		"INSTRUCTION_FORMAT22c_FIELD", "INSTRUCTION_FORMAT22c_FIELD_ODEX", "INSTRUCTION_FORMAT22c_TYPE", 
+		"INSTRUCTION_FORMAT22cs_FIELD", "INSTRUCTION_FORMAT22s", "INSTRUCTION_FORMAT22s_OR_ID", 
+		"INSTRUCTION_FORMAT22t", "INSTRUCTION_FORMAT22x", "INSTRUCTION_FORMAT23x", 
+		"INSTRUCTION_FORMAT30t", "INSTRUCTION_FORMAT31c", "INSTRUCTION_FORMAT31i", 
+		"INSTRUCTION_FORMAT31i_OR_ID", "INSTRUCTION_FORMAT31t", "INSTRUCTION_FORMAT32x", 
+		"INSTRUCTION_FORMAT35c_METHOD", "INSTRUCTION_FORMAT35c_METHOD_ODEX", "INSTRUCTION_FORMAT35c_TYPE", 
+		"INSTRUCTION_FORMAT35mi_METHOD", "INSTRUCTION_FORMAT35ms_METHOD", "INSTRUCTION_FORMAT3rc_METHOD", 
+		"INSTRUCTION_FORMAT3rc_METHOD_ODEX", "INSTRUCTION_FORMAT3rc_TYPE", "INSTRUCTION_FORMAT3rmi_METHOD", 
+		"INSTRUCTION_FORMAT3rms_METHOD", "INSTRUCTION_FORMAT45cc_METHOD", "INSTRUCTION_FORMAT4rcc_METHOD", 
+		"INSTRUCTION_FORMAT51l", "INTEGER_LITERAL", "INVALID_TOKEN", "I_ACCESS_LIST", 
+		"I_ANNOTATION", "I_ANNOTATIONS", "I_ANNOTATION_ELEMENT", "I_ARRAY_ELEMENTS", 
+		"I_ARRAY_ELEMENT_SIZE", "I_CATCH", "I_CATCHALL", "I_CATCHES", "I_CLASS_DEF", 
+		"I_ENCODED_ARRAY", "I_ENCODED_ENUM", "I_ENCODED_FIELD", "I_ENCODED_METHOD", 
+		"I_END_LOCAL", "I_EPILOGUE", "I_FIELD", "I_FIELDS", "I_FIELD_INITIAL_VALUE", 
+		"I_FIELD_TYPE", "I_IMPLEMENTS", "I_LABEL", "I_LINE", "I_LOCAL", "I_LOCALS", 
+		"I_METHOD", "I_METHODS", "I_METHOD_PROTOTYPE", "I_METHOD_RETURN_TYPE", 
+		"I_ORDERED_METHOD_ITEMS", "I_PACKED_SWITCH_ELEMENTS", "I_PACKED_SWITCH_START_KEY", 
+		"I_PARAMETER", "I_PARAMETERS", "I_PARAMETER_NOT_SPECIFIED", "I_PROLOGUE", 
+		"I_REGISTERS", "I_REGISTER_LIST", "I_REGISTER_RANGE", "I_RESTART_LOCAL", 
+		"I_SOURCE", "I_SPARSE_SWITCH_ELEMENTS", "I_STATEMENT_ARRAY_DATA", "I_STATEMENT_FORMAT10t", 
+		"I_STATEMENT_FORMAT10x", "I_STATEMENT_FORMAT11n", "I_STATEMENT_FORMAT11x", 
+		"I_STATEMENT_FORMAT12x", "I_STATEMENT_FORMAT20bc", "I_STATEMENT_FORMAT20t", 
+		"I_STATEMENT_FORMAT21c_FIELD", "I_STATEMENT_FORMAT21c_STRING", "I_STATEMENT_FORMAT21c_TYPE", 
+		"I_STATEMENT_FORMAT21ih", "I_STATEMENT_FORMAT21lh", "I_STATEMENT_FORMAT21s", 
+		"I_STATEMENT_FORMAT21t", "I_STATEMENT_FORMAT22b", "I_STATEMENT_FORMAT22c_FIELD", 
+		"I_STATEMENT_FORMAT22c_TYPE", "I_STATEMENT_FORMAT22s", "I_STATEMENT_FORMAT22t", 
+		"I_STATEMENT_FORMAT22x", "I_STATEMENT_FORMAT23x", "I_STATEMENT_FORMAT30t", 
+		"I_STATEMENT_FORMAT31c", "I_STATEMENT_FORMAT31i", "I_STATEMENT_FORMAT31t", 
+		"I_STATEMENT_FORMAT32x", "I_STATEMENT_FORMAT35c_METHOD", "I_STATEMENT_FORMAT35c_TYPE", 
+		"I_STATEMENT_FORMAT3rc_METHOD", "I_STATEMENT_FORMAT3rc_TYPE", "I_STATEMENT_FORMAT45cc_METHOD", 
+		"I_STATEMENT_FORMAT4rcc_METHOD", "I_STATEMENT_FORMAT51l", "I_STATEMENT_PACKED_SWITCH", 
+		"I_STATEMENT_SPARSE_SWITCH", "I_SUBANNOTATION", "I_SUPER", "LINE_COMMENT", 
+		"LINE_DIRECTIVE", "LOCALS_DIRECTIVE", "LOCAL_DIRECTIVE", "LONG_LITERAL", 
+		"MEMBER_NAME", "METHOD_DIRECTIVE", "NEGATIVE_INTEGER_LITERAL", "NULL_LITERAL", 
+		"OPEN_BRACE", "OPEN_PAREN", "PACKED_SWITCH_DIRECTIVE", "PARAMETER_DIRECTIVE", 
+		"PARAM_LIST_OR_ID_PRIMITIVE_TYPE", "POSITIVE_INTEGER_LITERAL", "PRIMITIVE_TYPE", 
+		"PROLOGUE_DIRECTIVE", "REGISTER", "REGISTERS_DIRECTIVE", "RESTART_LOCAL_DIRECTIVE", 
+		"SHORT_LITERAL", "SIMPLE_NAME", "SOURCE_DIRECTIVE", "SPARSE_SWITCH_DIRECTIVE", 
+		"STRING_LITERAL", "SUBANNOTATION_DIRECTIVE", "SUPER_DIRECTIVE", "VERIFICATION_ERROR_TYPE", 
 		"VOID_TYPE", "VTABLE_INDEX", "WHITE_SPACE"
 	};
 	public static final int EOF=-1;
@@ -321,7 +321,7 @@
 	}
 
 	@Override public String[] getTokenNames() { return smaliTreeWalker.tokenNames; }
-	@Override public String getGrammarFileName() { return "/ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g"; }
+	@Override public String getGrammarFileName() { return "smaliTreeWalker.g"; }
 
 
 	  public String classType;
@@ -334,8 +334,8 @@
 	      this.dexBuilder = dexBuilder;
 	  }
 
-	  public void setApiLevel(int apiLevel, boolean experimental) {
-	      this.opcodes = new Opcodes(apiLevel, experimental);
+	  public void setApiLevel(int apiLevel) {
+	      this.opcodes = Opcodes.forApi(apiLevel);
 	      this.apiLevel = apiLevel;
 	  }
 
@@ -408,7 +408,7 @@
 
 
 	// $ANTLR start "smali_file"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:160:1: smali_file returns [ClassDef classDef] : ^( I_CLASS_DEF header methods fields annotations ) ;
+	// smaliTreeWalker.g:160:1: smali_file returns [ClassDef classDef] : ^( I_CLASS_DEF header methods fields annotations ) ;
 	public final ClassDef smali_file() throws RecognitionException {
 		ClassDef classDef = null;
 
@@ -419,11 +419,11 @@
 		List<BuilderMethod> methods4 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:161:3: ( ^( I_CLASS_DEF header methods fields annotations ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:161:5: ^( I_CLASS_DEF header methods fields annotations )
+			// smaliTreeWalker.g:161:3: ( ^( I_CLASS_DEF header methods fields annotations ) )
+			// smaliTreeWalker.g:161:5: ^( I_CLASS_DEF header methods fields annotations )
 			{
-			match(input,I_CLASS_DEF,FOLLOW_I_CLASS_DEF_in_smali_file52);
-			match(input, Token.DOWN, null);
+			match(input,I_CLASS_DEF,FOLLOW_I_CLASS_DEF_in_smali_file52); 
+			match(input, Token.DOWN, null); 
 			pushFollow(FOLLOW_header_in_smali_file54);
 			header1=header();
 			state._fsp--;
@@ -440,12 +440,12 @@
 			annotations2=annotations();
 			state._fsp--;
 
-			match(input, Token.UP, null);
+			match(input, Token.UP, null); 
 
 
 			    classDef = dexBuilder.internClassDef((header1!=null?((smaliTreeWalker.header_return)header1).classType:null), (header1!=null?((smaliTreeWalker.header_return)header1).accessFlags:0), (header1!=null?((smaliTreeWalker.header_return)header1).superType:null),
 			            (header1!=null?((smaliTreeWalker.header_return)header1).implementsList:null), (header1!=null?((smaliTreeWalker.header_return)header1).sourceSpec:null), annotations2, fields3, methods4);
-			
+			  
 			}
 
 		}
@@ -455,7 +455,7 @@
 			      ex.printStackTrace(System.err);
 			    }
 			    reportError(new SemanticException(input, ex));
-			
+			  
 		}
 
 		finally {
@@ -476,7 +476,7 @@
 
 
 	// $ANTLR start "header"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:174:1: header returns [String classType, int accessFlags, String superType, List<String> implementsList, String sourceSpec] : class_spec ( super_spec )? implements_list source_spec ;
+	// smaliTreeWalker.g:174:1: header returns [String classType, int accessFlags, String superType, List<String> implementsList, String sourceSpec] : class_spec ( super_spec )? implements_list source_spec ;
 	public final smaliTreeWalker.header_return header() throws RecognitionException {
 		smaliTreeWalker.header_return retval = new smaliTreeWalker.header_return();
 		retval.start = input.LT(1);
@@ -487,14 +487,14 @@
 		String source_spec8 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:175:3: ( class_spec ( super_spec )? implements_list source_spec )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:175:3: class_spec ( super_spec )? implements_list source_spec
+			// smaliTreeWalker.g:175:3: ( class_spec ( super_spec )? implements_list source_spec )
+			// smaliTreeWalker.g:175:3: class_spec ( super_spec )? implements_list source_spec
 			{
 			pushFollow(FOLLOW_class_spec_in_header85);
 			class_spec5=class_spec();
 			state._fsp--;
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:175:14: ( super_spec )?
+			// smaliTreeWalker.g:175:14: ( super_spec )?
 			int alt1=2;
 			int LA1_0 = input.LA(1);
 			if ( (LA1_0==I_SUPER) ) {
@@ -502,7 +502,7 @@
 			}
 			switch (alt1) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:175:14: super_spec
+					// smaliTreeWalker.g:175:14: super_spec
 					{
 					pushFollow(FOLLOW_super_spec_in_header87);
 					super_spec6=super_spec();
@@ -528,7 +528,7 @@
 			    retval.superType = super_spec6;
 			    retval.implementsList = implements_list7;
 			    retval.sourceSpec = source_spec8;
-			
+			  
 			}
 
 		}
@@ -551,7 +551,7 @@
 
 
 	// $ANTLR start "class_spec"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:186:1: class_spec returns [String type, int accessFlags] : CLASS_DESCRIPTOR access_list ;
+	// smaliTreeWalker.g:186:1: class_spec returns [String type, int accessFlags] : CLASS_DESCRIPTOR access_list ;
 	public final smaliTreeWalker.class_spec_return class_spec() throws RecognitionException {
 		smaliTreeWalker.class_spec_return retval = new smaliTreeWalker.class_spec_return();
 		retval.start = input.LT(1);
@@ -560,10 +560,10 @@
 		int access_list10 =0;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:187:3: ( CLASS_DESCRIPTOR access_list )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:187:5: CLASS_DESCRIPTOR access_list
+			// smaliTreeWalker.g:187:3: ( CLASS_DESCRIPTOR access_list )
+			// smaliTreeWalker.g:187:5: CLASS_DESCRIPTOR access_list
 			{
-			CLASS_DESCRIPTOR9=(CommonTree)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_class_spec110);
+			CLASS_DESCRIPTOR9=(CommonTree)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_class_spec110); 
 			pushFollow(FOLLOW_access_list_in_class_spec112);
 			access_list10=access_list();
 			state._fsp--;
@@ -571,7 +571,7 @@
 
 			    retval.type = (CLASS_DESCRIPTOR9!=null?CLASS_DESCRIPTOR9.getText():null);
 			    retval.accessFlags = access_list10;
-			
+			  
 			}
 
 		}
@@ -589,7 +589,7 @@
 
 
 	// $ANTLR start "super_spec"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:193:1: super_spec returns [String type] : ^( I_SUPER CLASS_DESCRIPTOR ) ;
+	// smaliTreeWalker.g:193:1: super_spec returns [String type] : ^( I_SUPER CLASS_DESCRIPTOR ) ;
 	public final String super_spec() throws RecognitionException {
 		String type = null;
 
@@ -597,17 +597,17 @@
 		CommonTree CLASS_DESCRIPTOR11=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:194:3: ( ^( I_SUPER CLASS_DESCRIPTOR ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:194:5: ^( I_SUPER CLASS_DESCRIPTOR )
+			// smaliTreeWalker.g:194:3: ( ^( I_SUPER CLASS_DESCRIPTOR ) )
+			// smaliTreeWalker.g:194:5: ^( I_SUPER CLASS_DESCRIPTOR )
 			{
-			match(input,I_SUPER,FOLLOW_I_SUPER_in_super_spec130);
-			match(input, Token.DOWN, null);
-			CLASS_DESCRIPTOR11=(CommonTree)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_super_spec132);
-			match(input, Token.UP, null);
+			match(input,I_SUPER,FOLLOW_I_SUPER_in_super_spec130); 
+			match(input, Token.DOWN, null); 
+			CLASS_DESCRIPTOR11=(CommonTree)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_super_spec132); 
+			match(input, Token.UP, null); 
 
 
 			    type = (CLASS_DESCRIPTOR11!=null?CLASS_DESCRIPTOR11.getText():null);
-			
+			  
 			}
 
 		}
@@ -625,7 +625,7 @@
 
 
 	// $ANTLR start "implements_spec"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:200:1: implements_spec returns [String type] : ^( I_IMPLEMENTS CLASS_DESCRIPTOR ) ;
+	// smaliTreeWalker.g:200:1: implements_spec returns [String type] : ^( I_IMPLEMENTS CLASS_DESCRIPTOR ) ;
 	public final String implements_spec() throws RecognitionException {
 		String type = null;
 
@@ -633,17 +633,17 @@
 		CommonTree CLASS_DESCRIPTOR12=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:201:3: ( ^( I_IMPLEMENTS CLASS_DESCRIPTOR ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:201:5: ^( I_IMPLEMENTS CLASS_DESCRIPTOR )
+			// smaliTreeWalker.g:201:3: ( ^( I_IMPLEMENTS CLASS_DESCRIPTOR ) )
+			// smaliTreeWalker.g:201:5: ^( I_IMPLEMENTS CLASS_DESCRIPTOR )
 			{
-			match(input,I_IMPLEMENTS,FOLLOW_I_IMPLEMENTS_in_implements_spec152);
-			match(input, Token.DOWN, null);
-			CLASS_DESCRIPTOR12=(CommonTree)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_implements_spec154);
-			match(input, Token.UP, null);
+			match(input,I_IMPLEMENTS,FOLLOW_I_IMPLEMENTS_in_implements_spec152); 
+			match(input, Token.DOWN, null); 
+			CLASS_DESCRIPTOR12=(CommonTree)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_implements_spec154); 
+			match(input, Token.UP, null); 
 
 
 			    type = (CLASS_DESCRIPTOR12!=null?CLASS_DESCRIPTOR12.getText():null);
-			
+			  
 			}
 
 		}
@@ -661,20 +661,20 @@
 
 
 	// $ANTLR start "implements_list"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:206:1: implements_list returns [List<String> implementsList] : ( implements_spec )* ;
+	// smaliTreeWalker.g:206:1: implements_list returns [List<String> implementsList] : ( implements_spec )* ;
 	public final List<String> implements_list() throws RecognitionException {
 		List<String> implementsList = null;
 
 
 		String implements_spec13 =null;
 
-		 List<String> typeList;
+		 List<String> typeList; 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:208:3: ( ( implements_spec )* )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:208:5: ( implements_spec )*
+			// smaliTreeWalker.g:208:3: ( ( implements_spec )* )
+			// smaliTreeWalker.g:208:5: ( implements_spec )*
 			{
 			typeList = Lists.newArrayList();
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:209:5: ( implements_spec )*
+			// smaliTreeWalker.g:209:5: ( implements_spec )*
 			loop2:
 			while (true) {
 				int alt2=2;
@@ -685,7 +685,7 @@
 
 				switch (alt2) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:209:6: implements_spec
+					// smaliTreeWalker.g:209:6: implements_spec
 					{
 					pushFollow(FOLLOW_implements_spec_in_implements_list184);
 					implements_spec13=implements_spec();
@@ -706,7 +706,7 @@
 			    } else {
 			      implementsList = null;
 			    }
-			
+			  
 			}
 
 		}
@@ -724,7 +724,7 @@
 
 
 	// $ANTLR start "source_spec"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:218:1: source_spec returns [String source] : ( ^( I_SOURCE string_literal ) |);
+	// smaliTreeWalker.g:218:1: source_spec returns [String source] : ( ^( I_SOURCE string_literal ) |);
 	public final String source_spec() throws RecognitionException {
 		String source = null;
 
@@ -732,7 +732,7 @@
 		String string_literal14 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:219:3: ( ^( I_SOURCE string_literal ) |)
+			// smaliTreeWalker.g:219:3: ( ^( I_SOURCE string_literal ) |)
 			int alt3=2;
 			int LA3_0 = input.LA(1);
 			if ( (LA3_0==I_SOURCE) ) {
@@ -750,22 +750,22 @@
 
 			switch (alt3) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:219:5: ^( I_SOURCE string_literal )
+					// smaliTreeWalker.g:219:5: ^( I_SOURCE string_literal )
 					{
 					source = null;
-					match(input,I_SOURCE,FOLLOW_I_SOURCE_in_source_spec213);
-					match(input, Token.DOWN, null);
+					match(input,I_SOURCE,FOLLOW_I_SOURCE_in_source_spec213); 
+					match(input, Token.DOWN, null); 
 					pushFollow(FOLLOW_string_literal_in_source_spec215);
 					string_literal14=string_literal();
 					state._fsp--;
 
 					source = string_literal14;
-					match(input, Token.UP, null);
+					match(input, Token.UP, null); 
 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:221:16:
+					// smaliTreeWalker.g:221:16: 
 					{
 					}
 					break;
@@ -786,7 +786,7 @@
 
 
 	// $ANTLR start "access_list"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:223:1: access_list returns [int value] : ^( I_ACCESS_LIST ( ACCESS_SPEC )* ) ;
+	// smaliTreeWalker.g:223:1: access_list returns [int value] : ^( I_ACCESS_LIST ( ACCESS_SPEC )* ) ;
 	public final int access_list() throws RecognitionException {
 		int value = 0;
 
@@ -795,15 +795,15 @@
 
 
 		    value = 0;
-		
+		  
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:228:3: ( ^( I_ACCESS_LIST ( ACCESS_SPEC )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:228:5: ^( I_ACCESS_LIST ( ACCESS_SPEC )* )
+			// smaliTreeWalker.g:228:3: ( ^( I_ACCESS_LIST ( ACCESS_SPEC )* ) )
+			// smaliTreeWalker.g:228:5: ^( I_ACCESS_LIST ( ACCESS_SPEC )* )
 			{
-			match(input,I_ACCESS_LIST,FOLLOW_I_ACCESS_LIST_in_access_list248);
+			match(input,I_ACCESS_LIST,FOLLOW_I_ACCESS_LIST_in_access_list248); 
 			if ( input.LA(1)==Token.DOWN ) {
-				match(input, Token.DOWN, null);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:229:7: ( ACCESS_SPEC )*
+				match(input, Token.DOWN, null); 
+				// smaliTreeWalker.g:229:7: ( ACCESS_SPEC )*
 				loop4:
 				while (true) {
 					int alt4=2;
@@ -814,12 +814,12 @@
 
 					switch (alt4) {
 					case 1 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:230:9: ACCESS_SPEC
+						// smaliTreeWalker.g:230:9: ACCESS_SPEC
 						{
-						ACCESS_SPEC15=(CommonTree)match(input,ACCESS_SPEC,FOLLOW_ACCESS_SPEC_in_access_list266);
+						ACCESS_SPEC15=(CommonTree)match(input,ACCESS_SPEC,FOLLOW_ACCESS_SPEC_in_access_list266); 
 
 						          value |= AccessFlags.getAccessFlag(ACCESS_SPEC15.getText()).getValue();
-						
+						        
 						}
 						break;
 
@@ -828,7 +828,7 @@
 					}
 				}
 
-				match(input, Token.UP, null);
+				match(input, Token.UP, null); 
 			}
 
 			}
@@ -848,7 +848,7 @@
 
 
 	// $ANTLR start "fields"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:237:1: fields returns [List<BuilderField> fields] : ^( I_FIELDS ( field )* ) ;
+	// smaliTreeWalker.g:237:1: fields returns [List<BuilderField> fields] : ^( I_FIELDS ( field )* ) ;
 	public final List<BuilderField> fields() throws RecognitionException {
 		List<BuilderField> fields = null;
 
@@ -857,13 +857,13 @@
 
 		fields = Lists.newArrayList();
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:239:3: ( ^( I_FIELDS ( field )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:239:5: ^( I_FIELDS ( field )* )
+			// smaliTreeWalker.g:239:3: ( ^( I_FIELDS ( field )* ) )
+			// smaliTreeWalker.g:239:5: ^( I_FIELDS ( field )* )
 			{
-			match(input,I_FIELDS,FOLLOW_I_FIELDS_in_fields308);
+			match(input,I_FIELDS,FOLLOW_I_FIELDS_in_fields308); 
 			if ( input.LA(1)==Token.DOWN ) {
-				match(input, Token.DOWN, null);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:240:7: ( field )*
+				match(input, Token.DOWN, null); 
+				// smaliTreeWalker.g:240:7: ( field )*
 				loop5:
 				while (true) {
 					int alt5=2;
@@ -874,7 +874,7 @@
 
 					switch (alt5) {
 					case 1 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:240:8: field
+						// smaliTreeWalker.g:240:8: field
 						{
 						pushFollow(FOLLOW_field_in_fields317);
 						field16=field();
@@ -882,7 +882,7 @@
 
 
 						        fields.add(field16);
-						
+						      
 						}
 						break;
 
@@ -891,7 +891,7 @@
 					}
 				}
 
-				match(input, Token.UP, null);
+				match(input, Token.UP, null); 
 			}
 
 			}
@@ -911,7 +911,7 @@
 
 
 	// $ANTLR start "methods"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:245:1: methods returns [List<BuilderMethod> methods] : ^( I_METHODS ( method )* ) ;
+	// smaliTreeWalker.g:245:1: methods returns [List<BuilderMethod> methods] : ^( I_METHODS ( method )* ) ;
 	public final List<BuilderMethod> methods() throws RecognitionException {
 		List<BuilderMethod> methods = null;
 
@@ -920,13 +920,13 @@
 
 		methods = Lists.newArrayList();
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:247:3: ( ^( I_METHODS ( method )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:247:5: ^( I_METHODS ( method )* )
+			// smaliTreeWalker.g:247:3: ( ^( I_METHODS ( method )* ) )
+			// smaliTreeWalker.g:247:5: ^( I_METHODS ( method )* )
 			{
-			match(input,I_METHODS,FOLLOW_I_METHODS_in_methods349);
+			match(input,I_METHODS,FOLLOW_I_METHODS_in_methods349); 
 			if ( input.LA(1)==Token.DOWN ) {
-				match(input, Token.DOWN, null);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:248:7: ( method )*
+				match(input, Token.DOWN, null); 
+				// smaliTreeWalker.g:248:7: ( method )*
 				loop6:
 				while (true) {
 					int alt6=2;
@@ -937,7 +937,7 @@
 
 					switch (alt6) {
 					case 1 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:248:8: method
+						// smaliTreeWalker.g:248:8: method
 						{
 						pushFollow(FOLLOW_method_in_methods358);
 						method17=method();
@@ -945,7 +945,7 @@
 
 
 						        methods.add(method17);
-						
+						      
 						}
 						break;
 
@@ -954,7 +954,7 @@
 					}
 				}
 
-				match(input, Token.UP, null);
+				match(input, Token.UP, null); 
 			}
 
 			}
@@ -974,7 +974,7 @@
 
 
 	// $ANTLR start "field"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:253:1: field returns [BuilderField field] : ^( I_FIELD SIMPLE_NAME access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) field_initial_value ( annotations )? ) ;
+	// smaliTreeWalker.g:253:1: field returns [BuilderField field] : ^( I_FIELD SIMPLE_NAME access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) field_initial_value ( annotations )? ) ;
 	public final BuilderField field() throws RecognitionException {
 		BuilderField field = null;
 
@@ -986,29 +986,29 @@
 		Set<Annotation> annotations22 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:254:3: ( ^( I_FIELD SIMPLE_NAME access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) field_initial_value ( annotations )? ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:254:4: ^( I_FIELD SIMPLE_NAME access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) field_initial_value ( annotations )? )
+			// smaliTreeWalker.g:254:3: ( ^( I_FIELD SIMPLE_NAME access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) field_initial_value ( annotations )? ) )
+			// smaliTreeWalker.g:254:4: ^( I_FIELD SIMPLE_NAME access_list ^( I_FIELD_TYPE nonvoid_type_descriptor ) field_initial_value ( annotations )? )
 			{
-			match(input,I_FIELD,FOLLOW_I_FIELD_in_field383);
-			match(input, Token.DOWN, null);
-			SIMPLE_NAME20=(CommonTree)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_field385);
+			match(input,I_FIELD,FOLLOW_I_FIELD_in_field383); 
+			match(input, Token.DOWN, null); 
+			SIMPLE_NAME20=(CommonTree)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_field385); 
 			pushFollow(FOLLOW_access_list_in_field387);
 			access_list18=access_list();
 			state._fsp--;
 
-			match(input,I_FIELD_TYPE,FOLLOW_I_FIELD_TYPE_in_field390);
-			match(input, Token.DOWN, null);
+			match(input,I_FIELD_TYPE,FOLLOW_I_FIELD_TYPE_in_field390); 
+			match(input, Token.DOWN, null); 
 			pushFollow(FOLLOW_nonvoid_type_descriptor_in_field392);
 			nonvoid_type_descriptor21=nonvoid_type_descriptor();
 			state._fsp--;
 
-			match(input, Token.UP, null);
+			match(input, Token.UP, null); 
 
 			pushFollow(FOLLOW_field_initial_value_in_field395);
 			field_initial_value19=field_initial_value();
 			state._fsp--;
 
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:254:98: ( annotations )?
+			// smaliTreeWalker.g:254:98: ( annotations )?
 			int alt7=2;
 			int LA7_0 = input.LA(1);
 			if ( (LA7_0==I_ANNOTATIONS) ) {
@@ -1016,7 +1016,7 @@
 			}
 			switch (alt7) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:254:98: annotations
+					// smaliTreeWalker.g:254:98: annotations
 					{
 					pushFollow(FOLLOW_annotations_in_field397);
 					annotations22=annotations();
@@ -1027,7 +1027,7 @@
 
 			}
 
-			match(input, Token.UP, null);
+			match(input, Token.UP, null); 
 
 
 			    int accessFlags = access_list18;
@@ -1039,7 +1039,7 @@
 
 			    field = dexBuilder.internField(classType, (SIMPLE_NAME20!=null?SIMPLE_NAME20.getText():null), (nonvoid_type_descriptor21!=null?((smaliTreeWalker.nonvoid_type_descriptor_return)nonvoid_type_descriptor21).type:null), access_list18,
 			            field_initial_value19, annotations22);
-			
+			  
 			}
 
 		}
@@ -1057,7 +1057,7 @@
 
 
 	// $ANTLR start "field_initial_value"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:268:1: field_initial_value returns [EncodedValue encodedValue] : ( ^( I_FIELD_INITIAL_VALUE literal ) |);
+	// smaliTreeWalker.g:268:1: field_initial_value returns [EncodedValue encodedValue] : ( ^( I_FIELD_INITIAL_VALUE literal ) |);
 	public final EncodedValue field_initial_value() throws RecognitionException {
 		EncodedValue encodedValue = null;
 
@@ -1065,7 +1065,7 @@
 		EncodedValue literal23 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:269:3: ( ^( I_FIELD_INITIAL_VALUE literal ) |)
+			// smaliTreeWalker.g:269:3: ( ^( I_FIELD_INITIAL_VALUE literal ) |)
 			int alt8=2;
 			int LA8_0 = input.LA(1);
 			if ( (LA8_0==I_FIELD_INITIAL_VALUE) ) {
@@ -1083,21 +1083,21 @@
 
 			switch (alt8) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:269:5: ^( I_FIELD_INITIAL_VALUE literal )
+					// smaliTreeWalker.g:269:5: ^( I_FIELD_INITIAL_VALUE literal )
 					{
-					match(input,I_FIELD_INITIAL_VALUE,FOLLOW_I_FIELD_INITIAL_VALUE_in_field_initial_value418);
-					match(input, Token.DOWN, null);
+					match(input,I_FIELD_INITIAL_VALUE,FOLLOW_I_FIELD_INITIAL_VALUE_in_field_initial_value418); 
+					match(input, Token.DOWN, null); 
 					pushFollow(FOLLOW_literal_in_field_initial_value420);
 					literal23=literal();
 					state._fsp--;
 
-					match(input, Token.UP, null);
+					match(input, Token.UP, null); 
 
 					encodedValue = literal23;
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:270:16:
+					// smaliTreeWalker.g:270:16: 
 					{
 					}
 					break;
@@ -1118,7 +1118,7 @@
 
 
 	// $ANTLR start "literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:272:1: literal returns [EncodedValue encodedValue] : ( integer_literal | long_literal | short_literal | byte_literal | float_literal | double_literal | char_literal | string_literal | bool_literal | NULL_LITERAL | type_descriptor | array_literal | subannotation | field_literal | method_literal | enum_literal );
+	// smaliTreeWalker.g:272:1: literal returns [EncodedValue encodedValue] : ( integer_literal | long_literal | short_literal | byte_literal | float_literal | double_literal | char_literal | string_literal | bool_literal | NULL_LITERAL | type_descriptor | array_literal | subannotation | field_literal | method_literal | enum_literal );
 	public final EncodedValue literal() throws RecognitionException {
 		EncodedValue encodedValue = null;
 
@@ -1140,7 +1140,7 @@
 		FieldReference enum_literal38 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:273:3: ( integer_literal | long_literal | short_literal | byte_literal | float_literal | double_literal | char_literal | string_literal | bool_literal | NULL_LITERAL | type_descriptor | array_literal | subannotation | field_literal | method_literal | enum_literal )
+			// smaliTreeWalker.g:273:3: ( integer_literal | long_literal | short_literal | byte_literal | float_literal | double_literal | char_literal | string_literal | bool_literal | NULL_LITERAL | type_descriptor | array_literal | subannotation | field_literal | method_literal | enum_literal )
 			int alt9=16;
 			switch ( input.LA(1) ) {
 			case INTEGER_LITERAL:
@@ -1233,160 +1233,160 @@
 			}
 			switch (alt9) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:273:5: integer_literal
+					// smaliTreeWalker.g:273:5: integer_literal
 					{
 					pushFollow(FOLLOW_integer_literal_in_literal442);
 					integer_literal24=integer_literal();
 					state._fsp--;
 
-					 encodedValue = new ImmutableIntEncodedValue(integer_literal24);
+					 encodedValue = new ImmutableIntEncodedValue(integer_literal24); 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:274:5: long_literal
+					// smaliTreeWalker.g:274:5: long_literal
 					{
 					pushFollow(FOLLOW_long_literal_in_literal450);
 					long_literal25=long_literal();
 					state._fsp--;
 
-					 encodedValue = new ImmutableLongEncodedValue(long_literal25);
+					 encodedValue = new ImmutableLongEncodedValue(long_literal25); 
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:275:5: short_literal
+					// smaliTreeWalker.g:275:5: short_literal
 					{
 					pushFollow(FOLLOW_short_literal_in_literal458);
 					short_literal26=short_literal();
 					state._fsp--;
 
-					 encodedValue = new ImmutableShortEncodedValue(short_literal26);
+					 encodedValue = new ImmutableShortEncodedValue(short_literal26); 
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:276:5: byte_literal
+					// smaliTreeWalker.g:276:5: byte_literal
 					{
 					pushFollow(FOLLOW_byte_literal_in_literal466);
 					byte_literal27=byte_literal();
 					state._fsp--;
 
-					 encodedValue = new ImmutableByteEncodedValue(byte_literal27);
+					 encodedValue = new ImmutableByteEncodedValue(byte_literal27); 
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:277:5: float_literal
+					// smaliTreeWalker.g:277:5: float_literal
 					{
 					pushFollow(FOLLOW_float_literal_in_literal474);
 					float_literal28=float_literal();
 					state._fsp--;
 
-					 encodedValue = new ImmutableFloatEncodedValue(float_literal28);
+					 encodedValue = new ImmutableFloatEncodedValue(float_literal28); 
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:278:5: double_literal
+					// smaliTreeWalker.g:278:5: double_literal
 					{
 					pushFollow(FOLLOW_double_literal_in_literal482);
 					double_literal29=double_literal();
 					state._fsp--;
 
-					 encodedValue = new ImmutableDoubleEncodedValue(double_literal29);
+					 encodedValue = new ImmutableDoubleEncodedValue(double_literal29); 
 					}
 					break;
 				case 7 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:279:5: char_literal
+					// smaliTreeWalker.g:279:5: char_literal
 					{
 					pushFollow(FOLLOW_char_literal_in_literal490);
 					char_literal30=char_literal();
 					state._fsp--;
 
-					 encodedValue = new ImmutableCharEncodedValue(char_literal30);
+					 encodedValue = new ImmutableCharEncodedValue(char_literal30); 
 					}
 					break;
 				case 8 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:280:5: string_literal
+					// smaliTreeWalker.g:280:5: string_literal
 					{
 					pushFollow(FOLLOW_string_literal_in_literal498);
 					string_literal31=string_literal();
 					state._fsp--;
 
-					 encodedValue = new ImmutableStringEncodedValue(string_literal31);
+					 encodedValue = new ImmutableStringEncodedValue(string_literal31); 
 					}
 					break;
 				case 9 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:281:5: bool_literal
+					// smaliTreeWalker.g:281:5: bool_literal
 					{
 					pushFollow(FOLLOW_bool_literal_in_literal506);
 					bool_literal32=bool_literal();
 					state._fsp--;
 
-					 encodedValue = ImmutableBooleanEncodedValue.forBoolean(bool_literal32);
+					 encodedValue = ImmutableBooleanEncodedValue.forBoolean(bool_literal32); 
 					}
 					break;
 				case 10 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:282:5: NULL_LITERAL
+					// smaliTreeWalker.g:282:5: NULL_LITERAL
 					{
-					match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal514);
-					 encodedValue = ImmutableNullEncodedValue.INSTANCE;
+					match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_literal514); 
+					 encodedValue = ImmutableNullEncodedValue.INSTANCE; 
 					}
 					break;
 				case 11 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:283:5: type_descriptor
+					// smaliTreeWalker.g:283:5: type_descriptor
 					{
 					pushFollow(FOLLOW_type_descriptor_in_literal522);
 					type_descriptor33=type_descriptor();
 					state._fsp--;
 
-					 encodedValue = new ImmutableTypeEncodedValue(type_descriptor33);
+					 encodedValue = new ImmutableTypeEncodedValue(type_descriptor33); 
 					}
 					break;
 				case 12 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:284:5: array_literal
+					// smaliTreeWalker.g:284:5: array_literal
 					{
 					pushFollow(FOLLOW_array_literal_in_literal530);
 					array_literal34=array_literal();
 					state._fsp--;
 
-					 encodedValue = new ImmutableArrayEncodedValue(array_literal34);
+					 encodedValue = new ImmutableArrayEncodedValue(array_literal34); 
 					}
 					break;
 				case 13 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:285:5: subannotation
+					// smaliTreeWalker.g:285:5: subannotation
 					{
 					pushFollow(FOLLOW_subannotation_in_literal538);
 					subannotation35=subannotation();
 					state._fsp--;
 
-					 encodedValue = new ImmutableAnnotationEncodedValue((subannotation35!=null?((smaliTreeWalker.subannotation_return)subannotation35).annotationType:null), (subannotation35!=null?((smaliTreeWalker.subannotation_return)subannotation35).elements:null));
+					 encodedValue = new ImmutableAnnotationEncodedValue((subannotation35!=null?((smaliTreeWalker.subannotation_return)subannotation35).annotationType:null), (subannotation35!=null?((smaliTreeWalker.subannotation_return)subannotation35).elements:null)); 
 					}
 					break;
 				case 14 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:286:5: field_literal
+					// smaliTreeWalker.g:286:5: field_literal
 					{
 					pushFollow(FOLLOW_field_literal_in_literal546);
 					field_literal36=field_literal();
 					state._fsp--;
 
-					 encodedValue = new ImmutableFieldEncodedValue(field_literal36);
+					 encodedValue = new ImmutableFieldEncodedValue(field_literal36); 
 					}
 					break;
 				case 15 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:287:5: method_literal
+					// smaliTreeWalker.g:287:5: method_literal
 					{
 					pushFollow(FOLLOW_method_literal_in_literal554);
 					method_literal37=method_literal();
 					state._fsp--;
 
-					 encodedValue = new ImmutableMethodEncodedValue(method_literal37);
+					 encodedValue = new ImmutableMethodEncodedValue(method_literal37); 
 					}
 					break;
 				case 16 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:288:5: enum_literal
+					// smaliTreeWalker.g:288:5: enum_literal
 					{
 					pushFollow(FOLLOW_enum_literal_in_literal562);
 					enum_literal38=enum_literal();
 					state._fsp--;
 
-					 encodedValue = new ImmutableEnumEncodedValue(enum_literal38);
+					 encodedValue = new ImmutableEnumEncodedValue(enum_literal38); 
 					}
 					break;
 
@@ -1406,7 +1406,7 @@
 
 
 	// $ANTLR start "fixed_64bit_literal_number"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:291:1: fixed_64bit_literal_number returns [Number value] : ( integer_literal | long_literal | short_literal | byte_literal | float_literal | double_literal | char_literal | bool_literal );
+	// smaliTreeWalker.g:291:1: fixed_64bit_literal_number returns [Number value] : ( integer_literal | long_literal | short_literal | byte_literal | float_literal | double_literal | char_literal | bool_literal );
 	public final Number fixed_64bit_literal_number() throws RecognitionException {
 		Number value = null;
 
@@ -1421,7 +1421,7 @@
 		boolean bool_literal46 =false;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:292:3: ( integer_literal | long_literal | short_literal | byte_literal | float_literal | double_literal | char_literal | bool_literal )
+			// smaliTreeWalker.g:292:3: ( integer_literal | long_literal | short_literal | byte_literal | float_literal | double_literal | char_literal | bool_literal )
 			int alt10=8;
 			switch ( input.LA(1) ) {
 			case INTEGER_LITERAL:
@@ -1471,83 +1471,83 @@
 			}
 			switch (alt10) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:292:5: integer_literal
+					// smaliTreeWalker.g:292:5: integer_literal
 					{
 					pushFollow(FOLLOW_integer_literal_in_fixed_64bit_literal_number578);
 					integer_literal39=integer_literal();
 					state._fsp--;
 
-					 value = integer_literal39;
+					 value = integer_literal39; 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:293:5: long_literal
+					// smaliTreeWalker.g:293:5: long_literal
 					{
 					pushFollow(FOLLOW_long_literal_in_fixed_64bit_literal_number586);
 					long_literal40=long_literal();
 					state._fsp--;
 
-					 value = long_literal40;
+					 value = long_literal40; 
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:294:5: short_literal
+					// smaliTreeWalker.g:294:5: short_literal
 					{
 					pushFollow(FOLLOW_short_literal_in_fixed_64bit_literal_number594);
 					short_literal41=short_literal();
 					state._fsp--;
 
-					 value = short_literal41;
+					 value = short_literal41; 
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:295:5: byte_literal
+					// smaliTreeWalker.g:295:5: byte_literal
 					{
 					pushFollow(FOLLOW_byte_literal_in_fixed_64bit_literal_number602);
 					byte_literal42=byte_literal();
 					state._fsp--;
 
-					 value = byte_literal42;
+					 value = byte_literal42; 
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:296:5: float_literal
+					// smaliTreeWalker.g:296:5: float_literal
 					{
 					pushFollow(FOLLOW_float_literal_in_fixed_64bit_literal_number610);
 					float_literal43=float_literal();
 					state._fsp--;
 
-					 value = Float.floatToRawIntBits(float_literal43);
+					 value = Float.floatToRawIntBits(float_literal43); 
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:297:5: double_literal
+					// smaliTreeWalker.g:297:5: double_literal
 					{
 					pushFollow(FOLLOW_double_literal_in_fixed_64bit_literal_number618);
 					double_literal44=double_literal();
 					state._fsp--;
 
-					 value = Double.doubleToRawLongBits(double_literal44);
+					 value = Double.doubleToRawLongBits(double_literal44); 
 					}
 					break;
 				case 7 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:298:5: char_literal
+					// smaliTreeWalker.g:298:5: char_literal
 					{
 					pushFollow(FOLLOW_char_literal_in_fixed_64bit_literal_number626);
 					char_literal45=char_literal();
 					state._fsp--;
 
-					 value = (int)char_literal45;
+					 value = (int)char_literal45; 
 					}
 					break;
 				case 8 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:299:5: bool_literal
+					// smaliTreeWalker.g:299:5: bool_literal
 					{
 					pushFollow(FOLLOW_bool_literal_in_fixed_64bit_literal_number634);
 					bool_literal46=bool_literal();
 					state._fsp--;
 
-					 value = bool_literal46?1:0;
+					 value = bool_literal46?1:0; 
 					}
 					break;
 
@@ -1567,7 +1567,7 @@
 
 
 	// $ANTLR start "fixed_64bit_literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:301:1: fixed_64bit_literal returns [long value] : ( integer_literal | long_literal | short_literal | byte_literal | float_literal | double_literal | char_literal | bool_literal );
+	// smaliTreeWalker.g:301:1: fixed_64bit_literal returns [long value] : ( integer_literal | long_literal | short_literal | byte_literal | float_literal | double_literal | char_literal | bool_literal );
 	public final long fixed_64bit_literal() throws RecognitionException {
 		long value = 0;
 
@@ -1582,7 +1582,7 @@
 		boolean bool_literal54 =false;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:302:3: ( integer_literal | long_literal | short_literal | byte_literal | float_literal | double_literal | char_literal | bool_literal )
+			// smaliTreeWalker.g:302:3: ( integer_literal | long_literal | short_literal | byte_literal | float_literal | double_literal | char_literal | bool_literal )
 			int alt11=8;
 			switch ( input.LA(1) ) {
 			case INTEGER_LITERAL:
@@ -1632,83 +1632,83 @@
 			}
 			switch (alt11) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:302:5: integer_literal
+					// smaliTreeWalker.g:302:5: integer_literal
 					{
 					pushFollow(FOLLOW_integer_literal_in_fixed_64bit_literal649);
 					integer_literal47=integer_literal();
 					state._fsp--;
 
-					 value = integer_literal47;
+					 value = integer_literal47; 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:303:5: long_literal
+					// smaliTreeWalker.g:303:5: long_literal
 					{
 					pushFollow(FOLLOW_long_literal_in_fixed_64bit_literal657);
 					long_literal48=long_literal();
 					state._fsp--;
 
-					 value = long_literal48;
+					 value = long_literal48; 
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:304:5: short_literal
+					// smaliTreeWalker.g:304:5: short_literal
 					{
 					pushFollow(FOLLOW_short_literal_in_fixed_64bit_literal665);
 					short_literal49=short_literal();
 					state._fsp--;
 
-					 value = short_literal49;
+					 value = short_literal49; 
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:305:5: byte_literal
+					// smaliTreeWalker.g:305:5: byte_literal
 					{
 					pushFollow(FOLLOW_byte_literal_in_fixed_64bit_literal673);
 					byte_literal50=byte_literal();
 					state._fsp--;
 
-					 value = byte_literal50;
+					 value = byte_literal50; 
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:306:5: float_literal
+					// smaliTreeWalker.g:306:5: float_literal
 					{
 					pushFollow(FOLLOW_float_literal_in_fixed_64bit_literal681);
 					float_literal51=float_literal();
 					state._fsp--;
 
-					 value = Float.floatToRawIntBits(float_literal51);
+					 value = Float.floatToRawIntBits(float_literal51); 
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:307:5: double_literal
+					// smaliTreeWalker.g:307:5: double_literal
 					{
 					pushFollow(FOLLOW_double_literal_in_fixed_64bit_literal689);
 					double_literal52=double_literal();
 					state._fsp--;
 
-					 value = Double.doubleToRawLongBits(double_literal52);
+					 value = Double.doubleToRawLongBits(double_literal52); 
 					}
 					break;
 				case 7 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:308:5: char_literal
+					// smaliTreeWalker.g:308:5: char_literal
 					{
 					pushFollow(FOLLOW_char_literal_in_fixed_64bit_literal697);
 					char_literal53=char_literal();
 					state._fsp--;
 
-					 value = char_literal53;
+					 value = char_literal53; 
 					}
 					break;
 				case 8 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:309:5: bool_literal
+					// smaliTreeWalker.g:309:5: bool_literal
 					{
 					pushFollow(FOLLOW_bool_literal_in_fixed_64bit_literal705);
 					bool_literal54=bool_literal();
 					state._fsp--;
 
-					 value = bool_literal54?1:0;
+					 value = bool_literal54?1:0; 
 					}
 					break;
 
@@ -1728,7 +1728,7 @@
 
 
 	// $ANTLR start "fixed_32bit_literal"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:313:1: fixed_32bit_literal returns [int value] : ( integer_literal | long_literal | short_literal | byte_literal | float_literal | char_literal | bool_literal );
+	// smaliTreeWalker.g:313:1: fixed_32bit_literal returns [int value] : ( integer_literal | long_literal | short_literal | byte_literal | float_literal | char_literal | bool_literal );
 	public final int fixed_32bit_literal() throws RecognitionException {
 		int value = 0;
 
@@ -1742,7 +1742,7 @@
 		boolean bool_literal61 =false;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:314:3: ( integer_literal | long_literal | short_literal | byte_literal | float_literal | char_literal | bool_literal )
+			// smaliTreeWalker.g:314:3: ( integer_literal | long_literal | short_literal | byte_literal | float_literal | char_literal | bool_literal )
 			int alt12=7;
 			switch ( input.LA(1) ) {
 			case INTEGER_LITERAL:
@@ -1787,73 +1787,73 @@
 			}
 			switch (alt12) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:314:5: integer_literal
+					// smaliTreeWalker.g:314:5: integer_literal
 					{
 					pushFollow(FOLLOW_integer_literal_in_fixed_32bit_literal722);
 					integer_literal55=integer_literal();
 					state._fsp--;
 
-					 value = integer_literal55;
+					 value = integer_literal55; 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:315:5: long_literal
+					// smaliTreeWalker.g:315:5: long_literal
 					{
 					pushFollow(FOLLOW_long_literal_in_fixed_32bit_literal730);
 					long_literal56=long_literal();
 					state._fsp--;
 
-					 LiteralTools.checkInt(long_literal56); value = (int)long_literal56;
+					 LiteralTools.checkInt(long_literal56); value = (int)long_literal56; 
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:316:5: short_literal
+					// smaliTreeWalker.g:316:5: short_literal
 					{
 					pushFollow(FOLLOW_short_literal_in_fixed_32bit_literal738);
 					short_literal57=short_literal();
 					state._fsp--;
 
-					 value = short_literal57;
+					 value = short_literal57; 
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:317:5: byte_literal
+					// smaliTreeWalker.g:317:5: byte_literal
 					{
 					pushFollow(FOLLOW_byte_literal_in_fixed_32bit_literal746);
 					byte_literal58=byte_literal();
 					state._fsp--;
 
-					 value = byte_literal58;
+					 value = byte_literal58; 
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:318:5: float_literal
+					// smaliTreeWalker.g:318:5: float_literal
 					{
 					pushFollow(FOLLOW_float_literal_in_fixed_32bit_literal754);
 					float_literal59=float_literal();
 					state._fsp--;
 
-					 value = Float.floatToRawIntBits(float_literal59);
+					 value = Float.floatToRawIntBits(float_literal59); 
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:319:5: char_literal
+					// smaliTreeWalker.g:319:5: char_literal
 					{
 					pushFollow(FOLLOW_char_literal_in_fixed_32bit_literal762);
 					char_literal60=char_literal();
 					state._fsp--;
 
-					 value = char_literal60;
+					 value = char_literal60; 
 					}
 					break;
 				case 7 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:320:5: bool_literal
+					// smaliTreeWalker.g:320:5: bool_literal
 					{
 					pushFollow(FOLLOW_bool_literal_in_fixed_32bit_literal770);
 					bool_literal61=bool_literal();
 					state._fsp--;
 
-					 value = bool_literal61?1:0;
+					 value = bool_literal61?1:0; 
 					}
 					break;
 
@@ -1873,7 +1873,7 @@
 
 
 	// $ANTLR start "array_elements"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:322:1: array_elements returns [List<Number> elements] : ^( I_ARRAY_ELEMENTS ( fixed_64bit_literal_number )* ) ;
+	// smaliTreeWalker.g:322:1: array_elements returns [List<Number> elements] : ^( I_ARRAY_ELEMENTS ( fixed_64bit_literal_number )* ) ;
 	public final List<Number> array_elements() throws RecognitionException {
 		List<Number> elements = null;
 
@@ -1881,14 +1881,14 @@
 		Number fixed_64bit_literal_number62 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:323:3: ( ^( I_ARRAY_ELEMENTS ( fixed_64bit_literal_number )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:323:5: ^( I_ARRAY_ELEMENTS ( fixed_64bit_literal_number )* )
+			// smaliTreeWalker.g:323:3: ( ^( I_ARRAY_ELEMENTS ( fixed_64bit_literal_number )* ) )
+			// smaliTreeWalker.g:323:5: ^( I_ARRAY_ELEMENTS ( fixed_64bit_literal_number )* )
 			{
 			elements = Lists.newArrayList();
-			match(input,I_ARRAY_ELEMENTS,FOLLOW_I_ARRAY_ELEMENTS_in_array_elements792);
+			match(input,I_ARRAY_ELEMENTS,FOLLOW_I_ARRAY_ELEMENTS_in_array_elements792); 
 			if ( input.LA(1)==Token.DOWN ) {
-				match(input, Token.DOWN, null);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:325:7: ( fixed_64bit_literal_number )*
+				match(input, Token.DOWN, null); 
+				// smaliTreeWalker.g:325:7: ( fixed_64bit_literal_number )*
 				loop13:
 				while (true) {
 					int alt13=2;
@@ -1899,7 +1899,7 @@
 
 					switch (alt13) {
 					case 1 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:325:8: fixed_64bit_literal_number
+						// smaliTreeWalker.g:325:8: fixed_64bit_literal_number
 						{
 						pushFollow(FOLLOW_fixed_64bit_literal_number_in_array_elements801);
 						fixed_64bit_literal_number62=fixed_64bit_literal_number();
@@ -1907,7 +1907,7 @@
 
 
 						        elements.add(fixed_64bit_literal_number62);
-						
+						      
 						}
 						break;
 
@@ -1916,7 +1916,7 @@
 					}
 				}
 
-				match(input, Token.UP, null);
+				match(input, Token.UP, null); 
 			}
 
 			}
@@ -1936,7 +1936,7 @@
 
 
 	// $ANTLR start "packed_switch_elements"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:330:1: packed_switch_elements returns [List<Label> elements] : ^( I_PACKED_SWITCH_ELEMENTS ( label_ref )* ) ;
+	// smaliTreeWalker.g:330:1: packed_switch_elements returns [List<Label> elements] : ^( I_PACKED_SWITCH_ELEMENTS ( label_ref )* ) ;
 	public final List<Label> packed_switch_elements() throws RecognitionException {
 		List<Label> elements = null;
 
@@ -1945,13 +1945,13 @@
 
 		elements = Lists.newArrayList();
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:332:3: ( ^( I_PACKED_SWITCH_ELEMENTS ( label_ref )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:333:5: ^( I_PACKED_SWITCH_ELEMENTS ( label_ref )* )
+			// smaliTreeWalker.g:332:3: ( ^( I_PACKED_SWITCH_ELEMENTS ( label_ref )* ) )
+			// smaliTreeWalker.g:333:5: ^( I_PACKED_SWITCH_ELEMENTS ( label_ref )* )
 			{
-			match(input,I_PACKED_SWITCH_ELEMENTS,FOLLOW_I_PACKED_SWITCH_ELEMENTS_in_packed_switch_elements837);
+			match(input,I_PACKED_SWITCH_ELEMENTS,FOLLOW_I_PACKED_SWITCH_ELEMENTS_in_packed_switch_elements837); 
 			if ( input.LA(1)==Token.DOWN ) {
-				match(input, Token.DOWN, null);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:334:7: ( label_ref )*
+				match(input, Token.DOWN, null); 
+				// smaliTreeWalker.g:334:7: ( label_ref )*
 				loop14:
 				while (true) {
 					int alt14=2;
@@ -1962,13 +1962,13 @@
 
 					switch (alt14) {
 					case 1 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:334:8: label_ref
+						// smaliTreeWalker.g:334:8: label_ref
 						{
 						pushFollow(FOLLOW_label_ref_in_packed_switch_elements846);
 						label_ref63=label_ref();
 						state._fsp--;
 
-						 elements.add(label_ref63);
+						 elements.add(label_ref63); 
 						}
 						break;
 
@@ -1977,7 +1977,7 @@
 					}
 				}
 
-				match(input, Token.UP, null);
+				match(input, Token.UP, null); 
 			}
 
 			}
@@ -1997,7 +1997,7 @@
 
 
 	// $ANTLR start "sparse_switch_elements"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:337:1: sparse_switch_elements returns [List<SwitchLabelElement> elements] : ^( I_SPARSE_SWITCH_ELEMENTS ( fixed_32bit_literal label_ref )* ) ;
+	// smaliTreeWalker.g:337:1: sparse_switch_elements returns [List<SwitchLabelElement> elements] : ^( I_SPARSE_SWITCH_ELEMENTS ( fixed_32bit_literal label_ref )* ) ;
 	public final List<SwitchLabelElement> sparse_switch_elements() throws RecognitionException {
 		List<SwitchLabelElement> elements = null;
 
@@ -2007,13 +2007,13 @@
 
 		elements = Lists.newArrayList();
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:339:3: ( ^( I_SPARSE_SWITCH_ELEMENTS ( fixed_32bit_literal label_ref )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:340:5: ^( I_SPARSE_SWITCH_ELEMENTS ( fixed_32bit_literal label_ref )* )
+			// smaliTreeWalker.g:339:3: ( ^( I_SPARSE_SWITCH_ELEMENTS ( fixed_32bit_literal label_ref )* ) )
+			// smaliTreeWalker.g:340:5: ^( I_SPARSE_SWITCH_ELEMENTS ( fixed_32bit_literal label_ref )* )
 			{
-			match(input,I_SPARSE_SWITCH_ELEMENTS,FOLLOW_I_SPARSE_SWITCH_ELEMENTS_in_sparse_switch_elements881);
+			match(input,I_SPARSE_SWITCH_ELEMENTS,FOLLOW_I_SPARSE_SWITCH_ELEMENTS_in_sparse_switch_elements881); 
 			if ( input.LA(1)==Token.DOWN ) {
-				match(input, Token.DOWN, null);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:341:8: ( fixed_32bit_literal label_ref )*
+				match(input, Token.DOWN, null); 
+				// smaliTreeWalker.g:341:8: ( fixed_32bit_literal label_ref )*
 				loop15:
 				while (true) {
 					int alt15=2;
@@ -2024,7 +2024,7 @@
 
 					switch (alt15) {
 					case 1 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:341:9: fixed_32bit_literal label_ref
+						// smaliTreeWalker.g:341:9: fixed_32bit_literal label_ref
 						{
 						pushFollow(FOLLOW_fixed_32bit_literal_in_sparse_switch_elements891);
 						fixed_32bit_literal64=fixed_32bit_literal();
@@ -2036,7 +2036,7 @@
 
 
 						         elements.add(new SwitchLabelElement(fixed_32bit_literal64, label_ref65));
-						
+						       
 						}
 						break;
 
@@ -2045,7 +2045,7 @@
 					}
 				}
 
-				match(input, Token.UP, null);
+				match(input, Token.UP, null); 
 			}
 
 			}
@@ -2073,7 +2073,7 @@
 
 
 	// $ANTLR start "method"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:347:1: method returns [BuilderMethod ret] : ^( I_METHOD method_name_and_prototype access_list ( ( registers_directive ) |) ordered_method_items catches parameters[$method_name_and_prototype.parameters] annotations ) ;
+	// smaliTreeWalker.g:347:1: method returns [BuilderMethod ret] : ^( I_METHOD method_name_and_prototype access_list ( ( registers_directive ) |) ordered_method_items catches parameters[$method_name_and_prototype.parameters] annotations ) ;
 	public final BuilderMethod method() throws RecognitionException {
 		method_stack.push(new method_scope());
 		BuilderMethod ret = null;
@@ -2091,13 +2091,13 @@
 		    method_stack.peek().methodParameterRegisters = 0;
 		    int accessFlags = 0;
 		    method_stack.peek().isStatic = false;
-		
+		  
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:362:3: ( ^( I_METHOD method_name_and_prototype access_list ( ( registers_directive ) |) ordered_method_items catches parameters[$method_name_and_prototype.parameters] annotations ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:363:5: ^( I_METHOD method_name_and_prototype access_list ( ( registers_directive ) |) ordered_method_items catches parameters[$method_name_and_prototype.parameters] annotations )
+			// smaliTreeWalker.g:362:3: ( ^( I_METHOD method_name_and_prototype access_list ( ( registers_directive ) |) ordered_method_items catches parameters[$method_name_and_prototype.parameters] annotations ) )
+			// smaliTreeWalker.g:363:5: ^( I_METHOD method_name_and_prototype access_list ( ( registers_directive ) |) ordered_method_items catches parameters[$method_name_and_prototype.parameters] annotations )
 			{
-			I_METHOD70=(CommonTree)match(input,I_METHOD,FOLLOW_I_METHOD_in_method945);
-			match(input, Token.DOWN, null);
+			I_METHOD70=(CommonTree)match(input,I_METHOD,FOLLOW_I_METHOD_in_method945); 
+			match(input, Token.DOWN, null); 
 			pushFollow(FOLLOW_method_name_and_prototype_in_method953);
 			method_name_and_prototype67=method_name_and_prototype();
 			state._fsp--;
@@ -2111,8 +2111,8 @@
 			        method_stack.peek().isStatic = AccessFlags.STATIC.isSet(accessFlags);
 			        method_stack.peek().methodParameterRegisters =
 			                MethodUtil.getParameterRegisterCount((method_name_and_prototype67!=null?((smaliTreeWalker.method_name_and_prototype_return)method_name_and_prototype67).parameters:null), method_stack.peek().isStatic);
-			
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:372:7: ( ( registers_directive ) |)
+			      
+			// smaliTreeWalker.g:372:7: ( ( registers_directive ) |)
 			int alt16=2;
 			int LA16_0 = input.LA(1);
 			if ( (LA16_0==I_LOCALS||LA16_0==I_REGISTERS) ) {
@@ -2130,10 +2130,10 @@
 
 			switch (alt16) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:373:9: ( registers_directive )
+					// smaliTreeWalker.g:373:9: ( registers_directive )
 					{
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:373:9: ( registers_directive )
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:373:10: registers_directive
+					// smaliTreeWalker.g:373:9: ( registers_directive )
+					// smaliTreeWalker.g:373:10: registers_directive
 					{
 					pushFollow(FOLLOW_registers_directive_in_method988);
 					registers_directive68=registers_directive();
@@ -2148,17 +2148,17 @@
 
 					          method_stack.peek().methodBuilder = new MethodImplementationBuilder(method_stack.peek().totalMethodRegisters);
 
-					
+					        
 					}
 
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:386:9:
+					// smaliTreeWalker.g:386:9: 
 					{
 
 					          method_stack.peek().methodBuilder = new MethodImplementationBuilder(0);
-					
+					        
 					}
 					break;
 
@@ -2180,7 +2180,7 @@
 			annotations71=annotations();
 			state._fsp--;
 
-			match(input, Token.UP, null);
+			match(input, Token.UP, null); 
 
 
 			    MethodImplementation methodImplementation = null;
@@ -2253,7 +2253,7 @@
 			            accessFlags,
 			            annotations71,
 			            methodImplementation);
-			
+			  
 			}
 
 		}
@@ -2277,7 +2277,7 @@
 
 
 	// $ANTLR start "method_prototype"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:468:1: method_prototype returns [List<String> parameters, String returnType] : ^( I_METHOD_PROTOTYPE ^( I_METHOD_RETURN_TYPE type_descriptor ) method_type_list ) ;
+	// smaliTreeWalker.g:468:1: method_prototype returns [List<String> parameters, String returnType] : ^( I_METHOD_PROTOTYPE ^( I_METHOD_RETURN_TYPE type_descriptor ) method_type_list ) ;
 	public final smaliTreeWalker.method_prototype_return method_prototype() throws RecognitionException {
 		smaliTreeWalker.method_prototype_return retval = new smaliTreeWalker.method_prototype_return();
 		retval.start = input.LT(1);
@@ -2286,29 +2286,29 @@
 		List<String> method_type_list73 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:469:3: ( ^( I_METHOD_PROTOTYPE ^( I_METHOD_RETURN_TYPE type_descriptor ) method_type_list ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:469:5: ^( I_METHOD_PROTOTYPE ^( I_METHOD_RETURN_TYPE type_descriptor ) method_type_list )
+			// smaliTreeWalker.g:469:3: ( ^( I_METHOD_PROTOTYPE ^( I_METHOD_RETURN_TYPE type_descriptor ) method_type_list ) )
+			// smaliTreeWalker.g:469:5: ^( I_METHOD_PROTOTYPE ^( I_METHOD_RETURN_TYPE type_descriptor ) method_type_list )
 			{
-			match(input,I_METHOD_PROTOTYPE,FOLLOW_I_METHOD_PROTOTYPE_in_method_prototype1094);
-			match(input, Token.DOWN, null);
-			match(input,I_METHOD_RETURN_TYPE,FOLLOW_I_METHOD_RETURN_TYPE_in_method_prototype1097);
-			match(input, Token.DOWN, null);
+			match(input,I_METHOD_PROTOTYPE,FOLLOW_I_METHOD_PROTOTYPE_in_method_prototype1094); 
+			match(input, Token.DOWN, null); 
+			match(input,I_METHOD_RETURN_TYPE,FOLLOW_I_METHOD_RETURN_TYPE_in_method_prototype1097); 
+			match(input, Token.DOWN, null); 
 			pushFollow(FOLLOW_type_descriptor_in_method_prototype1099);
 			type_descriptor72=type_descriptor();
 			state._fsp--;
 
-			match(input, Token.UP, null);
+			match(input, Token.UP, null); 
 
 			pushFollow(FOLLOW_method_type_list_in_method_prototype1102);
 			method_type_list73=method_type_list();
 			state._fsp--;
 
-			match(input, Token.UP, null);
+			match(input, Token.UP, null); 
 
 
 			    retval.returnType = type_descriptor72;
 			    retval.parameters = method_type_list73;
-			
+			  
 			}
 
 		}
@@ -2332,7 +2332,7 @@
 
 
 	// $ANTLR start "method_name_and_prototype"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:475:1: method_name_and_prototype returns [String name, List<SmaliMethodParameter> parameters, String returnType] : SIMPLE_NAME method_prototype ;
+	// smaliTreeWalker.g:475:1: method_name_and_prototype returns [String name, List<SmaliMethodParameter> parameters, String returnType] : SIMPLE_NAME method_prototype ;
 	public final smaliTreeWalker.method_name_and_prototype_return method_name_and_prototype() throws RecognitionException {
 		smaliTreeWalker.method_name_and_prototype_return retval = new smaliTreeWalker.method_name_and_prototype_return();
 		retval.start = input.LT(1);
@@ -2341,10 +2341,10 @@
 		TreeRuleReturnScope method_prototype75 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:476:3: ( SIMPLE_NAME method_prototype )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:476:5: SIMPLE_NAME method_prototype
+			// smaliTreeWalker.g:476:3: ( SIMPLE_NAME method_prototype )
+			// smaliTreeWalker.g:476:5: SIMPLE_NAME method_prototype
 			{
-			SIMPLE_NAME74=(CommonTree)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_method_name_and_prototype1120);
+			SIMPLE_NAME74=(CommonTree)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_method_name_and_prototype1120); 
 			pushFollow(FOLLOW_method_prototype_in_method_name_and_prototype1122);
 			method_prototype75=method_prototype();
 			state._fsp--;
@@ -2362,7 +2362,7 @@
 			        }
 			    }
 			    retval.returnType = (method_prototype75!=null?((smaliTreeWalker.method_prototype_return)method_prototype75).returnType:null);
-			
+			  
 			}
 
 		}
@@ -2380,7 +2380,7 @@
 
 
 	// $ANTLR start "method_type_list"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:492:1: method_type_list returns [List<String> types] : ( nonvoid_type_descriptor )* ;
+	// smaliTreeWalker.g:492:1: method_type_list returns [List<String> types] : ( nonvoid_type_descriptor )* ;
 	public final List<String> method_type_list() throws RecognitionException {
 		List<String> types = null;
 
@@ -2389,12 +2389,12 @@
 
 
 		    types = Lists.newArrayList();
-		
+		  
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:497:3: ( ( nonvoid_type_descriptor )* )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:497:5: ( nonvoid_type_descriptor )*
+			// smaliTreeWalker.g:497:3: ( ( nonvoid_type_descriptor )* )
+			// smaliTreeWalker.g:497:5: ( nonvoid_type_descriptor )*
 			{
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:497:5: ( nonvoid_type_descriptor )*
+			// smaliTreeWalker.g:497:5: ( nonvoid_type_descriptor )*
 			loop17:
 			while (true) {
 				int alt17=2;
@@ -2405,7 +2405,7 @@
 
 				switch (alt17) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:498:7: nonvoid_type_descriptor
+					// smaliTreeWalker.g:498:7: nonvoid_type_descriptor
 					{
 					pushFollow(FOLLOW_nonvoid_type_descriptor_in_method_type_list1156);
 					nonvoid_type_descriptor76=nonvoid_type_descriptor();
@@ -2413,7 +2413,7 @@
 
 
 					        types.add((nonvoid_type_descriptor76!=null?((smaliTreeWalker.nonvoid_type_descriptor_return)nonvoid_type_descriptor76).type:null));
-					
+					      
 					}
 					break;
 
@@ -2439,7 +2439,7 @@
 
 
 	// $ANTLR start "method_reference"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:505:1: method_reference returns [ImmutableMethodReference methodReference] : ( reference_type_descriptor )? SIMPLE_NAME method_prototype ;
+	// smaliTreeWalker.g:505:1: method_reference returns [ImmutableMethodReference methodReference] : ( reference_type_descriptor )? SIMPLE_NAME method_prototype ;
 	public final ImmutableMethodReference method_reference() throws RecognitionException {
 		ImmutableMethodReference methodReference = null;
 
@@ -2449,10 +2449,10 @@
 		TreeRuleReturnScope method_prototype79 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:506:3: ( ( reference_type_descriptor )? SIMPLE_NAME method_prototype )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:506:5: ( reference_type_descriptor )? SIMPLE_NAME method_prototype
+			// smaliTreeWalker.g:506:3: ( ( reference_type_descriptor )? SIMPLE_NAME method_prototype )
+			// smaliTreeWalker.g:506:5: ( reference_type_descriptor )? SIMPLE_NAME method_prototype
 			{
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:506:5: ( reference_type_descriptor )?
+			// smaliTreeWalker.g:506:5: ( reference_type_descriptor )?
 			int alt18=2;
 			int LA18_0 = input.LA(1);
 			if ( (LA18_0==ARRAY_TYPE_PREFIX||LA18_0==CLASS_DESCRIPTOR) ) {
@@ -2460,7 +2460,7 @@
 			}
 			switch (alt18) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:506:5: reference_type_descriptor
+					// smaliTreeWalker.g:506:5: reference_type_descriptor
 					{
 					pushFollow(FOLLOW_reference_type_descriptor_in_method_reference1185);
 					reference_type_descriptor77=reference_type_descriptor();
@@ -2471,7 +2471,7 @@
 
 			}
 
-			SIMPLE_NAME78=(CommonTree)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_method_reference1188);
+			SIMPLE_NAME78=(CommonTree)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_method_reference1188); 
 			pushFollow(FOLLOW_method_prototype_in_method_reference1190);
 			method_prototype79=method_prototype();
 			state._fsp--;
@@ -2485,7 +2485,7 @@
 			    }
 			    methodReference = new ImmutableMethodReference(type, (SIMPLE_NAME78!=null?SIMPLE_NAME78.getText():null),
 			             (method_prototype79!=null?((smaliTreeWalker.method_prototype_return)method_prototype79).parameters:null), (method_prototype79!=null?((smaliTreeWalker.method_prototype_return)method_prototype79).returnType:null));
-			
+			  
 			}
 
 		}
@@ -2503,7 +2503,7 @@
 
 
 	// $ANTLR start "field_reference"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:518:1: field_reference returns [ImmutableFieldReference fieldReference] : ( reference_type_descriptor )? SIMPLE_NAME nonvoid_type_descriptor ;
+	// smaliTreeWalker.g:518:1: field_reference returns [ImmutableFieldReference fieldReference] : ( reference_type_descriptor )? SIMPLE_NAME nonvoid_type_descriptor ;
 	public final ImmutableFieldReference field_reference() throws RecognitionException {
 		ImmutableFieldReference fieldReference = null;
 
@@ -2513,10 +2513,10 @@
 		TreeRuleReturnScope nonvoid_type_descriptor82 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:519:3: ( ( reference_type_descriptor )? SIMPLE_NAME nonvoid_type_descriptor )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:519:5: ( reference_type_descriptor )? SIMPLE_NAME nonvoid_type_descriptor
+			// smaliTreeWalker.g:519:3: ( ( reference_type_descriptor )? SIMPLE_NAME nonvoid_type_descriptor )
+			// smaliTreeWalker.g:519:5: ( reference_type_descriptor )? SIMPLE_NAME nonvoid_type_descriptor
 			{
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:519:5: ( reference_type_descriptor )?
+			// smaliTreeWalker.g:519:5: ( reference_type_descriptor )?
 			int alt19=2;
 			int LA19_0 = input.LA(1);
 			if ( (LA19_0==ARRAY_TYPE_PREFIX||LA19_0==CLASS_DESCRIPTOR) ) {
@@ -2524,7 +2524,7 @@
 			}
 			switch (alt19) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:519:5: reference_type_descriptor
+					// smaliTreeWalker.g:519:5: reference_type_descriptor
 					{
 					pushFollow(FOLLOW_reference_type_descriptor_in_field_reference1207);
 					reference_type_descriptor80=reference_type_descriptor();
@@ -2535,7 +2535,7 @@
 
 			}
 
-			SIMPLE_NAME81=(CommonTree)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_field_reference1210);
+			SIMPLE_NAME81=(CommonTree)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_field_reference1210); 
 			pushFollow(FOLLOW_nonvoid_type_descriptor_in_field_reference1212);
 			nonvoid_type_descriptor82=nonvoid_type_descriptor();
 			state._fsp--;
@@ -2549,7 +2549,7 @@
 			    }
 			    fieldReference = new ImmutableFieldReference(type, (SIMPLE_NAME81!=null?SIMPLE_NAME81.getText():null),
 			            (nonvoid_type_descriptor82!=null?((smaliTreeWalker.nonvoid_type_descriptor_return)nonvoid_type_descriptor82).type:null));
-			
+			  
 			}
 
 		}
@@ -2572,7 +2572,7 @@
 
 
 	// $ANTLR start "registers_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:531:1: registers_directive returns [boolean isLocalsDirective, int registers] : ^( ( I_REGISTERS | I_LOCALS ) short_integral_literal ) ;
+	// smaliTreeWalker.g:531:1: registers_directive returns [boolean isLocalsDirective, int registers] : ^( ( I_REGISTERS | I_LOCALS ) short_integral_literal ) ;
 	public final smaliTreeWalker.registers_directive_return registers_directive() throws RecognitionException {
 		smaliTreeWalker.registers_directive_return retval = new smaliTreeWalker.registers_directive_return();
 		retval.start = input.LT(1);
@@ -2580,11 +2580,11 @@
 		short short_integral_literal83 =0;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:532:3: ( ^( ( I_REGISTERS | I_LOCALS ) short_integral_literal ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:532:5: ^( ( I_REGISTERS | I_LOCALS ) short_integral_literal )
+			// smaliTreeWalker.g:532:3: ( ^( ( I_REGISTERS | I_LOCALS ) short_integral_literal ) )
+			// smaliTreeWalker.g:532:5: ^( ( I_REGISTERS | I_LOCALS ) short_integral_literal )
 			{
 			retval.registers = 0;
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:533:7: ( I_REGISTERS | I_LOCALS )
+			// smaliTreeWalker.g:533:7: ( I_REGISTERS | I_LOCALS )
 			int alt20=2;
 			int LA20_0 = input.LA(1);
 			if ( (LA20_0==I_REGISTERS) ) {
@@ -2602,29 +2602,29 @@
 
 			switch (alt20) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:533:9: I_REGISTERS
+					// smaliTreeWalker.g:533:9: I_REGISTERS
 					{
-					match(input,I_REGISTERS,FOLLOW_I_REGISTERS_in_registers_directive1238);
+					match(input,I_REGISTERS,FOLLOW_I_REGISTERS_in_registers_directive1238); 
 					retval.isLocalsDirective = false;
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:534:9: I_LOCALS
+					// smaliTreeWalker.g:534:9: I_LOCALS
 					{
-					match(input,I_LOCALS,FOLLOW_I_LOCALS_in_registers_directive1250);
+					match(input,I_LOCALS,FOLLOW_I_LOCALS_in_registers_directive1250); 
 					retval.isLocalsDirective = true;
 					}
 					break;
 
 			}
 
-			match(input, Token.DOWN, null);
+			match(input, Token.DOWN, null); 
 			pushFollow(FOLLOW_short_integral_literal_in_registers_directive1268);
 			short_integral_literal83=short_integral_literal();
 			state._fsp--;
 
 			retval.registers = short_integral_literal83 & 0xFFFF;
-			match(input, Token.UP, null);
+			match(input, Token.UP, null); 
 
 			}
 
@@ -2643,22 +2643,22 @@
 
 
 	// $ANTLR start "label_def"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:539:1: label_def : ^( I_LABEL SIMPLE_NAME ) ;
+	// smaliTreeWalker.g:539:1: label_def : ^( I_LABEL SIMPLE_NAME ) ;
 	public final void label_def() throws RecognitionException {
 		CommonTree SIMPLE_NAME84=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:540:3: ( ^( I_LABEL SIMPLE_NAME ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:540:5: ^( I_LABEL SIMPLE_NAME )
+			// smaliTreeWalker.g:540:3: ( ^( I_LABEL SIMPLE_NAME ) )
+			// smaliTreeWalker.g:540:5: ^( I_LABEL SIMPLE_NAME )
 			{
-			match(input,I_LABEL,FOLLOW_I_LABEL_in_label_def1288);
-			match(input, Token.DOWN, null);
-			SIMPLE_NAME84=(CommonTree)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_label_def1290);
-			match(input, Token.UP, null);
+			match(input,I_LABEL,FOLLOW_I_LABEL_in_label_def1288); 
+			match(input, Token.DOWN, null); 
+			SIMPLE_NAME84=(CommonTree)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_label_def1290); 
+			match(input, Token.UP, null); 
 
 
 			    method_stack.peek().methodBuilder.addLabel((SIMPLE_NAME84!=null?SIMPLE_NAME84.getText():null));
-			
+			  
 			}
 
 		}
@@ -2675,20 +2675,20 @@
 
 
 	// $ANTLR start "catches"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:545:1: catches returns [List<BuilderTryBlock> tryBlocks] : ^( I_CATCHES ( catch_directive )* ( catchall_directive )* ) ;
+	// smaliTreeWalker.g:545:1: catches returns [List<BuilderTryBlock> tryBlocks] : ^( I_CATCHES ( catch_directive )* ( catchall_directive )* ) ;
 	public final List<BuilderTryBlock> catches() throws RecognitionException {
 		List<BuilderTryBlock> tryBlocks = null;
 
 
 		tryBlocks = Lists.newArrayList();
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:547:3: ( ^( I_CATCHES ( catch_directive )* ( catchall_directive )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:547:5: ^( I_CATCHES ( catch_directive )* ( catchall_directive )* )
+			// smaliTreeWalker.g:547:3: ( ^( I_CATCHES ( catch_directive )* ( catchall_directive )* ) )
+			// smaliTreeWalker.g:547:5: ^( I_CATCHES ( catch_directive )* ( catchall_directive )* )
 			{
-			match(input,I_CATCHES,FOLLOW_I_CATCHES_in_catches1316);
+			match(input,I_CATCHES,FOLLOW_I_CATCHES_in_catches1316); 
 			if ( input.LA(1)==Token.DOWN ) {
-				match(input, Token.DOWN, null);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:547:17: ( catch_directive )*
+				match(input, Token.DOWN, null); 
+				// smaliTreeWalker.g:547:17: ( catch_directive )*
 				loop21:
 				while (true) {
 					int alt21=2;
@@ -2699,7 +2699,7 @@
 
 					switch (alt21) {
 					case 1 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:547:17: catch_directive
+						// smaliTreeWalker.g:547:17: catch_directive
 						{
 						pushFollow(FOLLOW_catch_directive_in_catches1318);
 						catch_directive();
@@ -2713,7 +2713,7 @@
 					}
 				}
 
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:547:34: ( catchall_directive )*
+				// smaliTreeWalker.g:547:34: ( catchall_directive )*
 				loop22:
 				while (true) {
 					int alt22=2;
@@ -2724,7 +2724,7 @@
 
 					switch (alt22) {
 					case 1 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:547:34: catchall_directive
+						// smaliTreeWalker.g:547:34: catchall_directive
 						{
 						pushFollow(FOLLOW_catchall_directive_in_catches1321);
 						catchall_directive();
@@ -2738,7 +2738,7 @@
 					}
 				}
 
-				match(input, Token.UP, null);
+				match(input, Token.UP, null); 
 			}
 
 			}
@@ -2758,7 +2758,7 @@
 
 
 	// $ANTLR start "catch_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:549:1: catch_directive : ^( I_CATCH nonvoid_type_descriptor from= label_ref to= label_ref using= label_ref ) ;
+	// smaliTreeWalker.g:549:1: catch_directive : ^( I_CATCH nonvoid_type_descriptor from= label_ref to= label_ref using= label_ref ) ;
 	public final void catch_directive() throws RecognitionException {
 		Label from =null;
 		Label to =null;
@@ -2766,11 +2766,11 @@
 		TreeRuleReturnScope nonvoid_type_descriptor85 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:550:3: ( ^( I_CATCH nonvoid_type_descriptor from= label_ref to= label_ref using= label_ref ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:550:5: ^( I_CATCH nonvoid_type_descriptor from= label_ref to= label_ref using= label_ref )
+			// smaliTreeWalker.g:550:3: ( ^( I_CATCH nonvoid_type_descriptor from= label_ref to= label_ref using= label_ref ) )
+			// smaliTreeWalker.g:550:5: ^( I_CATCH nonvoid_type_descriptor from= label_ref to= label_ref using= label_ref )
 			{
-			match(input,I_CATCH,FOLLOW_I_CATCH_in_catch_directive1334);
-			match(input, Token.DOWN, null);
+			match(input,I_CATCH,FOLLOW_I_CATCH_in_catch_directive1334); 
+			match(input, Token.DOWN, null); 
 			pushFollow(FOLLOW_nonvoid_type_descriptor_in_catch_directive1336);
 			nonvoid_type_descriptor85=nonvoid_type_descriptor();
 			state._fsp--;
@@ -2787,12 +2787,12 @@
 			using=label_ref();
 			state._fsp--;
 
-			match(input, Token.UP, null);
+			match(input, Token.UP, null); 
 
 
 			    method_stack.peek().methodBuilder.addCatch(dexBuilder.internTypeReference((nonvoid_type_descriptor85!=null?((smaliTreeWalker.nonvoid_type_descriptor_return)nonvoid_type_descriptor85).type:null)),
 			        from, to, using);
-			
+			  
 			}
 
 		}
@@ -2809,18 +2809,18 @@
 
 
 	// $ANTLR start "catchall_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:556:1: catchall_directive : ^( I_CATCHALL from= label_ref to= label_ref using= label_ref ) ;
+	// smaliTreeWalker.g:556:1: catchall_directive : ^( I_CATCHALL from= label_ref to= label_ref using= label_ref ) ;
 	public final void catchall_directive() throws RecognitionException {
 		Label from =null;
 		Label to =null;
 		Label using =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:557:3: ( ^( I_CATCHALL from= label_ref to= label_ref using= label_ref ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:557:5: ^( I_CATCHALL from= label_ref to= label_ref using= label_ref )
+			// smaliTreeWalker.g:557:3: ( ^( I_CATCHALL from= label_ref to= label_ref using= label_ref ) )
+			// smaliTreeWalker.g:557:5: ^( I_CATCHALL from= label_ref to= label_ref using= label_ref )
 			{
-			match(input,I_CATCHALL,FOLLOW_I_CATCHALL_in_catchall_directive1364);
-			match(input, Token.DOWN, null);
+			match(input,I_CATCHALL,FOLLOW_I_CATCHALL_in_catchall_directive1364); 
+			match(input, Token.DOWN, null); 
 			pushFollow(FOLLOW_label_ref_in_catchall_directive1368);
 			from=label_ref();
 			state._fsp--;
@@ -2833,11 +2833,11 @@
 			using=label_ref();
 			state._fsp--;
 
-			match(input, Token.UP, null);
+			match(input, Token.UP, null); 
 
 
 			    method_stack.peek().methodBuilder.addCatch(from, to, using);
-			
+			  
 			}
 
 		}
@@ -2854,16 +2854,16 @@
 
 
 	// $ANTLR start "parameters"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:562:1: parameters[List<SmaliMethodParameter> parameters] : ^( I_PARAMETERS ( parameter[parameters] )* ) ;
+	// smaliTreeWalker.g:562:1: parameters[List<SmaliMethodParameter> parameters] : ^( I_PARAMETERS ( parameter[parameters] )* ) ;
 	public final void parameters(List<SmaliMethodParameter> parameters) throws RecognitionException {
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:563:3: ( ^( I_PARAMETERS ( parameter[parameters] )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:563:5: ^( I_PARAMETERS ( parameter[parameters] )* )
+			// smaliTreeWalker.g:563:3: ( ^( I_PARAMETERS ( parameter[parameters] )* ) )
+			// smaliTreeWalker.g:563:5: ^( I_PARAMETERS ( parameter[parameters] )* )
 			{
-			match(input,I_PARAMETERS,FOLLOW_I_PARAMETERS_in_parameters1393);
+			match(input,I_PARAMETERS,FOLLOW_I_PARAMETERS_in_parameters1393); 
 			if ( input.LA(1)==Token.DOWN ) {
-				match(input, Token.DOWN, null);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:563:20: ( parameter[parameters] )*
+				match(input, Token.DOWN, null); 
+				// smaliTreeWalker.g:563:20: ( parameter[parameters] )*
 				loop23:
 				while (true) {
 					int alt23=2;
@@ -2874,7 +2874,7 @@
 
 					switch (alt23) {
 					case 1 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:563:21: parameter[parameters]
+						// smaliTreeWalker.g:563:21: parameter[parameters]
 						{
 						pushFollow(FOLLOW_parameter_in_parameters1396);
 						parameter(parameters);
@@ -2888,7 +2888,7 @@
 					}
 				}
 
-				match(input, Token.UP, null);
+				match(input, Token.UP, null); 
 			}
 
 			}
@@ -2907,7 +2907,7 @@
 
 
 	// $ANTLR start "parameter"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:565:1: parameter[List<SmaliMethodParameter> parameters] : ^( I_PARAMETER REGISTER ( string_literal )? annotations ) ;
+	// smaliTreeWalker.g:565:1: parameter[List<SmaliMethodParameter> parameters] : ^( I_PARAMETER REGISTER ( string_literal )? annotations ) ;
 	public final void parameter(List<SmaliMethodParameter> parameters) throws RecognitionException {
 		CommonTree REGISTER86=null;
 		CommonTree I_PARAMETER87=null;
@@ -2915,13 +2915,13 @@
 		Set<Annotation> annotations89 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:566:3: ( ^( I_PARAMETER REGISTER ( string_literal )? annotations ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:566:5: ^( I_PARAMETER REGISTER ( string_literal )? annotations )
+			// smaliTreeWalker.g:566:3: ( ^( I_PARAMETER REGISTER ( string_literal )? annotations ) )
+			// smaliTreeWalker.g:566:5: ^( I_PARAMETER REGISTER ( string_literal )? annotations )
 			{
-			I_PARAMETER87=(CommonTree)match(input,I_PARAMETER,FOLLOW_I_PARAMETER_in_parameter1412);
-			match(input, Token.DOWN, null);
-			REGISTER86=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_parameter1414);
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:566:28: ( string_literal )?
+			I_PARAMETER87=(CommonTree)match(input,I_PARAMETER,FOLLOW_I_PARAMETER_in_parameter1412); 
+			match(input, Token.DOWN, null); 
+			REGISTER86=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_parameter1414); 
+			// smaliTreeWalker.g:566:28: ( string_literal )?
 			int alt24=2;
 			int LA24_0 = input.LA(1);
 			if ( (LA24_0==STRING_LITERAL) ) {
@@ -2929,7 +2929,7 @@
 			}
 			switch (alt24) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:566:28: string_literal
+					// smaliTreeWalker.g:566:28: string_literal
 					{
 					pushFollow(FOLLOW_string_literal_in_parameter1416);
 					string_literal88=string_literal();
@@ -2944,7 +2944,7 @@
 			annotations89=annotations();
 			state._fsp--;
 
-			match(input, Token.UP, null);
+			match(input, Token.UP, null); 
 
 
 			        final int registerNumber = parseRegister_short((REGISTER86!=null?REGISTER86.getText():null));
@@ -2976,7 +2976,7 @@
 			        if (annotations89 != null && annotations89.size() > 0) {
 			            methodParameter.annotations = annotations89;
 			        }
-			
+			    
 			}
 
 		}
@@ -2993,10 +2993,10 @@
 
 
 	// $ANTLR start "debug_directive"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:599:1: debug_directive : ( line | local | end_local | restart_local | prologue | epilogue | source );
+	// smaliTreeWalker.g:599:1: debug_directive : ( line | local | end_local | restart_local | prologue | epilogue | source );
 	public final void debug_directive() throws RecognitionException {
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:600:3: ( line | local | end_local | restart_local | prologue | epilogue | source )
+			// smaliTreeWalker.g:600:3: ( line | local | end_local | restart_local | prologue | epilogue | source )
 			int alt25=7;
 			switch ( input.LA(1) ) {
 			case I_LINE:
@@ -3041,7 +3041,7 @@
 			}
 			switch (alt25) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:600:5: line
+					// smaliTreeWalker.g:600:5: line
 					{
 					pushFollow(FOLLOW_line_in_debug_directive1436);
 					line();
@@ -3050,7 +3050,7 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:601:5: local
+					// smaliTreeWalker.g:601:5: local
 					{
 					pushFollow(FOLLOW_local_in_debug_directive1442);
 					local();
@@ -3059,7 +3059,7 @@
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:602:5: end_local
+					// smaliTreeWalker.g:602:5: end_local
 					{
 					pushFollow(FOLLOW_end_local_in_debug_directive1448);
 					end_local();
@@ -3068,7 +3068,7 @@
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:603:5: restart_local
+					// smaliTreeWalker.g:603:5: restart_local
 					{
 					pushFollow(FOLLOW_restart_local_in_debug_directive1454);
 					restart_local();
@@ -3077,7 +3077,7 @@
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:604:5: prologue
+					// smaliTreeWalker.g:604:5: prologue
 					{
 					pushFollow(FOLLOW_prologue_in_debug_directive1460);
 					prologue();
@@ -3086,7 +3086,7 @@
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:605:5: epilogue
+					// smaliTreeWalker.g:605:5: epilogue
 					{
 					pushFollow(FOLLOW_epilogue_in_debug_directive1466);
 					epilogue();
@@ -3095,7 +3095,7 @@
 					}
 					break;
 				case 7 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:606:5: source
+					// smaliTreeWalker.g:606:5: source
 					{
 					pushFollow(FOLLOW_source_in_debug_directive1472);
 					source();
@@ -3119,25 +3119,25 @@
 
 
 	// $ANTLR start "line"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:608:1: line : ^( I_LINE integral_literal ) ;
+	// smaliTreeWalker.g:608:1: line : ^( I_LINE integral_literal ) ;
 	public final void line() throws RecognitionException {
 		int integral_literal90 =0;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:609:3: ( ^( I_LINE integral_literal ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:609:5: ^( I_LINE integral_literal )
+			// smaliTreeWalker.g:609:3: ( ^( I_LINE integral_literal ) )
+			// smaliTreeWalker.g:609:5: ^( I_LINE integral_literal )
 			{
-			match(input,I_LINE,FOLLOW_I_LINE_in_line1483);
-			match(input, Token.DOWN, null);
+			match(input,I_LINE,FOLLOW_I_LINE_in_line1483); 
+			match(input, Token.DOWN, null); 
 			pushFollow(FOLLOW_integral_literal_in_line1485);
 			integral_literal90=integral_literal();
 			state._fsp--;
 
-			match(input, Token.UP, null);
+			match(input, Token.UP, null); 
 
 
 			        method_stack.peek().methodBuilder.addLineNumber(integral_literal90);
-			
+			    
 			}
 
 		}
@@ -3154,7 +3154,7 @@
 
 
 	// $ANTLR start "local"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:614:1: local : ^( I_LOCAL REGISTER ( ( NULL_LITERAL |name= string_literal ) ( nonvoid_type_descriptor )? (signature= string_literal )? )? ) ;
+	// smaliTreeWalker.g:614:1: local : ^( I_LOCAL REGISTER ( ( NULL_LITERAL |name= string_literal ) ( nonvoid_type_descriptor )? (signature= string_literal )? )? ) ;
 	public final void local() throws RecognitionException {
 		CommonTree REGISTER91=null;
 		String name =null;
@@ -3162,13 +3162,13 @@
 		TreeRuleReturnScope nonvoid_type_descriptor92 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:615:3: ( ^( I_LOCAL REGISTER ( ( NULL_LITERAL |name= string_literal ) ( nonvoid_type_descriptor )? (signature= string_literal )? )? ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:615:5: ^( I_LOCAL REGISTER ( ( NULL_LITERAL |name= string_literal ) ( nonvoid_type_descriptor )? (signature= string_literal )? )? )
+			// smaliTreeWalker.g:615:3: ( ^( I_LOCAL REGISTER ( ( NULL_LITERAL |name= string_literal ) ( nonvoid_type_descriptor )? (signature= string_literal )? )? ) )
+			// smaliTreeWalker.g:615:5: ^( I_LOCAL REGISTER ( ( NULL_LITERAL |name= string_literal ) ( nonvoid_type_descriptor )? (signature= string_literal )? )? )
 			{
-			match(input,I_LOCAL,FOLLOW_I_LOCAL_in_local1503);
-			match(input, Token.DOWN, null);
-			REGISTER91=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_local1505);
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:615:24: ( ( NULL_LITERAL |name= string_literal ) ( nonvoid_type_descriptor )? (signature= string_literal )? )?
+			match(input,I_LOCAL,FOLLOW_I_LOCAL_in_local1503); 
+			match(input, Token.DOWN, null); 
+			REGISTER91=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_local1505); 
+			// smaliTreeWalker.g:615:24: ( ( NULL_LITERAL |name= string_literal ) ( nonvoid_type_descriptor )? (signature= string_literal )? )?
 			int alt29=2;
 			int LA29_0 = input.LA(1);
 			if ( (LA29_0==NULL_LITERAL||LA29_0==STRING_LITERAL) ) {
@@ -3176,9 +3176,9 @@
 			}
 			switch (alt29) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:615:25: ( NULL_LITERAL |name= string_literal ) ( nonvoid_type_descriptor )? (signature= string_literal )?
+					// smaliTreeWalker.g:615:25: ( NULL_LITERAL |name= string_literal ) ( nonvoid_type_descriptor )? (signature= string_literal )?
 					{
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:615:25: ( NULL_LITERAL |name= string_literal )
+					// smaliTreeWalker.g:615:25: ( NULL_LITERAL |name= string_literal )
 					int alt26=2;
 					int LA26_0 = input.LA(1);
 					if ( (LA26_0==NULL_LITERAL) ) {
@@ -3196,13 +3196,13 @@
 
 					switch (alt26) {
 						case 1 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:615:26: NULL_LITERAL
+							// smaliTreeWalker.g:615:26: NULL_LITERAL
 							{
-							match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_local1509);
+							match(input,NULL_LITERAL,FOLLOW_NULL_LITERAL_in_local1509); 
 							}
 							break;
 						case 2 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:615:41: name= string_literal
+							// smaliTreeWalker.g:615:41: name= string_literal
 							{
 							pushFollow(FOLLOW_string_literal_in_local1515);
 							name=string_literal();
@@ -3213,7 +3213,7 @@
 
 					}
 
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:615:62: ( nonvoid_type_descriptor )?
+					// smaliTreeWalker.g:615:62: ( nonvoid_type_descriptor )?
 					int alt27=2;
 					int LA27_0 = input.LA(1);
 					if ( (LA27_0==ARRAY_TYPE_PREFIX||LA27_0==CLASS_DESCRIPTOR||LA27_0==PRIMITIVE_TYPE) ) {
@@ -3221,7 +3221,7 @@
 					}
 					switch (alt27) {
 						case 1 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:615:62: nonvoid_type_descriptor
+							// smaliTreeWalker.g:615:62: nonvoid_type_descriptor
 							{
 							pushFollow(FOLLOW_nonvoid_type_descriptor_in_local1518);
 							nonvoid_type_descriptor92=nonvoid_type_descriptor();
@@ -3232,7 +3232,7 @@
 
 					}
 
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:615:96: (signature= string_literal )?
+					// smaliTreeWalker.g:615:96: (signature= string_literal )?
 					int alt28=2;
 					int LA28_0 = input.LA(1);
 					if ( (LA28_0==STRING_LITERAL) ) {
@@ -3240,7 +3240,7 @@
 					}
 					switch (alt28) {
 						case 1 :
-							// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:615:96: signature= string_literal
+							// smaliTreeWalker.g:615:96: signature= string_literal
 							{
 							pushFollow(FOLLOW_string_literal_in_local1523);
 							signature=string_literal();
@@ -3256,7 +3256,7 @@
 
 			}
 
-			match(input, Token.UP, null);
+			match(input, Token.UP, null); 
 
 
 			      int registerNumber = parseRegister_short((REGISTER91!=null?REGISTER91.getText():null));
@@ -3264,7 +3264,7 @@
 			              dexBuilder.internNullableStringReference(name),
 			              dexBuilder.internNullableTypeReference((nonvoid_type_descriptor92!=null?((smaliTreeWalker.nonvoid_type_descriptor_return)nonvoid_type_descriptor92).type:null)),
 			              dexBuilder.internNullableStringReference(signature));
-			
+			    
 			}
 
 		}
@@ -3281,23 +3281,23 @@
 
 
 	// $ANTLR start "end_local"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:624:1: end_local : ^( I_END_LOCAL REGISTER ) ;
+	// smaliTreeWalker.g:624:1: end_local : ^( I_END_LOCAL REGISTER ) ;
 	public final void end_local() throws RecognitionException {
 		CommonTree REGISTER93=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:625:3: ( ^( I_END_LOCAL REGISTER ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:625:5: ^( I_END_LOCAL REGISTER )
+			// smaliTreeWalker.g:625:3: ( ^( I_END_LOCAL REGISTER ) )
+			// smaliTreeWalker.g:625:5: ^( I_END_LOCAL REGISTER )
 			{
-			match(input,I_END_LOCAL,FOLLOW_I_END_LOCAL_in_end_local1544);
-			match(input, Token.DOWN, null);
-			REGISTER93=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_end_local1546);
-			match(input, Token.UP, null);
+			match(input,I_END_LOCAL,FOLLOW_I_END_LOCAL_in_end_local1544); 
+			match(input, Token.DOWN, null); 
+			REGISTER93=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_end_local1546); 
+			match(input, Token.UP, null); 
 
 
 			      int registerNumber = parseRegister_short((REGISTER93!=null?REGISTER93.getText():null));
 			      method_stack.peek().methodBuilder.addEndLocal(registerNumber);
-			
+			    
 			}
 
 		}
@@ -3314,23 +3314,23 @@
 
 
 	// $ANTLR start "restart_local"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:631:1: restart_local : ^( I_RESTART_LOCAL REGISTER ) ;
+	// smaliTreeWalker.g:631:1: restart_local : ^( I_RESTART_LOCAL REGISTER ) ;
 	public final void restart_local() throws RecognitionException {
 		CommonTree REGISTER94=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:632:3: ( ^( I_RESTART_LOCAL REGISTER ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:632:5: ^( I_RESTART_LOCAL REGISTER )
+			// smaliTreeWalker.g:632:3: ( ^( I_RESTART_LOCAL REGISTER ) )
+			// smaliTreeWalker.g:632:5: ^( I_RESTART_LOCAL REGISTER )
 			{
-			match(input,I_RESTART_LOCAL,FOLLOW_I_RESTART_LOCAL_in_restart_local1564);
-			match(input, Token.DOWN, null);
-			REGISTER94=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_restart_local1566);
-			match(input, Token.UP, null);
+			match(input,I_RESTART_LOCAL,FOLLOW_I_RESTART_LOCAL_in_restart_local1564); 
+			match(input, Token.DOWN, null); 
+			REGISTER94=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_restart_local1566); 
+			match(input, Token.UP, null); 
 
 
 			      int registerNumber = parseRegister_short((REGISTER94!=null?REGISTER94.getText():null));
 			      method_stack.peek().methodBuilder.addRestartLocal(registerNumber);
-			
+			    
 			}
 
 		}
@@ -3347,16 +3347,16 @@
 
 
 	// $ANTLR start "prologue"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:638:1: prologue : I_PROLOGUE ;
+	// smaliTreeWalker.g:638:1: prologue : I_PROLOGUE ;
 	public final void prologue() throws RecognitionException {
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:639:3: ( I_PROLOGUE )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:639:5: I_PROLOGUE
+			// smaliTreeWalker.g:639:3: ( I_PROLOGUE )
+			// smaliTreeWalker.g:639:5: I_PROLOGUE
 			{
-			match(input,I_PROLOGUE,FOLLOW_I_PROLOGUE_in_prologue1583);
+			match(input,I_PROLOGUE,FOLLOW_I_PROLOGUE_in_prologue1583); 
 
 			      method_stack.peek().methodBuilder.addPrologue();
-			
+			    
 			}
 
 		}
@@ -3373,16 +3373,16 @@
 
 
 	// $ANTLR start "epilogue"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:644:1: epilogue : I_EPILOGUE ;
+	// smaliTreeWalker.g:644:1: epilogue : I_EPILOGUE ;
 	public final void epilogue() throws RecognitionException {
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:645:3: ( I_EPILOGUE )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:645:5: I_EPILOGUE
+			// smaliTreeWalker.g:645:3: ( I_EPILOGUE )
+			// smaliTreeWalker.g:645:5: I_EPILOGUE
 			{
-			match(input,I_EPILOGUE,FOLLOW_I_EPILOGUE_in_epilogue1599);
+			match(input,I_EPILOGUE,FOLLOW_I_EPILOGUE_in_epilogue1599); 
 
 			      method_stack.peek().methodBuilder.addEpilogue();
-			
+			    
 			}
 
 		}
@@ -3399,18 +3399,18 @@
 
 
 	// $ANTLR start "source"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:650:1: source : ^( I_SOURCE ( string_literal )? ) ;
+	// smaliTreeWalker.g:650:1: source : ^( I_SOURCE ( string_literal )? ) ;
 	public final void source() throws RecognitionException {
 		String string_literal95 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:651:3: ( ^( I_SOURCE ( string_literal )? ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:651:5: ^( I_SOURCE ( string_literal )? )
+			// smaliTreeWalker.g:651:3: ( ^( I_SOURCE ( string_literal )? ) )
+			// smaliTreeWalker.g:651:5: ^( I_SOURCE ( string_literal )? )
 			{
-			match(input,I_SOURCE,FOLLOW_I_SOURCE_in_source1616);
+			match(input,I_SOURCE,FOLLOW_I_SOURCE_in_source1616); 
 			if ( input.LA(1)==Token.DOWN ) {
-				match(input, Token.DOWN, null);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:651:16: ( string_literal )?
+				match(input, Token.DOWN, null); 
+				// smaliTreeWalker.g:651:16: ( string_literal )?
 				int alt30=2;
 				int LA30_0 = input.LA(1);
 				if ( (LA30_0==STRING_LITERAL) ) {
@@ -3418,7 +3418,7 @@
 				}
 				switch (alt30) {
 					case 1 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:651:16: string_literal
+						// smaliTreeWalker.g:651:16: string_literal
 						{
 						pushFollow(FOLLOW_string_literal_in_source1618);
 						string_literal95=string_literal();
@@ -3429,12 +3429,12 @@
 
 				}
 
-				match(input, Token.UP, null);
+				match(input, Token.UP, null); 
 			}
 
 
 			      method_stack.peek().methodBuilder.addSetSourceFile(dexBuilder.internNullableStringReference(string_literal95));
-			
+			    
 			}
 
 		}
@@ -3451,16 +3451,16 @@
 
 
 	// $ANTLR start "ordered_method_items"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:656:1: ordered_method_items : ^( I_ORDERED_METHOD_ITEMS ( label_def | instruction | debug_directive )* ) ;
+	// smaliTreeWalker.g:656:1: ordered_method_items : ^( I_ORDERED_METHOD_ITEMS ( label_def | instruction | debug_directive )* ) ;
 	public final void ordered_method_items() throws RecognitionException {
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:657:3: ( ^( I_ORDERED_METHOD_ITEMS ( label_def | instruction | debug_directive )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:657:5: ^( I_ORDERED_METHOD_ITEMS ( label_def | instruction | debug_directive )* )
+			// smaliTreeWalker.g:657:3: ( ^( I_ORDERED_METHOD_ITEMS ( label_def | instruction | debug_directive )* ) )
+			// smaliTreeWalker.g:657:5: ^( I_ORDERED_METHOD_ITEMS ( label_def | instruction | debug_directive )* )
 			{
-			match(input,I_ORDERED_METHOD_ITEMS,FOLLOW_I_ORDERED_METHOD_ITEMS_in_ordered_method_items1637);
+			match(input,I_ORDERED_METHOD_ITEMS,FOLLOW_I_ORDERED_METHOD_ITEMS_in_ordered_method_items1637); 
 			if ( input.LA(1)==Token.DOWN ) {
-				match(input, Token.DOWN, null);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:657:30: ( label_def | instruction | debug_directive )*
+				match(input, Token.DOWN, null); 
+				// smaliTreeWalker.g:657:30: ( label_def | instruction | debug_directive )*
 				loop31:
 				while (true) {
 					int alt31=4;
@@ -3524,7 +3524,7 @@
 					}
 					switch (alt31) {
 					case 1 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:657:31: label_def
+						// smaliTreeWalker.g:657:31: label_def
 						{
 						pushFollow(FOLLOW_label_def_in_ordered_method_items1640);
 						label_def();
@@ -3533,7 +3533,7 @@
 						}
 						break;
 					case 2 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:657:43: instruction
+						// smaliTreeWalker.g:657:43: instruction
 						{
 						pushFollow(FOLLOW_instruction_in_ordered_method_items1644);
 						instruction();
@@ -3542,7 +3542,7 @@
 						}
 						break;
 					case 3 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:657:57: debug_directive
+						// smaliTreeWalker.g:657:57: debug_directive
 						{
 						pushFollow(FOLLOW_debug_directive_in_ordered_method_items1648);
 						debug_directive();
@@ -3556,7 +3556,7 @@
 					}
 				}
 
-				match(input, Token.UP, null);
+				match(input, Token.UP, null); 
 			}
 
 			}
@@ -3575,7 +3575,7 @@
 
 
 	// $ANTLR start "label_ref"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:659:1: label_ref returns [Label label] : SIMPLE_NAME ;
+	// smaliTreeWalker.g:659:1: label_ref returns [Label label] : SIMPLE_NAME ;
 	public final Label label_ref() throws RecognitionException {
 		Label label = null;
 
@@ -3583,11 +3583,11 @@
 		CommonTree SIMPLE_NAME96=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:660:3: ( SIMPLE_NAME )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:660:5: SIMPLE_NAME
+			// smaliTreeWalker.g:660:3: ( SIMPLE_NAME )
+			// smaliTreeWalker.g:660:5: SIMPLE_NAME
 			{
-			SIMPLE_NAME96=(CommonTree)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_label_ref1664);
-			 label = method_stack.peek().methodBuilder.getLabel((SIMPLE_NAME96!=null?SIMPLE_NAME96.getText():null));
+			SIMPLE_NAME96=(CommonTree)match(input,SIMPLE_NAME,FOLLOW_SIMPLE_NAME_in_label_ref1664); 
+			 label = method_stack.peek().methodBuilder.getLabel((SIMPLE_NAME96!=null?SIMPLE_NAME96.getText():null)); 
 			}
 
 		}
@@ -3610,7 +3610,7 @@
 
 
 	// $ANTLR start "register_list"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:662:1: register_list returns [byte[] registers, byte registerCount] : ^( I_REGISTER_LIST ( REGISTER )* ) ;
+	// smaliTreeWalker.g:662:1: register_list returns [byte[] registers, byte registerCount] : ^( I_REGISTER_LIST ( REGISTER )* ) ;
 	public final smaliTreeWalker.register_list_return register_list() throws RecognitionException {
 		smaliTreeWalker.register_list_return retval = new smaliTreeWalker.register_list_return();
 		retval.start = input.LT(1);
@@ -3621,15 +3621,15 @@
 
 		    retval.registers = new byte[5];
 		    retval.registerCount = 0;
-		
+		  
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:668:3: ( ^( I_REGISTER_LIST ( REGISTER )* ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:668:5: ^( I_REGISTER_LIST ( REGISTER )* )
+			// smaliTreeWalker.g:668:3: ( ^( I_REGISTER_LIST ( REGISTER )* ) )
+			// smaliTreeWalker.g:668:5: ^( I_REGISTER_LIST ( REGISTER )* )
 			{
-			I_REGISTER_LIST97=(CommonTree)match(input,I_REGISTER_LIST,FOLLOW_I_REGISTER_LIST_in_register_list1689);
+			I_REGISTER_LIST97=(CommonTree)match(input,I_REGISTER_LIST,FOLLOW_I_REGISTER_LIST_in_register_list1689); 
 			if ( input.LA(1)==Token.DOWN ) {
-				match(input, Token.DOWN, null);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:669:7: ( REGISTER )*
+				match(input, Token.DOWN, null); 
+				// smaliTreeWalker.g:669:7: ( REGISTER )*
 				loop32:
 				while (true) {
 					int alt32=2;
@@ -3640,16 +3640,16 @@
 
 					switch (alt32) {
 					case 1 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:669:8: REGISTER
+						// smaliTreeWalker.g:669:8: REGISTER
 						{
-						REGISTER98=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_register_list1698);
+						REGISTER98=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_register_list1698); 
 
 						        if (retval.registerCount == 5) {
 						          throw new SemanticException(input, I_REGISTER_LIST97, "A list of registers can only have a maximum of 5 " +
 						                  "registers. Use the <op>/range alternate opcode instead.");
 						        }
 						        retval.registers[retval.registerCount++] = parseRegister_nibble((REGISTER98!=null?REGISTER98.getText():null));
-						
+						      
 						}
 						break;
 
@@ -3658,7 +3658,7 @@
 					}
 				}
 
-				match(input, Token.UP, null);
+				match(input, Token.UP, null); 
 			}
 
 			}
@@ -3683,7 +3683,7 @@
 
 
 	// $ANTLR start "register_range"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:678:1: register_range returns [int startRegister, int endRegister] : ^( I_REGISTER_RANGE (startReg= REGISTER (endReg= REGISTER )? )? ) ;
+	// smaliTreeWalker.g:678:1: register_range returns [int startRegister, int endRegister] : ^( I_REGISTER_RANGE (startReg= REGISTER (endReg= REGISTER )? )? ) ;
 	public final smaliTreeWalker.register_range_return register_range() throws RecognitionException {
 		smaliTreeWalker.register_range_return retval = new smaliTreeWalker.register_range_return();
 		retval.start = input.LT(1);
@@ -3693,13 +3693,13 @@
 		CommonTree I_REGISTER_RANGE99=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:679:3: ( ^( I_REGISTER_RANGE (startReg= REGISTER (endReg= REGISTER )? )? ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:679:5: ^( I_REGISTER_RANGE (startReg= REGISTER (endReg= REGISTER )? )? )
+			// smaliTreeWalker.g:679:3: ( ^( I_REGISTER_RANGE (startReg= REGISTER (endReg= REGISTER )? )? ) )
+			// smaliTreeWalker.g:679:5: ^( I_REGISTER_RANGE (startReg= REGISTER (endReg= REGISTER )? )? )
 			{
-			I_REGISTER_RANGE99=(CommonTree)match(input,I_REGISTER_RANGE,FOLLOW_I_REGISTER_RANGE_in_register_range1723);
+			I_REGISTER_RANGE99=(CommonTree)match(input,I_REGISTER_RANGE,FOLLOW_I_REGISTER_RANGE_in_register_range1723); 
 			if ( input.LA(1)==Token.DOWN ) {
-				match(input, Token.DOWN, null);
-				// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:679:24: (startReg= REGISTER (endReg= REGISTER )? )?
+				match(input, Token.DOWN, null); 
+				// smaliTreeWalker.g:679:24: (startReg= REGISTER (endReg= REGISTER )? )?
 				int alt34=2;
 				int LA34_0 = input.LA(1);
 				if ( (LA34_0==REGISTER) ) {
@@ -3707,10 +3707,10 @@
 				}
 				switch (alt34) {
 					case 1 :
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:679:25: startReg= REGISTER (endReg= REGISTER )?
+						// smaliTreeWalker.g:679:25: startReg= REGISTER (endReg= REGISTER )?
 						{
-						startReg=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_register_range1728);
-						// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:679:49: (endReg= REGISTER )?
+						startReg=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_register_range1728); 
+						// smaliTreeWalker.g:679:49: (endReg= REGISTER )?
 						int alt33=2;
 						int LA33_0 = input.LA(1);
 						if ( (LA33_0==REGISTER) ) {
@@ -3718,9 +3718,9 @@
 						}
 						switch (alt33) {
 							case 1 :
-								// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:679:49: endReg= REGISTER
+								// smaliTreeWalker.g:679:49: endReg= REGISTER
 								{
-								endReg=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_register_range1732);
+								endReg=(CommonTree)match(input,REGISTER,FOLLOW_REGISTER_in_register_range1732); 
 								}
 								break;
 
@@ -3731,7 +3731,7 @@
 
 				}
 
-				match(input, Token.UP, null);
+				match(input, Token.UP, null); 
 			}
 
 
@@ -3751,7 +3751,7 @@
 			                    throw new SemanticException(input, I_REGISTER_RANGE99, "A register range must have the lower register listed first");
 			                }
 			            }
-			
+			    
 			}
 
 		}
@@ -3769,7 +3769,7 @@
 
 
 	// $ANTLR start "verification_error_reference"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:699:1: verification_error_reference returns [ImmutableReference reference] : ( CLASS_DESCRIPTOR | field_reference | method_reference );
+	// smaliTreeWalker.g:699:1: verification_error_reference returns [ImmutableReference reference] : ( CLASS_DESCRIPTOR | field_reference | method_reference );
 	public final ImmutableReference verification_error_reference() throws RecognitionException {
 		ImmutableReference reference = null;
 
@@ -3779,7 +3779,7 @@
 		ImmutableMethodReference method_reference102 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:700:3: ( CLASS_DESCRIPTOR | field_reference | method_reference )
+			// smaliTreeWalker.g:700:3: ( CLASS_DESCRIPTOR | field_reference | method_reference )
 			int alt35=3;
 			switch ( input.LA(1) ) {
 			case CLASS_DESCRIPTOR:
@@ -3960,16 +3960,16 @@
 			}
 			switch (alt35) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:700:5: CLASS_DESCRIPTOR
+					// smaliTreeWalker.g:700:5: CLASS_DESCRIPTOR
 					{
-					CLASS_DESCRIPTOR100=(CommonTree)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_verification_error_reference1755);
+					CLASS_DESCRIPTOR100=(CommonTree)match(input,CLASS_DESCRIPTOR,FOLLOW_CLASS_DESCRIPTOR_in_verification_error_reference1755); 
 
 					    reference = new ImmutableTypeReference((CLASS_DESCRIPTOR100!=null?CLASS_DESCRIPTOR100.getText():null));
-					
+					  
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:704:5: field_reference
+					// smaliTreeWalker.g:704:5: field_reference
 					{
 					pushFollow(FOLLOW_field_reference_in_verification_error_reference1765);
 					field_reference101=field_reference();
@@ -3977,11 +3977,11 @@
 
 
 					    reference = field_reference101;
-					
+					  
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:708:5: method_reference
+					// smaliTreeWalker.g:708:5: method_reference
 					{
 					pushFollow(FOLLOW_method_reference_in_verification_error_reference1775);
 					method_reference102=method_reference();
@@ -3989,7 +3989,7 @@
 
 
 					    reference = method_reference102;
-					
+					  
 					}
 					break;
 
@@ -4009,7 +4009,7 @@
 
 
 	// $ANTLR start "verification_error_type"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:713:1: verification_error_type returns [int verificationError] : VERIFICATION_ERROR_TYPE ;
+	// smaliTreeWalker.g:713:1: verification_error_type returns [int verificationError] : VERIFICATION_ERROR_TYPE ;
 	public final int verification_error_type() throws RecognitionException {
 		int verificationError = 0;
 
@@ -4017,13 +4017,13 @@
 		CommonTree VERIFICATION_ERROR_TYPE103=null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:714:3: ( VERIFICATION_ERROR_TYPE )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:714:5: VERIFICATION_ERROR_TYPE
+			// smaliTreeWalker.g:714:3: ( VERIFICATION_ERROR_TYPE )
+			// smaliTreeWalker.g:714:5: VERIFICATION_ERROR_TYPE
 			{
-			VERIFICATION_ERROR_TYPE103=(CommonTree)match(input,VERIFICATION_ERROR_TYPE,FOLLOW_VERIFICATION_ERROR_TYPE_in_verification_error_type1792);
+			VERIFICATION_ERROR_TYPE103=(CommonTree)match(input,VERIFICATION_ERROR_TYPE,FOLLOW_VERIFICATION_ERROR_TYPE_in_verification_error_type1792); 
 
 			    verificationError = VerificationError.getVerificationError((VERIFICATION_ERROR_TYPE103!=null?VERIFICATION_ERROR_TYPE103.getText():null));
-			
+			  
 			}
 
 		}
@@ -4044,13 +4044,13 @@
 
 
 	// $ANTLR start "instruction"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:719:1: instruction : ( insn_format10t | insn_format10x | insn_format11n | insn_format11x | insn_format12x | insn_format20bc | insn_format20t | insn_format21c_field | insn_format21c_string | insn_format21c_type | insn_format21ih | insn_format21lh | insn_format21s | insn_format21t | insn_format22b | insn_format22c_field | insn_format22c_type | insn_format22s | insn_format22t | insn_format22x | insn_format23x | insn_format30t | insn_format31c | insn_format31i | insn_format31t | insn_format32x | insn_format35c_method | insn_format35c_type | insn_format3rc_method | insn_format3rc_type | insn_format45cc_method | insn_format4rcc_method | insn_format51l_type | insn_array_data_directive | insn_packed_switch_directive | insn_sparse_switch_directive );
+	// smaliTreeWalker.g:719:1: instruction : ( insn_format10t | insn_format10x | insn_format11n | insn_format11x | insn_format12x | insn_format20bc | insn_format20t | insn_format21c_field | insn_format21c_string | insn_format21c_type | insn_format21ih | insn_format21lh | insn_format21s | insn_format21t | insn_format22b | insn_format22c_field | insn_format22c_type | insn_format22s | insn_format22t | insn_format22x | insn_format23x | insn_format30t | insn_format31c | insn_format31i | insn_format31t | insn_format32x | insn_format35c_method | insn_format35c_type | insn_format3rc_method | insn_format3rc_type | insn_format45cc_method | insn_format4rcc_method | insn_format51l_type | insn_array_data_directive | insn_packed_switch_directive | insn_sparse_switch_directive );
 	public final smaliTreeWalker.instruction_return instruction() throws RecognitionException {
 		smaliTreeWalker.instruction_return retval = new smaliTreeWalker.instruction_return();
 		retval.start = input.LT(1);
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:720:3: ( insn_format10t | insn_format10x | insn_format11n | insn_format11x | insn_format12x | insn_format20bc | insn_format20t | insn_format21c_field | insn_format21c_string | insn_format21c_type | insn_format21ih | insn_format21lh | insn_format21s | insn_format21t | insn_format22b | insn_format22c_field | insn_format22c_type | insn_format22s | insn_format22t | insn_format22x | insn_format23x | insn_format30t | insn_format31c | insn_format31i | insn_format31t | insn_format32x | insn_format35c_method | insn_format35c_type | insn_format3rc_method | insn_format3rc_type | insn_format45cc_method | insn_format4rcc_method | insn_format51l_type | insn_array_data_directive | insn_packed_switch_directive | insn_sparse_switch_directive )
+			// smaliTreeWalker.g:720:3: ( insn_format10t | insn_format10x | insn_format11n | insn_format11x | insn_format12x | insn_format20bc | insn_format20t | insn_format21c_field | insn_format21c_string | insn_format21c_type | insn_format21ih | insn_format21lh | insn_format21s | insn_format21t | insn_format22b | insn_format22c_field | insn_format22c_type | insn_format22s | insn_format22t | insn_format22x | insn_format23x | insn_format30t | insn_format31c | insn_format31i | insn_format31t | insn_format32x | insn_format35c_method | insn_format35c_type | insn_format3rc_method | insn_format3rc_type | insn_format45cc_method | insn_format4rcc_method | insn_format51l_type | insn_array_data_directive | insn_packed_switch_directive | insn_sparse_switch_directive )
 			int alt36=36;
 			switch ( input.LA(1) ) {
 			case I_STATEMENT_FORMAT10t:
@@ -4240,7 +4240,7 @@
 			}
 			switch (alt36) {
 				case 1 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:720:5: insn_format10t
+					// smaliTreeWalker.g:720:5: insn_format10t
 					{
 					pushFollow(FOLLOW_insn_format10t_in_instruction1806);
 					insn_format10t();
@@ -4249,7 +4249,7 @@
 					}
 					break;
 				case 2 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:721:5: insn_format10x
+					// smaliTreeWalker.g:721:5: insn_format10x
 					{
 					pushFollow(FOLLOW_insn_format10x_in_instruction1812);
 					insn_format10x();
@@ -4258,7 +4258,7 @@
 					}
 					break;
 				case 3 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:722:5: insn_format11n
+					// smaliTreeWalker.g:722:5: insn_format11n
 					{
 					pushFollow(FOLLOW_insn_format11n_in_instruction1818);
 					insn_format11n();
@@ -4267,7 +4267,7 @@
 					}
 					break;
 				case 4 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:723:5: insn_format11x
+					// smaliTreeWalker.g:723:5: insn_format11x
 					{
 					pushFollow(FOLLOW_insn_format11x_in_instruction1824);
 					insn_format11x();
@@ -4276,7 +4276,7 @@
 					}
 					break;
 				case 5 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:724:5: insn_format12x
+					// smaliTreeWalker.g:724:5: insn_format12x
 					{
 					pushFollow(FOLLOW_insn_format12x_in_instruction1830);
 					insn_format12x();
@@ -4285,7 +4285,7 @@
 					}
 					break;
 				case 6 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:725:5: insn_format20bc
+					// smaliTreeWalker.g:725:5: insn_format20bc
 					{
 					pushFollow(FOLLOW_insn_format20bc_in_instruction1836);
 					insn_format20bc();
@@ -4294,7 +4294,7 @@
 					}
 					break;
 				case 7 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:726:5: insn_format20t
+					// smaliTreeWalker.g:726:5: insn_format20t
 					{
 					pushFollow(FOLLOW_insn_format20t_in_instruction1842);
 					insn_format20t();
@@ -4303,7 +4303,7 @@
 					}
 					break;
 				case 8 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:727:5: insn_format21c_field
+					// smaliTreeWalker.g:727:5: insn_format21c_field
 					{
 					pushFollow(FOLLOW_insn_format21c_field_in_instruction1848);
 					insn_format21c_field();
@@ -4312,7 +4312,7 @@
 					}
 					break;
 				case 9 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:728:5: insn_format21c_string
+					// smaliTreeWalker.g:728:5: insn_format21c_string
 					{
 					pushFollow(FOLLOW_insn_format21c_string_in_instruction1854);
 					insn_format21c_string();
@@ -4321,7 +4321,7 @@
 					}
 					break;
 				case 10 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:729:5: insn_format21c_type
+					// smaliTreeWalker.g:729:5: insn_format21c_type
 					{
 					pushFollow(FOLLOW_insn_format21c_type_in_instruction1860);
 					insn_format21c_type();
@@ -4330,7 +4330,7 @@
 					}
 					break;
 				case 11 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:730:5: insn_format21ih
+					// smaliTreeWalker.g:730:5: insn_format21ih
 					{
 					pushFollow(FOLLOW_insn_format21ih_in_instruction1866);
 					insn_format21ih();
@@ -4339,7 +4339,7 @@
 					}
 					break;
 				case 12 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:731:5: insn_format21lh
+					// smaliTreeWalker.g:731:5: insn_format21lh
 					{
 					pushFollow(FOLLOW_insn_format21lh_in_instruction1872);
 					insn_format21lh();
@@ -4348,7 +4348,7 @@
 					}
 					break;
 				case 13 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:732:5: insn_format21s
+					// smaliTreeWalker.g:732:5: insn_format21s
 					{
 					pushFollow(FOLLOW_insn_format21s_in_instruction1878);
 					insn_format21s();
@@ -4357,7 +4357,7 @@
 					}
 					break;
 				case 14 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:733:5: insn_format21t
+					// smaliTreeWalker.g:733:5: insn_format21t
 					{
 					pushFollow(FOLLOW_insn_format21t_in_instruction1884);
 					insn_format21t();
@@ -4366,7 +4366,7 @@
 					}
 					break;
 				case 15 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:734:5: insn_format22b
+					// smaliTreeWalker.g:734:5: insn_format22b
 					{
 					pushFollow(FOLLOW_insn_format22b_in_instruction1890);
 					insn_format22b();
@@ -4375,7 +4375,7 @@
 					}
 					break;
 				case 16 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:735:5: insn_format22c_field
+					// smaliTreeWalker.g:735:5: insn_format22c_field
 					{
 					pushFollow(FOLLOW_insn_format22c_field_in_instruction1896);
 					insn_format22c_field();
@@ -4384,7 +4384,7 @@
 					}
 					break;
 				case 17 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:736:5: insn_format22c_type
+					// smaliTreeWalker.g:736:5: insn_format22c_type
 					{
 					pushFollow(FOLLOW_insn_format22c_type_in_instruction1902);
 					insn_format22c_type();
@@ -4393,7 +4393,7 @@
 					}
 					break;
 				case 18 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:737:5: insn_format22s
+					// smaliTreeWalker.g:737:5: insn_format22s
 					{
 					pushFollow(FOLLOW_insn_format22s_in_instruction1908);
 					insn_format22s();
@@ -4402,7 +4402,7 @@
 					}
 					break;
 				case 19 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:738:5: insn_format22t
+					// smaliTreeWalker.g:738:5: insn_format22t
 					{
 					pushFollow(FOLLOW_insn_format22t_in_instruction1914);
 					insn_format22t();
@@ -4411,7 +4411,7 @@
 					}
 					break;
 				case 20 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:739:5: insn_format22x
+					// smaliTreeWalker.g:739:5: insn_format22x
 					{
 					pushFollow(FOLLOW_insn_format22x_in_instruction1920);
 					insn_format22x();
@@ -4420,7 +4420,7 @@
 					}
 					break;
 				case 21 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:740:5: insn_format23x
+					// smaliTreeWalker.g:740:5: insn_format23x
 					{
 					pushFollow(FOLLOW_insn_format23x_in_instruction1926);
 					insn_format23x();
@@ -4429,7 +4429,7 @@
 					}
 					break;
 				case 22 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:741:5: insn_format30t
+					// smaliTreeWalker.g:741:5: insn_format30t
 					{
 					pushFollow(FOLLOW_insn_format30t_in_instruction1932);
 					insn_format30t();
@@ -4438,7 +4438,7 @@
 					}
 					break;
 				case 23 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:742:5: insn_format31c
+					// smaliTreeWalker.g:742:5: insn_format31c
 					{
 					pushFollow(FOLLOW_insn_format31c_in_instruction1938);
 					insn_format31c();
@@ -4447,7 +4447,7 @@
 					}
 					break;
 				case 24 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:743:5: insn_format31i
+					// smaliTreeWalker.g:743:5: insn_format31i
 					{
 					pushFollow(FOLLOW_insn_format31i_in_instruction1944);
 					insn_format31i();
@@ -4456,7 +4456,7 @@
 					}
 					break;
 				case 25 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:744:5: insn_format31t
+					// smaliTreeWalker.g:744:5: insn_format31t
 					{
 					pushFollow(FOLLOW_insn_format31t_in_instruction1950);
 					insn_format31t();
@@ -4465,7 +4465,7 @@
 					}
 					break;
 				case 26 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:745:5: insn_format32x
+					// smaliTreeWalker.g:745:5: insn_format32x
 					{
 					pushFollow(FOLLOW_insn_format32x_in_instruction1956);
 					insn_format32x();
@@ -4474,7 +4474,7 @@
 					}
 					break;
 				case 27 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:746:5: insn_format35c_method
+					// smaliTreeWalker.g:746:5: insn_format35c_method
 					{
 					pushFollow(FOLLOW_insn_format35c_method_in_instruction1962);
 					insn_format35c_method();
@@ -4483,7 +4483,7 @@
 					}
 					break;
 				case 28 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:747:5: insn_format35c_type
+					// smaliTreeWalker.g:747:5: insn_format35c_type
 					{
 					pushFollow(FOLLOW_insn_format35c_type_in_instruction1968);
 					insn_format35c_type();
@@ -4492,7 +4492,7 @@
 					}
 					break;
 				case 29 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:748:5: insn_format3rc_method
+					// smaliTreeWalker.g:748:5: insn_format3rc_method
 					{
 					pushFollow(FOLLOW_insn_format3rc_method_in_instruction1974);
 					insn_format3rc_method();
@@ -4501,7 +4501,7 @@
 					}
 					break;
 				case 30 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:749:5: insn_format3rc_type
+					// smaliTreeWalker.g:749:5: insn_format3rc_type
 					{
 					pushFollow(FOLLOW_insn_format3rc_type_in_instruction1980);
 					insn_format3rc_type();
@@ -4510,7 +4510,7 @@
 					}
 					break;
 				case 31 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:750:5: insn_format45cc_method
+					// smaliTreeWalker.g:750:5: insn_format45cc_method
 					{
 					pushFollow(FOLLOW_insn_format45cc_method_in_instruction1986);
 					insn_format45cc_method();
@@ -4519,7 +4519,7 @@
 					}
 					break;
 				case 32 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:751:5: insn_format4rcc_method
+					// smaliTreeWalker.g:751:5: insn_format4rcc_method
 					{
 					pushFollow(FOLLOW_insn_format4rcc_method_in_instruction1992);
 					insn_format4rcc_method();
@@ -4528,7 +4528,7 @@
 					}
 					break;
 				case 33 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:752:5: insn_format51l_type
+					// smaliTreeWalker.g:752:5: insn_format51l_type
 					{
 					pushFollow(FOLLOW_insn_format51l_type_in_instruction1998);
 					insn_format51l_type();
@@ -4537,7 +4537,7 @@
 					}
 					break;
 				case 34 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:753:5: insn_array_data_directive
+					// smaliTreeWalker.g:753:5: insn_array_data_directive
 					{
 					pushFollow(FOLLOW_insn_array_data_directive_in_instruction2004);
 					insn_array_data_directive();
@@ -4546,7 +4546,7 @@
 					}
 					break;
 				case 35 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:754:5: insn_packed_switch_directive
+					// smaliTreeWalker.g:754:5: insn_packed_switch_directive
 					{
 					pushFollow(FOLLOW_insn_packed_switch_directive_in_instruction2010);
 					insn_packed_switch_directive();
@@ -4555,7 +4555,7 @@
 					}
 					break;
 				case 36 :
-					// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:755:5: insn_sparse_switch_directive
+					// smaliTreeWalker.g:755:5: insn_sparse_switch_directive
 					{
 					pushFollow(FOLLOW_insn_sparse_switch_directive_in_instruction2016);
 					insn_sparse_switch_directive();
@@ -4570,7 +4570,7 @@
 
 			    reportError(new SemanticException(input, ((CommonTree)retval.start), ex.getMessage()));
 			    recover(input, null);
-			
+			  
 		}
 
 		finally {
@@ -4583,28 +4583,28 @@
 
 
 	// $ANTLR start "insn_format10t"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:761:1: insn_format10t : ^( I_STATEMENT_FORMAT10t INSTRUCTION_FORMAT10t label_ref ) ;
+	// smaliTreeWalker.g:761:1: insn_format10t : ^( I_STATEMENT_FORMAT10t INSTRUCTION_FORMAT10t label_ref ) ;
 	public final void insn_format10t() throws RecognitionException {
 		CommonTree INSTRUCTION_FORMAT10t104=null;
 		Label label_ref105 =null;
 
 		try {
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:762:3: ( ^( I_STATEMENT_FORMAT10t INSTRUCTION_FORMAT10t label_ref ) )
-			// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:763:5: ^( I_STATEMENT_FORMAT10t INSTRUCTION_FORMAT10t label_ref )
+			// smaliTreeWalker.g:762:3: ( ^( I_STATEMENT_FORMAT10t INSTRUCTION_FORMAT10t label_ref ) )
+			// smaliTreeWalker.g:763:5: ^( I_STATEMENT_FORMAT10t INSTRUCTION_FORMAT10t label_ref )
 			{
-			match(input,I_STATEMENT_FORMAT10t,FOLLOW_I_STATEMENT_FORMAT10t_in_insn_format10t2040);
-			match(input, Token.DOWN, null);
-			INSTRUCTION_FORMAT10t104=(CommonTree)match(input,INSTRUCTION_FORMAT10t,FOLLOW_INSTRUCTION_FORMAT10t_in_insn_format10t2042);
+			match(input,I_STATEMENT_FORMAT10t,FOLLOW_I_STATEMENT_FORMAT10t_in_insn_format10t2040); 
+			match(input, Token.DOWN, null); 
+			INSTRUCTION_FORMAT10t104=(CommonTree)match(input,INSTRUCTION_FORMAT10t,FOLLOW_INSTRUCTION_FORMAT10t_in_insn_format10t2042); 
 			pushFollow(FOLLOW_label_ref_in_insn_format10t2044);
 			label_ref105=label_ref();
 			state._fsp--;
 
-			match(input, Token.UP, null);
+			match(input, Token.UP, null); 
 
 
 			      Opcode opcode = opcodes.getOpcodeByName((INSTRUCTION_FORMAT10t104!=null?INSTRUCTION_FORMAT10t104.getText():null));
 			      method_stack.peek().methodBuilder.addInstruction(new BuilderInstruction10t(opcode, label_ref105));
-			
+			    
 			}
 
 		}
@@ -4621,23 +4621,23 @@
 
 
 	// $ANTLR start "insn_format10x"
-	// /ssd2/floating/external/smali/smali/src/main/antlr/smaliTreeWalker.g:769:1: insn_format10x : ^( I_STATEMENT_FORMAT10x INSTRUCTION_FORMAT10x ) ;
+	// smaliTreeWalker.g:769:1: insn_format10x : ^( I_STATEMENT_FORMAT10x INSTRUCTION_FORMAT10x ) ;
 	public final void insn_format10x() throws RecognitionException {
 		CommonTree INSTRUCTION_FORMAT10x106=null;