INC DEC to Increment and Decrement

diff --git a/lib/obnc/Strings.obn b/lib/obnc/Strings.obn
index 353564ad6e41a324167ace691a95f3e8abba0715..ea61de5d42904f8a70fc4f2c01404e10a3d8bc82 100644 (file)
--- a/lib/obnc/Strings.obn
+++ b/lib/obnc/Strings.obn
@@ -15,7 +15,7 @@ Implements the basic library module from "The Oakwood Guidelines for Oberon-2 Co
        begin
                i := 0;
                while s[i] # 0X do
-                       INC(i)
+                       Increment(i)
                end
        return i
        end Len;
@@ -130,10 +130,10 @@ Implements the basic library module from "The Oakwood Guidelines for Oberon-2 Co
                
                idxs := pos - 1;
                repeat
-                       INC(idxs);
+                       Increment(idxs);
                        idxp := 0;
                        while (pattern[idxp] # 0X) & (s[idxs + idxp] = pattern[idxp]) do
-                               INC(idxp)
+                               Increment(idxp)
                        end
                until (pattern[idxp] = 0X) or (s[idxs + idxp] = 0X);
 
@@ -157,7 +157,7 @@ Implements the basic library module from "The Oakwood Guidelines for Oberon-2 Co
                        if (s[i] >= "a") & (s[i] <= "z") then
                                s[i] := AsChar(AsInt("A") + AsInt(s[i]) - AsInt("a"));
                        end;
-                       INC(i)
+                       Increment(i)
                end
        end Cap;
 

diff --git a/src/Oberon.y b/src/Oberon.y
index cbf803a574d9d452ad4e23ccbf070417f81e536a..25dca072888aad8a6f190d206e9863c888b3be4b 100644 (file)
--- a/src/Oberon.y
+++ b/src/Oberon.y
@@ -3593,11 +3593,11 @@ static Trees_Node PredeclaredProcedureAST(const char procName[], Trees_Node expL
                {"AsInt", TREES_ORD_PROC},
                {"AsReal", TREES_FLT_PROC},
                {"Assert", TREES_ASSERT_PROC},
-               {"DEC", TREES_DEC_PROC},
+               {"Decrement", TREES_DEC_PROC},
                {"EXCL", TREES_EXCL_PROC},
                {"FLOOR", TREES_FLOOR_PROC},
-               {"INC", TREES_INC_PROC},
                {"INCL", TREES_INCL_PROC},
+               {"Increment", TREES_INC_PROC},
                {"Length", TREES_LEN_PROC},
                {"New", TREES_NEW_PROC},
 

diff --git a/src/Table.c b/src/Table.c
index a73e408ff86ceb30f2c00064a5bef97107e7b349..805da98e7b62c6efabab71c308deeac84efc496d 100644 (file)
--- a/src/Table.c
+++ b/src/Table.c
@@ -95,11 +95,11 @@ void Table_Init(void)
                {"Bool", TREES_TYPE_KIND, TREES_BOOLEAN_TYPE},
                {"Byte", TREES_TYPE_KIND, TREES_BYTE_TYPE},
                {"Char", TREES_TYPE_KIND, TREES_CHAR_TYPE},
-               {"DEC", TREES_PROCEDURE_KIND, TREES_DEC_PROC},       /* Operator */
+               {"Decrement", TREES_PROCEDURE_KIND, TREES_DEC_PROC},       /* Operator */
                {"EXCL", TREES_PROCEDURE_KIND, TREES_EXCL_PROC},
                {"FLOOR", TREES_PROCEDURE_KIND, TREES_FLOOR_PROC},
-               {"INC", TREES_PROCEDURE_KIND, TREES_INC_PROC},       /* Operator */
                {"INCL", TREES_PROCEDURE_KIND, TREES_INCL_PROC},
+               {"Increment", TREES_PROCEDURE_KIND, TREES_INC_PROC},       /* Operator */
                {"Int", TREES_TYPE_KIND, TREES_INTEGER_TYPE},
                {"Length", TREES_PROCEDURE_KIND, TREES_LEN_PROC},
                {"New", TREES_PROCEDURE_KIND, TREES_NEW_PROC},

diff --git a/src/y.tab.c b/src/y.tab.c
index 8d0a3950a7381eadc3a29cc94ac886ea0084d1a0..316e3d9b1b7b4591360f9f842d82e46aacd96370 100644 (file)
--- a/src/y.tab.c
+++ b/src/y.tab.c
@@ -5571,11 +5571,11 @@ static Trees_Node PredeclaredProcedureAST(const char procName[], Trees_Node expL
                {"AsInt", TREES_ORD_PROC},
                {"AsReal", TREES_FLT_PROC},
                {"Assert", TREES_ASSERT_PROC},
-               {"DEC", TREES_DEC_PROC},
+               {"Decrement", TREES_DEC_PROC},
                {"EXCL", TREES_EXCL_PROC},
                {"FLOOR", TREES_FLOOR_PROC},
-               {"INC", TREES_INC_PROC},
                {"INCL", TREES_INCL_PROC},
+               {"Increment", TREES_INC_PROC},
                {"Length", TREES_LEN_PROC},
                {"New", TREES_NEW_PROC},
 

diff --git a/tests/obnc/passing/T4Expressions.obn b/tests/obnc/passing/T4Expressions.obn
index 1d6755ae455cf07009a901897823f02a82fe7895..27faf413b85a4a3896e6b822176015ee0c67c3ca 100644 (file)
--- a/tests/obnc/passing/T4Expressions.obn
+++ b/tests/obnc/passing/T4Expressions.obn
@@ -21,14 +21,14 @@ module T4Expressions;
 
        procedure IncReturnZero(var x: Int): Int;
        begin
-               INC(x)
+               Increment(x)
        return 0
        end IncReturnZero;
 
 
        procedure IncReturnEmpty(var x: Int): Set;
        begin
-               INC(x)
+               Increment(x)
        return {}
        end IncReturnEmpty;
 

diff --git a/tests/obnc/passing/T5Statements.obn b/tests/obnc/passing/T5Statements.obn
index 12b3bafbd6d9d648c3fbacf3cf7abda6f3079b37..7c99899e3e1b703f57d828c1d83a777bd3538e53 100644 (file)
--- a/tests/obnc/passing/T5Statements.obn
+++ b/tests/obnc/passing/T5Statements.obn
@@ -299,19 +299,19 @@ module T5Statements;
                        v: pointer to record f: Int end;
        begin
                n := 0;
-               INC(n);
+               Increment(n);
                Assert(n = 1);
 
                n := 0;
-               INC(n, 10);
+               Increment(n, 10);
                Assert(n = 10);
 
                n := 0;
-               DEC(n);
+               Decrement(n);
                Assert(n = -1);
 
                n := 0;
-               DEC(n, 10);
+               Decrement(n, 10);
                Assert(n = -10);
 
                A := {};
@@ -459,8 +459,8 @@ module T5Statements;
                n:= 0;
                i := 1;
                repeat
-                       INC(n);
-                       INC(i)
+                       Increment(n);
+                       Increment(i)
                until i = 11;
                Assert(n = 10);
        end TestRepeatStatements;
@@ -468,7 +468,7 @@ module T5Statements;
 
        procedure IncGlobalIntegerReturnOne(): Int;
        begin
-               INC(globalInteger)
+               Increment(globalInteger)
        return 1
        end IncGlobalIntegerReturnOne;
 

diff --git a/tests/obnc/passing/T6ProcedureDeclarations.obn b/tests/obnc/passing/T6ProcedureDeclarations.obn
index 28d3ae4e0334d484049eea831337b0f230f730e9..64b88481ec27aca244a1845d999dbd2b50add629 100644 (file)
--- a/tests/obnc/passing/T6ProcedureDeclarations.obn
+++ b/tests/obnc/passing/T6ProcedureDeclarations.obn
@@ -128,7 +128,7 @@ module T6ProcedureDeclarations;
                                for i := 0 to Length(M) - 1 do
                                        for j := 0 to Length(M[0]) - 1 do
                                                Assert(M[i, j] = c);
-                                               INC(c)
+                                               Increment(c)
                                        end
                                end;
                        end Inner;
@@ -139,7 +139,7 @@ module T6ProcedureDeclarations;
                                c := Length(row);
                                for j := 0 to Length(row) - 1 do
                                        Assert(row[j] = c);
-                                       INC(c)
+                                       Increment(c)
                                end
                        end Inner1;
 
@@ -157,7 +157,7 @@ module T6ProcedureDeclarations;
                                for j := 0 to Length(T[0]) - 1 do
                                        for k := 0 to Length(T[0, 0]) - 1 do
                                                Assert(T[i, j, k] = c);
-                                               INC(c)
+                                               Increment(c)
                                        end
                                end
                        end;
@@ -174,7 +174,7 @@ module T6ProcedureDeclarations;
                for i := 0 to Length(M) - 1 do
                        for j := 0 to Length(M[0]) - 1 do
                                M[i, j] := c;
-                               INC(c)
+                               Increment(c)
                        end
                end;
                Q(M);
@@ -184,7 +184,7 @@ module T6ProcedureDeclarations;
                        for j := 0 to Length(T[0]) - 1 do
                                for k := 0 to Length(T[0, 0]) - 1 do
                                        T[i, j, k] := c;
-                                       INC(c)
+                                       Increment(c)
                                end
                        end
                end;