From 9d819c5f8966695eab2fdcabb1c76601c5d86c90 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Sat, 16 Sep 2017 21:11:32 -0400
Subject: [PATCH] clean up edasm.

---
 Syntaxes/65816.sublime-syntax |  6 +++++-
 Syntaxes/EDAsm.sublime-syntax | 22 +++-------------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/Syntaxes/65816.sublime-syntax b/Syntaxes/65816.sublime-syntax
index dfe65b6..70d5175 100644
--- a/Syntaxes/65816.sublime-syntax
+++ b/Syntaxes/65816.sublime-syntax
@@ -35,4 +35,8 @@ contexts:
 
   mnemonics-65c02-m740:
     - match: \b(?i:CLT|COM|LDM|RRF|SET|TST)\b
-      scope: keyword.mnemonic.m740
\ No newline at end of file
+      scope: keyword.mnemonic.m740
+
+  mnemonics-sweet16:
+    - match: \b(?i:RTN|SET|LD|LDD|ST|STD|POP|POPD|STP|ADD|SUB|CPR|INR|DCR|BR|BNC|BC|BP|BM|BZ|BNZ|BM1|BNM1|BK|RS|BS)\b
+      scope: keyword.mnemonic.sweet16
diff --git a/Syntaxes/EDAsm.sublime-syntax b/Syntaxes/EDAsm.sublime-syntax
index 8c4314a..366568f 100644
--- a/Syntaxes/EDAsm.sublime-syntax
+++ b/Syntaxes/EDAsm.sublime-syntax
@@ -13,9 +13,7 @@ contexts:
     - include: comment
     - include: registers
   main:
-    - include: label
 
-  label:
     - match: '{{ws}}'
       push: opcode
 
@@ -33,8 +31,9 @@ contexts:
     - match: '{{ws}}'
       set: operand
 
-    - include: mnemonics-6502
-    - include: mnemonics-65c02
+
+    - include: scope:source.asm.65816#mnemonics-6502
+    - include: scope:source.asm.65816#mnemonics-65c02
 
     - match: \b((?i)ASC|STR|DCI|CHR)\b
       scope: keyword.directive
@@ -96,21 +95,6 @@ contexts:
     - match: \b(?i:A|X|Y)\b
       scope: variable.language.register
 
-  mnemonics-6502:
-    - match: \b(?i:ADC|AND|ASL|BCC|BCS|BEQ|BIT|BMI|BNE|BPL|BRK|BVC|BVS|CLC|CLD|CLI|CLV|CMP|CPX|CPY|DEC|DEX|DEY|EOR|INC|INX|INY|JMP|JSR|LDA|LDX|LDY|LSR|NOP|ORA|PHA|PHP|PLA|PLP|ROL|ROR|RTI|RTS|SBC|SEC|SED|SEI|STA|STX|STY|TAX|TAY|TSX|TXA|TXS|TYA)\b
-      scope: keyword.mnemonic.6502
-
-  mnemonics-65c02:
-    - match: \b(?i:BRA|PHX|PHY|PLX|PLY|STP|STZ|TRB|TSB|WAI)\b
-      scope: keyword.mnemonic.65c02
-
-  mnemonics-6502-alt:
-    - match: \b(?i:BLT|BGE|DEA|INA|LSL)\b
-      scope: keyword.mnemonic.6502-alt
-
-  mnemonics-sweet16:
-    - match: \b(?i:RTN|SET|LD|LDD|ST|STD|POP|POPD|STP|ADD|SUB|CPR|INR|DCR|BR|BNC|BC|BP|BM|BZ|BNZ|BM1|BNM1|BK|RS|BS)\b
-      scope: keyword.mnemonic.65c02
 
   expect-comment:
     - include: comment