WebSVN – Kolibri OS – Diff – /programs/develop/oberon07/Source/ARITH.ob07

     tINTEGER* = 1;  tREAL* = 2;  tSET*    = 3;
     tBOOLEAN* = 4;  tCHAR* = 5;  tWCHAR*  = 6;
+    tSTRING*  = 7;
-    tSTRING*  = 7;
+    opEQ* = 0; opNE* = 1; opLT* = 2; opLE* = 3; opGT* = 4; opGE* = 5;
     opIN* = 6; opIS* = 7;
 TYPE
     RETURN res
 END equal;
-PROCEDURE relation* (VAR v: VALUE; v2: VALUE; operator: RELATION; VAR error: INTEGER);
+PROCEDURE relation* (VAR v: VALUE; v2: VALUE; op: INTEGER; VAR error: INTEGER);
 VAR
     res: BOOLEAN;
 BEGIN
     error := 0;
     res := FALSE;
-    CASE operator[0] OF
+    CASE op OF
+    |opEQ:
         res := equal(v, v2, error)
     |"=":
-        res := equal(v, v2, error)
+    |opNE:
         res := ~equal(v, v2, error)
-    |"#":
-        res := ~equal(v, v2, error)
-    |"<":
-        IF operator[1] = "=" THEN
-            res := less(v, v2, error);
+    |opLT:
+        res := less(v, v2, error)
-            IF error = 0 THEN
-                res := equal(v, v2, error) OR res
+    |opLE:
-            END
+        res := less(v, v2, error);
-        ELSE
+        IF error = 0 THEN
-            res := less(v, v2, error)
+            res := equal(v, v2, error) OR res
         END
-    |">":
-        IF operator[1] = "=" THEN
+    |opGE:
-            res := ~less(v, v2, error)
+        res := ~less(v, v2, error)
         ELSE
-            res := less(v, v2, error);
+    |opGT:
-            IF error = 0 THEN
+        res := less(v, v2, error);
     RETURN check(v)
+END setInt;
+PROCEDURE concat* (VAR s: ARRAY OF CHAR; s1: ARRAY OF CHAR): BOOLEAN;
+VAR
+    res: BOOLEAN;
+BEGIN
+    res := LENGTH(s) + LENGTH(s1) < LEN(s);
+    IF res THEN
+        STRINGS.append(s, s1)
+    END
+    RETURN res
-END setInt;
+END concat;
 PROCEDURE init;

Subversion Repositories Kolibri OS

(root)/programs/develop/oberon07/Source/ARITH.ob07 – Rev 7983 → 8097