add comparisons

Author: ckrause

loda/lang/operation.py

@@ -44,26 +44,29 @@ class Operation:
 
     class Type(Enum):
         """Operation type. Type names are written as three-letter, lower-case words."""
-        NOP = 1
-        MOV = 2
-        ADD = 3
-        SUB = 4
-        TRN = 5
-        MUL = 6
-        DIV = 7
-        DIF = 8
-        MOD = 9
-        POW = 10
-        GCD = 11
-        BIN = 12
-        EQU = 13
-        MIN = 14
-        MAX = 15
-        LPB = 16
-        LPE = 17
-        CLR = 18
-        SEQ = 19
-        DBG = 20
+        NOP = 1     # no operation
+        MOV = 2     # assignment
+        ADD = 3     # addition
+        SUB = 4     # subtraction
+        TRN = 5     # truncated subtraction
+        MUL = 6     # multiplication
+        DIV = 7     # division
+        DIF = 8     # conditional division
+        MOD = 9     # modulo
+        POW = 10    # power
+        GCD = 11    # greatest common divisor
+        BIN = 12    # binomial coefficient
+        EQU = 13    # equality
+        NEQ = 14    # inequality
+        LEQ = 15    # less or equal
+        GEQ = 16    # greater or equal
+        MIN = 17    # minimum
+        MAX = 18    # maximum
+        LPB = 19    # loop begin
+        LPE = 20    # loop end
+        CLR = 21    # clear
+        SEQ = 22    # sequence
+        DBG = 23    # debug
 
     type: Type
     """Type of this operation."""

loda/runtime/operations.py

@@ -126,6 +126,27 @@ def equ(a, b):
     return 1 if a == b else 0
 
 
+def neq(a, b):
+    """Inequality."""
+    if a == None or b == None:
+        return None
+    return 1 if a != b else 0
+
+
+def leq(a, b):
+    """Less or equal."""
+    if a == None or b == None:
+        return None
+    return 1 if a <= b else 0
+
+
+def geq(a, b):
+    """Greater or equal."""
+    if a == None or b == None:
+        return None
+    return 1 if a >= b else 0
+
+
 def min(a, b):
     """Minimum."""
     if a == None or b == None:
@@ -166,6 +187,12 @@ def exec_arithmetic(t: Operation.Type, a, b):
         return bin(a, b)
     elif t == Operation.Type.EQU:
         return equ(a, b)
+    elif t == Operation.Type.NEQ:
+        return neq(a, b)
+    elif t == Operation.Type.LEQ:
+        return leq(a, b)
+    elif t == Operation.Type.GEQ:
+        return geq(a, b)
     elif t == Operation.Type.MIN:
         return min(a, b)
     elif t == Operation.Type.MAX:

tests/operations/geq.csv

@@ -0,0 +1,10 @@
+Op1,Op2,Result
+0,0,1
+1,1,1
+2,2,1
+-1,-1,1
+-2,-2,1
+1,0,1
+0,1,0
+-1,0,0
+0,-1,1

tests/operations/leq.csv

@@ -0,0 +1,10 @@
+Op1,Op2,Result
+0,0,1
+1,1,1
+2,2,1
+-1,-1,1
+-2,-2,1
+1,0,0
+0,1,1
+-1,0,1
+0,-1,0

tests/operations/neq.csv

@@ -0,0 +1,10 @@
+Op1,Op2,Result
+0,0,0
+1,1,0
+2,2,0
+-1,-1,0
+-2,-2,0
+1,0,1
+0,1,1
+-1,0,1
+0,-1,1