MarkusAmshove · MarkusAmshove · May 24, 2023 · May 24, 2023 · May 24, 2023 · May 24, 2023
diff --git a/libs/natparse/src/main/java/org/amshove/natparse/natural/IExpandArrayNode.java b/libs/natparse/src/main/java/org/amshove/natparse/natural/IExpandArrayNode.java
@@ -1,11 +1,15 @@
 package org.amshove.natparse.natural;
 
+import org.amshove.natparse.ReadOnlyList;
+
 import javax.annotation.Nullable;
 
 public interface IExpandArrayNode extends IStatementNode
 {
 	IVariableReferenceNode arrayToExpand();
 
+	ReadOnlyList<IOperandNode> dimensions();
+
 	@Nullable
 	IVariableReferenceNode errorVariable();
 }
diff --git a/libs/natparse/src/main/java/org/amshove/natparse/natural/IReduceArrayNode.java b/libs/natparse/src/main/java/org/amshove/natparse/natural/IReduceArrayNode.java
@@ -1,5 +1,7 @@
 package org.amshove.natparse.natural;
 
+import org.amshove.natparse.ReadOnlyList;
+
 import javax.annotation.Nullable;
 
 public interface IReduceArrayNode extends IStatementNode
@@ -8,4 +10,6 @@ public interface IReduceArrayNode extends IStatementNode
 
 	@Nullable
 	IVariableReferenceNode errorVariable();
+
+	ReadOnlyList<IOperandNode> dimensions();
 }
diff --git a/libs/natparse/src/main/java/org/amshove/natparse/natural/IResizeArrayNode.java b/libs/natparse/src/main/java/org/amshove/natparse/natural/IResizeArrayNode.java
@@ -1,11 +1,15 @@
 package org.amshove.natparse.natural;
 
+import org.amshove.natparse.ReadOnlyList;
+
 import javax.annotation.Nullable;
 
 public interface IResizeArrayNode extends IStatementNode
 {
 	IVariableReferenceNode arrayToResize();
 
+	ReadOnlyList<IOperandNode> dimensions();
+
 	@Nullable
 	IVariableReferenceNode errorVariable();
 }
