1 files changed, 38 insertions, 22 deletions
diff --git a/smali/src/test/resources/LexerTest/RealSmaliFileTest.tokens b/smali/src/test/resources/LexerTest/RealSmaliFileTest.tokens
index 562530df..a0f648a1 100644
--- a/smali/src/test/resources/LexerTest/RealSmaliFileTest.tokens
+++ b/smali/src/test/resources/LexerTest/RealSmaliFileTest.tokens
@@ -152,7 +152,7 @@ END_FIELD_DIRECTIVE(".end field")
 METHOD_DIRECTIVE(".method")
 ACCESS_SPEC("static")
 ACCESS_SPEC("constructor")
-METHOD_NAME("<clinit>")
+MEMBER_NAME("<clinit>")
 OPEN_PAREN("(")
 CLOSE_PAREN(")")
 VOID_TYPE("V")
@@ -211,7 +211,7 @@ CLOSE_BRACE("}")
 COMMA(",")
 CLASS_DESCRIPTOR("Lcom/android/internal/os/BatteryStatsImpl$1;")
 ARROW("->")
-METHOD_NAME("<init>")
+MEMBER_NAME("<init>")
 OPEN_PAREN("(")
 CLOSE_PAREN(")")
 VOID_TYPE("V")
@@ -259,15 +259,17 @@ END_ARRAY_DATA_DIRECTIVE(".end array-data")
 END_METHOD_DIRECTIVE(".end method")
 METHOD_DIRECTIVE(".method")
 ACCESS_SPEC("constructor")
-METHOD_NAME("<init>")
+MEMBER_NAME("<init>")
 OPEN_PAREN("(")
 CLASS_DESCRIPTOR("Lcom/android/internal/telephony/cdma/CDMAPhone;")
 CLOSE_PAREN(")")
 VOID_TYPE("V")
 REGISTERS_DIRECTIVE(".registers")
 POSITIVE_INTEGER_LITERAL("2")
-PARAMETER_DIRECTIVE(".parameter")
-STRING_LITERAL("\"phone\"")
+PARAMETER_DIRECTIVE(".param")
+REGISTER("p1")
+COMMA(",")
+SIMPLE_NAME("phone")
 PROLOGUE_DIRECTIVE(".prologue")
 LINE_DIRECTIVE(".line")
 POSITIVE_INTEGER_LITERAL("42")
@@ -280,7 +282,7 @@ CLOSE_BRACE("}")
 COMMA(",")
 CLASS_DESCRIPTOR("Lcom/android/internal/telephony/IccFileHandler;")
 ARROW("->")
-METHOD_NAME("<init>")
+MEMBER_NAME("<init>")
 OPEN_PAREN("(")
 CLASS_DESCRIPTOR("Lcom/android/internal/telephony/PhoneBase;")
 CLOSE_PAREN(")")
@@ -298,8 +300,10 @@ CLOSE_PAREN(")")
 CLASS_DESCRIPTOR("Ljava/lang/String;")
 REGISTERS_DIRECTIVE(".registers")
 POSITIVE_INTEGER_LITERAL("3")
-PARAMETER_DIRECTIVE(".parameter")
-STRING_LITERAL("\"efid\"")
+PARAMETER_DIRECTIVE(".param")
+REGISTER("p1")
+COMMA(",")
+SIMPLE_NAME("efid")
 PROLOGUE_DIRECTIVE(".prologue")
 LINE_DIRECTIVE(".line")
 POSITIVE_INTEGER_LITERAL("71")
@@ -369,8 +373,10 @@ CLOSE_PAREN(")")
 CLASS_DESCRIPTOR("Lcom/android/internal/telephony/IccCardStatus$CardState;")
 REGISTERS_DIRECTIVE(".registers")
 POSITIVE_INTEGER_LITERAL("6")
-PARAMETER_DIRECTIVE(".parameter")
-STRING_LITERAL("\"state\"")
+PARAMETER_DIRECTIVE(".param")
+REGISTER("p1")
+COMMA(",")
+SIMPLE_NAME("state")
 PROLOGUE_DIRECTIVE(".prologue")
 LINE_DIRECTIVE(".line")
 POSITIVE_INTEGER_LITERAL("59")
@@ -396,7 +402,7 @@ CLOSE_BRACE("}")
 COMMA(",")
 CLASS_DESCRIPTOR("Ljava/lang/StringBuilder;")
 ARROW("->")
-METHOD_NAME("<init>")
+MEMBER_NAME("<init>")
 OPEN_PAREN("(")
 CLOSE_PAREN(")")
 VOID_TYPE("V")
@@ -458,7 +464,7 @@ CLOSE_BRACE("}")
 COMMA(",")
 CLASS_DESCRIPTOR("Ljava/lang/RuntimeException;")
 ARROW("->")
-METHOD_NAME("<init>")
+MEMBER_NAME("<init>")
 OPEN_PAREN("(")
 CLASS_DESCRIPTOR("Ljava/lang/String;")
 CLOSE_PAREN(")")
@@ -551,16 +557,26 @@ CLOSE_PAREN(")")
 VOID_TYPE("V")
 REGISTERS_DIRECTIVE(".registers")
 POSITIVE_INTEGER_LITERAL("13")
-PARAMETER_DIRECTIVE(".parameter")
-STRING_LITERAL("\"commandInterfaceCFAction\"")
-PARAMETER_DIRECTIVE(".parameter")
-STRING_LITERAL("\"commandInterfaceCFReason\"")
-PARAMETER_DIRECTIVE(".parameter")
-STRING_LITERAL("\"dialingNumber\"")
-PARAMETER_DIRECTIVE(".parameter")
-STRING_LITERAL("\"timerSeconds\"")
-PARAMETER_DIRECTIVE(".parameter")
-STRING_LITERAL("\"onComplete\"")
+PARAMETER_DIRECTIVE(".param")
+REGISTER("p1")
+COMMA(",")
+SIMPLE_NAME("commandInterfaceCFAction")
+PARAMETER_DIRECTIVE(".param")
+REGISTER("p2")
+COMMA(",")
+SIMPLE_NAME("commandInterfaceCFReason")
+PARAMETER_DIRECTIVE(".param")
+REGISTER("p3")
+COMMA(",")
+SIMPLE_NAME("dialingNumber")
+PARAMETER_DIRECTIVE(".param")
+REGISTER("p4")
+COMMA(",")
+SIMPLE_NAME("timerSeconds")
+PARAMETER_DIRECTIVE(".param")
+REGISTER("p5")
+COMMA(",")
+SIMPLE_NAME("onComplete")
 PROLOGUE_DIRECTIVE(".prologue")
 INSTRUCTION_FORMAT11n("const/4")
 REGISTER("v3")