Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdolfo SBH2016-07-12 17:24:04 +0000
committerEd Willink2016-10-22 14:15:33 +0000
commitdca3730b2927835b193d7cf2346849ac3352b5bb (patch)
treeb47f14f26473ff1442e49486b2137635d39080bf
parentc32d9ad1b49fcc3faf0c4cd936c96d6370267185 (diff)
downloadorg.eclipse.qvtd-dca3730b2927835b193d7cf2346849ac3352b5bb.tar.gz
org.eclipse.qvtd-dca3730b2927835b193d7cf2346849ac3352b5bb.tar.xz
org.eclipse.qvtd-dca3730b2927835b193d7cf2346849ac3352b5bb.zip
[496420] - workaround to remove the cyclic dependency to disambiguate
NameExpCS
-rw-r--r--doc/org.eclipse.qvtd.doc.miniocl.build/src/org/eclipse/qvtd/doc/miniocl/build/MiniOCL-BuildEverything.mwe23
-rw-r--r--doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLCS2ASDisambiguation.ocl9
-rw-r--r--doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/temp/.gitignore1
3 files changed, 8 insertions, 5 deletions
diff --git a/doc/org.eclipse.qvtd.doc.miniocl.build/src/org/eclipse/qvtd/doc/miniocl/build/MiniOCL-BuildEverything.mwe2 b/doc/org.eclipse.qvtd.doc.miniocl.build/src/org/eclipse/qvtd/doc/miniocl/build/MiniOCL-BuildEverything.mwe2
index 6f71949b3..cda9df335 100644
--- a/doc/org.eclipse.qvtd.doc.miniocl.build/src/org/eclipse/qvtd/doc/miniocl/build/MiniOCL-BuildEverything.mwe2
+++ b/doc/org.eclipse.qvtd.doc.miniocl.build/src/org/eclipse/qvtd/doc/miniocl/build/MiniOCL-BuildEverything.mwe2
@@ -118,7 +118,8 @@ Workflow {
bean = org.eclipse.ocl.examples.build.utilities.ProjectMapSetup { resourceSet = rSet2 }
bean = org.eclipse.ocl.examples.build.utilities.EcoreGenModelSetup { resourceSet = rSet2 }
- component = org.eclipse.ocl.examples.build.utilities.GenerateCGedQVTiTransformation {
+ component = org.eclipse.ocl.examples.build.utilities.GenerateCGedQVTiTransformation {
+ debug = true
resourceSet = rSet2
oclDocURI = "platform:/resource/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLCS2AS.ocl"
javaFolder = "../org.eclipse.qvtd.doc.minioclcs.xtext/src-gen"
diff --git a/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLCS2ASDisambiguation.ocl b/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLCS2ASDisambiguation.ocl
index e8d68906f..81714fa2c 100644
--- a/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLCS2ASDisambiguation.ocl
+++ b/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/MiniOCLCS2ASDisambiguation.ocl
@@ -7,8 +7,9 @@ package cs
-- FIXME Manually added
context NameExpCS
-def : lookupVariable() : as::Variable =
- ast.lookupVariable(expName.path->first())
+def : lookupVariableToDisambiguate() : as::Variable =
+ oclContainer().oclAsType(CSTrace).ast.lookupVariable(expName.path->first())
+
-- ENDOF manual addition
context NameExpCS
@@ -28,9 +29,9 @@ def : isVariableExp() : Boolean =
roundedBrackets = null
and not isNameExpOfACallExpCS()
and expName.path->size() = 1 -- If using a qualified name, we assume we are looking for a fully qualified property
- and lookupVariable() <> null
+ and lookupVariableToDisambiguate() <> null
def : isPropCallExpWithImplicitSource() : Boolean =
roundedBrackets = null
and not isNameExpOfACallExpCS()
- and lookupVariable() = null
+ -- and lookupVariableToDisambiguate() = null
endpackage
diff --git a/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/temp/.gitignore b/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/temp/.gitignore
index d9addb9e9..5caebd01e 100644
--- a/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/temp/.gitignore
+++ b/doc/org.eclipse.qvtd.doc.minioclcs.xtext/model/temp/.gitignore
@@ -1,2 +1,3 @@
/MiniOCLCS2AS.qvtias
/MiniOCLCS2AS.qvts.xmi
+/graphs/

Back to the top