Allow EM, HD and PM on view variables without type

MarkusAmshove · Dec 18, 2024 · 1ec028b · 1ec028b
1 parent b0d220d
commit 1ec028b
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 7 deletions.
diff --git a/libs/natparse/src/main/java/org/amshove/natparse/parsing/ViewParser.java b/libs/natparse/src/main/java/org/amshove/natparse/parsing/ViewParser.java
@@ -111,6 +111,13 @@ private VariableNode variable(GroupNode enclosingGroup) throws ParseError
 				return typedDdmArrayVariable;
 			}
 
+			if (peekKind(SyntaxKind.EM) || peekKind(SyntaxKind.HD) || peekKind(SyntaxKind.PM))
+			{
+				consumeEmHdPm(variable);
+				// The parens we're in is for attributes, not the type, so the type has to be inferred from the DDM.
+				return typedVariableFromDdm(variable, enclosingGroup);
+			}
+
 			return typedVariable(variable);
 		}
 
@@ -122,6 +129,15 @@ private VariableNode variable(GroupNode enclosingGroup) throws ParseError
 		return typedVariableFromDdm(variable, enclosingGroup);
 	}
 
+	private void consumeEmHdPm(VariableNode variable) throws ParseError
+	{
+		while (!isAtEnd() && !peekKind(SyntaxKind.RPAREN) && !peekKind(SyntaxKind.END_DEFINE))
+		{
+			consume(variable);
+		}
+		consumeMandatory(variable, SyntaxKind.RPAREN);
+	}
+
 	private TypedVariableNode typedVariable(VariableNode variable) throws ParseError
 	{
 		var typedVariable = new TypedVariableNode(variable);
@@ -174,14 +190,10 @@ private TypedVariableNode typedVariable(VariableNode variable) throws ParseError
 			type.setDynamicLength();
 		}
 
-		// Consume optional emhdpm
+		// Consume optional EMHDPM
 		if (consumeOptionally(typedVariable, SyntaxKind.LPAREN))
 		{
-			while (!isAtEnd() && peek().kind() != SyntaxKind.RPAREN && peek().kind() != SyntaxKind.END_DEFINE)
-			{
-				consume(typedVariable);
-			}
-			consumeMandatory(typedVariable, SyntaxKind.RPAREN);
+			consumeEmHdPm(typedVariable);
 		}
 
 		typedVariable.setType(type);
@@ -239,7 +251,7 @@ private GroupNode group(VariableNode variable) throws ParseError
 
 	// This is used when there is no type specified in the view.
 	// Type is loaded from DDM.
-	private VariableNode typedVariableFromDdm(VariableNode variable, GroupNode enclosingGroup)
+	private VariableNode typedVariableFromDdm(VariableNode variable, GroupNode enclosingGroup) throws ParseError
 	{
 		// unresolved DDM
 		if (view.ddm() == null)
@@ -249,6 +261,16 @@ private VariableNode typedVariableFromDdm(VariableNode variable, GroupNode enclo
 
 		var typedVariable = new TypedVariableNode(variable);
 
+		// Consume optional EMHDPM
+		if (consumeOptionally(typedVariable, SyntaxKind.LPAREN))
+		{
+			while (!isAtEnd() && peek().kind() != SyntaxKind.RPAREN && peek().kind() != SyntaxKind.END_DEFINE)
+			{
+				consume(typedVariable);
+			}
+			consumeMandatory(typedVariable, SyntaxKind.RPAREN);
+		}
+
 		var isCountVariable = variable.name().startsWith("C*");
 		var fieldName = isCountVariable ? variable.name().substring(2) : variable.name();
 		var ddmField = view.ddm().findField(fieldName);

diff --git a/libs/natparse/src/test/java/org/amshove/natparse/parsing/DefineDataParserShould.java b/libs/natparse/src/test/java/org/amshove/natparse/parsing/DefineDataParserShould.java
@@ -1499,6 +1499,19 @@ void allowEmHdPmInViews()
 		assertNodeType(view.variables().first(), IGroupNode.class);
 	}
 
+	@Test
+	void allowEmHdPmInViewVariablesWithoutExplicitType()
+	{
+		assertParsesWithoutDiagnostics("""
+			define data
+			local
+			1 myview view of myddm
+				2 withtype (n2) (hd='Header')
+				2 withouttype (hd='Header')
+			end-define
+		""");
+	}
+
 	@Test
 	void parseViewWithOptionalOf()
 	{