[487320] Parenthesize non-trivial unary expression arguments

1 files changed, 10 insertions, 1 deletions

diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java
index 7a69f2c778..68e6d1a838 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java
@@ -588,7 +588,16 @@ public class EssentialOCLDeclarationVisitor extends BaseDeclarationVisitor
 			return createInfixExpCS(csSource, operationName, csArgument);
 		}
 		else {
-			ExpCS csSource = context.visitDeclaration(ExpCS.class, asSource);
+			ExpCS csSource;
+			if (isLowerPrecedence(asSource, asPrecedence)) {
+				ExpCS csExp = createExpCS(asSource);
+				NestedExpCS csNested = EssentialOCLCSFactory.eINSTANCE.createNestedExpCS();
+				csNested.setOwnedExpression(csExp);
+				csSource = csNested;
+			}
+			else {
+				csSource = context.visitDeclaration(ExpCS.class, asSource);
+			}
 			PrefixExpCS csPrefix = EssentialOCLCSFactory.eINSTANCE.createPrefixExpCS();
 			csPrefix.setName(operationName);
 			ExpCS csResult = csPrefix;