From 162fb7f1e5019e24fe7a50935d894b44809347dd Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Mon, 4 Nov 2019 08:18:28 +0100
Subject: [PATCH] Working on catching all declared constants in parse 0.

---
 .../Pass0GenerateStatementSequence.java       |  2 ++
 .../dk/camelot64/kickc/test/TestPrograms.java |  3 ++-
 src/test/kc/function-pointer-noarg-call-5.kc  | 21 +++++++++----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
index 595a3a3c9..c129e7a8e 100644
--- a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
+++ b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
@@ -2018,6 +2018,8 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
       // Special handling of negative literal number
       if(child instanceof ConstantInteger && operator.equals(Operators.NEG)) {
          return new ConstantInteger(-((ConstantInteger) child).getInteger(), ((ConstantInteger) child).getType());
+      } else if(operator.equals(Operators.ADDRESS_OF) && child instanceof SymbolRef) {
+         return new ConstantSymbolPointer((SymbolRef) child);
       } else if(child instanceof ConstantValue) {
          return new ConstantUnary((OperatorUnary) operator, (ConstantValue) child);
       } else {
diff --git a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
index 07c204288..1125c6ec5 100644
--- a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
+++ b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
@@ -2710,7 +2710,8 @@ public class TestPrograms {
 
    @Test
    public void testAddressOf1() throws IOException, URISyntaxException {
-      compileAndCompare("address-of-1");
+      compileAndCompare("address-of-1", log().verboseCreateSsa());
+      fail("Address-of-not detected!");
    }
 
    @Test
diff --git a/src/test/kc/function-pointer-noarg-call-5.kc b/src/test/kc/function-pointer-noarg-call-5.kc
index 7cd6a2a5f..933a31034 100644
--- a/src/test/kc/function-pointer-noarg-call-5.kc
+++ b/src/test/kc/function-pointer-noarg-call-5.kc
@@ -1,16 +1,5 @@
 // Tests calling into arrays of pointers to non-args no-return functions
 
-
-void()*[2] fns = { &fn1, &fn2 };
-
-void main() {
-    byte i = 0;
-    while(true) {
-        void()* f = fns[++i&1];
-        (*f)();
-    }
-}
-
 void fn1() {
     const byte* BORDERCOL = $d020;
     (*BORDERCOL)++;
@@ -21,3 +10,13 @@ void fn2() {
     (*BGCOL)++;
 }
 
+void()*[2] fns = { &fn1, &fn2 };
+
+void main() {
+    byte i = 0;
+    while(true) {
+        void()* f = fns[++i&1];
+        (*f)();
+    }
+}
+