Fix the tests related to bracketed names

This commit is contained in:
Ben Gruver 2013-09-14 13:42:55 -07:00
parent 569c014562
commit 51a13e3353
3 changed files with 13 additions and 9 deletions

View File

@ -152,7 +152,7 @@ END_FIELD_DIRECTIVE(".end field")
METHOD_DIRECTIVE(".method") METHOD_DIRECTIVE(".method")
ACCESS_SPEC("static") ACCESS_SPEC("static")
ACCESS_SPEC("constructor") ACCESS_SPEC("constructor")
METHOD_NAME("<clinit>") MEMBER_NAME("<clinit>")
OPEN_PAREN("(") OPEN_PAREN("(")
CLOSE_PAREN(")") CLOSE_PAREN(")")
VOID_TYPE("V") VOID_TYPE("V")
@ -211,7 +211,7 @@ CLOSE_BRACE("}")
COMMA(",") COMMA(",")
CLASS_DESCRIPTOR("Lcom/android/internal/os/BatteryStatsImpl$1;") CLASS_DESCRIPTOR("Lcom/android/internal/os/BatteryStatsImpl$1;")
ARROW("->") ARROW("->")
METHOD_NAME("<init>") MEMBER_NAME("<init>")
OPEN_PAREN("(") OPEN_PAREN("(")
CLOSE_PAREN(")") CLOSE_PAREN(")")
VOID_TYPE("V") VOID_TYPE("V")
@ -259,7 +259,7 @@ END_ARRAY_DATA_DIRECTIVE(".end array-data")
END_METHOD_DIRECTIVE(".end method") END_METHOD_DIRECTIVE(".end method")
METHOD_DIRECTIVE(".method") METHOD_DIRECTIVE(".method")
ACCESS_SPEC("constructor") ACCESS_SPEC("constructor")
METHOD_NAME("<init>") MEMBER_NAME("<init>")
OPEN_PAREN("(") OPEN_PAREN("(")
CLASS_DESCRIPTOR("Lcom/android/internal/telephony/cdma/CDMAPhone;") CLASS_DESCRIPTOR("Lcom/android/internal/telephony/cdma/CDMAPhone;")
CLOSE_PAREN(")") CLOSE_PAREN(")")
@ -282,7 +282,7 @@ CLOSE_BRACE("}")
COMMA(",") COMMA(",")
CLASS_DESCRIPTOR("Lcom/android/internal/telephony/IccFileHandler;") CLASS_DESCRIPTOR("Lcom/android/internal/telephony/IccFileHandler;")
ARROW("->") ARROW("->")
METHOD_NAME("<init>") MEMBER_NAME("<init>")
OPEN_PAREN("(") OPEN_PAREN("(")
CLASS_DESCRIPTOR("Lcom/android/internal/telephony/PhoneBase;") CLASS_DESCRIPTOR("Lcom/android/internal/telephony/PhoneBase;")
CLOSE_PAREN(")") CLOSE_PAREN(")")
@ -402,7 +402,7 @@ CLOSE_BRACE("}")
COMMA(",") COMMA(",")
CLASS_DESCRIPTOR("Ljava/lang/StringBuilder;") CLASS_DESCRIPTOR("Ljava/lang/StringBuilder;")
ARROW("->") ARROW("->")
METHOD_NAME("<init>") MEMBER_NAME("<init>")
OPEN_PAREN("(") OPEN_PAREN("(")
CLOSE_PAREN(")") CLOSE_PAREN(")")
VOID_TYPE("V") VOID_TYPE("V")
@ -464,7 +464,7 @@ CLOSE_BRACE("}")
COMMA(",") COMMA(",")
CLASS_DESCRIPTOR("Ljava/lang/RuntimeException;") CLASS_DESCRIPTOR("Ljava/lang/RuntimeException;")
ARROW("->") ARROW("->")
METHOD_NAME("<init>") MEMBER_NAME("<init>")
OPEN_PAREN("(") OPEN_PAREN("(")
CLASS_DESCRIPTOR("Ljava/lang/String;") CLASS_DESCRIPTOR("Ljava/lang/String;")
CLOSE_PAREN(")") CLOSE_PAREN(")")

View File

@ -34,6 +34,8 @@ Ljava/lang/String;Ljava/lang/String;
<init> <init>
<clinit> <clinit>
<blah>
<init->
Ljava/lang/String Ljava/lang/String
L; L;

View File

@ -32,8 +32,10 @@ PARAM_LIST("[I[I[I")
PARAM_LIST("[I[Z") PARAM_LIST("[I[Z")
PARAM_LIST("[I[Ljava/lang/String;") PARAM_LIST("[I[Ljava/lang/String;")
METHOD_NAME("<init>") MEMBER_NAME("<init>")
METHOD_NAME("<clinit>") MEMBER_NAME("<clinit>")
MEMBER_NAME("<blah>")
MEMBER_NAME("<init->")
SIMPLE_NAME("Ljava") INVALID_TOKEN("/") SIMPLE_NAME("lang") INVALID_TOKEN("/") SIMPLE_NAME("String") SIMPLE_NAME("Ljava") INVALID_TOKEN("/") SIMPLE_NAME("lang") INVALID_TOKEN("/") SIMPLE_NAME("String")
SIMPLE_NAME("L") INVALID_TOKEN(";") SIMPLE_NAME("L") INVALID_TOKEN(";")
@ -45,4 +47,4 @@ INVALID_TOKEN("[") VOID_TYPE("V")
INVALID_TOKEN("[") SIMPLE_NAME("java") INVALID_TOKEN("/") SIMPLE_NAME("lang") INVALID_TOKEN("/") SIMPLE_NAME("String") INVALID_TOKEN(";") INVALID_TOKEN("[") SIMPLE_NAME("java") INVALID_TOKEN("/") SIMPLE_NAME("lang") INVALID_TOKEN("/") SIMPLE_NAME("String") INVALID_TOKEN(";")
INVALID_TOKEN("[") INVALID_TOKEN(";") INVALID_TOKEN("[") INVALID_TOKEN(";")
INVALID_TOKEN("<") SIMPLE_NAME("linit") INVALID_TOKEN(">") MEMBER_NAME("<linit>")