From 51a13e33532a906ab4c9c291a887f19d29590936 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Sat, 14 Sep 2013 13:42:55 -0700
Subject: Fix the tests related to bracketed names

---
 smali/src/test/resources/LexerTest/RealSmaliFileTest.tokens  | 12 ++++++------
 .../src/test/resources/LexerTest/TypeAndIdentifierTest.smali |  2 ++
 .../test/resources/LexerTest/TypeAndIdentifierTest.tokens    |  8 +++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'smali')

diff --git a/smali/src/test/resources/LexerTest/RealSmaliFileTest.tokens b/smali/src/test/resources/LexerTest/RealSmaliFileTest.tokens
index 1bd5b0f9..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,7 +259,7 @@ 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(")")
@@ -282,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(")")
@@ -402,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")
@@ -464,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(")")
diff --git a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.smali b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.smali
index 7fd9b65a..f001d19e 100644
--- a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.smali
+++ b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.smali
@@ -34,6 +34,8 @@ Ljava/lang/String;Ljava/lang/String;
 
 <init>
 <clinit>
+<blah>
+<init->
 
 Ljava/lang/String
 L;
diff --git a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.tokens b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.tokens
index 531622e9..2bd781a5 100644
--- a/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.tokens
+++ b/smali/src/test/resources/LexerTest/TypeAndIdentifierTest.tokens
@@ -32,8 +32,10 @@ PARAM_LIST("[I[I[I")
 PARAM_LIST("[I[Z")
 PARAM_LIST("[I[Ljava/lang/String;")
 
-METHOD_NAME("<init>")
-METHOD_NAME("<clinit>")
+MEMBER_NAME("<init>")
+MEMBER_NAME("<clinit>")
+MEMBER_NAME("<blah>")
+MEMBER_NAME("<init->")
 
 SIMPLE_NAME("Ljava") INVALID_TOKEN("/") SIMPLE_NAME("lang") INVALID_TOKEN("/") SIMPLE_NAME("String")
 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("[") INVALID_TOKEN(";")
 
-INVALID_TOKEN("<") SIMPLE_NAME("linit") INVALID_TOKEN(">")
\ No newline at end of file
+MEMBER_NAME("<linit>")
\ No newline at end of file
-- 
cgit v1.2.3