Added 'import'

Epistimis · Jan 13, 2024 · f922d13 · f922d13
1 parent b22bd06
commit f922d13
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/com.epistimis.uddl/src/com/epistimis/uddl/GenerateUddl.mwe2 b/com.epistimis.uddl/src/com/epistimis/uddl/GenerateUddl.mwe2
@@ -81,6 +81,10 @@ Workflow {
 			projectWizard = {
 				generate = true
 			}
+			// https://idiomaticsoft.com/post/2022-05-16-xtext-importuri/ 
+			scopeProvider = scoping.ImportNamespacesScopingFragment2 {
+				generateXtendStub = false
+			}
 		}
 	}
 }
diff --git a/com.epistimis.uddl/src/com/epistimis/uddl/Uddl.xtext b/com.epistimis.uddl/src/com/epistimis/uddl/Uddl.xtext
@@ -4,11 +4,11 @@ generate uddl "http://www.epistimis.com/uddl/Uddl"
 
 import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 
-//// Starter rule comes first
-//ModelFile:
-//	includes+=Include*
-//	dataModel=DataModel
-//;
+// Starter rule comes first
+ModelFile:
+	(includes+=Include)*
+	dataModel=DataModel
+;
 
 /** A DataModel is a container for ConceptualDataModels, LogicalDataModels, and PlatformDataModels */
 DataModel:
@@ -37,10 +37,11 @@ QN:
     ID ('.' ID)*;
 
 /**
- * Use 'include' because 'import' is an XBase keyword
+ * Use 'include' because 'import' is an XBase keyword ?
+ * Probably not - examples use 'import' and doc knows of XBase
  */
 Include:
-    'include' importedNamespace=QualifiedNameWithWildcard;
+    'import' importedNamespace=QualifiedNameWithWildcard ';' ;
 
 /**
  * Already defined in XBase