GROOVY-8551: simplify parser rules for array

src/antlr/GroovyParser.g4

@@ -1141,22 +1141,12 @@ options { baseContext = mapEntryLabel; }
 creator[int t]
     :   createdName
         (   nls arguments anonymousInnerClassDeclaration[0]?
-        |   dim[0]+ nls arrayInitializer
-        |   dim[1]+ dim[0]*
+        |   dim+ (nls arrayInitializer)?
         )
     ;
 
-/**
- *  n 0: dim without size expression; 1: dim with size expression
- */
-dim[int n]
-    :   annotationsOpt LBRACK
-        (
-            { $n == 1 }?
-            expression
-        |
-        )
-        RBRACK
+dim
+    :   annotationsOpt LBRACK expression? RBRACK
     ;
 
 arrayInitializer

src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java

@@ -3482,7 +3482,15 @@ public Expression visitCreator(final CreatorContext ctx) {
             final int nDim = dims.size();
             if (asBoolean(ctx.arrayInitializer())) { // create array: new Type[][]{ ... }
                 List<List<AnnotationNode>> typeAnnotations = new ArrayList<>(nDim);
-                for (var dim : dims) typeAnnotations.add(this.visitAnnotationsOpt(dim.annotationsOpt()));
+                for (var dim : dims) {
+                    final ExpressionContext dimExpressionContext = dim.expression();
+                    if (asBoolean(dimExpressionContext)) {
+                        throw createParsingFailedException(
+                                "Unsupported array dimension expression: " + dimExpressionContext.getText(),
+                                dimExpressionContext);
+                    }
+                    typeAnnotations.add(this.visitAnnotationsOpt(dim.annotationsOpt()));
+                }
 
                 ClassNode elementType = classNode;
                 for (int i = nDim - 1; i > 0; i -= 1) {
@@ -3500,10 +3508,26 @@ public Expression visitCreator(final CreatorContext ctx) {
             } else { // create array: new Type[n][]
                 final List<Expression> sizeExpressions = new ArrayList<>(nDim);
                 final List<List<AnnotationNode>> typeAnnotations = new ArrayList<>(nDim);
-                for (var dim : dims) {
+                ExpressionContext lastDimExpressionContext = null;
+                for (int i = 0, n = dims.size(); i < n; i += 1) {
+                    var dim = dims.get(i);
+                    final ExpressionContext dimExpressionContext = dim.expression();
+                    if (i == 0) {
+                        if (!asBoolean(dimExpressionContext)) {
+                            throw createParsingFailedException("array dimension expression is expected", dim);
+                        }
+                    } else {
+                        if (asBoolean(dimExpressionContext) && !asBoolean(lastDimExpressionContext)) {
+                            throw createParsingFailedException(
+                                    "Unsupported array dimension expression: " + dimExpressionContext.getText(),
+                                    dimExpressionContext);
+                        }
+                    }
+                    lastDimExpressionContext = dimExpressionContext;
+
                     final Expression sizeExpression;
-                    if (asBoolean(dim.expression())) {
-                        sizeExpression = (Expression) this.visit(dim.expression());
+                    if (asBoolean(dimExpressionContext)) {
+                        sizeExpression = (Expression) this.visit(dimExpressionContext);
                     } else {
                         sizeExpression = ConstantExpression.EMPTY_EXPRESSION;
                     }

src/test-resources/fail/Array_03x.groovy

@@ -0,0 +1,19 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+def foo = new double[2][][5]

src/test-resources/fail/Array_04x.groovy

@@ -0,0 +1,19 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+def foo = new double[2] { 1.0, 2.0 }

src/test/org/apache/groovy/parser/antlr4/SyntaxErrorTest.groovy

@@ -496,6 +496,8 @@ final class SyntaxErrorTest {
     void 'groovy core - Array'() {
         TestUtils.doRunAndShouldFail('fail/Array_01x.groovy')
         TestUtils.doRunAndShouldFail('fail/Array_02x.groovy')
+        TestUtils.doRunAndShouldFail('fail/Array_03x.groovy')
+        TestUtils.doRunAndShouldFail('fail/Array_04x.groovy')
     }
 
     @Test