Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdolfo SBH2016-11-16 11:25:26 +0000
committerAdolfo SBH2016-11-28 19:48:19 +0000
commit96422187f4e10c2c7e6b848e5b4f86ca22b27ea4 (patch)
treed311d3901e58dcbb0a0e3ce4ae344543a9e3815e
parentd9033c9b3ed82ecf4515bb87ee530c21e9fb7591 (diff)
downloadorg.eclipse.qvtd-asanchez/master.tar.gz
org.eclipse.qvtd-asanchez/master.tar.xz
org.eclipse.qvtd-asanchez/master.zip
[miniocl] - Adding the missing iterator/iterate variable contributionsasanchez/master
-rw-r--r--doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLFull.cs2as9
-rw-r--r--doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLFullLookup.ocl14
2 files changed, 23 insertions, 0 deletions
diff --git a/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLFull.cs2as b/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLFull.cs2as
index 00e24832c..f21666650 100644
--- a/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLFull.cs2as
+++ b/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLFull.cs2as
@@ -316,5 +316,14 @@ name_resolution {
for all excepting ownedVariable
provides occluding Variable using ownedVariable;
}
+ IteratorExp {
+ in current_scope
+ provides occluding Variable using ownedIterator;
+ }
+ IterateExp {
+ in current_scope
+ for ownedBody
+ provides occluding Variable using ownedIterator, ownedResult;
+ }
}
} \ No newline at end of file
diff --git a/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLFullLookup.ocl b/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLFullLookup.ocl
index 0eeb6e814..db964e138 100644
--- a/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLFullLookup.ocl
+++ b/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLFullLookup.ocl
@@ -486,5 +486,19 @@ def : _unqualified_env_Variable(child : ocl::OclElement) : lookup::LookupEnviron
else parentEnv_Variable()
endif
+context IteratorExp
+def : _unqualified_env_Variable(child : ocl::OclElement) : lookup::LookupEnvironment =
+ parentEnv_Variable().nestedEnv()
+ .addElements(ownedIterator)
+
+context IterateExp
+def : _unqualified_env_Variable(child : ocl::OclElement) : lookup::LookupEnvironment =
+ if ownedBody->includes(child)
+ then parentEnv_Variable().nestedEnv()
+ .addElements(ownedIterator)
+ .addElements(ownedResult)
+
+ else parentEnv_Variable()
+ endif
endpackage

Back to the top