diff options
2 files changed, 6 insertions, 9 deletions
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2Target.cs2as b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2Target.cs2as index 72a5db7ef..bc9d1b37b 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2Target.cs2as +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2Target.cs2as @@ -64,7 +64,7 @@ nameresolution { name-qualifier PathNameCS name-segments-property path; /*from source */ TRoot { - scopes-resetting A1, A2 using ownedA; + scopes A1, A2 using ownedA; } A1 { @@ -77,7 +77,7 @@ nameresolution { A2 { named-element - qualifies C using ownsC; + qualifies C using ownsC; for ownsC scopes C using following ownsC; diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2TargetLookup.ocl b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2TargetLookup.ocl index 88905a2bf..874fee4c4 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2TargetLookup.ocl +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/Source2TargetLookup.ocl @@ -52,15 +52,12 @@ package _target context TRoot def : _unqualified_env_A1(child : ocl::OclElement) : lookup::LookupEnvironment = - let env = lookup::LookupEnvironment {} - in env + parentEnv_A1() .addElements(ownedA) def : _unqualified_env_A2(child : ocl::OclElement) : lookup::LookupEnvironment = - let env = lookup::LookupEnvironment {} - in env + parentEnv_A2() .addElements(ownedA) - context A1 @@ -80,7 +77,7 @@ def : _qualified_env() : lookup::LookupEnvironment = .addElements(ownsB) def : _unqualified_env_B(child : ocl::OclElement) : lookup::LookupEnvironment = if ownsB->includes(child) - then parentEnv_B() + then parentEnv_B().nestedEnv() .addElements(ownsB->select(x | self.ownsB->indexOf(x) < self.ownsB->indexOf(child))) else parentEnv_B() @@ -104,7 +101,7 @@ def : _qualified_env() : lookup::LookupEnvironment = .addElements(ownsC) def : _unqualified_env_C(child : ocl::OclElement) : lookup::LookupEnvironment = if ownsC->includes(child) - then parentEnv_C() + then parentEnv_C().nestedEnv() .addElements(ownsC->select(x | self.ownsC->indexOf(x) < self.ownsC->indexOf(child))) else parentEnv_C() |