[ops] Move internal operators; make inc/dec support mul. variables

Author: iiPythonx

main.xpp

@@ -1,13 +1,8 @@
-jmp run
+var @x 1
+var @y 2
+var @z 3
+rep 10 loop
 
-:woah a b c
-    prt "Hello, world!"
-    prt a b c
-    ret b
-
-:run
-    prt "Hi. How are you?"
-    jmp woah 1 2 3 ?response
-    prt response "should be 2"
-    rem response
-    prt response "should be None"
+:loop
+    prt @x @y @z
+    inc @x @y @z

xpp/modules/ops/stdlib/internal.py

@@ -5,7 +5,8 @@
 from copy import copy as copyobj
 from xpp import load_sections, config
 from xpp.modules.ops.shared import (
-    ensure_arguments, InvalidArgument
+    fetch_io_args, ensure_arguments,
+    InvalidArgument
 )
 
 # Initialization
@@ -84,5 +85,19 @@ def ret(ctx) -> None:
         if ctx.args:
             section.return_value = [a.value for a in ctx.args]
 
+    def var(ctx) -> None:
+        ensure_arguments("var", "var <name> <value>", ["name", "value"], ctx.args)
+        ctx.args[0].set(ctx.args[1].value)
+
+    def jmp(ctx) -> None:
+        ain, aout = fetch_io_args("jmp", "jmp <section> [args...] [?output]", ["section"], ctx.args)
+        results = ctx.mem.interpreter.run_section(ain[0].value if isinstance(ain[0].value, str) else ain[0].raw, [a.value for a in ain[1:]])
+        outn = len(aout)
+        for i, r in enumerate(results):
+            if i > outn:
+                break
+
+            ctx.args[-(outn - i)].set(r)
+
     def rem(ctx) -> None:
         [arg.delete() for arg in ctx.args]

xpp/modules/ops/stdlib/math.py

@@ -66,20 +66,34 @@ def pow(ctx) -> int | float:
         return perform_operation(ain[0].value, ain[1:], operator.pow, aout)
 
     def inc(ctx) -> int | float:
-        ain, aout = fetch_io_args("inc", "inc <value> [?output]", ["value"], ctx.args)
-        if not isinstance(ain[0].value, (int, float)):
-            raise InvalidArgument("inc: value must be either an integer or a float!")
+        ain, aout = fetch_io_args("inc", "inc <args...> [?output]", ["args"], ctx.args)
+        if aout and len(ain) > 1:
+            raise InvalidArgument("inc: can only process one input if output variable is specified!")
 
-        ain[0].set(ain[0].value + 1)
-        [out.set(ain[0].value) for out in aout]
+        for val in ain:
+            if not isinstance(val.value, (int, float)):
+                raise InvalidArgument("inc: all values must be either an integer or a float!")
+
+            val.set(val.value + 1)
+
+        if aout:
+            [out.set(val.value) for out in aout]
+            return val.value
 
     def dec(ctx) -> int | float:
-        ain, aout = fetch_io_args("dec", "dec <value> [?output]", ["value"], ctx.args)
-        if not isinstance(ain[0].value, (int, float)):
-            raise InvalidArgument("dec: value must be either an integer or a float!")
+        ain, aout = fetch_io_args("dec", "dec <args...> [?output]", ["args"], ctx.args)
+        if aout and len(ain) > 1:
+            raise InvalidArgument("dec: can only process one input if output variable is specified!")
+
+        for val in ain:
+            if not isinstance(val.value, (int, float)):
+                raise InvalidArgument("dec: all values must be either an integer or a float!")
+
+            val.set(val.value - 1)
 
-        ain[0].set(ain[0].value - 1)
-        [out.set(ain[0].value) for out in aout]
+        if aout:
+            [out.set(val.value) for out in aout]
+            return val.value
 
     def rnd(ctx) -> int:
         ain, aout = fetch_io_args("rnd", "rnd <value> [precision] [?output]", ["value"], ctx.args)

xpp/modules/ops/stdlib/stdio.py

@@ -2,9 +2,6 @@
 
 # Modules
 import sys
-from xpp.modules.ops.shared import (
-    fetch_io_args, ensure_arguments
-)
 
 # Operators class
 class XOperators:
@@ -14,20 +11,6 @@ class XOperators:
     def prt(ctx) -> None:
         print(*[v.value for v in ctx.args])
 
-    def var(ctx) -> None:
-        ensure_arguments("var", "var <name> <value>", ["name", "value"], ctx.args)
-        ctx.args[0].set(ctx.args[1].value)
-
-    def jmp(ctx) -> None:
-        ain, aout = fetch_io_args("jmp", "jmp <section> [args...] [?output]", ["section"], ctx.args)
-        results = ctx.mem.interpreter.run_section(ain[0].value if isinstance(ain[0].value, str) else ain[0].raw, [a.value for a in ain[1:]])
-        outn = len(aout)
-        for i, r in enumerate(results):
-            if i > outn:
-                break
-
-            ctx.args[-(outn - i)].set(r)
-
     def cls(ctx) -> None:
         print("\033c\033[3J", end = "")