Merge pull request #1439 from lf-lang/tokenize-empty-width

Tokenize empty bracket pairs properly
lf-lang · Nov 1, 2022 · d9095f4 · d9095f4
2 parents c58094e + 066596d
commit d9095f4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaParsingTest.java b/org.lflang.tests/src/org/lflang/tests/compiler/LinguaFrancaParsingTest.java
@@ -94,6 +94,18 @@ main reactor(@b parm: int) {
         parseWithoutError(testCase);
     }
 
+    @Test
+    public void testTokenizeEmptyWidth() throws Exception {
+        String testCase = """
+                target C;
+                main reactor {
+                    state foo: int[];
+                    state foo: int[   ]; //spaces are allowed
+                }
+            """;
+        parseWithoutError(testCase);
+    }
+
     private Model parseWithoutError(String s) throws Exception {
         Model model = parser.parse(s);
         Assertions.assertNotNull(model);

diff --git a/org.lflang/src/org/lflang/LinguaFranca.xtext b/org.lflang/src/org/lflang/LinguaFranca.xtext
@@ -332,11 +332,11 @@ Type:
 ;
 
 ArraySpec:
-    ofVariableLength?='[]' | '[' length=INT ']';
-    
+    '[' ( ofVariableLength?=']' | length=INT ']' );
+
 WidthSpec:
-    ofVariableLength?='[]' | '[' (terms+=WidthTerm) ('+' terms+=WidthTerm)* ']';
-    
+    '[' ( ofVariableLength?=']' | (terms+=WidthTerm) ('+' terms+=WidthTerm)* ']' );
+
 WidthTerm:
     width=INT
     | parameter=[Parameter]
@@ -502,7 +502,7 @@ Token:
     // Braces
     '(' | ')' | '{' | '}' |
     // Brackets
-    '[' | ']' | '<' | '>' | '[]' |
+    '[' | ']' | '<' | '>' |
     // Punctuation
     ':' | ';' | ',' | '.' | '::' |
     // Slashes