From 4a0d9d3fa1e0c60b3a39af6864450c98eb69f2cb Mon Sep 17 00:00:00 2001
From: "JesusFreke@JesusFreke.com"
 <JesusFreke@JesusFreke.com@55b6fa8a-2a1e-11de-a435-ffa8d773f76a>
Date: Sun, 13 Sep 2009 02:50:42 +0000
Subject: [PATCH] Change the sytax for labels from label: to :label

git-svn-id: https://smali.googlecode.com/svn/trunk@467 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
---
 .../templates/templates/baksmali.stg          | 22 +++++++++----------
 .../src/main/antlr3/org/jf/smali/smaliLexer.g |  2 +-
 .../antlr3/org/jf/smali/smaliTreeWalker.g     |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/baksmali/src/main/resources/templates/templates/baksmali.stg b/baksmali/src/main/resources/templates/templates/baksmali.stg
index 62b7346e..4367936c 100644
--- a/baksmali/src/main/resources/templates/templates/baksmali.stg
+++ b/baksmali/src/main/resources/templates/templates/baksmali.stg
@@ -130,7 +130,7 @@ Format31tLabelMap ::= [
 
 Format10t(Opcode, Target) ::=
 <<
-<Opcode> goto_<Target>:
+<Opcode> :goto_<Target>
 >>
 
 Format10x(Opcode) ::=
@@ -155,7 +155,7 @@ Format12x(Opcode, RegisterA, RegisterB) ::=
 
 Format20t(Opcode, Target) ::=
 <<
-<Opcode> goto_<Target>:
+<Opcode> :goto_<Target>
 >>
 
 Format21c(Opcode, Register, Reference) ::=
@@ -175,7 +175,7 @@ Format21s(Opcode, Register, Literal) ::=
 
 Format21t(Opcode, Register, Target) ::=
 <<
-<Opcode> <Register>, cond_<Target>:
+<Opcode> <Register>, :cond_<Target>
 >>
 
 Format22b(Opcode, RegisterA, RegisterB, Literal) ::=
@@ -205,7 +205,7 @@ Format22s(Opcode, RegisterA, RegisterB, Literal) ::=
 
 Format22t(Opcode, RegisterA, RegisterB, Target) ::=
 <<
-<Opcode> <RegisterA>, <RegisterB>, cond_<Target>:
+<Opcode> <RegisterA>, <RegisterB>, :cond_<Target>
 >>
 
 Format22x(Opcode, RegisterA, RegisterB) ::=
@@ -220,7 +220,7 @@ Format23x(Opcode, RegisterA, RegisterB, RegisterC) ::=
 
 Format30t(Opcode, Target) ::=
 <<
-<Opcode> goto_<Target>:
+<Opcode> :goto_<Target>
 >>
 
 Format31c(Opcode, Register, Reference) ::=
@@ -235,7 +235,7 @@ Format31i(Opcode, Register, Literal) ::=
 
 Format31t(Opcode, Register, Target) ::=
 <<
-<Opcode> <Register>, <Format31tLabelMap.(Opcode)><Target>:
+<Opcode> <Register>, :<Format31tLabelMap.(Opcode)><Target>
 >>
 
 Format32x(Opcode, RegisterA, RegisterB) ::=
@@ -318,21 +318,21 @@ ArrayElement(Bytes) ::=
 PackedSwitchData(Opcode, FirstKey, Targets) ::=
 <<
 .packed-switch <FirstKey>
-    <Targets: {pswitch_<it>:}; separator="\n">
+    <Targets: {:pswitch_<it>}; separator="\n">
 .end packed-switch
 >>
 
 SparseSwitchData(Opcode, Targets) ::=
 <<
 .sparse-switch
-    <Targets:{<it.Value> -> sswitch_<it.Target>:}; separator="\n">
+    <Targets:{<it.Value> -> :sswitch_<it.Target>}; separator="\n">
 .end sparse-switch
 >>
 
 
 Label(Prefix, HexOffset, CommentedOut) ::=
 <<
-<if(CommentedOut)>#<endif><Prefix><HexOffset>:
+:<if(CommentedOut)>#<endif><Prefix><HexOffset>
 >>
 
 Line(Line) ::=
@@ -377,12 +377,12 @@ Blank(Blank) ::=
 
 Catch(ExceptionType, StartAddress, EndAddress, HandlerAddress) ::=
 <<
-.catch <ExceptionType> {try_start_<StartAddress>: .. try_end_<EndAddress>:} handler_<HandlerAddress>:
+.catch <ExceptionType> {:try_start_<StartAddress> .. :try_end_<EndAddress>} :handler_<HandlerAddress>
 >>
 
 CatchAll(StartAddress, EndAddress, HandlerAddress) ::=
 <<
-.catchall {try_start_<StartAddress>: .. try_end_<EndAddress>:} handler_<HandlerAddress>: 
+.catchall {:try_start_<StartAddress> .. :try_end_<EndAddress>} :handler_<HandlerAddress> 
 >>
 
 
diff --git a/smali/src/main/antlr3/org/jf/smali/smaliLexer.g b/smali/src/main/antlr3/org/jf/smali/smaliLexer.g
index 574af50e..5f654279 100644
--- a/smali/src/main/antlr3/org/jf/smali/smaliLexer.g
+++ b/smali/src/main/antlr3/org/jf/smali/smaliLexer.g
@@ -548,7 +548,7 @@ fragment OFFSET
 fragment LABEL_EMIT
 	:	LABEL {emit($LABEL, LABEL);};
 LABEL
-	:	SIMPLE_NAME ':';
+	:	':' SIMPLE_NAME;
 
 fragment CLASS_DIRECTIVE_EMIT
 	:	CLASS_DIRECTIVE {emit($CLASS_DIRECTIVE, CLASS_DIRECTIVE);};
diff --git a/smali/src/main/antlr3/org/jf/smali/smaliTreeWalker.g b/smali/src/main/antlr3/org/jf/smali/smaliTreeWalker.g
index 6364fa1f..4368ddc4 100644
--- a/smali/src/main/antlr3/org/jf/smali/smaliTreeWalker.g
+++ b/smali/src/main/antlr3/org/jf/smali/smaliTreeWalker.g
@@ -821,7 +821,7 @@ label returns[String labelName]
 	:	LABEL
 		{
 			String label = $LABEL.text;
-			return label.substring(0, label.length()-1);
+			return label.substring(1, label.length());
 		};
 		
 offset	returns[int offsetValue]