From d6ec26fc45838909b648a105c577b4048c8d86b3 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Sun, 5 May 2013 12:55:09 -0400 Subject: [PATCH] ST compatibility --- Syntaxes/65816.tmLanguage | 30 +++--- Syntaxes/EDAsm.tmLanguage | 73 +++++++++++++-- Syntaxes/MPW Asm IIgs.tmLanguage | 77 ++++++++++++++- Syntaxes/Merlin.tmLanguage | 77 ++++++++++++++- Syntaxes/NinjaForce assembler.tmLanguage | 113 ++++++++++++++++------- Syntaxes/ORCA:M.tmLanguage | 79 +++++++++++++++- 6 files changed, 384 insertions(+), 65 deletions(-) diff --git a/Syntaxes/65816.tmLanguage b/Syntaxes/65816.tmLanguage index 68a0294..7bdde28 100644 --- a/Syntaxes/65816.tmLanguage +++ b/Syntaxes/65816.tmLanguage @@ -9,10 +9,16 @@ patterns - match - \b(?i:ADC|AND|ASL|BCC|BCS|BEQ|BIT|BMI|BNE|BPL|BRA|BRK|BRL|BVC|BVS|CLC|CLD|CLI|CLV|CMP|COP|CPX|CPY|DEC|DEX|DEY|EOR|INC|INX|INY|JML|JMP|JSL|JSR|LDA|LDX|LDY|LSR|MVN|MVP|NOP|ORA|PEA|PEI|PER|PHA|PHB|PHD|PHK|PHP|PHX|PHY|PLA|PLB|PLD|PLP|PLX|PLY|REP|ROL|ROR|RTI|RTL|RTS|SBC|SEC|SED|SEI|SEP|STA|STP|STX|STY|STZ|TAX|TAY|TCD|TCS|TDC|TRB|TSB|TSC|TSX|TXA|TXS|TXY|TYA|TYX|WAI|WDM|XBA|XCE)\b - name - keyword.mnemonic.65816 + include + #M6502 + + + include + #M65C02 + + + include + #M65816 repository @@ -31,6 +37,13 @@ name keyword.mnemonic.65816 + M65816L + + match + \b(?i:ADCL|ANDL|CMPL|EORL|LDAL|ORAL|SBCL|STAL)\b + name + keyword.mnemonic.65816.long + M65C02 match @@ -55,17 +68,10 @@ hex_number match - \$[A-Za-z0-9]+ + \$[A-Fa-f0-9]+ name constant.numeric.hex - long_mnemonics - - match - \b(?i:ADCL|ANDL|CMPL|EORL|LDAL|ORAL|SBCL|STAL)\b - name - keyword.mnemonic.65816.long - octal_number match diff --git a/Syntaxes/EDAsm.tmLanguage b/Syntaxes/EDAsm.tmLanguage index c0734f1..bd30e6b 100644 --- a/Syntaxes/EDAsm.tmLanguage +++ b/Syntaxes/EDAsm.tmLanguage @@ -4,33 +4,35 @@ fileTypes + isDisabled + name EDASM patterns include - source.asm.65816#M6502 + #M6502 include - source.asm.65816#M65C02 + #M65C02 include - source.asm.65816#hex_number + #hex_number include - source.asm.65816#binary_number + #binary_number include - source.asm.65816#decimal_number + #decimal_number include - source.asm.65816#octal_number + #octal_number match @@ -106,6 +108,65 @@ keyword.operator + repository + + M6502 + + 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 + name + keyword.mnemonic.6502 + + M65816 + + match + \b(?i:BRL|COP|JML|JSL|MVN|MVP|PEA|PEI|PER|PHB|PHD|PHK|PLB|PLD|REP|RTL|SEP|TCD|TCS|TDC|TSC|TXY|TYX|WDM|XBA|XCE)\b + name + keyword.mnemonic.65816 + + M65816L + + match + \b(?i:ADCL|ANDL|CMPL|EORL|LDAL|ORAL|SBCL|STAL)\b + name + keyword.mnemonic.65816.long + + M65C02 + + match + \b(?i:BRA|PHX|PHY|PLX|PLY|STP|STZ|TRB|TSB|WAI)\b + name + keyword.mnemonic.65c02 + + binary_number + + match + %[01]+ + name + constant.numeric.binary + + decimal_number + + match + \b([0-9]+)\b + name + constant.numeric.decimal + + hex_number + + match + \$[A-Fa-f0-9]+ + name + constant.numeric.hex + + octal_number + + match + @([0-7]+)\b + name + constant.numeric.octal + + scopeName source.asm.6502.edasm uuid diff --git a/Syntaxes/MPW Asm IIgs.tmLanguage b/Syntaxes/MPW Asm IIgs.tmLanguage index 0bb0a5f..b73ab0a 100644 --- a/Syntaxes/MPW Asm IIgs.tmLanguage +++ b/Syntaxes/MPW Asm IIgs.tmLanguage @@ -6,25 +6,35 @@ aii + isDisabled + name MPW Asm IIgs patterns include - source.asm.65816 + #M6502 include - source.asm.65816#hex_number + #M65C02 include - source.asm.65816#binary_number + #M65816 include - source.asm.65816#decimal_number + #hex_number + + + include + #binary_number + + + include + #decimal_number match @@ -377,6 +387,65 @@ support.function.macro + repository + + M6502 + + 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 + name + keyword.mnemonic.6502 + + M65816 + + match + \b(?i:BRL|COP|JML|JSL|MVN|MVP|PEA|PEI|PER|PHB|PHD|PHK|PLB|PLD|REP|RTL|SEP|TCD|TCS|TDC|TSC|TXY|TYX|WDM|XBA|XCE)\b + name + keyword.mnemonic.65816 + + M65816L + + match + \b(?i:ADCL|ANDL|CMPL|EORL|LDAL|ORAL|SBCL|STAL)\b + name + keyword.mnemonic.65816.long + + M65C02 + + match + \b(?i:BRA|PHX|PHY|PLX|PLY|STP|STZ|TRB|TSB|WAI)\b + name + keyword.mnemonic.65c02 + + binary_number + + match + %[01]+ + name + constant.numeric.binary + + decimal_number + + match + \b([0-9]+)\b + name + constant.numeric.decimal + + hex_number + + match + \$[A-Fa-f0-9]+ + name + constant.numeric.hex + + octal_number + + match + @([0-7]+)\b + name + constant.numeric.octal + + scopeName source.asm.65816.mpw uuid diff --git a/Syntaxes/Merlin.tmLanguage b/Syntaxes/Merlin.tmLanguage index 5c69ab2..ae8ae45 100644 --- a/Syntaxes/Merlin.tmLanguage +++ b/Syntaxes/Merlin.tmLanguage @@ -6,25 +6,35 @@ S + isDisabled + name Merlin patterns include - source.asm.65816 + #M6502 include - source.asm.65816#long_mnemonics + #M65C02 include - source.asm.65816#hex_number + #M65816 include - source.asm.65816#decimal_number + #M65816L + + + include + #hex_number + + + include + #decimal_number match @@ -362,6 +372,65 @@ keyword.operator + repository + + M6502 + + 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 + name + keyword.mnemonic.6502 + + M65816 + + match + \b(?i:BRL|COP|JML|JSL|MVN|MVP|PEA|PEI|PER|PHB|PHD|PHK|PLB|PLD|REP|RTL|SEP|TCD|TCS|TDC|TSC|TXY|TYX|WDM|XBA|XCE)\b + name + keyword.mnemonic.65816 + + M65816L + + match + \b(?i:ADCL|ANDL|CMPL|EORL|LDAL|ORAL|SBCL|STAL)\b + name + keyword.mnemonic.65816.long + + M65C02 + + match + \b(?i:BRA|PHX|PHY|PLX|PLY|STP|STZ|TRB|TSB|WAI)\b + name + keyword.mnemonic.65c02 + + binary_number + + match + %[01]+ + name + constant.numeric.binary + + decimal_number + + match + \b([0-9]+)\b + name + constant.numeric.decimal + + hex_number + + match + \$[A-Fa-f0-9]+ + name + constant.numeric.hex + + octal_number + + match + @([0-7]+)\b + name + constant.numeric.octal + + scopeName source.asm.65816.merlin uuid diff --git a/Syntaxes/NinjaForce assembler.tmLanguage b/Syntaxes/NinjaForce assembler.tmLanguage index 2debb62..3a2efaa 100644 --- a/Syntaxes/NinjaForce assembler.tmLanguage +++ b/Syntaxes/NinjaForce assembler.tmLanguage @@ -13,28 +13,32 @@ patterns - 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 - name - keyword.mnemonic.6502 + include + #M6502 - match - \b(?i:BRA|PHX|PHY|PLX|PLY|STP|STZ|TRB|TSB|WAI)\b - name - keyword.mnemonic.65c02 + include + #M65C02 - match - \b(?i:BRL|COP|JML|JSL|MVN|MVP|PEA|PEI|PER|PHB|PHD|PHK|PLB|PLD|REP|RTL|SEP|TCD|TCS|TDC|TSC|TXY|TYX|WDM|XBA|XCE)\b - name - keyword.mnemonic.65816 + include + #M65816 - match - \b(?i:ADCL|ANDL|CMPL|EORL|LDAL|ORAL|SBCL|STAL)\b - name - keyword.mnemonic.65816.long + include + #M65816L + + + include + #binary_number + + + include + #decimal_number + + + include + #hex_number match @@ -42,24 +46,6 @@ name keyword.mnemonic.65816.alt - - match - %[01]+ - name - constant.numeric.binary - - - match - \b([0-9]+)\b - name - constant.numeric.decimal - - - match - \$[A-Fa-f0-9]+ - name - constant.numeric.hex - match ^[A-Za-z][A-Za-z0-9_]* @@ -173,6 +159,65 @@ keyword.operator + repository + + M6502 + + 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 + name + keyword.mnemonic.6502 + + M65816 + + match + \b(?i:BRL|COP|JML|JSL|MVN|MVP|PEA|PEI|PER|PHB|PHD|PHK|PLB|PLD|REP|RTL|SEP|TCD|TCS|TDC|TSC|TXY|TYX|WDM|XBA|XCE)\b + name + keyword.mnemonic.65816 + + M65816L + + match + \b(?i:ADCL|ANDL|CMPL|EORL|LDAL|ORAL|SBCL|STAL)\b + name + keyword.mnemonic.65816.long + + M65C02 + + match + \b(?i:BRA|PHX|PHY|PLX|PLY|STP|STZ|TRB|TSB|WAI)\b + name + keyword.mnemonic.65c02 + + binary_number + + match + %[01]+ + name + constant.numeric.binary + + decimal_number + + match + \b([0-9]+)\b + name + constant.numeric.decimal + + hex_number + + match + \$[A-Fa-f0-9]+ + name + constant.numeric.hex + + octal_number + + match + @([0-7]+)\b + name + constant.numeric.octal + + scopeName source.asm.65816.ninjaforce uuid diff --git a/Syntaxes/ORCA:M.tmLanguage b/Syntaxes/ORCA:M.tmLanguage index 693b299..5cd63a7 100644 --- a/Syntaxes/ORCA:M.tmLanguage +++ b/Syntaxes/ORCA:M.tmLanguage @@ -7,29 +7,39 @@ src s + isDisabled + name ORCA/M patterns include - source.asm.65816 + #M6502 include - source.asm.65816#hex_number + #M65C02 include - source.asm.65816#binary_number + #M65816 include - source.asm.65816#decimal_number + #hex_number include - source.asm.65816#octal_number + #binary_number + + + include + #decimal_number + + + include + #octal_number match @@ -282,6 +292,65 @@ string.quoted.single + repository + + M6502 + + 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 + name + keyword.mnemonic.6502 + + M65816 + + match + \b(?i:BRL|COP|JML|JSL|MVN|MVP|PEA|PEI|PER|PHB|PHD|PHK|PLB|PLD|REP|RTL|SEP|TCD|TCS|TDC|TSC|TXY|TYX|WDM|XBA|XCE)\b + name + keyword.mnemonic.65816 + + M65816L + + match + \b(?i:ADCL|ANDL|CMPL|EORL|LDAL|ORAL|SBCL|STAL)\b + name + keyword.mnemonic.65816.long + + M65C02 + + match + \b(?i:BRA|PHX|PHY|PLX|PLY|STP|STZ|TRB|TSB|WAI)\b + name + keyword.mnemonic.65c02 + + binary_number + + match + %[01]+ + name + constant.numeric.binary + + decimal_number + + match + \b([0-9]+)\b + name + constant.numeric.decimal + + hex_number + + match + \$[A-Fa-f0-9]+ + name + constant.numeric.hex + + octal_number + + match + @([0-7]+)\b + name + constant.numeric.octal + + scopeName source.asm.65816.orcam uuid