From f027b58a166caaf64c9123e07f8ba2be72179b9d Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Mon, 22 Jun 2020 08:16:47 +0200
Subject: [PATCH] Removed support for pc parameter on inline kickasm Closes
 #479, #480

---
 .../Maven__com_ibm_icu_icu4j_58_2.xml         | 13 --------
 .../Maven__com_ibm_icu_icu4j_61_1.xml         | 13 ++++++++
 .../libraries/Maven__org_antlr_ST4_4_0_8.xml  | 13 --------
 .idea/libraries/Maven__org_antlr_ST4_4_3.xml  | 13 ++++++++
 .../Maven__org_antlr_antlr4_4_7_1.xml         | 13 --------
 .../Maven__org_antlr_antlr4_4_8_1.xml         | 13 ++++++++
 ...Maven__org_antlr_antlr4_runtime_4_8_1.xml} |  8 ++---
 .../Maven__org_antlr_antlr_runtime_3_5_2.xml  | 13 --------
 .idea/libraries/org_antlr_antlr4_4_7_1.xml    | 32 -------------------
 .../org_antlr_antlr4_runtime_4_7_1.xml        | 14 --------
 .idea/misc.xml                                | 10 ++++++
 kickc.iml                                     | 11 +++----
 pom.xml                                       |  4 +--
 .../dk/camelot64/kickc/test/TestPrograms.java |  5 +++
 src/test/kc/test-kasm-pc-error.c              | 16 ++++++++++
 15 files changed, 80 insertions(+), 111 deletions(-)
 delete mode 100644 .idea/libraries/Maven__com_ibm_icu_icu4j_58_2.xml
 create mode 100644 .idea/libraries/Maven__com_ibm_icu_icu4j_61_1.xml
 delete mode 100644 .idea/libraries/Maven__org_antlr_ST4_4_0_8.xml
 create mode 100644 .idea/libraries/Maven__org_antlr_ST4_4_3.xml
 delete mode 100644 .idea/libraries/Maven__org_antlr_antlr4_4_7_1.xml
 create mode 100644 .idea/libraries/Maven__org_antlr_antlr4_4_8_1.xml
 rename .idea/libraries/{Maven__org_antlr_antlr4_runtime_4_7_1.xml => Maven__org_antlr_antlr4_runtime_4_8_1.xml} (63%)
 delete mode 100644 .idea/libraries/Maven__org_antlr_antlr_runtime_3_5_2.xml
 delete mode 100644 .idea/libraries/org_antlr_antlr4_4_7_1.xml
 delete mode 100644 .idea/libraries/org_antlr_antlr4_runtime_4_7_1.xml
 create mode 100644 src/test/kc/test-kasm-pc-error.c

diff --git a/.idea/libraries/Maven__com_ibm_icu_icu4j_58_2.xml b/.idea/libraries/Maven__com_ibm_icu_icu4j_58_2.xml
deleted file mode 100644
index a1484c019..000000000
--- a/.idea/libraries/Maven__com_ibm_icu_icu4j_58_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.ibm.icu:icu4j:58.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/ibm/icu/icu4j/58.2/icu4j-58.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/ibm/icu/icu4j/58.2/icu4j-58.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/ibm/icu/icu4j/58.2/icu4j-58.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_ibm_icu_icu4j_61_1.xml b/.idea/libraries/Maven__com_ibm_icu_icu4j_61_1.xml
new file mode 100644
index 000000000..425700eba
--- /dev/null
+++ b/.idea/libraries/Maven__com_ibm_icu_icu4j_61_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ibm.icu:icu4j:61.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ibm/icu/icu4j/61.1/icu4j-61.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ibm/icu/icu4j/61.1/icu4j-61.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ibm/icu/icu4j/61.1/icu4j-61.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_ST4_4_0_8.xml b/.idea/libraries/Maven__org_antlr_ST4_4_0_8.xml
deleted file mode 100644
index 4582c2052..000000000
--- a/.idea/libraries/Maven__org_antlr_ST4_4_0_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.antlr:ST4:4.0.8">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/ST4/4.0.8/ST4-4.0.8.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/ST4/4.0.8/ST4-4.0.8-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/ST4/4.0.8/ST4-4.0.8-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_ST4_4_3.xml b/.idea/libraries/Maven__org_antlr_ST4_4_3.xml
new file mode 100644
index 000000000..7cc44a69a
--- /dev/null
+++ b/.idea/libraries/Maven__org_antlr_ST4_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.antlr:ST4:4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/ST4/4.3/ST4-4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/ST4/4.3/ST4-4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/ST4/4.3/ST4-4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr4_4_7_1.xml b/.idea/libraries/Maven__org_antlr_antlr4_4_7_1.xml
deleted file mode 100644
index 95934904a..000000000
--- a/.idea/libraries/Maven__org_antlr_antlr4_4_7_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.antlr:antlr4:4.7.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7.1/antlr4-4.7.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7.1/antlr4-4.7.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7.1/antlr4-4.7.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr4_4_8_1.xml b/.idea/libraries/Maven__org_antlr_antlr4_4_8_1.xml
new file mode 100644
index 000000000..4d1ad8eb7
--- /dev/null
+++ b/.idea/libraries/Maven__org_antlr_antlr4_4_8_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.antlr:antlr4:4.8-1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.8-1/antlr4-4.8-1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.8-1/antlr4-4.8-1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.8-1/antlr4-4.8-1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_7_1.xml b/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_8_1.xml
similarity index 63%
rename from .idea/libraries/Maven__org_antlr_antlr4_runtime_4_7_1.xml
rename to .idea/libraries/Maven__org_antlr_antlr4_runtime_4_8_1.xml
index 4fc437abb..1e79170b2 100644
--- a/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_7_1.xml
+++ b/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_8_1.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.antlr:antlr4-runtime:4.7.1">
+  <library name="Maven: org.antlr:antlr4-runtime:4.8-1">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.8-1/antlr4-runtime-4.8-1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.8-1/antlr4-runtime-4.8-1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.8-1/antlr4-runtime-4.8-1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_5_2.xml b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_5_2.xml
deleted file mode 100644
index 4fc5cbb6b..000000000
--- a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.antlr:antlr-runtime:3.5.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/org_antlr_antlr4_4_7_1.xml b/.idea/libraries/org_antlr_antlr4_4_7_1.xml
deleted file mode 100644
index 199b0e3c1..000000000
--- a/.idea/libraries/org_antlr_antlr4_4_7_1.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<component name="libraryTable">
-  <library name="org.antlr:antlr4:4.7.1" type="repository">
-    <properties maven-id="org.antlr:antlr4:4.7.1" />
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7.1/antlr4-4.7.1.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/ST4/4.0.8/ST4-4.0.8.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/abego/treelayout/org.abego.treelayout.core/1.0.3/org.abego.treelayout.core-1.0.3.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/javax.json/1.0.4/javax.json-1.0.4.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/com/ibm/icu/icu4j/58.2/icu4j-58.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7.1/antlr4-4.7.1-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/ST4/4.0.8/ST4-4.0.8-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/abego/treelayout/org.abego.treelayout.core/1.0.3/org.abego.treelayout.core-1.0.3-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/javax.json/1.0.4/javax.json-1.0.4-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/com/ibm/icu/icu4j/58.2/icu4j-58.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7.1/antlr4-4.7.1-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/ST4/4.0.8/ST4-4.0.8-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/abego/treelayout/org.abego.treelayout.core/1.0.3/org.abego.treelayout.core-1.0.3-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/javax.json/1.0.4/javax.json-1.0.4-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/com/ibm/icu/icu4j/58.2/icu4j-58.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/org_antlr_antlr4_runtime_4_7_1.xml b/.idea/libraries/org_antlr_antlr4_runtime_4_7_1.xml
deleted file mode 100644
index f3f783483..000000000
--- a/.idea/libraries/org_antlr_antlr4_runtime_4_7_1.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<component name="libraryTable">
-  <library name="org.antlr:antlr4-runtime:4.7.1" type="repository">
-    <properties maven-id="org.antlr:antlr4-runtime:4.7.1" />
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c13e9bb26..ae023ebb9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,6 +13,16 @@
           <option name="language" value="" />
           <option name="generateVisitor" value="true" />
         </PerGrammarGenerationSettings>
