diff --git a/.idea/libraries/antlr_4_8_complete.xml b/.idea/libraries/antlr_4_8_complete.xml
new file mode 100644
index 000000000..839920784
--- /dev/null
+++ b/.idea/libraries/antlr_4_8_complete.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/antlr_runtime_4_8.xml b/.idea/libraries/antlr_runtime_4_8.xml
new file mode 100644
index 000000000..702529a49
--- /dev/null
+++ b/.idea/libraries/antlr_runtime_4_8.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/compiler/build.gradle b/compiler/build.gradle
index aac2adae3..f6de8fb26 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -8,7 +8,7 @@ plugins {
// id "org.jetbrains.kotlin.jvm" version "1.3.61"
id 'application'
id 'org.jetbrains.dokka' version "0.9.18"
- id 'com.github.johnrengelman.shadow' version '5.1.0'
+ id 'com.github.johnrengelman.shadow' version '5.2.0'
id 'java'
}
@@ -31,7 +31,7 @@ dependencies {
implementation project(':parser')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
// implementation "org.jetbrains.kotlin:kotlin-reflect"
- implementation 'org.antlr:antlr4-runtime:4.7.2'
+ implementation 'org.antlr:antlr4-runtime:4.8'
implementation 'org.jetbrains.kotlinx:kotlinx-cli-jvm:0.1.0-dev-5'
// implementation 'net.razorvine:ksim65:1.6'
implementation project(':parser')
diff --git a/compiler/compiler.iml b/compiler/compiler.iml
index 10103c91c..bf8bf45c1 100644
--- a/compiler/compiler.iml
+++ b/compiler/compiler.iml
@@ -11,9 +11,9 @@
-
+
\ No newline at end of file
diff --git a/examples/screencodes.p8 b/examples/screencodes.p8
index da9aa5173..b4e12bcec 100644
--- a/examples/screencodes.p8
+++ b/examples/screencodes.p8
@@ -10,7 +10,7 @@ main {
c64.VMCSB |= 2 ; switch to lowercase charset
str s1 = "HELLO hello 1234 @[/]\n"
- str s2 = "HELLO hello 1234 @[/]\n" ; TODO as c64scr
+ str s2 = "HELLO hello 1234 @[/]\n" as c64sc
c64scr.print("\n\n\n\nString output via print:\n")
c64scr.print(s1)
diff --git a/parser/antlr/lib/antlr-4.7.2-complete.jar b/parser/antlr/lib/antlr-4.8-complete.jar
similarity index 74%
rename from parser/antlr/lib/antlr-4.7.2-complete.jar
rename to parser/antlr/lib/antlr-4.8-complete.jar
index 9794f19b2..89a0640e2 100644
Binary files a/parser/antlr/lib/antlr-4.7.2-complete.jar and b/parser/antlr/lib/antlr-4.8-complete.jar differ
diff --git a/parser/antlr/lib/antlr-runtime-4.7.2.jar b/parser/antlr/lib/antlr-runtime-4.8.jar
similarity index 86%
rename from parser/antlr/lib/antlr-runtime-4.7.2.jar
rename to parser/antlr/lib/antlr-runtime-4.8.jar
index 7a27e1b20..c75f90f0c 100644
Binary files a/parser/antlr/lib/antlr-runtime-4.7.2.jar and b/parser/antlr/lib/antlr-runtime-4.8.jar differ
diff --git a/parser/build.gradle b/parser/build.gradle
index ce9b71094..06759b3c7 100644
--- a/parser/build.gradle
+++ b/parser/build.gradle
@@ -20,10 +20,10 @@ configurations {
}
dependencies {
- antlr 'org.antlr:antlr4:4.7.2'
- implementation 'org.antlr:antlr4-runtime:4.7.2'
+ antlr 'org.antlr:antlr4:4.8'
+ implementation 'org.antlr:antlr4-runtime:4.8'
-// antlr('org.antlr:antlr4:4.7.2') {
+// antlr('org.antlr:antlr4:4.8') {
// exclude group: 'com.ibm.icu', module: 'icu4j'
// }
}
diff --git a/parser/parser.iml b/parser/parser.iml
index 2896f4626..cd8426fc9 100644
--- a/parser/parser.iml
+++ b/parser/parser.iml
@@ -8,6 +8,6 @@
-
+
\ No newline at end of file
diff --git a/parser/src/prog8/parser/prog8Lexer.java b/parser/src/prog8/parser/prog8Lexer.java
index a349fdf53..eafe59435 100644
--- a/parser/src/prog8/parser/prog8Lexer.java
+++ b/parser/src/prog8/parser/prog8Lexer.java
@@ -1,4 +1,4 @@
-// Generated from prog8.g4 by ANTLR 4.7.2
+// Generated from prog8.g4 by ANTLR 4.8
package prog8.parser;
@@ -13,7 +13,7 @@ import org.antlr.v4.runtime.misc.*;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class prog8Lexer extends Lexer {
- static { RuntimeMetaData.checkVersion("4.7.2", RuntimeMetaData.VERSION); }
+ static { RuntimeMetaData.checkVersion("4.8", RuntimeMetaData.VERSION); }
protected static final DFA[] _decisionToDFA;
protected static final PredictionContextCache _sharedContextCache =
diff --git a/parser/src/prog8/parser/prog8Parser.java b/parser/src/prog8/parser/prog8Parser.java
index f19a18834..8e05a6b48 100644
--- a/parser/src/prog8/parser/prog8Parser.java
+++ b/parser/src/prog8/parser/prog8Parser.java
@@ -1,4 +1,4 @@
-// Generated from prog8.g4 by ANTLR 4.7.2
+// Generated from prog8.g4 by ANTLR 4.8
package prog8.parser;
@@ -13,7 +13,7 @@ import java.util.ArrayList;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class prog8Parser extends Parser {
- static { RuntimeMetaData.checkVersion("4.7.2", RuntimeMetaData.VERSION); }
+ static { RuntimeMetaData.checkVersion("4.8", RuntimeMetaData.VERSION); }
protected static final DFA[] _decisionToDFA;
protected static final PredictionContextCache _sharedContextCache =