Merge pull request #81 from useocl/fix_operationcall

h-man2 · web-flow · commit 3067dd1b4e37 · 2024-06-14T11:02:10.000+02:00
fix: handling of result values for operation calls
diff --git a/use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExpInstanceConstructor.java b/use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExpInstanceConstructor.java
@@ -83,6 +83,7 @@ public Value eval(EvalContext ctx) {
 
         MOperationCall operationCall = new MOperationCall(this, self, constructor, arguments);
         operationCall.setPreferredPPCHandler(ExpressionPPCHandler.getDefaultOutputHandler());
+        operationCall.setResultValue(result);
 
         MSystem system = ctx.postState().system();
         try {
@@ -93,7 +94,7 @@ public Value eval(EvalContext ctx) {
         } finally {
             try {
                 if (operationCall.enteredSuccessfully()) {
-                    system.exitQueryOperation(ctx, result);
+                    system.exitQueryOperation(ctx);
                 }
             } catch (MSystemException ignored) {
             }

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ public Value eval(EvalContext ctx) {`
`83`	`83`
`84`	`84`	`MOperationCall operationCall = new MOperationCall(this, self, constructor, arguments);`
`85`	`85`	`operationCall.setPreferredPPCHandler(ExpressionPPCHandler.getDefaultOutputHandler());`
	`86`	`+ operationCall.setResultValue(result);`
`86`	`87`
`87`	`88`	`MSystem system = ctx.postState().system();`
`88`	`89`	`try {`
`@@ -93,7 +94,7 @@ public Value eval(EvalContext ctx) {`
`93`	`94`	`} finally {`
`94`	`95`	`try {`
`95`	`96`	`if (operationCall.enteredSuccessfully()) {`
`96`		`- system.exitQueryOperation(ctx, result);`
	`97`	`+ system.exitQueryOperation(ctx);`
`97`	`98`	`}`
`98`	`99`	`} catch (MSystemException ignored) {`
`99`	`100`	`}`