From: mike lowis Date: Sat, 10 Apr 2021 00:34:48 +0000 (-0400) Subject: FLOOR to Floor X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=2012067e4bb922bc6b6fa4f8767849a052e86617;p=proto%2Fobnc.git FLOOR to Floor --- diff --git a/src/Oberon.y b/src/Oberon.y index 25dca07..f917c26 100644 --- 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 805da98..d11e94c 100644 --- 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 316e3d9..2843ea3 100644 --- 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 27faf41..b4835e8 100644 --- 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);