now handles sets containing newlines, refs #5

godber · Jan 6, 2015 · 39e8f27 · 39e8f27
1 parent d876a6a
commit 39e8f27
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/antlr_grammar/ODLv21.g4 b/antlr_grammar/ODLv21.g4
@@ -67,7 +67,7 @@ sequence_2D
 // NOTE: Despite the grammar accepting any scalar value in sets, the PDS only
 //       accepts SYMBOL and INTEGER values in sets. See 12.5.6.1
 set_value
-  : '{' scalar_value (',' scalar_value)* '}'
+  : '{' scalar_value (NEWLINE)? (',' (NEWLINE)? scalar_value (NEWLINE)? )* '}'
   | '{' '}'
   ;
 

diff --git a/antlr_grammar/data/set2.lbl b/antlr_grammar/data/set2.lbl
@@ -10,4 +10,13 @@ SYM_SET1       = {ONE,
 SYM_SET2       = {ONE,
                   TWO,
                   THREE}
+SYM_SET3       = {ONE
+                 ,TWO
+                 ,THREE}
+SYM_SET4       = {ONE
+                 ,
+                 TWO
+                 ,
+                 THREE
+                 }
 END