From 0d622f978cc913d07d5b2a4fa4b6bc94750ec2ba Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Sun, 26 Nov 2017 21:46:53 +0100
Subject: [PATCH] Added two string problems (local & inline) to
 error-test-cases.

---
 .../kickc/fragment/AsmFragmentManager.java         |  6 +++---
 .../java/dk/camelot64/kickc/test/TestErrors.java   |  8 ++++++++
 .../java/dk/camelot64/kickc/test/inline-string.kc  | 14 ++++++++++++++
 .../java/dk/camelot64/kickc/test/local-string.kc   |  9 +++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/dk/camelot64/kickc/test/inline-string.kc
 create mode 100644 src/main/java/dk/camelot64/kickc/test/local-string.kc

diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentManager.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentManager.java
index 73bca15f0..4fbc4a407 100644
--- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentManager.java
+++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentManager.java
@@ -124,9 +124,9 @@ public class AsmFragmentManager {
 
       List<FragmentSynthesis> synths = new ArrayList<>();
 
-      synths.add(new FragmentSynthesis("(.*)=(.*)_(band|bor|plus)_(as?by)", ".*=as?by_.*", null, "$1=$4_$3_$2", null, null));
-      synths.add(new FragmentSynthesis("(.*)=(.*)_(band|bor|plus)_(xs?by)", ".*=[xa]s?by_.*", null, "$1=$4_$3_$2", null, null));
-      synths.add(new FragmentSynthesis("(.*)=(.*)_(band|bor|plus)_(ys?by)", ".*=[axy]s?by_.*", null, "$1=$4_$3_$2", null, null));
+      synths.add(new FragmentSynthesis("(.*)=(.*)_(band|bor|bxor|plus)_(as?by)", ".*=as?by_.*", null, "$1=$4_$3_$2", null, null));
+      synths.add(new FragmentSynthesis("(.*)=(.*)_(band|bor|bxor|plus)_(xs?by)", ".*=[xa]s?by_.*", null, "$1=$4_$3_$2", null, null));
+      synths.add(new FragmentSynthesis("(.*)=(.*)_(band|bor|bxor|plus)_(ys?by)", ".*=[axy]s?by_.*", null, "$1=$4_$3_$2", null, null));
 
       synths.add(new FragmentSynthesis("xby=(.*)", null, null, "aby=$1", "tax\n", null));
       synths.add(new FragmentSynthesis("xsby=(.*)", null, null, "asby=$1", "tax\n", null));
diff --git a/src/main/java/dk/camelot64/kickc/test/TestErrors.java b/src/main/java/dk/camelot64/kickc/test/TestErrors.java
index 0cc42c690..c1ae6ce89 100644
--- a/src/main/java/dk/camelot64/kickc/test/TestErrors.java
+++ b/src/main/java/dk/camelot64/kickc/test/TestErrors.java
@@ -24,6 +24,14 @@ public class TestErrors extends TestCase {
       helper = new ReferenceHelper("dk/camelot64/kickc/test/ref/");
    }
 
+   public void testLocalString() throws IOException, URISyntaxException {
+      compileAndCompare("local-string");
+   }
+
+   public void testInlineString() throws IOException, URISyntaxException {
+      compileAndCompare("inline-string");
+   }
+
    public void testPrint() throws IOException, URISyntaxException {
       compileAndCompare("print");
    }
diff --git a/src/main/java/dk/camelot64/kickc/test/inline-string.kc b/src/main/java/dk/camelot64/kickc/test/inline-string.kc
new file mode 100644
index 000000000..c7ac1af69
--- /dev/null
+++ b/src/main/java/dk/camelot64/kickc/test/inline-string.kc
@@ -0,0 +1,14 @@
+// Inline Strings in method calls are attempted inlined all the way to ASM. This creates error during binding. Instead a local constant byte[] st = "..."; variable should be created (generating an ASM .text).
+
+byte* screen = $0400;
+byte[] msg1 = "message 1 @";
+void main() {
+    print(msg1);
+    print("message 2 @");
+}
+
+void print(byte* msg) {
+    while(*msg!='@') {
+        *(screen++) = *msg;
+    }
+}
diff --git a/src/main/java/dk/camelot64/kickc/test/local-string.kc b/src/main/java/dk/camelot64/kickc/test/local-string.kc
new file mode 100644
index 000000000..30dffb394
--- /dev/null
+++ b/src/main/java/dk/camelot64/kickc/test/local-string.kc
@@ -0,0 +1,9 @@
+// Local constant strings are placed at the start of the method. This means the generated ASM jumps / calls straignt into the constant string
+void main() {
+    byte* screen = $0400;
+    byte[] msg = "message 2 @";
+    byte i=0;
+    while(msg[i]!='@') {
+        screen[i++] = msg[i];
+    }
+}