+        <PerGrammarGenerationSettings>
+          <option name="fileName" value="$PROJECT_DIR$/src/main/java/dk/camelot64/kickc/parser/KickCLexer.g4" />
+          <option name="autoGen" value="true" />
+          <option name="outputDir" value="$PROJECT_DIR$/src/main/java" />
+          <option name="libDir" value="" />
+          <option name="encoding" value="" />
+          <option name="pkg" value="" />
+          <option name="language" value="" />
+          <option name="generateVisitor" value="true" />
+        </PerGrammarGenerationSettings>
       </list>
     </option>
   </component>
diff --git a/kickc.iml b/kickc.iml
index 08cb8797e..ba8f07076 100644
--- a/kickc.iml
+++ b/kickc.iml
@@ -11,14 +11,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="org.antlr:antlr4:4.7.1" level="project" />
-    <orderEntry type="library" name="org.antlr:antlr4-runtime:4.7.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.antlr:antlr4:4.7.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.antlr:antlr-runtime:3.5.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.antlr:ST4:4.0.8" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.antlr:antlr4:4.8-1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.antlr:ST4:4.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.abego.treelayout:org.abego.treelayout.core:1.0.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.ibm.icu:icu4j:58.2" level="project" />
-    <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.ibm.icu:icu4j:61.1" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.8-1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: cml.kickass:kickassembler:5.15" level="project" />
diff --git a/pom.xml b/pom.xml
index b9c3f5cbd..3332076d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4</artifactId>
-            <version>4.7.1</version>
+            <version>4.8-1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
-            <version>4.7.1</version>
+            <version>4.8-1</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
index b2c9f404a..eb83c0bca 100644
--- a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
+++ b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
@@ -3358,6 +3358,11 @@ public class TestPrograms {
       compileAndCompare("test-kasm-pc.c");
    }
 
+   @Test
+   public void testKasmPcError() throws IOException, URISyntaxException {
+      assertError("test-kasm-pc-error.c", "mismatched input 'pc' expecting");
+   }
+
    @Test
    public void testKasm() throws IOException, URISyntaxException {
       compileAndCompare("test-kasm.c");
diff --git a/src/test/kc/test-kasm-pc-error.c b/src/test/kc/test-kasm-pc-error.c
new file mode 100644
index 000000000..1f504e754
--- /dev/null
+++ b/src/test/kc/test-kasm-pc-error.c
@@ -0,0 +1,16 @@
+// Test inline KickAssembler code with PC location specification
+
+char* const TABLE = 0x2000;
+
+kickasm(pc TABLE) {{
+    .byte 1, 2, 3
+}};
+
+void main() {
+    byte* BORDER_COLOR = $d020;
+    byte i=0;
+    while(true) {
+        *BORDER_COLOR = TABLE[i++];
+    }
+}
+