[397429] - Adding a cyclic dependency among OCL files
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS2ASHelpers.ocl b/plugins/org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS2ASHelpers.ocl
index 3f653bc..76a67f0 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS2ASHelpers.ocl
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS2ASHelpers.ocl
@@ -1,4 +1,5 @@
import 'EssentialOCLCS.ecore'
+import 'EssentialOCLCS2AS.ocl'
import '/resource/org.eclipse.ocl.xtext.base/model/BaseCS.ecore'
import '/resource/org.eclipse.ocl.pivot/model/Pivot.ecore'
import '/resource/org.eclipse.ocl.pivot/model/PivotCS2ASLookup.ocl'
@@ -10,14 +11,6 @@
context TypeNameExpCS
def : ast() : ocl::Type =
multiplicityType(element) -- REF element manually hand-coded which returns the proper type
-
--- FIXME This has been manually added. Discuss with Ed
-
-context ExpCS
-def : ast() : ocl::OCLExpression =
- invalid -- to be overriden
-
--- END OF manual addition
-- FIXME to be defined in helpers section
context NameExpCS