Fixed keyword variable name in AcceleoAstSerializer and AstSerializer.

eclipse-acceleo · Dec 5, 2023 · c63da84 · c63da84
1 parent 2339f3f
commit c63da84
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/parser/AcceleoAstSerializer.java b/plugins/org.eclipse.acceleo.aql/src/org/eclipse/acceleo/aql/parser/AcceleoAstSerializer.java
@@ -39,6 +39,7 @@
 import org.eclipse.acceleo.Template;
 import org.eclipse.acceleo.TextStatement;
 import org.eclipse.acceleo.Variable;
+import org.eclipse.acceleo.query.parser.AstBuilder;
 import org.eclipse.acceleo.query.parser.AstSerializer;
 import org.eclipse.acceleo.util.AcceleoSwitch;
 
@@ -113,7 +114,8 @@ public String serialize(AcceleoASTNode node) {
 
 	@Override
 	public Object caseBinding(Binding binding) {
-		builder.append(binding.getName());
+		final String bindingName = AstBuilder.protectWithUnderscore(binding.getName());
+		builder.append(bindingName);
 		if (binding.getType() != null) {
 			builder.append(" : ");
 			builder.append(querySerializer.serialize(binding.getType().getAst()));
@@ -567,7 +569,8 @@ public Object caseTextStatement(TextStatement textStatement) {
 
 	@Override
 	public Object caseVariable(Variable variable) {
-		builder.append(variable.getName());
+		final String variableName = AstBuilder.protectWithUnderscore(variable.getName());
+		builder.append(variableName);
 		builder.append(SPACE);
 		builder.append(AcceleoParser.COLON);
 		builder.append(SPACE);

diff --git a/...plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstSerializer.java b/...plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/parser/AstSerializer.java
@@ -147,7 +147,8 @@ private static Map<String, Integer> initOperatorPrecedence() {
 
 	@Override
 	public Object caseBinding(Binding binding) {
-		builder.append(binding.getName());
+		final String bindingName = AstBuilder.protectWithUnderscore(binding.getName());
+		builder.append(bindingName);
 		if (binding.getType() != null) {
 			builder.append(SPACE).append(':').append(SPACE);
 			builder.append(doSwitch(binding.getType()));
@@ -932,7 +933,8 @@ public Object caseEClassifierTypeLiteral(EClassifierTypeLiteral object) {
 
 	@Override
 	public Object caseVariableDeclaration(VariableDeclaration variableDeclaration) {
-		builder.append(variableDeclaration.getName());
+		final String variableName = AstBuilder.protectWithUnderscore(variableDeclaration.getName());
+		builder.append(variableName);
 		if (variableDeclaration.getType() != null) {
 			builder.append(SPACE).append(':').append(SPACE);
 			doSwitch(variableDeclaration.getType());
@@ -942,7 +944,8 @@ public Object caseVariableDeclaration(VariableDeclaration variableDeclaration) {
 
 	@Override
 	public Object caseVarRef(VarRef varRef) {
-		builder.append(varRef.getVariableName());
+		final String variableName = AstBuilder.protectWithUnderscore(varRef.getVariableName());
+		builder.append(variableName);
 		return DUMMY;
 	}