FLOOR to Floor

diff --git a/src/Oberon.y b/src/Oberon.y
index 25dca072888aad8a6f190d206e9863c888b3be4b..f917c26bfef45b2c0db7eb8d08deceb7c87535c4 100644 (file)
--- a/src/Oberon.y
+++ b/src/Oberon.y
@@ -3595,7 +3595,7 @@ static Trees_Node PredeclaredProcedureAST(const char procName[], Trees_Node expL
                {"Assert", TREES_ASSERT_PROC},
                {"Decrement", TREES_DEC_PROC},
                {"EXCL", TREES_EXCL_PROC},
-               {"FLOOR", TREES_FLOOR_PROC},
+               {"Floor", TREES_FLOOR_PROC},
                {"INCL", TREES_INCL_PROC},
                {"Increment", TREES_INC_PROC},
                {"Length", TREES_LEN_PROC},

diff --git a/src/Table.c b/src/Table.c
index 805da98e7b62c6efabab71c308deeac84efc496d..d11e94c70d10417fc3cb059d81766d454edcd07b 100644 (file)
--- a/src/Table.c
+++ b/src/Table.c
@@ -97,7 +97,7 @@ void Table_Init(void)
                {"Char", TREES_TYPE_KIND, TREES_CHAR_TYPE},
                {"Decrement", TREES_PROCEDURE_KIND, TREES_DEC_PROC},       /* Operator */
                {"EXCL", TREES_PROCEDURE_KIND, TREES_EXCL_PROC},
-               {"FLOOR", TREES_PROCEDURE_KIND, TREES_FLOOR_PROC},
+               {"Floor", TREES_PROCEDURE_KIND, TREES_FLOOR_PROC},
                {"INCL", TREES_PROCEDURE_KIND, TREES_INCL_PROC},
                {"Increment", TREES_PROCEDURE_KIND, TREES_INC_PROC},       /* Operator */
                {"Int", TREES_TYPE_KIND, TREES_INTEGER_TYPE},

diff --git a/src/y.tab.c b/src/y.tab.c
index 316e3d9b1b7b4591360f9f842d82e46aacd96370..2843ea3ee970380c6f202def0df6db6522e399ff 100644 (file)
--- a/src/y.tab.c
+++ b/src/y.tab.c
@@ -5573,7 +5573,7 @@ static Trees_Node PredeclaredProcedureAST(const char procName[], Trees_Node expL
                {"Assert", TREES_ASSERT_PROC},
                {"Decrement", TREES_DEC_PROC},
                {"EXCL", TREES_EXCL_PROC},
-               {"FLOOR", TREES_FLOOR_PROC},
+               {"Floor", TREES_FLOOR_PROC},
                {"INCL", TREES_INCL_PROC},
                {"Increment", TREES_INC_PROC},
                {"Length", TREES_LEN_PROC},

diff --git a/tests/obnc/passing/T4Expressions.obn b/tests/obnc/passing/T4Expressions.obn
index 27faf413b85a4a3896e6b822176015ee0c67c3ca..b4835e8c00ba8091dd2dc843d67f1f3e16960f82 100644 (file)
--- a/tests/obnc/passing/T4Expressions.obn
+++ b/tests/obnc/passing/T4Expressions.obn
@@ -379,7 +379,7 @@ Out.Integer(AsInt({1, 2, a, 5, b, 8} = {1, 2, a..b, 8}), 0); Out.Ln;
                const eps = 0.01;
                        (*make sure function procedures with constant parameters are constant expressions*)
                        absConst = ABS(0);
-                       floorConst = FLOOR(eps);
+                       floorConst = Floor(eps);
                        fltConst = AsReal(0);
                        ordConst = AsInt(true);
                        chrConst = AsChar(0);
@@ -406,11 +406,11 @@ Out.Integer(AsInt({1, 2, a, 5, b, 8} = {1, 2, a..b, 8}), 0); Out.Ln;
                a := "";
                Assert(Length(a) = 10);
 
-               Assert(FLOOR(-1.5) = -2);
-               Assert(FLOOR(0.0) = 0);
-               Assert(FLOOR(1.5) = 1);
+               Assert(Floor(-1.5) = -2);
+               Assert(Floor(0.0) = 0);
+               Assert(Floor(1.5) = 1);
                i := 0;
-               j := FLOOR(AsReal(IncReturnZero(i)) + 1.5);
+               j := Floor(AsReal(IncReturnZero(i)) + 1.5);
                Assert(j = 1);
                Assert(i = 1);