syntax relaxation: allow semicolon

src/eberon/eberon_grammar.js

@@ -67,10 +67,14 @@ function makeMethodHeading(identdef, formalParameters){
 function makeFieldList(identdef, identList, type, formalParameters){
     return context(
         or(makeMethodHeading(identdef, formalParameters),
-           and(identList, ":", type)),
+               and(identList, ":", type)),
         Context.FieldListDeclaration);
 }
 
+function makeFieldListSequence(base){
+    return and(base, optional(";"));
+}
+
 function makeForInit(ident, expression, assignment){
     return or(makeInPlaceInit(ident, expression, EbContext.InPlaceVariableInitFor), 
               and(ident, assignment));
@@ -93,6 +97,7 @@ exports.language = {
         makeProcedureHeading,
         makeProcedureDeclaration,
         makeFieldList, 
+        makeFieldListSequence,
         makeForInit,
         makeArrayDimensions,
         makeFormalArray,

src/grammar.js

@@ -27,6 +27,7 @@ function make(makeIdentdef,
               makeProcedureHeading, 
               makeProcedureDeclaration,
               makeFieldList,
+              makeFieldListSequence,
               makeForInit,
               makeArrayDimensions,
               makeFormalArray,
@@ -157,7 +158,7 @@ var fieldList = makeFieldList(
         type,
         function(stream, context){return formalParameters(stream, context);}
         );
-var fieldListSequence = and(fieldList, repeat(and(";", fieldList)));
+var fieldListSequence = makeFieldListSequence(and(fieldList, repeat(and(";", fieldList))));
 
 var arrayType = and("ARRAY", 
                     context(and(makeArrayDimensions(constExpression), "OF", type), 

src/oberon/oberon_grammar.js

@@ -53,6 +53,10 @@ function makeFieldList(identdef, identList, type){
     return context(and(identList, ":", type), Context.FieldListDeclaration);
 }
 
+function makeFieldListSequence(base){
+    return base;
+}
+
 function makeForInit(ident, expression, assignment){
     return and(ident, assignment);
 }
@@ -73,6 +77,7 @@ exports.language = {
         makeProcedureHeading,
         makeProcedureDeclaration,
         makeFieldList,
+        makeFieldListSequence,
         makeForInit,
         makeArrayDimensions,
         makeFormalArray,

test/test_unit_eberon.js

@@ -1033,6 +1033,7 @@ exports.suite = {
     },
 "syntax relaxation": testWithGrammar(
     grammar.declarationSequence, 
-    pass("PROCEDURE p; END;")
+    pass("PROCEDURE p; END;",
+         "TYPE T = RECORD field: INTEGER; END;")
     )
 };

test/test_unit_oberon.js

@@ -105,5 +105,10 @@ exports.suite = {
     grammar.procedureDeclaration,
     pass(),
     fail(["PROCEDURE p; END", "not parsed"])
+    ),
+"syntax strictness": testWithGrammar(
+    grammar.procedureDeclaration,
+    pass(),
+    fail(["TYPE T = RECORD field: INTEGER; END;", "not parsed"])
     )
 };