oceani: last fixes for UNTESTED for now.

[ocean] / csrc / oceani.mdc

diff --git a/csrc/oceani.mdc b/csrc/oceani.mdc
index ad0d1b5c6905e8be8c7a7867f2c4c132e35367f3..9d6aec94e566edb0e55de42ad7001aa5715b8d2f 100644 (file)
--- a/csrc/oceani.mdc
+++ b/csrc/oceani.mdc
@@ -1157,7 +1157,7 @@ A separate function encoding these cases will simplify some code later.
        {
                int cmp;
                if (tl != tr)
-                       return tl - tr; // NOTEST
+                       return tl - tr;
                switch (tl->vtype) {
                case Vlabel: cmp = left->label == right->label ? 0 : 1; break;
                case Vnum: cmp = mpq_cmp(left->num, right->num); break;
@@ -4553,7 +4553,8 @@ the common header for all reductions to use.
        Block -> { IN OptNL Statementlist OUT OptNL } ${ $0 = $<Sl; }$
        |        { SimpleStatements } ${ $0 = reorder_bilist($<SS); }$
        |        SimpleStatements ; ${ $0 = reorder_bilist($<SS); }$
-       |        SimpleStatements EOL ${ $0 = reorder_bilist($<SS); }$
+       |        SimpleStatements EOL ${ $0 = reorder_bilist($<SS); 
+               }$
        |        IN OptNL Statementlist OUT ${ $0 = $<Sl; }$
 
        OpenBlock -> OpenScope { IN OptNL Statementlist OUT OptNL } ${ $0 = $<Sl; }$
@@ -4562,7 +4563,7 @@ the common header for all reductions to use.
        |        OpenScope SimpleStatements EOL ${ $0 = reorder_bilist($<SS); }$
        |        IN OpenScope OptNL Statementlist OUT ${ $0 = $<Sl; }$
 
-       UseBlock -> { OpenScope IN OptNL Statementlist OUT OptNL } ${ $0 = $<Sl; }$
+       UseBlock -> { IN OpenScope OptNL Statementlist OUT OptNL } ${ $0 = $<Sl; }$
        |        { OpenScope SimpleStatements } ${ $0 = reorder_bilist($<SS); }$
        |        IN OpenScope OptNL Statementlist OUT ${ $0 = $<Sl; }$
 
@@ -5784,7 +5785,7 @@ is a bit more interesting at this level.
                $0 = declare_function(c, $<FN, $<Ar, $<Ty, NULL, $<Bl);
        }$
        | func FuncName ( OpenScope ArgsLine ) : ( ArgsLine ) Block Newlines ${
-               $0 = declare_function(c, $<FN, $<AL, NULL, $<AL2, $<Bl);        // UNTESTED
+               $0 = declare_function(c, $<FN, $<AL, NULL, $<AL2, $<Bl);
        }$
        | func FuncName IN OpenScope Args OUT OptNL return Type Newlines do Block Newlines ${
                $0 = declare_function(c, $<FN, $<Ar, $<Ty, NULL, $<Bl);
@@ -5796,7 +5797,7 @@ is a bit more interesting at this level.
                $0 = declare_function(c, $<FN, $<Ar, NULL, $<Ar2, $<Bl);
        }$
        | func FuncName NEWLINE OpenScope return IN Args OUT OptNL do Block Newlines ${
-               $0 = declare_function(c, $<FN, NULL, NULL, $<Ar, $<Bl); // UNTESTED
+               $0 = declare_function(c, $<FN, NULL, NULL, $<Ar, $<Bl);
        }$
 
 ###### print func decls