Added macro call. Extended syntax highlighting.

src/test/java/de/platon42/intellij/plugins/m68k/parser/MacroCallTest.kt

@@ -0,0 +1,31 @@
+package de.platon42.intellij.plugins.m68k.parser
+
+import de.platon42.intellij.jupiter.MyTestCase
+import de.platon42.intellij.jupiter.ParsingTestExtension
+import de.platon42.intellij.jupiter.TestDataSubPath
+import org.junit.jupiter.api.Test
+
+@TestDataSubPath("macros")
+internal class MacroCallTest : AbstractParsingTest() {
+
+    @Test
+    internal fun standard_macrocall_without_parameters(@MyTestCase testCase: ParsingTestExtension.IParsingTestCase) {
+        testGoodSyntax(testCase, " BLTHOGON\n")
+    }
+
+    @Test
+    internal fun call_with_complex_parameters(@MyTestCase testCase: ParsingTestExtension.IParsingTestCase) {
+        testGoodSyntax(testCase, " COPIMOVE (3<<0)|(3<<3)|(1<<6),bplcon2\n")
+    }
+
+    @Test
+    internal fun pushm_call_with_register_list(@MyTestCase testCase: ParsingTestExtension.IParsingTestCase) {
+        testGoodSyntax(testCase, " PUSHM d0/d3/d5-d7/a0-a2/a4-a6 ; save a couple of registers\n")
+    }
+
+    @Test
+    internal fun putmsg_call_with_specially_bracketed_parameters(@MyTestCase testCase: ParsingTestExtension.IParsingTestCase) {
+        // FIXME this doesn't work as intended...
+        testGoodSyntax(testCase, "\tPUTMSG 10,<\"%s has left the building at %d:%d\",10,'Yup!'>,a0,$42(a1,d0.w),#42\n")
+    }
+}

src/test/resources/parser/labels/bad_indented_dot_local_label_without_label.txt

@@ -1,6 +1,5 @@
 Assembly File: a.asm
   PsiWhiteSpace('   ')
-  M68kStatementImpl(STATEMENT)
-    M68kMacroCallImpl(MACRO_CALL)
-      PsiElement(M68kTokenType.SYMBOL)('.local_label')
+  PsiErrorElement:'.local_label' unexpected
+    PsiElement(M68kTokenType.SYMBOL)('.local_label')
   PsiElement(M68kTokenType.EOL)('\n')

src/test/resources/parser/labels/bad_indented_local_label_dollar_without_label.txt

@@ -1,6 +1,5 @@
 Assembly File: a.asm
   PsiWhiteSpace('   ')
-  M68kStatementImpl(STATEMENT)
-    M68kMacroCallImpl(MACRO_CALL)
-      PsiElement(M68kTokenType.SYMBOL)('local_label$')
+  PsiErrorElement:'local_label$' unexpected
+    PsiElement(M68kTokenType.SYMBOL)('local_label$')
   PsiElement(M68kTokenType.EOL)('\n')

src/test/resources/parser/macros/call_with_complex_parameters.txt

@@ -0,0 +1,10 @@
+Assembly File: a.asm
+  PsiWhiteSpace(' ')
+  M68kStatementImpl(STATEMENT)
+    M68kMacroCallImpl(MACRO_CALL)
+      PsiElement(M68kTokenType.MACRO_INVOKATION)('COPIMOVE')
+      PsiWhiteSpace(' ')
+      PsiElement(M68kTokenType.STRINGLIT)('(3<<0)|(3<<3)|(1<<6)')
+      PsiElement(M68kTokenType.SEPARATOR)(',')
+      PsiElement(M68kTokenType.STRINGLIT)('bplcon2')
+  PsiElement(M68kTokenType.EOL)('\n')

src/test/resources/parser/macros/pushm_call_with_register_list.txt

@@ -0,0 +1,10 @@
+Assembly File: a.asm
+  PsiWhiteSpace(' ')
+  M68kStatementImpl(STATEMENT)
+    M68kMacroCallImpl(MACRO_CALL)
+      PsiElement(M68kTokenType.MACRO_INVOKATION)('PUSHM')
+      PsiWhiteSpace(' ')
+      PsiElement(M68kTokenType.STRINGLIT)('d0/d3/d5-d7/a0-a2/a4-a6')
+  PsiWhiteSpace(' ')
+  PsiComment(M68kTokenType.COMMENT)('; save a couple of registers')
+  PsiElement(M68kTokenType.EOL)('\n')

src/test/resources/parser/macros/putmsg_call_with_specially_bracketed_parameters.txt

@@ -0,0 +1,18 @@
+Assembly File: a.asm
+  PsiWhiteSpace('\t')
+  M68kStatementImpl(STATEMENT)
+    M68kMacroCallImpl(MACRO_CALL)
+      PsiElement(M68kTokenType.MACRO_INVOKATION)('PUTMSG')
+      PsiWhiteSpace(' ')
+      PsiElement(M68kTokenType.STRINGLIT)('10')
+      PsiElement(M68kTokenType.SEPARATOR)(',')
+      PsiElement(M68kTokenType.STRINGLIT)('<"%s has left the building at %d:%d",10,'Yup!'>')
+      PsiElement(M68kTokenType.SEPARATOR)(',')
+      PsiElement(M68kTokenType.STRINGLIT)('a0')
+      PsiElement(M68kTokenType.SEPARATOR)(',')
+      PsiElement(M68kTokenType.STRINGLIT)('$42(a1')
+      PsiElement(M68kTokenType.SEPARATOR)(',')
+      PsiElement(M68kTokenType.STRINGLIT)('d0.w)')
+      PsiElement(M68kTokenType.SEPARATOR)(',')
+      PsiElement(M68kTokenType.STRINGLIT)('#42')
+  PsiElement(M68kTokenType.EOL)('\n')

src/test/resources/parser/macros/standard_macrocall_without_parameters.txt

@@ -0,0 +1,6 @@
+Assembly File: a.asm
+  PsiWhiteSpace(' ')
+  M68kStatementImpl(STATEMENT)
+    M68kMacroCallImpl(MACRO_CALL)
+      PsiElement(M68kTokenType.MACRO_INVOKATION)('BLTHOGON')
+  PsiElement(M68kTokenType.EOL)('\n')