components to component

Author: EcmaXp

src/main/java/kr/pe/ecmaxp/openpie/arch/OpenPieInterruptHandler.kt

@@ -20,7 +20,7 @@ class OpenPieInterruptHandler(val vm: OpenPieVirtualMachine) {
                 SYS_CONTROL -> handleControl(intr, synchronized)
                 SYS_DEBUG -> handleDebug(intr, synchronized)
                 SYS_SIGNAL -> handleSignal(intr, synchronized)
-                SYS_COMPONENTS -> handleComponents(intr, synchronized)
+                SYS_COMPONENT -> handleComponents(intr, synchronized)
                 SYS_VALUE -> handleValue(intr, synchronized)
                 SYS_COMPUTER -> handleComputer(intr, synchronized)
                 SYS_INFO -> handleInfo(intr, synchronized)
@@ -108,7 +108,7 @@ class OpenPieInterruptHandler(val vm: OpenPieVirtualMachine) {
 
     private fun handleComponents(intr: Interrupt, synchronized: Boolean): Int {
         return when (intr.imm) {
-            SYS_COMPONENTS_INVOKE -> {
+            SYS_COMPONENT_INVOKE -> {
                 val obj = intr.readObject()
                 val call = ComponentInvoke.fromArray(obj as Array<*>)
                         ?: return intr.responseError(Exception("Invalid invoke"))
@@ -137,7 +137,7 @@ class OpenPieInterruptHandler(val vm: OpenPieVirtualMachine) {
                 ret.error?.printStackTrace()
                 intr.responseResult(ret)
             }
-            SYS_COMPONENTS_LIST -> {
+            SYS_COMPONENT_LIST -> {
                 when (intr.r0) {
                     0 -> intr.responseValue(machine.components())
                     else -> {
@@ -152,9 +152,9 @@ class OpenPieInterruptHandler(val vm: OpenPieVirtualMachine) {
                     }
                 }
             }
-            SYS_COMPONENTS_COUNT -> intr.responseValue(machine.componentCount())
-            SYS_COMPONENTS_MAX -> intr.responseValue(machine.maxComponents())
-            SYS_COMPONENTS_METHODS -> {
+            SYS_COMPONENT_COUNT -> intr.responseValue(machine.componentCount())
+            SYS_COMPONENT_MAX -> intr.responseValue(machine.maxComponents())
+            SYS_COMPONENT_METHODS -> {
                 val req = intr.readObject() as Array<*>
                 val node = machine.node().network().node(req[0] as String)
 
@@ -164,7 +164,7 @@ class OpenPieInterruptHandler(val vm: OpenPieVirtualMachine) {
 
                 intr.responseNone()
             }
-            SYS_COMPONENTS_DOC -> {
+            SYS_COMPONENT_DOC -> {
                 val req = intr.readObject() as Array<*>
                 if (req.size == 2) {
                     val node = machine.node().network().node(req[0] as String)

src/main/java/kr/pe/ecmaxp/openpie/arch/consts/OpenPieSystemCallTable.kt

@@ -15,13 +15,13 @@ const val SYS_SIGNAL_REQUEST = SYS_SIGNAL or 1
 const val SYS_SIGNAL_PENDING = SYS_SIGNAL or 2
 const val SYS_SIGNAL_PUSH = SYS_SIGNAL or 3
 
-const val SYS_COMPONENTS = 0x040000
-const val SYS_COMPONENTS_INVOKE = SYS_COMPONENTS or 0
-const val SYS_COMPONENTS_LIST = SYS_COMPONENTS or 16
-const val SYS_COMPONENTS_COUNT = SYS_COMPONENTS or 17
-const val SYS_COMPONENTS_MAX = SYS_COMPONENTS or 18
-const val SYS_COMPONENTS_METHODS = SYS_COMPONENTS or 19
-const val SYS_COMPONENTS_DOC = SYS_COMPONENTS or 20
+const val SYS_COMPONENT = 0x040000
+const val SYS_COMPONENT_INVOKE = SYS_COMPONENT or 0
+const val SYS_COMPONENT_LIST = SYS_COMPONENT or 16
+const val SYS_COMPONENT_COUNT = SYS_COMPONENT or 17
+const val SYS_COMPONENT_MAX = SYS_COMPONENT or 18
+const val SYS_COMPONENT_METHODS = SYS_COMPONENT or 19
+const val SYS_COMPONENT_DOC = SYS_COMPONENT or 20
 
 const val SYS_VALUE = 0x050000
 const val SYS_VALUE_INVOKE = SYS_VALUE or 1

src/main/resources/assets/openpie/firmwares/debug/eeprom.py

@@ -3,7 +3,7 @@
 
 def main():
     globals().pop('main')
-    from ucomponents import invoke, components
+    from ucomponent import invoke, components
     from ucomputer import crash, get_computer_address
 
     def component(t):

src/main/resources/assets/openpie/opos/init.py

@@ -2,7 +2,7 @@
 
 import machine
 import uos
-from ucomponents import invoke
+from ucomponent import invoke
 from uio import FileIO
 
 

src/main/resources/assets/openpie/opos/lib/components.py

@@ -1,4 +1,4 @@
-from ucomponents import invoke, methods, doc, components as _components
+from ucomponent import invoke, methods, doc, components as _components
 
 __all__ = ['Component', 'get_component', 'find_components', 'components']