diff --git a/libs/natparse/src/main/java/org/amshove/natparse/parsing/AbstractParser.java b/libs/natparse/src/main/java/org/amshove/natparse/parsing/AbstractParser.java
@@ -873,6 +873,7 @@ protected IRangedArrayAccessNode consumeRangedArrayAccess(BaseSyntaxNode parent,
 	{
 		var rangedAccess = new RangedArrayAccessNode();
 		parent.replaceChild((BaseSyntaxNode) lower, rangedAccess);
+		rangedAccess.addNode((BaseSyntaxNode) lower);
 		consumeMandatory(rangedAccess, SyntaxKind.COLON);
 		var upper = consumeArithmeticExpression(rangedAccess);
 

diff --git a/libs/natparse/src/main/java/org/amshove/natparse/parsing/ExpandArrayNode.java b/libs/natparse/src/main/java/org/amshove/natparse/parsing/ExpandArrayNode.java
@@ -1,12 +1,18 @@
 package org.amshove.natparse.parsing;
 
+import org.amshove.natparse.ReadOnlyList;
 import org.amshove.natparse.natural.IExpandArrayNode;
+import org.amshove.natparse.natural.IOperandNode;
 import org.amshove.natparse.natural.IVariableReferenceNode;
 
+import java.util.ArrayList;
+import java.util.List;
+
 class ExpandArrayNode extends StatementNode implements IExpandArrayNode
 {
 	private IVariableReferenceNode arrayToExpand;
 	private IVariableReferenceNode errorVariable;
+	private final List<IOperandNode> dimensions = new ArrayList<>();
 
 	@Override
 	public IVariableReferenceNode arrayToExpand()
@@ -20,6 +26,12 @@ public IVariableReferenceNode errorVariable()
 		return errorVariable;
 	}
 
+	@Override
+	public ReadOnlyList<IOperandNode> dimensions()
+	{
+		return ReadOnlyList.from(dimensions);
+	}
+
 	void setArrayToExpand(IVariableReferenceNode array)
 	{
 		arrayToExpand = array;
@@ -29,4 +41,9 @@ void setErrorVariable(IVariableReferenceNode errorVariable)
 	{
 		this.errorVariable = errorVariable;
 	}
+
+	void addDimension(IOperandNode dimension)
+	{
+		dimensions.add(dimension);
+	}
 }
diff --git a/libs/natparse/src/main/java/org/amshove/natparse/parsing/ReduceArrayNode.java b/libs/natparse/src/main/java/org/amshove/natparse/parsing/ReduceArrayNode.java
@@ -1,12 +1,19 @@
 package org.amshove.natparse.parsing;
 
+import org.amshove.natparse.ReadOnlyList;
+import org.amshove.natparse.natural.IOperandNode;
 import org.amshove.natparse.natural.IReduceArrayNode;
+import org.amshove.natparse.natural.ISyntaxNode;
 import org.amshove.natparse.natural.IVariableReferenceNode;
 
+import java.util.ArrayList;
+import java.util.List;
+
 class ReduceArrayNode extends StatementNode implements IReduceArrayNode
 {
 	private IVariableReferenceNode arrayToReduce;
 	private IVariableReferenceNode errorVariable;
+	private final List<IOperandNode> dimensions = new ArrayList<>();
 
 	@Override
 	public IVariableReferenceNode arrayToReduce()
@@ -20,6 +27,12 @@ public IVariableReferenceNode errorVariable()
 		return errorVariable;
 	}
 
+	@Override
+	public ReadOnlyList<IOperandNode> dimensions()
+	{
+		return ReadOnlyList.from(dimensions);
+	}
+
 	void setArrayToReduce(IVariableReferenceNode array)
 	{
 		arrayToReduce = array;
@@ -29,4 +42,9 @@ void setErrorVariable(IVariableReferenceNode errorVariable)
 	{
 		this.errorVariable = errorVariable;
 	}
+
+	void addDimension(IOperandNode operand)
+	{
+		dimensions.add(operand);
+	}
 }
diff --git a/libs/natparse/src/main/java/org/amshove/natparse/parsing/ResizeArrayNode.java b/libs/natparse/src/main/java/org/amshove/natparse/parsing/ResizeArrayNode.java
@@ -1,12 +1,18 @@
 package org.amshove.natparse.parsing;
 
+import org.amshove.natparse.ReadOnlyList;
+import org.amshove.natparse.natural.IOperandNode;
 import org.amshove.natparse.natural.IResizeArrayNode;
 import org.amshove.natparse.natural.IVariableReferenceNode;
 
+import java.util.ArrayList;
+import java.util.List;
+
 class ResizeArrayNode extends StatementNode implements IResizeArrayNode
 {
 	private IVariableReferenceNode arrayToResize;
 	private IVariableReferenceNode errorVariable;
+	private final List<IOperandNode> dimensions = new ArrayList<>();
 
 	@Override
 	public IVariableReferenceNode arrayToResize()
@@ -20,6 +26,12 @@ public IVariableReferenceNode errorVariable()
 		return errorVariable;
 	}
 
+	@Override
+	public ReadOnlyList<IOperandNode> dimensions()
+	{
+		return ReadOnlyList.from(dimensions);
+	}
+
 	void setArrayToResize(IVariableReferenceNode array)
 	{
 		arrayToResize = array;
@@ -29,4 +41,9 @@ void setErrorVariable(IVariableReferenceNode errorVariable)
 	{
 		this.errorVariable = errorVariable;
 	}
+
+	void addDimension(IOperandNode operand)
+	{
+		dimensions.add(operand);
+	}
 }
diff --git a/libs/natparse/src/main/java/org/amshove/natparse/parsing/StatementListParser.java b/libs/natparse/src/main/java/org/amshove/natparse/parsing/StatementListParser.java
@@ -824,17 +824,18 @@ private StatementNode reduce() throws ParseError
 
 		if (consumeOptionally(reduce, SyntaxKind.LPAREN))
 		{
-			while (!isAtEnd() && !peekKind(SyntaxKind.RPAREN))
+			do
 			{
-				consume(reduce);
+				reduce.addDimension(consumeArrayAccess(reduce));
 			}
-
+			while (consumeOptionally(reduce, SyntaxKind.COMMA));
 			consumeMandatory(reduce, SyntaxKind.RPAREN);
 		}
 		else
 		{
 			var literal = consumeLiteralNode(reduce, SyntaxKind.NUMBER_LITERAL);
 			checkIntLiteralValue(literal, 0);
+			reduce.addDimension(literal);
 		}
 
 		if (consumeOptionally(reduce, SyntaxKind.GIVING))
@@ -891,10 +892,11 @@ private StatementNode expand() throws ParseError
 		consumeMandatory(expand, SyntaxKind.TO);
 
 		consumeMandatory(expand, SyntaxKind.LPAREN);
-		while (!isAtEnd() && !peekKind(SyntaxKind.RPAREN))
+		do
 		{
-			consume(expand);
+			expand.addDimension(consumeArrayAccess(expand));
 		}
+		while (consumeOptionally(expand, SyntaxKind.COMMA));
 		consumeMandatory(expand, SyntaxKind.RPAREN);
 
 		if (consumeOptionally(expand, SyntaxKind.GIVING))
@@ -956,11 +958,11 @@ private StatementNode resize() throws ParseError
 		consumeMandatory(resize, SyntaxKind.TO);
 
 		consumeMandatory(resize, SyntaxKind.LPAREN);
-		while (!isAtEnd() && !peekKind(SyntaxKind.RPAREN))
+		do
 		{
-			consume(resize);
+			resize.addDimension(consumeArrayAccess(resize));
 		}
-
+		while (consumeOptionally(resize, SyntaxKind.COMMA));
 		consumeMandatory(resize, SyntaxKind.RPAREN);
 
 		if (consumeOptionally(resize, SyntaxKind.GIVING))

diff --git a/libs/natparse/src/test/java/org/amshove/natparse/parsing/AbstractParserTest.java b/libs/natparse/src/test/java/org/amshove/natparse/parsing/AbstractParserTest.java
@@ -128,6 +128,7 @@ protected NaturalModule newEmptyLda()
 
 	protected IVariableReferenceNode assertIsVariableReference(IOperandNode operand, String name)
 	{
+		assertThat(operand).as("Expected a variable reference, but operand is null").isNotNull();
 		var variable = assertNodeType(operand, IVariableReferenceNode.class);
 		assertThat(variable.referencingToken().symbolName()).isEqualTo(name);
 		return variable;

diff --git a/libs/natparse/src/test/java/org/amshove/natparse/parsing/StatementListParserShould.java b/libs/natparse/src/test/java/org/amshove/natparse/parsing/StatementListParserShould.java
@@ -1914,6 +1914,23 @@ void parseResizeArray(String combination)
 		assertThat(resize.findDescendantToken(SyntaxKind.RPAREN)).isNotNull();
 	}
 
+	@Test
+	void parseResizeArrayToDimensionWithVariableReferences()
+	{
+		var resize = assertParsesSingleStatement("RESIZE ARRAY ARR TO (1:#K)", IResizeArrayNode.class);
+		var variableRef = resize.dimensions().first().findDescendantOfType(IVariableReferenceNode.class);
+		assertThat(variableRef).isNotNull();
+		assertIsVariableReference(variableRef, "#K");
+	}
+
+	@Test
+	void parseResizeArrayToMultipleDimensionsWithVariableReferences()
+	{
+		var resize = assertParsesSingleStatement("RESIZE ARRAY ARR TO (1:#K,#L:5)", IResizeArrayNode.class);
+		assertIsVariableReference(resize.dimensions().get(0).findDescendantOfType(IVariableReferenceNode.class), "#K");
+		assertIsVariableReference(resize.dimensions().get(1).findDescendantOfType(IVariableReferenceNode.class), "#L");
+	}
+
 	@ParameterizedTest
 	@ValueSource(strings =
 	{
@@ -2117,6 +2134,23 @@ void parseReduceArrayToDimension(String source)
 		assertThat(reduce.arrayToReduce().referencingToken().symbolName()).isEqualTo("#ARR");
 	}
 
+	@Test
+	void parseReduceArrayToDimensionWithVariableReferences()
+	{
+		var reduce = assertParsesSingleStatement("REDUCE ARRAY ARR TO (1:#K)", IReduceArrayNode.class);
+		var variableRef = reduce.dimensions().first().findDescendantOfType(IVariableReferenceNode.class);
+		assertThat(variableRef).isNotNull();
+		assertIsVariableReference(variableRef, "#K");
+	}
+
+	@Test
+	void parseReduceArrayToMultipleDimensionsWithVariableReferences()
+	{
+		var reduce = assertParsesSingleStatement("REDUCE ARRAY ARR TO (1:#K,#L:5)", IReduceArrayNode.class);
+		assertIsVariableReference(reduce.dimensions().get(0).findDescendantOfType(IVariableReferenceNode.class), "#K");
+		assertIsVariableReference(reduce.dimensions().get(1).findDescendantOfType(IVariableReferenceNode.class), "#L");
+	}
+
 	@ParameterizedTest
 	@ValueSource(strings =
 	{
@@ -2150,8 +2184,25 @@ void parseReduceDynamicWithVariableSize(String combination)
 	})
 	void parseExpandArrayToDimension(String source)
 	{
-		var reduce = assertParsesSingleStatement("EXPAND %s ARRAY #ARR TO (1:10,*:*,5:*)".formatted(source), IExpandArrayNode.class);
-		assertThat(reduce.arrayToExpand().referencingToken().symbolName()).isEqualTo("#ARR");
+		var expand = assertParsesSingleStatement("EXPAND %s ARRAY #ARR TO (1:10,*:*,5:*)".formatted(source), IExpandArrayNode.class);
+		assertThat(expand.arrayToExpand().referencingToken().symbolName()).isEqualTo("#ARR");
+	}
+
+	@Test
+	void parseExpandArrayToDimensionWithVariableReferences()
+	{
+		var expand = assertParsesSingleStatement("EXPAND ARRAY ARR TO (1:#K)", IExpandArrayNode.class);
+		var variableRef = expand.dimensions().first().findDescendantOfType(IVariableReferenceNode.class);
+		assertThat(variableRef).isNotNull();
+		assertIsVariableReference(variableRef, "#K");
+	}
+
+	@Test
+	void parseExpandArrayToMultipleDimensionsWithVariableReferences()
+	{
+		var expand = assertParsesSingleStatement("EXPAND ARRAY ARR TO (1:#K,#L:5)", IExpandArrayNode.class);
+		assertIsVariableReference(expand.dimensions().get(0).findDescendantOfType(IVariableReferenceNode.class), "#K");
+		assertIsVariableReference(expand.dimensions().get(1).findDescendantOfType(IVariableReferenceNode.class), "#L");
 	}
 
 	@ParameterizedTest