oceani: exercise more parsing options for blocks.

This tests some untested code.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index 0b7c76a726ca8ecc66ee4d68efb9f6f09dc43728..d2628815b35d190dc8ff70182cb7351a5f2a29ae 100644 (file)
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -702,6 +702,13 @@ Test functions.  They don't return anything, so we need to get them to print
        do
                n = 4 // xkcd:221
 
        do
                n = 4 // xkcd:221
 

+       // exercise the parsing options
+       func t1 (a:number) {
+               print "t1"
+       }
+       func t2 (a:string) {print "string"}
+       func t3() print "t3"
+

 ###### output: functions
        done
        1  done
 ###### output: functions
        done
        1  done

diff --git a/csrc/oceani.mdc b/csrc/oceani.mdc
index 6723b1416fec85197661345e7ab985387e9bf59a..cd37f1b8b8766eeb8371bb9ec5171a34cdc70e0a 100644 (file)
--- a/csrc/oceani.mdc
+++ b/csrc/oceani.mdc
@@ -4550,12 +4550,10 @@ the common header for all reductions to use.
        $TERM { } ;
 
        $*binode
        $TERM { } ;
 
        $*binode

-       Block -> { IN OptNL Statementlist OUT OptNL } ${ $0 = $<Sl;     // UNTESTED
-               }$
-       |        { SimpleStatements } ${ $0 = reorder_bilist($<SS);     // UNTESTED
-               }$
+       Block -> { IN OptNL Statementlist OUT OptNL } ${ $0 = $<Sl; }$
+       |        { SimpleStatements } ${ $0 = reorder_bilist($<SS); }$

        |        SimpleStatements ; ${ $0 = reorder_bilist($<SS); }$
        |        SimpleStatements ; ${ $0 = reorder_bilist($<SS); }$

-       |        SimpleStatements EOL ${ $0 = reorder_bilist($<SS);     // UNTESTED
+       |        SimpleStatements EOL ${ $0 = reorder_bilist($<SS); 

                }$
        |        IN OptNL Statementlist OUT ${ $0 = $<Sl; }$
 
                }$
        |        IN OptNL Statementlist OUT ${ $0 = $<Sl; }$