[485668] - Fixing the OCL2QVTp transformation to spread the safe

navigation to oclAsType call

2 files changed, 3 insertions, 3 deletions

diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2.cs2as b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2.cs2as
index fe23ee0fe..e0057d62b 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2.cs2as
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2.cs2as
@@ -101,7 +101,7 @@ nameresolution {
 		named-element

 			filtered by args : OrderedSet(Argument)

 				when args->size() = ownedParameters->size() and

-						args->forAll(x | x.name = ownedParameters->at(args->indexOf(x)).name);				

+						args->forAll(x | x.name = ownedParameters->at(args->indexOf(x)).name);

 	}

 	

 	Property {

diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2.ocl b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2.ocl
index 255ce7fdf..58d1c9c15 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2.ocl
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2.ocl
@@ -45,7 +45,7 @@ context NameExpCS
 def : ast() : as::CallExp =

 	if isOpCallExp()

 	then as::OperationCallExp {

-		ownedCallExp = if ownedNameExp = null then null else ownedNameExp.ast() endif, -- FIXME, this is not properly CGed. See PropertyCallExp creation

+		ownedCallExp = ownedNameExp?.ast(),

 		ownedArguments = roundedBrackets.args.ast(), 

 	referredOperation = if oclContainer().oclIsKindOf(NameExpCS) then ast().lookupOperationFrom(ast().owningSource.type, name, ast().oclAsType(as::OperationCallExp).ownedArguments) else ast().lookupOperation(name, ast().oclAsType(as::OperationCallExp).ownedArguments) endif, 

 	type = ast().oclAsType(as::OperationCallExp).referredOperation?.type

@@ -53,7 +53,7 @@ def : ast() : as::CallExp =
 	else

 		if isPropCallExp()

 		then as::PropertyCallExp {

-			ownedCallExp = if ownedNameExp = null then null else ownedNameExp.ast() endif, 

+			ownedCallExp = ownedNameExp?.ast(), 

 		referredProperty = if oclContainer().oclIsKindOf(NameExpCS) then ast().lookupPropertyFrom(ast().owningSource.type, name) else ast().lookupProperty(name) endif, 

 		type = ast().oclAsType(as::PropertyCallExp).referredProperty?.type

 		}