antlr library updated to 4.8

This commit is contained in:
Irmen de Jong 2020-02-07 23:58:07 +01:00
parent b8816a0e2f
commit 3dd38c0ac8
11 changed files with 30 additions and 12 deletions

9
.idea/libraries/antlr_4_8_complete.xml generated Normal file
View File

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="antlr-4.8-complete">
<CLASSES>
<root url="jar://$PROJECT_DIR$/parser/antlr/lib/antlr-4.8-complete.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/antlr_runtime_4_8.xml generated Normal file
View File

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="antlr-runtime-4.8">
<CLASSES>
<root url="jar://$PROJECT_DIR$/parser/antlr/lib/antlr-runtime-4.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@ -8,7 +8,7 @@ plugins {
// id "org.jetbrains.kotlin.jvm" version "1.3.61" // id "org.jetbrains.kotlin.jvm" version "1.3.61"
id 'application' id 'application'
id 'org.jetbrains.dokka' version "0.9.18" 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' id 'java'
} }
@ -31,7 +31,7 @@ dependencies {
implementation project(':parser') implementation project(':parser')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
// implementation "org.jetbrains.kotlin:kotlin-reflect" // 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 'org.jetbrains.kotlinx:kotlinx-cli-jvm:0.1.0-dev-5'
// implementation 'net.razorvine:ksim65:1.6' // implementation 'net.razorvine:ksim65:1.6'
implementation project(':parser') implementation project(':parser')

View File

@ -11,9 +11,9 @@
<orderEntry type="jdk" jdkName="openjdk-11" jdkType="JavaSDK" /> <orderEntry type="jdk" jdkName="openjdk-11" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" /> <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="antlr-runtime-4.7.2" level="project" />
<orderEntry type="module" module-name="parser" /> <orderEntry type="module" module-name="parser" />
<orderEntry type="library" name="unittest-libs" level="project" /> <orderEntry type="library" name="unittest-libs" level="project" />
<orderEntry type="library" name="kotlinx-cli-jvm-0.1.0-dev-5" level="project" /> <orderEntry type="library" name="kotlinx-cli-jvm-0.1.0-dev-5" level="project" />
<orderEntry type="library" name="antlr-runtime-4.8" level="project" />
</component> </component>
</module> </module>

View File

@ -10,7 +10,7 @@ main {
c64.VMCSB |= 2 ; switch to lowercase charset c64.VMCSB |= 2 ; switch to lowercase charset
str s1 = "HELLO hello 1234 @[/]\n" 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("\n\n\n\nString output via print:\n")
c64scr.print(s1) c64scr.print(s1)

View File

@ -20,10 +20,10 @@ configurations {
} }
dependencies { dependencies {
antlr 'org.antlr:antlr4:4.7.2' antlr 'org.antlr:antlr4:4.8'
implementation 'org.antlr:antlr4-runtime:4.7.2' 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' // exclude group: 'com.ibm.icu', module: 'icu4j'
// } // }
} }

View File

@ -8,6 +8,6 @@
</content> </content>
<orderEntry type="jdk" jdkName="openjdk-11" jdkType="JavaSDK" /> <orderEntry type="jdk" jdkName="openjdk-11" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="antlr-4.7.2-complete" level="project" /> <orderEntry type="library" name="antlr-4.8-complete" level="project" />
</component> </component>
</module> </module>

View File

@ -1,4 +1,4 @@
// Generated from prog8.g4 by ANTLR 4.7.2 // Generated from prog8.g4 by ANTLR 4.8
package prog8.parser; package prog8.parser;
@ -13,7 +13,7 @@ import org.antlr.v4.runtime.misc.*;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class prog8Lexer extends Lexer { 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 DFA[] _decisionToDFA;
protected static final PredictionContextCache _sharedContextCache = protected static final PredictionContextCache _sharedContextCache =

View File

@ -1,4 +1,4 @@
// Generated from prog8.g4 by ANTLR 4.7.2 // Generated from prog8.g4 by ANTLR 4.8
package prog8.parser; package prog8.parser;
@ -13,7 +13,7 @@ import java.util.ArrayList;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"}) @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class prog8Parser extends Parser { 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 DFA[] _decisionToDFA;
protected static final PredictionContextCache _sharedContextCache = protected static final PredictionContextCache _sharedContextCache =