fix some visitors not working with records

iTitus · iTitus · commit e6eb2e6dab34 · 2025-03-10T14:40:37.000+01:00
diff --git a/src/main/java/de/hhu/stups/codegenerator/MachineConstantsOptimizer.java b/src/main/java/de/hhu/stups/codegenerator/MachineConstantsOptimizer.java
@@ -313,17 +313,17 @@ public Node visitStringNode(StringNode node, Void expected) {
 
     @Override
     public Node visitRecordNode(RecordNode node, Void expected) {
-        return node;
+        return new RecordNode(node.getSourceCodePosition(), node.getDeclarations(), node.getExpressions().stream().map(expr -> (ExprNode) visitExprNode(expr, expected)).collect(Collectors.toList()));
     }
 
     @Override
     public Node visitStructNode(StructNode node, Void expected) {
-        return node;
+        return new StructNode(node.getSourceCodePosition(), node.getDeclarations(), node.getExpressions().stream().map(expr -> (ExprNode) visitExprNode(expr, expected)).collect(Collectors.toList()));
     }
 
     @Override
     public Node visitRecordFieldAccessNode(RecordFieldAccessNode node, Void expected) {
-        return node;
+        return new RecordFieldAccessNode(node.getSourceCodePosition(), (ExprNode) visitExprNode(node.getRecord(), expected), node.getIdentifier());
     }
 
     @Override
diff --git a/src/main/java/de/hhu/stups/codegenerator/MachineConstantsPreprocessor.java b/src/main/java/de/hhu/stups/codegenerator/MachineConstantsPreprocessor.java
@@ -271,16 +271,19 @@ public Node visitStringNode(StringNode node, Void expected) {
 
     @Override
     public Node visitRecordNode(RecordNode node, Void expected) {
+        node.getExpressions().forEach(e -> visitExprNode(e, expected));
         return null;
     }
 
     @Override
     public Node visitStructNode(StructNode node, Void expected) {
+        node.getExpressions().forEach(e -> visitExprNode(e, expected));
         return null;
     }
 
     @Override
     public Node visitRecordFieldAccessNode(RecordFieldAccessNode node, Void expected) {
+        visitExprNode(node.getRecord(), expected);
         return null;
     }
 
diff --git a/src/main/java/de/hhu/stups/codegenerator/analyzers/IdentifierAnalyzer.java b/src/main/java/de/hhu/stups/codegenerator/analyzers/IdentifierAnalyzer.java
@@ -348,16 +348,19 @@ public Void visitChoiceSubstitutionNode(ChoiceSubstitutionNode node, Void expect
 
     @Override
     public Void visitRecordNode(RecordNode node, Void expected) {
+        node.getExpressions().forEach(expr -> visitExprNode(expr, expected));
         return null;
     }
 
     @Override
     public Void visitStructNode(StructNode node, Void expected) {
+        node.getExpressions().forEach(expr -> visitExprNode(expr, expected));
         return null;
     }
 
     @Override
     public Void visitRecordFieldAccessNode(RecordFieldAccessNode node, Void expected) {
+        visitExprNode(node.getRecord(), expected);
         return null;
     }
 
diff --git a/src/main/java/de/hhu/stups/codegenerator/analyzers/ParallelConstructAnalyzer.java b/src/main/java/de/hhu/stups/codegenerator/analyzers/ParallelConstructAnalyzer.java
@@ -433,8 +433,15 @@ public Void visitRecordNode(RecordNode node, Void expected) {
         return null;
     }
 
+    /*
+     * When visiting a record node, local variables are added to ignored variables as they are not relevant for variables in a parallel substitution.
+     */
     @Override
     public Void visitStructNode(StructNode node, Void expected) {
+        List<String> locals = node.getDeclarations().stream().map(DeclarationNode::getName).collect(Collectors.toList());
+        ignoredVariables.addAll(locals);
+        node.getExpressions().forEach(expr -> visitExprNode(expr, expected));
+        ignoredVariables.removeAll(locals);
         return null;
     }
 
diff --git a/src/main/java/de/hhu/stups/codegenerator/analyzers/PrimedIdentifierAnalyzer.java b/src/main/java/de/hhu/stups/codegenerator/analyzers/PrimedIdentifierAnalyzer.java
@@ -272,16 +272,19 @@ public Void visitChoiceSubstitutionNode(ChoiceSubstitutionNode node, Void expect
 
     @Override
     public Void visitRecordNode(RecordNode node, Void expected) {
+        node.getExpressions().forEach(expr -> visitExprNode(expr, expected));
         return null;
     }
 
     @Override
     public Void visitStructNode(StructNode node, Void expected) {
+        node.getExpressions().forEach(expr -> visitExprNode(expr, expected));
         return null;
     }
 
     @Override
     public Void visitRecordFieldAccessNode(RecordFieldAccessNode node, Void expected) {
+        visitExprNode(node.getRecord(), expected);
         return null;
     }
 
diff --git a/src/main/java/de/hhu/stups/codegenerator/generators/LambdaFunctionGenerator.java b/src/main/java/de/hhu/stups/codegenerator/generators/LambdaFunctionGenerator.java
@@ -416,16 +416,19 @@ public Void visitChoiceSubstitutionNode(ChoiceSubstitutionNode node, Void expect
 
     @Override
     public Void visitRecordNode(RecordNode node, Void expected) {
+        node.getExpressions().forEach(expr -> visitExprNode(expr, expected));
         return null;
     }
 
     @Override
     public Void visitStructNode(StructNode node, Void expected) {
+        node.getExpressions().forEach(expr -> visitExprNode(expr, expected));
         return null;
     }
 
     @Override
     public Void visitRecordFieldAccessNode(RecordFieldAccessNode node, Void expected) {
+        visitExprNode(node.getRecord(), expected);
         return null;
     }
 
diff --git a/src/main/java/de/hhu/stups/codegenerator/generators/MachineGenerator.java b/src/main/java/de/hhu/stups/codegenerator/generators/MachineGenerator.java
@@ -739,7 +739,7 @@ public String visitRecordNode(RecordNode node, Void expected) {
 
 	@Override
 	public String visitStructNode(StructNode node, Void expected) {
-		return "";
+		return expressionGenerator.visitExprNode(node);
 	}
 
 	@Override
diff --git a/src/main/java/de/hhu/stups/codegenerator/generators/MachinePreprocessor.java b/src/main/java/de/hhu/stups/codegenerator/generators/MachinePreprocessor.java
@@ -577,17 +577,23 @@ public Node visitStringNode(StringNode node, Void expected) {
 
     @Override
     public Node visitRecordNode(RecordNode node, Void expected) {
-        return node;
+        RecordNode result = new RecordNode(node.getSourceCodePosition(), node.getDeclarations(), node.getExpressions().stream().map(expr -> (ExprNode) visitExprNode(node, expected)).collect(Collectors.toList()));
+        result.setType(node.getType());
+        return result;
     }
 
     @Override
     public Node visitStructNode(StructNode node, Void expected) {
-        return node;
+        StructNode result = new StructNode(node.getSourceCodePosition(), node.getDeclarations(), node.getExpressions().stream().map(expr -> (ExprNode) visitExprNode(node, expected)).collect(Collectors.toList()));
+        result.setType(node.getType());
+        return result;
     }
 
     @Override
     public Node visitRecordFieldAccessNode(RecordFieldAccessNode node, Void expected) {
-        return node;
+        RecordFieldAccessNode result = new RecordFieldAccessNode(node.getSourceCodePosition(), (ExprNode) visitExprNode(node.getRecord(), expected), node.getIdentifier());
+        result.setType(node.getType());
+        return result;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -313,17 +313,17 @@ public Node visitStringNode(StringNode node, Void expected) {`
`313`	`313`
`314`	`314`	`@Override`
`315`	`315`	`public Node visitRecordNode(RecordNode node, Void expected) {`
`316`		`- return node;`
	`316`	`+ return new RecordNode(node.getSourceCodePosition(), node.getDeclarations(), node.getExpressions().stream().map(expr -> (ExprNode) visitExprNode(expr, expected)).collect(Collectors.toList()));`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`@Override`
`320`	`320`	`public Node visitStructNode(StructNode node, Void expected) {`
`321`		`- return node;`
	`321`	`+ return new StructNode(node.getSourceCodePosition(), node.getDeclarations(), node.getExpressions().stream().map(expr -> (ExprNode) visitExprNode(expr, expected)).collect(Collectors.toList()));`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`@Override`
`325`	`325`	`public Node visitRecordFieldAccessNode(RecordFieldAccessNode node, Void expected) {`
`326`		`- return node;`
	`326`	`+ return new RecordFieldAccessNode(node.getSourceCodePosition(), (ExprNode) visitExprNode(node.getRecord(), expected), node.getIdentifier());`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -271,16 +271,19 @@ public Node visitStringNode(StringNode node, Void expected) {`
`271`	`271`
`272`	`272`	`@Override`
`273`	`273`	`public Node visitRecordNode(RecordNode node, Void expected) {`
	`274`	`+ node.getExpressions().forEach(e -> visitExprNode(e, expected));`
`274`	`275`	`return null;`
`275`	`276`	`}`
`276`	`277`
`277`	`278`	`@Override`
`278`	`279`	`public Node visitStructNode(StructNode node, Void expected) {`
	`280`	`+ node.getExpressions().forEach(e -> visitExprNode(e, expected));`
`279`	`281`	`return null;`
`280`	`282`	`}`
`281`	`283`
`282`	`284`	`@Override`
`283`	`285`	`public Node visitRecordFieldAccessNode(RecordFieldAccessNode node, Void expected) {`
	`286`	`+ visitExprNode(node.getRecord(), expected);`
`284`	`287`	`return null;`
`285`	`288`	`}`
`286`	`289`
Original file line number	Diff line number	Diff line change
`@@ -348,16 +348,19 @@ public Void visitChoiceSubstitutionNode(ChoiceSubstitutionNode node, Void expect`
`348`	`348`
`349`	`349`	`@Override`
`350`	`350`	`public Void visitRecordNode(RecordNode node, Void expected) {`
	`351`	`+ node.getExpressions().forEach(expr -> visitExprNode(expr, expected));`
`351`	`352`	`return null;`
`352`	`353`	`}`
`353`	`354`
`354`	`355`	`@Override`
`355`	`356`	`public Void visitStructNode(StructNode node, Void expected) {`
	`357`	`+ node.getExpressions().forEach(expr -> visitExprNode(expr, expected));`
`356`	`358`	`return null;`
`357`	`359`	`}`
`358`	`360`
`359`	`361`	`@Override`
`360`	`362`	`public Void visitRecordFieldAccessNode(RecordFieldAccessNode node, Void expected) {`
	`363`	`+ visitExprNode(node.getRecord(), expected);`
`361`	`364`	`return null;`
`362`	`365`	`}`
`363`	`366`
Original file line number	Diff line number	Diff line change
`@@ -433,8 +433,15 @@ public Void visitRecordNode(RecordNode node, Void expected) {`
`433`	`433`	`return null;`
`434`	`434`	`}`
`435`	`435`
	`436`	`+ /*`
	`437`	`+ * When visiting a record node, local variables are added to ignored variables as they are not relevant for variables in a parallel substitution.`
	`438`	`+ */`
`436`	`439`	`@Override`
`437`	`440`	`public Void visitStructNode(StructNode node, Void expected) {`
	`441`	`+ List<String> locals = node.getDeclarations().stream().map(DeclarationNode::getName).collect(Collectors.toList());`
	`442`	`+ ignoredVariables.addAll(locals);`
	`443`	`+ node.getExpressions().forEach(expr -> visitExprNode(expr, expected));`
	`444`	`+ ignoredVariables.removeAll(locals);`
`438`	`445`	`return null;`
`439`	`446`	`}`
`440`	`447`
Original file line number	Diff line number	Diff line change
`@@ -272,16 +272,19 @@ public Void visitChoiceSubstitutionNode(ChoiceSubstitutionNode node, Void expect`
`272`	`272`
`273`	`273`	`@Override`
`274`	`274`	`public Void visitRecordNode(RecordNode node, Void expected) {`
	`275`	`+ node.getExpressions().forEach(expr -> visitExprNode(expr, expected));`
`275`	`276`	`return null;`
`276`	`277`	`}`
`277`	`278`
`278`	`279`	`@Override`
`279`	`280`	`public Void visitStructNode(StructNode node, Void expected) {`
	`281`	`+ node.getExpressions().forEach(expr -> visitExprNode(expr, expected));`
`280`	`282`	`return null;`
`281`	`283`	`}`
`282`	`284`
`283`	`285`	`@Override`
`284`	`286`	`public Void visitRecordFieldAccessNode(RecordFieldAccessNode node, Void expected) {`
	`287`	`+ visitExprNode(node.getRecord(), expected);`
`285`	`288`	`return null;`
`286`	`289`	`}`
`287`	`290`
Original file line number	Diff line number	Diff line change
`@@ -416,16 +416,19 @@ public Void visitChoiceSubstitutionNode(ChoiceSubstitutionNode node, Void expect`
`416`	`416`
`417`	`417`	`@Override`
`418`	`418`	`public Void visitRecordNode(RecordNode node, Void expected) {`
	`419`	`+ node.getExpressions().forEach(expr -> visitExprNode(expr, expected));`
`419`	`420`	`return null;`
`420`	`421`	`}`
`421`	`422`
`422`	`423`	`@Override`
`423`	`424`	`public Void visitStructNode(StructNode node, Void expected) {`
	`425`	`+ node.getExpressions().forEach(expr -> visitExprNode(expr, expected));`
`424`	`426`	`return null;`
`425`	`427`	`}`
`426`	`428`
`427`	`429`	`@Override`
`428`	`430`	`public Void visitRecordFieldAccessNode(RecordFieldAccessNode node, Void expected) {`
	`431`	`+ visitExprNode(node.getRecord(), expected);`
`429`	`432`	`return null;`
`430`	`433`	`}`
`431`	`434`
Original file line number	Diff line number	Diff line change
`@@ -739,7 +739,7 @@ public String visitRecordNode(RecordNode node, Void expected) {`
`739`	`739`
`740`	`740`	`@Override`
`741`	`741`	`public String visitStructNode(StructNode node, Void expected) {`
`742`		`- return "";`
	`742`	`+ return expressionGenerator.visitExprNode(node);`
`743`	`743`	`}`
`744`	`744`
`745`	`745`	`@Override`