dgr and dgs

ckrause · ckrause · commit f6463ad81257 · 2025-10-04T15:23:38.000+02:00
diff --git a/loda/lang/operation.py b/loda/lang/operation.py
@@ -67,11 +67,13 @@ class Type(Enum):
         BAN = 21    # bitwise and
         BOR = 22    # bitwise or
         BXO = 23    # bitwise xor
-        LPB = 24    # loop begin
-        LPE = 25    # loop end
-        CLR = 26    # clear
-        SEQ = 27    # sequence
-        DBG = 28    # debug
+        DGS = 24    # digit sum
+        DGR = 25    # digital root
+        LPB = 26    # loop begin
+        LPE = 27    # loop end
+        CLR = 28    # clear
+        SEQ = 29    # sequence
+        DBG = 30    # debug
 
     type: Type
     """Type of this operation."""
diff --git a/loda/runtime/operations.py b/loda/runtime/operations.py
@@ -212,6 +212,30 @@ def bxo(a, b):
     return a ^ b
 
 
+def dgs(a, b):
+    """Digit sum in base b."""
+    if a is None or b is None or b < 2:
+        return None
+    sign = -1 if a < 0 else 1
+    aa = abs(a)
+    r = 0
+    while aa > 0:
+        r += aa % b
+        aa //= b
+    return sign * r
+
+
+def dgr(a, b):
+    """Digital root in base b."""
+    if a is None or b is None or b < 2:
+        return None
+    if a == 0:
+        return 0
+    sign = -1 if a < 0 else 1
+    aa = abs(a)
+    return sign * (1 + ((aa - 1) % (b - 1)))
+
+
 def exec_arithmetic(t: Operation.Type, a, b):
     """Execute an arithmetic operation."""
     if t == Operation.Type.MOV:
@@ -258,5 +282,9 @@ def exec_arithmetic(t: Operation.Type, a, b):
         return bor(a, b)
     elif t == Operation.Type.BXO:
         return bxo(a, b)
+    elif t == Operation.Type.DGS:
+        return dgs(a, b)
+    elif t == Operation.Type.DGR:
+        return dgr(a, b)
     else:
         raise ValueError("operation type not arithmetic: {}".format(t))
diff --git a/tests/operations/dgr.csv b/tests/operations/dgr.csv
@@ -0,0 +1,24 @@
+Op1,Op2,Result
+5,10,5
+15,10,6
+125,10,8
+1235,10,2
+12345,10,6
+-5,10,-5
+-15,10,-6
+-125,10,-8
+-1235,10,-2
+-12345,10,-6
+1,2,1
+3,2,1
+7,2,1
+15,2,1
+31,2,1
+-1,2,-1
+-3,2,-1
+-7,2,-1
+-15,2,-1
+-31,2,-1
+19,3,1
+18446744073709551615,2,1
+18446744073709551615,4,3
diff --git a/tests/operations/dgs.csv b/tests/operations/dgs.csv
@@ -0,0 +1,24 @@
+Op1,Op2,Result
+5,10,5
+15,10,6
+125,10,8
+1235,10,11
+12345,10,15
+-5,10,-5
+-15,10,-6
+-125,10,-8
+-1235,10,-11
+-12345,10,-15
+1,2,1
+3,2,2
+7,2,3
+15,2,4
+31,2,5
+-1,2,-1
+-3,2,-2
+-7,2,-3
+-15,2,-4
+-31,2,-5
+19,3,3
+18446744073709551615,2,64
+18446744073709551615,4,96
