diff options
| author | Ben Gruver <bgruv@google.com> | 2014-02-17 14:22:57 -0800 |
|---|---|---|
| committer | Ben Gruver <bgruv@google.com> | 2014-02-17 14:23:39 -0800 |
| commit | 37ade89bda535794fe4530024cb7a095cc033911 (patch) | |
| tree | f0abe2625e1ce1cca7a65428c7254ec496034e55 /smali/src/test/resources | |
| parent | b90e2a4c62e5e0da19672998707f42c72cf2e909 (diff) | |
| download | smali-37ade89bda535794fe4530024cb7a095cc033911.tar.gz | |
Improve how method parameter lists are lexed
Diffstat (limited to 'smali/src/test/resources')
3 files changed, 77 insertions, 12 deletions
diff --git a/smali/src/test/resources/LexerTest/RealSmaliFileTest.tokens b/smali/src/test/resources/LexerTest/RealSmaliFileTest.tokens index a0f648a1..ba40c2f2 100644 --- a/smali/src/test/resources/LexerTest/RealSmaliFileTest.tokens +++ b/smali/src/test/resources/LexerTest/RealSmaliFileTest.tokens @@ -552,7 +552,13 @@ METHOD_DIRECTIVE(".method") ACCESS_SPEC("public") SIMPLE_NAME("setCallForwardingOption") OPEN_PAREN("(") -PARAM_LIST("IILjava/lang/String;ILandroid/os/Message;") +PARAM_LIST_START("") +PRIMITIVE_TYPE("I") +PRIMITIVE_TYPE("I") +CLASS_DESCRIPTOR("Ljava/lang/String;") +PRIMITIVE_TYPE("I") +CLASS_DESCRIPTOR("Landroid/os/Message;") +PARAM_LIST_END("") CLOSE_PAREN(")") VOID_TYPE("V") REGISTERS_DIRECTIVE(".registers") @@ -697,7 +703,12 @@ CLASS_DESCRIPTOR("Lcom/android/internal/telephony/gsm/GSMPhone$MyHandler;") ARROW("->") SIMPLE_NAME("obtainMessage") OPEN_PAREN("(") -PARAM_LIST("IIILjava/lang/Object;") +PARAM_LIST_START("") +PRIMITIVE_TYPE("I") +PRIMITIVE_TYPE("I") +PRIMITIVE_TYPE("I") +CLASS_DESCRIPTOR("Ljava/lang/Object;") +PARAM_LIST_END("") CLOSE_PAREN(")") CLASS_DESCRIPTOR("Landroid/os/Message;") INSTRUCTION_FORMAT11x("move-result-object") @@ -749,7 +760,14 @@ CLASS_DESCRIPTOR("Lcom/android/internal/telephony/CommandsInterface;") ARROW("->") SIMPLE_NAME("setCallForward") OPEN_PAREN("(") -PARAM_LIST("IIILjava/lang/String;ILandroid/os/Message;") +PARAM_LIST_START("") +PRIMITIVE_TYPE("I") +PRIMITIVE_TYPE("I") +PRIMITIVE_TYPE("I") +CLASS_DESCRIPTOR("Ljava/lang/String;") +PRIMITIVE_TYPE("I") +CLASS_DESCRIPTOR("Landroid/os/Message;") +PARAM_LIST_END("") CLOSE_PAREN(")") VOID_TYPE("V") LINE_DIRECTIVE(".line") diff --git a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.smali b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.smali index f001d19e..2120d33f 100644 --- a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.smali +++ b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.smali @@ -47,4 +47,6 @@ L[Ljava/lang/String; [java/lang/String; [; -<linit>
\ No newline at end of file +<linit> + +III
\ No newline at end of file diff --git a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.tokens b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.tokens index 2bd781a5..d99d2c29 100644 --- a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.tokens +++ b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.tokens @@ -24,13 +24,52 @@ ARRAY_DESCRIPTOR("[D") ARRAY_DESCRIPTOR("[Ljava/lang/String;") ARRAY_DESCRIPTOR("[LI/I/I;") -PARAM_LIST_OR_ID("IIIII") -PARAM_LIST_OR_ID("ZBSCIJFD") -PARAM_LIST("ILa;[La;[I") -PARAM_LIST("Ljava/lang/String;Ljava/lang/String;") -PARAM_LIST("[I[I[I") -PARAM_LIST("[I[Z") -PARAM_LIST("[I[Ljava/lang/String;") +PARAM_LIST_OR_ID_START("") +PRIMITIVE_TYPE("I") +PRIMITIVE_TYPE("I") +PRIMITIVE_TYPE("I") +PRIMITIVE_TYPE("I") +PRIMITIVE_TYPE("I") +PARAM_LIST_OR_ID_END("") + +PARAM_LIST_OR_ID_START("") +PRIMITIVE_TYPE("Z") +PRIMITIVE_TYPE("B") +PRIMITIVE_TYPE("S") +PRIMITIVE_TYPE("C") +PRIMITIVE_TYPE("I") +PRIMITIVE_TYPE("J") +PRIMITIVE_TYPE("F") +PRIMITIVE_TYPE("D") +PARAM_LIST_OR_ID_END("") + +PARAM_LIST_START("") +PRIMITIVE_TYPE("I") +CLASS_DESCRIPTOR("La;") +ARRAY_DESCRIPTOR("[La;") +ARRAY_DESCRIPTOR("[I") +PARAM_LIST_END("") + +PARAM_LIST_START("") +CLASS_DESCRIPTOR("Ljava/lang/String;") +CLASS_DESCRIPTOR("Ljava/lang/String;") +PARAM_LIST_END("") + +PARAM_LIST_START("") +ARRAY_DESCRIPTOR("[I") +ARRAY_DESCRIPTOR("[I") +ARRAY_DESCRIPTOR("[I") +PARAM_LIST_END("") + +PARAM_LIST_START("") +ARRAY_DESCRIPTOR("[I") +ARRAY_DESCRIPTOR("[Z") +PARAM_LIST_END("") + +PARAM_LIST_START("") +ARRAY_DESCRIPTOR("[I") +ARRAY_DESCRIPTOR("[Ljava/lang/String;") +PARAM_LIST_END("") MEMBER_NAME("<init>") MEMBER_NAME("<clinit>") @@ -47,4 +86,10 @@ INVALID_TOKEN("[") VOID_TYPE("V") INVALID_TOKEN("[") SIMPLE_NAME("java") INVALID_TOKEN("/") SIMPLE_NAME("lang") INVALID_TOKEN("/") SIMPLE_NAME("String") INVALID_TOKEN(";") INVALID_TOKEN("[") INVALID_TOKEN(";") -MEMBER_NAME("<linit>")
\ No newline at end of file +MEMBER_NAME("<linit>") + +PARAM_LIST_OR_ID_START("") +PRIMITIVE_TYPE("I") +PRIMITIVE_TYPE("I") +PRIMITIVE_TYPE("I") +PARAM_LIST_OR_ID_END("")
\ No newline at end of file |