From 70c9ab9074e5efb9c66c488e21954ec76d673f0b Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Thu, 6 Jul 2023 23:13:00 +0200 Subject: [PATCH] upgrade libraries --- .idea/libraries/antlr_antlr4.xml | 6 +++--- .idea/libraries/michael_bull_kotlin_result_jvm.xml | 4 ++-- codeCore/build.gradle | 2 +- codeGenCpu6502/build.gradle | 2 +- codeGenExperimental/build.gradle | 2 +- .../src/prog8/codegen/experimental/ExperiCodeGen.kt | 13 +++++++++++-- codeGenIntermediate/build.gradle | 2 +- compiler/build.gradle | 4 ++-- compilerAst/build.gradle | 4 ++-- docs/source/todo.rst | 3 +-- parser/build.gradle | 4 ++-- virtualmachine/build.gradle | 2 +- 12 files changed, 28 insertions(+), 20 deletions(-) diff --git a/.idea/libraries/antlr_antlr4.xml b/.idea/libraries/antlr_antlr4.xml index c035c70ed..ad56addf3 100644 --- a/.idea/libraries/antlr_antlr4.xml +++ b/.idea/libraries/antlr_antlr4.xml @@ -1,13 +1,13 @@ - + - - + + diff --git a/.idea/libraries/michael_bull_kotlin_result_jvm.xml b/.idea/libraries/michael_bull_kotlin_result_jvm.xml index 010bffd03..11230d9b2 100644 --- a/.idea/libraries/michael_bull_kotlin_result_jvm.xml +++ b/.idea/libraries/michael_bull_kotlin_result_jvm.xml @@ -1,8 +1,8 @@ - + - + diff --git a/codeCore/build.gradle b/codeCore/build.gradle index 56a2b1b2f..5e26b02c3 100644 --- a/codeCore/build.gradle +++ b/codeCore/build.gradle @@ -26,7 +26,7 @@ compileTestKotlin { dependencies { // should have no dependencies to other modules implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" - implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.17" + implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.18" } sourceSets { diff --git a/codeGenCpu6502/build.gradle b/codeGenCpu6502/build.gradle index 024ced683..c54a52fdf 100644 --- a/codeGenCpu6502/build.gradle +++ b/codeGenCpu6502/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation project(':codeCore') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" // implementation "org.jetbrains.kotlin:kotlin-reflect" - implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.17" + implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.18" testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.6.2' } diff --git a/codeGenExperimental/build.gradle b/codeGenExperimental/build.gradle index 8a444fa3c..0135be55c 100644 --- a/codeGenExperimental/build.gradle +++ b/codeGenExperimental/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation project(':codeGenIntermediate') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" // implementation "org.jetbrains.kotlin:kotlin-reflect" - implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.17" + implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.18" } diff --git a/codeGenExperimental/src/prog8/codegen/experimental/ExperiCodeGen.kt b/codeGenExperimental/src/prog8/codegen/experimental/ExperiCodeGen.kt index 541be861b..8b6f4c79a 100644 --- a/codeGenExperimental/src/prog8/codegen/experimental/ExperiCodeGen.kt +++ b/codeGenExperimental/src/prog8/codegen/experimental/ExperiCodeGen.kt @@ -26,6 +26,15 @@ class ExperiCodeGen: ICodeGeneratorBackend { IRFileWriter(irProgram, null).write() println("** experimental codegen stub: no assembly generated **") - return null + return EmptyProgram } -} \ No newline at end of file +} + +private object EmptyProgram : IAssemblyProgram { + override val name = "" + override fun assemble(options: CompilationOptions, errors: IErrorReporter): Boolean { + println("** nothing assembled **") + return true + } + +} diff --git a/codeGenIntermediate/build.gradle b/codeGenIntermediate/build.gradle index 110fa5c27..fad8f7d1b 100644 --- a/codeGenIntermediate/build.gradle +++ b/codeGenIntermediate/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation project(':intermediate') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" // implementation "org.jetbrains.kotlin:kotlin-reflect" - implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.17" + implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.18" testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.6.2' } diff --git a/compiler/build.gradle b/compiler/build.gradle index 0a0fc9477..79edb7a68 100644 --- a/compiler/build.gradle +++ b/compiler/build.gradle @@ -33,11 +33,11 @@ dependencies { implementation project(':codeGenIntermediate') implementation project(':codeGenExperimental') implementation project(':virtualmachine') - implementation "org.antlr:antlr4-runtime:4.12.0" + implementation "org.antlr:antlr4-runtime:4.13.0" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" // implementation "org.jetbrains.kotlin:kotlin-reflect" implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.5' - implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.17" + implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.18" testImplementation project(':intermediate') testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.6.2' diff --git a/compilerAst/build.gradle b/compilerAst/build.gradle index 781b01d82..120cd3b58 100644 --- a/compilerAst/build.gradle +++ b/compilerAst/build.gradle @@ -24,8 +24,8 @@ compileTestKotlin { dependencies { implementation project(':codeCore') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" - implementation "org.antlr:antlr4-runtime:4.12.0" - implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.17" + implementation "org.antlr:antlr4-runtime:4.13.0" + implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.18" implementation project(':parser') } diff --git a/docs/source/todo.rst b/docs/source/todo.rst index 76b9fa7f8..3e3801121 100644 --- a/docs/source/todo.rst +++ b/docs/source/todo.rst @@ -1,8 +1,7 @@ TODO ==== -- IR: don't use ext.b to clear the msb of an unsigned word, add a specialized instruction for this zmsb.w? -- Fix expericodegen errors (on rockrunners etc) +- Fix expericodegen errors (examples/cx16/diskspeed, rockrunners etc) ... diff --git a/parser/build.gradle b/parser/build.gradle index d494b709c..7836487ee 100644 --- a/parser/build.gradle +++ b/parser/build.gradle @@ -10,8 +10,8 @@ java { } dependencies { - antlr 'org.antlr:antlr4:4.12.0' - implementation 'org.antlr:antlr4-runtime:4.12.0' + antlr 'org.antlr:antlr4:4.13.0' + implementation 'org.antlr:antlr4-runtime:4.13.0' } configurations.all { diff --git a/virtualmachine/build.gradle b/virtualmachine/build.gradle index e696c48b9..e93e70fc5 100644 --- a/virtualmachine/build.gradle +++ b/virtualmachine/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation project(':codeCore') implementation project(':intermediate') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" - implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.17" + implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.18" testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.6.2' }