diff --git a/compiler/build.gradle b/compiler/build.gradle index dad0b7675..59c1e3a49 100644 --- a/compiler/build.gradle +++ b/compiler/build.gradle @@ -34,7 +34,7 @@ dependencies { 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("com.github.hypfvieh:dbus-java:3.2.0") + // implementation "com.github.hypfvieh:dbus-java:3.2.0" implementation project(':parser') testImplementation "org.jetbrains.kotlin:kotlin-test-junit5" @@ -101,7 +101,7 @@ test { // Show test results. testLogging { - events "passed", "skipped", "failed" + events "skipped", "failed" } } diff --git a/compiler/src/prog8/server/dbus/IrmenDbusTest.kt b/compiler/src/prog8/server/dbus/IrmenDbusTest.kt index db8cf404f..80c81dbac 100644 --- a/compiler/src/prog8/server/dbus/IrmenDbusTest.kt +++ b/compiler/src/prog8/server/dbus/IrmenDbusTest.kt @@ -1,22 +1,22 @@ package prog8.server.dbus -import org.freedesktop.dbus.interfaces.DBusInterface - - -interface IrmenDbusTest: DBusInterface -{ - fun Status(address: String): Map -} - - -internal class TestService: IrmenDbusTest { - override fun Status(address: String): Map { - return mapOf( - 5 to "hello", - 42 to address - ) - } - - override fun isRemote() = true - override fun getObjectPath() = "/razorvine/TestService" -} +//import org.freedesktop.dbus.interfaces.DBusInterface +// +// +//interface IrmenDbusTest: DBusInterface +//{ +// fun Status(address: String): Map +//} +// +// +//internal class TestService: IrmenDbusTest { +// override fun Status(address: String): Map { +// return mapOf( +// 5 to "hello", +// 42 to address +// ) +// } +// +// override fun isRemote() = true +// override fun getObjectPath() = "/razorvine/TestService" +//} diff --git a/compiler/src/prog8/server/dbus/clientmain.kt b/compiler/src/prog8/server/dbus/clientmain.kt index ff9cc5eef..76ec64ebc 100644 --- a/compiler/src/prog8/server/dbus/clientmain.kt +++ b/compiler/src/prog8/server/dbus/clientmain.kt @@ -1,16 +1,17 @@ package prog8.server.dbus -import org.freedesktop.dbus.connections.impl.DBusConnection - - -fun main() { - DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION).use { - println(it.names.toList()) - println(it.uniqueName) - println(it.address) - println(it.machineId) - val obj = it.getRemoteObject("local.net.razorvine.dbus.test", "/razorvine/TestService", IrmenDbusTest::class.java) - println(obj.Status("irmen")) - } -} +//import org.freedesktop.dbus.connections.impl.DBusConnection +// +// +//fun main() { +// DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION).use { +// println(it.names.toList()) +// println(it.uniqueName) +// println(it.address) +// println(it.machineId) +// val obj = it.getRemoteObject("local.net.razorvine.dbus.test", "/razorvine/TestService", IrmenDbusTest::class.java) +// println(obj.Status("irmen")) +// } +//} +// diff --git a/compiler/src/prog8/server/dbus/testdbus.kt b/compiler/src/prog8/server/dbus/testdbus.kt index e473b4b6e..ad38aaef4 100644 --- a/compiler/src/prog8/server/dbus/testdbus.kt +++ b/compiler/src/prog8/server/dbus/testdbus.kt @@ -1,18 +1,18 @@ package prog8.server.dbus -import org.freedesktop.dbus.connections.impl.DBusConnection - - -fun main() { - DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION).use { - it.requestBusName("local.net.razorvine.dbus.test") - println(it.names.toList()) - println(it.uniqueName) - println(it.address) - println(it.machineId) - val service = TestService() - it.exportObject(service.objectPath, service) - - Thread.sleep(100000) - } -} +//import org.freedesktop.dbus.connections.impl.DBusConnection +// +// +//fun main() { +// DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION).use { +// it.requestBusName("local.net.razorvine.dbus.test") +// println(it.names.toList()) +// println(it.uniqueName) +// println(it.address) +// println(it.machineId) +// val service = TestService() +// it.exportObject(service.objectPath, service) +// +// Thread.sleep(100000) +// } +//} diff --git a/examples/bdmusic.p8 b/examples/bdmusic.p8 index 73aacba5b..7206e772c 100644 --- a/examples/bdmusic.p8 +++ b/examples/bdmusic.p8 @@ -34,27 +34,28 @@ sub start() { delay() } } +} - sub delay() { - ubyte d - for d in 0 to 12 { - while(c64.RASTER!=0) { - ; tempo delay synced to screen refresh - } +sub delay() { + ubyte d + for d in 0 to 12 { + while(c64.RASTER!=0) { + ; tempo delay synced to screen refresh } } - - sub print_notes(ubyte n1, ubyte n2) { - c64.CHROUT('\n') - c64scr.plot(n1/2, 24) - c64.COLOR=7 - c64.CHROUT('Q') - c64scr.plot(n2/2, 24) - c64.COLOR=4 - c64.CHROUT('Q') - } } +sub print_notes(ubyte n1, ubyte n2) { + c64.CHROUT('\n') + c64scr.plot(n1/2, 24) + c64.COLOR=7 + c64.CHROUT('Q') + c64scr.plot(n2/2, 24) + c64.COLOR=4 + c64.CHROUT('Q') +} + + ; details about the boulderdash music can be found here: ; https://www.elmerproductions.com/sp/peterb/sounds.html#Theme%20tune diff --git a/examples/comparisons_byte.p8 b/examples/comparisons_byte.p8 index 2bf6b27ed..d605973bd 100644 --- a/examples/comparisons_byte.p8 +++ b/examples/comparisons_byte.p8 @@ -55,8 +55,7 @@ main { check_eval_stack() return - - sub compare() { + sub compare() { c64scr.print(" == != < > <= >=\n") if v1==v2 diff --git a/examples/comparisons_float.p8 b/examples/comparisons_float.p8 index e60f21481..6c2ab1530 100644 --- a/examples/comparisons_float.p8 +++ b/examples/comparisons_float.p8 @@ -71,7 +71,7 @@ main { check_eval_stack() return - sub compare() { + sub compare() { c64scr.print(" == != < > <= >=\n") if v1==v2 @@ -106,7 +106,6 @@ main { } - } sub check_eval_stack() { diff --git a/examples/comparisons_ubyte.p8 b/examples/comparisons_ubyte.p8 index 4576aa7e0..de9bb3bce 100644 --- a/examples/comparisons_ubyte.p8 +++ b/examples/comparisons_ubyte.p8 @@ -55,7 +55,7 @@ main { check_eval_stack() return - sub compare() { + sub compare() { c64scr.print(" == != < > <= >=\n") if v1==v2 diff --git a/examples/comparisons_uword.p8 b/examples/comparisons_uword.p8 index 3b3f85423..1580e9655 100644 --- a/examples/comparisons_uword.p8 +++ b/examples/comparisons_uword.p8 @@ -85,7 +85,7 @@ main { check_eval_stack() return - sub compare() { + sub compare() { c64scr.print(" == != < > <= >=\n") if v1==v2 diff --git a/examples/comparisons_word.p8 b/examples/comparisons_word.p8 index c86ff0433..b1cab8178 100644 --- a/examples/comparisons_word.p8 +++ b/examples/comparisons_word.p8 @@ -121,7 +121,7 @@ main { check_eval_stack() return - sub compare() { + sub compare() { c64scr.print(" == != < > <= >=\n") if v1==v2 diff --git a/examples/test.p8 b/examples/test.p8 index 5d72e8f75..a8a43e714 100644 --- a/examples/test.p8 +++ b/examples/test.p8 @@ -27,10 +27,6 @@ main { c64scr.print("sp2:") sub3() - sub blerp() { - ;-- keep this! - } - sub3() sub3() sub3()