From f170f95c75db747af970025115129017a0246d89 Mon Sep 17 00:00:00 2001
From: John Mumm <jtfmumm@gmail.com>
Date: Thu, 10 Oct 2013 16:01:54 -0400
Subject: [PATCH] Minor

---
 6502asm.JSON-tmLanguage | 18 +++++++++---------
 6502asm.tmLanguage      | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/6502asm.JSON-tmLanguage b/6502asm.JSON-tmLanguage
index 0c05ff5..c7d3495 100644
--- a/6502asm.JSON-tmLanguage
+++ b/6502asm.JSON-tmLanguage
@@ -6,31 +6,31 @@
  
         {
             "match": "(?i)\\b(adc|and|asl|dec|dex|dey|eor|inc|inx|iny|lsr|ora|rol|ror|sbc)\\b",
-            "name": "keyword.operator.asm",
+            "name": "keyword.arithlogic.asm",
             "comment": "Arithmetic and logic instruction mnemonics"
         },
 
         { 
             "match": "(?i)\\b(bcc|bcs|beq|bmi|bne|bpl|bvc|bvs|jmp|jsr|rti|rts)\\b",
-            "name": "keyword.operator.asm",
+            "name": "keyword.branch.asm",
             "comment": "Branch instruction mnemonics"
         },
 
         { 
             "match": "(?i)\\b(bit|cmp|cpx|cpy)\\b",
-            "name": "keyword.operator.asm",
+            "name": "keyword.compare.asm",
             "comment": "Comparison instructions"
         },
 
         { 
             "match": "(?i)\\b(clc|cld|cli|clv|sec|sed|sei)\\b",
-            "name": "keyword.operator.asm",
+            "name": "keyword.flagset.asm",
             "comment": "Flag setting instructions"
         },
 
         { 
             "match": "(?i)\\b(lda|ldx|ldy|pha|php|pla|plp|sta|stx|sty|tax|tay|tsx|txa|txs|tya)\\b",
-            "name": "keyword.operator.asm",
+            "name": "keyword.transfer.asm",
             "comment": "Load, store, and transfer instructions"
         },
 
@@ -59,15 +59,15 @@
         },
 
         {
-            "match": "(?i)\\%(0b(0|1)+)\\b",
+            "match": "(?i)\\%[0|1]+)\\b",
             "name": "constant.numeric.asm",
-            "comment": "Bin number constant"
+            "comment": "Binary number constant"
         },
 
         {
-            "match": "(?i)\\#(0|[1-9]\\d+)\\b",
+            "match": "(?i)\\#([0-9]+)\\b",
             "name": "constant.numeric.asm",
-            "comment": "Dec number constant"
+            "comment": "Decimal number constant"
         }
 
     ],
diff --git a/6502asm.tmLanguage b/6502asm.tmLanguage
index 7853254..30beaaf 100644
--- a/6502asm.tmLanguage
+++ b/6502asm.tmLanguage
@@ -16,7 +16,7 @@
 			<key>match</key>
 			<string>(?i)\b(adc|and|asl|dec|dex|dey|eor|inc|inx|iny|lsr|ora|rol|ror|sbc)\b</string>
 			<key>name</key>
-			<string>keyword.operator.asm</string>
+			<string>keyword.arithlogic.asm</string>
 		</dict>
 		<dict>
 			<key>comment</key>
@@ -24,7 +24,7 @@
 			<key>match</key>
 			<string>(?i)\b(bcc|bcs|beq|bmi|bne|bpl|bvc|bvs|jmp|jsr|rti|rts)\b</string>
 			<key>name</key>
-			<string>keyword.operator.asm</string>
+			<string>keyword.branch.asm</string>
 		</dict>
 		<dict>
 			<key>comment</key>
@@ -32,7 +32,7 @@
 			<key>match</key>
 			<string>(?i)\b(bit|cmp|cpx|cpy)\b</string>
 			<key>name</key>
-			<string>keyword.operator.asm</string>
+			<string>keyword.compare.asm</string>
 		</dict>
 		<dict>
 			<key>comment</key>
@@ -40,7 +40,7 @@
 			<key>match</key>
 			<string>(?i)\b(clc|cld|cli|clv|sec|sed|sei)\b</string>
 			<key>name</key>
-			<string>keyword.operator.asm</string>
+			<string>keyword.flagset.asm</string>
 		</dict>
 		<dict>
 			<key>comment</key>
@@ -48,7 +48,7 @@
 			<key>match</key>
 			<string>(?i)\b(lda|ldx|ldy|pha|php|pla|plp|sta|stx|sty|tax|tay|tsx|txa|txs|tya)\b</string>
 			<key>name</key>
-			<string>keyword.operator.asm</string>
+			<string>keyword.transfer.asm</string>
 		</dict>
 		<dict>
 			<key>comment</key>
@@ -84,17 +84,17 @@
 		</dict>
 		<dict>
 			<key>comment</key>
-			<string>Bin number constant</string>
+			<string>Binary number constant</string>
 			<key>match</key>
-			<string>(?i)\%(0b(0|1)+)\b</string>
+			<string>(?i)\%[0|1]+)\b</string>
 			<key>name</key>
 			<string>constant.numeric.asm</string>
 		</dict>
 		<dict>
 			<key>comment</key>
-			<string>Dec number constant</string>
+			<string>Decimal number constant</string>
 			<key>match</key>
-			<string>(?i)\#(0|[1-9]\d+)\b</string>
+			<string>(?i)\#([0-9]+)\b</string>
 			<key>name</key>
 			<string>constant.numeric.asm</string>
 		</dict>