Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdolfo SBH2016-03-14 17:16:51 +0000
committerEd Willink2016-03-23 17:55:32 +0000
commit91252a44025d8d85c23c4369992742a8a059cea7 (patch)
tree4ece745eb3ca8bc3abddc9608a13315808a5a6c0 /tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests
parenta046f446b1f891a7443c01ec4bb0ac1a163f53e9 (diff)
downloadorg.eclipse.qvtd-91252a44025d8d85c23c4369992742a8a059cea7.tar.gz
org.eclipse.qvtd-91252a44025d8d85c23c4369992742a8a059cea7.tar.xz
org.eclipse.qvtd-91252a44025d8d85c23c4369992742a8a059cea7.zip
[cs2as] - Fixing CS2AS description (empty scopes not supported by CG)
for Example 2
Diffstat (limited to 'tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests')
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2as.cs2as2
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asLookup.ocl4
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2.cs2as2
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2Lookup.ocl3
4 files changed, 4 insertions, 7 deletions
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2as.cs2as b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2as.cs2as
index 317f98ca7..3c60aa8e6 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2as.cs2as
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2as.cs2as
@@ -30,7 +30,7 @@ nameresolution {
name-qualifier PathNameCS name-segments-property path; /*from source */
Root {
- scopes-resetting
+ scopes
Package using ownedPackages;
}
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asLookup.ocl b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asLookup.ocl
index 586e737fc..a63a28672 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asLookup.ocl
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asLookup.ocl
@@ -40,11 +40,9 @@ package as
context Root
def : _unqualified_env_Package(child : ocl::OclElement) : lookup::LookupEnvironment =
- let env = lookup::LookupEnvironment {}
- in env
+ parentEnv_Package()
.addElements(ownedPackages)
-
context Package
def : _lookupQualifiedPackage(pName : String) : Package[?] =
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 40cdc82ec..03c79d825 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
@@ -71,7 +71,7 @@ nameresolution {
name-qualifier PathNameCS name-segments-property path; /*from source */
Root {
- scopes-resetting
+ scopes
Package using ownedPackages;
}
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2Lookup.ocl b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2Lookup.ocl
index 6f656f2f8..e48d53970 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2Lookup.ocl
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example2/classescs2asV2Lookup.ocl
@@ -53,8 +53,7 @@ package as
context Root
def : _unqualified_env_Package(child : ocl::OclElement) : lookup::LookupEnvironment =
- let env = lookup::LookupEnvironment {}
- in env
+ parentEnv_Package()
.addElements(ownedPackages)

Back to the top