Allow fields in array initializers so that size and initial value can be set.

Author: dibyendumajumdar

antlr-parser/examples/all-features.lang

@@ -19,12 +19,20 @@ func foo(a: Int, b: [Int]) {
     }
 }
 func bar() -> Test {
-    var v = new Test { intArray = new [Tree] {} }
+    var v = new Test { intArray = new [Tree] { new Tree{left=null,right=null} } }
     return v
 }
 func main() {
     var m = 42
+    var j: Int
     var t: Tree
-    var b = true
-    var c: Bool
+    var array = new [Int] {size=10,1,2,3}
+    array[1] = 42
+    t.left = null
+    if (m < 1)
+       print(1)
+    else if (m == 5)
+       print(2)
+    else
+       print(3)
 }

parser/src/main/java/com/compilerprogramming/ezlang/parser/Parser.java

@@ -334,22 +334,17 @@ private AST.Expr parseNew(Lexer lexer) {
         AST.TypeExpr resultType = parseTypeExpr(lexer);
         var newExpr = new AST.NewExpr(resultType);
         List<AST.Expr> initExpr = new ArrayList<>();
-        int initType = 0;
         int index = 0;
         if (testPunctuation(lexer, "{")) {
             while (!isToken(currentToken, "}")) {
                 if (currentToken.kind == Token.Kind.IDENT && lexer.peekChar() == '=') {
-                    if (initType == 0) initType = 1;
-                    else if (initType != 1) throw new CompilerException("Cannot mix initializer expressions");
                     String fieldname = currentToken.str;
                     nextToken(lexer);
                     matchPunctuation(lexer, "=");
                     AST.Expr value = parseBool(lexer);
                     initExpr.add(new AST.InitFieldExpr(newExpr, fieldname, value));
                 }
                 else {
-                    if (initType == 0) initType = 2;
-                    else if (initType != 2) throw new CompilerException("Cannot mix initializer expressions");
                     var indexLit = Integer.valueOf(index++);
                     var indexExpr = new AST.LiteralExpr(Token.newNum(indexLit,indexLit.toString(),0));
                     initExpr.add(new AST.ArrayInitExpr(newExpr, indexExpr, parseBool(lexer)));

parser/src/test/java/com/compilerprogramming/ezlang/parser/TestParser.java

@@ -36,7 +36,7 @@ func bar() -> Test {
 func main() {
     var m = 42
     var t: Tree
-    var array = new [Int] {1,2,3}
+    var array = new [Int] {size=10,1,2,3}
     array[1] = 42
     t.left = null
     if (m < 1)