diff --git a/.idea/libraries/KotlinJavaRuntime.xml b/.idea/libraries/KotlinJavaRuntime.xml
index b6883dbc1..409da39e6 100644
--- a/.idea/libraries/KotlinJavaRuntime.xml
+++ b/.idea/libraries/KotlinJavaRuntime.xml
@@ -1,23 +1,23 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/io_kotest_assertions_core_jvm.xml b/.idea/libraries/io_kotest_assertions_core_jvm.xml
index b239f10f9..8f3f7ac6a 100644
--- a/.idea/libraries/io_kotest_assertions_core_jvm.xml
+++ b/.idea/libraries/io_kotest_assertions_core_jvm.xml
@@ -1,21 +1,18 @@
-
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/.idea/libraries/io_kotest_runner_junit5_jvm.xml b/.idea/libraries/io_kotest_runner_junit5_jvm.xml
index 61a6427f5..09df403fd 100644
--- a/.idea/libraries/io_kotest_runner_junit5_jvm.xml
+++ b/.idea/libraries/io_kotest_runner_junit5_jvm.xml
@@ -1,30 +1,30 @@
-
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -32,11 +32,8 @@
-
-
-
-
-
+
+
diff --git a/.idea/libraries/michael_bull_kotlin_result_jvm.xml b/.idea/libraries/michael_bull_kotlin_result_jvm.xml
index 0d81dcdb8..e58e0442b 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 f9a5dd8e0..a98eda6c3 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.20"
+ implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0"
}
sourceSets {
diff --git a/codeGenCpu6502/build.gradle b/codeGenCpu6502/build.gradle
index 7908120a3..59842ef68 100644
--- a/codeGenCpu6502/build.gradle
+++ b/codeGenCpu6502/build.gradle
@@ -26,9 +26,9 @@ 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.20"
+ implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0"
- testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.8.0'
+ testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.9.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}
diff --git a/codeGenExperimental/build.gradle b/codeGenExperimental/build.gradle
index 9ca1f71ff..51d257288 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.20"
+ implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0"
}
diff --git a/codeGenIntermediate/build.gradle b/codeGenIntermediate/build.gradle
index 7511c96ae..659e060e9 100644
--- a/codeGenIntermediate/build.gradle
+++ b/codeGenIntermediate/build.gradle
@@ -28,9 +28,9 @@ 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.20"
+ implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0"
- testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.8.0'
+ testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.9.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
diff --git a/codeOptimizers/build.gradle b/codeOptimizers/build.gradle
index 4cf1df8dc..cbc4ac70a 100644
--- a/codeOptimizers/build.gradle
+++ b/codeOptimizers/build.gradle
@@ -27,7 +27,7 @@ dependencies {
implementation project(':codeCore')
implementation project(':compilerAst')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
- implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.20"
+ implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0"
// implementation "org.jetbrains.kotlin:kotlin-reflect"
}
diff --git a/compiler/build.gradle b/compiler/build.gradle
index 64a59f261..5da5a11ed 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -36,11 +36,11 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
// implementation "org.jetbrains.kotlin:kotlin-reflect"
implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.6'
- implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.20"
+ implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0"
testImplementation project(':codeCore')
testImplementation project(':intermediate')
- testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.8.0'
+ testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.9.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
diff --git a/compilerAst/build.gradle b/compilerAst/build.gradle
index 15ce16cb6..fdb525938 100644
--- a/compilerAst/build.gradle
+++ b/compilerAst/build.gradle
@@ -25,7 +25,7 @@ dependencies {
implementation project(':codeCore')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
implementation "org.antlr:antlr4-runtime:4.13.1"
- implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.20"
+ implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0"
implementation project(':parser')
}
diff --git a/examples/test.p8 b/examples/test.p8
index 0f807978b..44a81a645 100644
--- a/examples/test.p8
+++ b/examples/test.p8
@@ -2,16 +2,9 @@
%zeropage basicsafe
main {
- sub show_bug(byte a, byte b) {
- if (a >= 0) == (b > 0) {
- txt.print("bug!")
- } else {
- txt.print("no bug.")
- }
- txt.nl()
- }
-
sub start() {
- show_bug(-1, 4)
+ uword workFunc=$2000
+
+ void = call(workFunc)
}
}
diff --git a/gradle.properties b/gradle.properties
index 86638f9f3..2749eda69 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,5 +4,5 @@ org.gradle.parallel=true
org.gradle.daemon=true
kotlin.code.style=official
javaVersion=11
-kotlinVersion=1.9.22
-version=10.3
+kotlinVersion=1.9.24
+version=10.3.1-SNAPSHOT
diff --git a/intermediate/build.gradle b/intermediate/build.gradle
index dbc05a191..d0a7bfe40 100644
--- a/intermediate/build.gradle
+++ b/intermediate/build.gradle
@@ -26,7 +26,7 @@ compileTestKotlin {
dependencies {
implementation project(':codeCore')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
- testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.8.0'
+ testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.9.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}
diff --git a/virtualmachine/build.gradle b/virtualmachine/build.gradle
index 2e0158171..2e93cb06b 100644
--- a/virtualmachine/build.gradle
+++ b/virtualmachine/build.gradle
@@ -27,8 +27,8 @@ 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.20"
- testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.8.0'
+ implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:2.0.0"
+ testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.9.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}