Merge pull request #589 from Systems-Modeling/ST6RI-791

ST6RI-791 Remove ability to have import declarations without explicit visibility
Systems-Modeling · Sep 4, 2024 · 66123a6 · 66123a6
2 parents 740efda + 997a1d6
commit 66123a6
Show file tree

Hide file tree

Showing 35 changed files with 11,907 additions and 12,064 deletions.
diff --git a/...xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_Import_Visibility.kerml.xt b/...xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_Import_Visibility.kerml.xt
@@ -0,0 +1,26 @@
+//* 
+XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
+	ResourceSet {
+		ThisFile {}
+		File {from ="/library/Base.kerml"}
+       	File {from ="/library/ScalarValues.kerml"}
+	}
+	Workspace {
+		JavaProject {
+			SrcFolder {
+				ThisFile {}
+				File {from ="/library/Base.kerml"}
+		       	File {from ="/library/ScalarValues.kerml"}
+			}
+		}
+	}
+END_SETUP 
+*/
+package ImportVisibility {
+	public import ScalarValues;
+	private import ScalarValues;
+	protected import ScalarValues;
+	// XPECT errors ---> "mismatched input 'import' expecting '}'" at "import"
+	import ScalarValues;
+	// XPECT errors ---> "extraneous input '}' expecting EOF" at "}"
+}
diff --git a/...xpect.tests/src/org/omg/kerml/xpect/tests/validation/Import_RootNamspace_invalid.kerml.xt b/...xpect.tests/src/org/omg/kerml/xpect/tests/validation/Import_RootNamspace_invalid.kerml.xt
@@ -0,0 +1,25 @@
+//* 
+XPECT_SETUP org.omg.kerml.xpect.tests.validation.KerMLValidationTest
+	ResourceSet {
+		ThisFile {}
+		File {from ="/library/Base.kerml"}
+       	File {from ="/library/ScalarValues.kerml"}
+	}
+	Workspace {
+		JavaProject {
+			SrcFolder {
+				ThisFile {}
+				File {from ="/library/Base.kerml"}
+		       	File {from ="/library/ScalarValues.kerml"}
+			}
+		}
+	}
+END_SETUP 
+*/
+// XPECT errors ---> "Top level import must be private" at "public import ScalarValues"
+public import ScalarValues;
+
+private import Import_RootNamespace;
+
+package Import_RootNamespace {
+}
diff --git a/org.omg.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/AbstractKerMLIdeModule.java b/org.omg.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/AbstractKerMLIdeModule.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.28.0
+ * generated by Xtext 2.34.0
  */
 package org.omg.kerml.xtext.ide;
 

diff --git a/org.omg.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/contentassist/antlr/KerMLParser.java b/org.omg.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/contentassist/antlr/KerMLParser.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.28.0
+ * generated by Xtext 2.34.0
  */
 package org.omg.kerml.xtext.ide.contentassist.antlr;
 

diff --git a/org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/AbstractKerMLUiModule.java b/org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/AbstractKerMLUiModule.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.28.0
+ * generated by Xtext 2.34.0
  */
 package org.omg.kerml.xtext.ui;
 

diff --git a/org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/KerMLExecutableExtensionFactory.java b/org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/KerMLExecutableExtensionFactory.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.28.0
+ * generated by Xtext 2.34.0
  */
 package org.omg.kerml.xtext.ui;
 

diff --git a/org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/internal/XtextActivator.java b/org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/internal/XtextActivator.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.28.0
+ * generated by Xtext 2.34.0
  */
 package org.omg.kerml.xtext.ui.internal;
 

diff --git a/org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/AbstractKerMLRuntimeModule.java b/org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/AbstractKerMLRuntimeModule.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.28.0
+ * generated by Xtext 2.34.0
  */
 package org.omg.kerml.xtext;
 

diff --git a/org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerML.xtextbin b/org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerML.xtextbin
diff --git a/org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerMLStandaloneSetupGenerated.java b/org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerMLStandaloneSetupGenerated.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.28.0
+ * generated by Xtext 2.34.0
  */
 package org.omg.kerml.xtext;
 

diff --git a/...omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/KerMLAntlrTokenFileProvider.java b/...omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/KerMLAntlrTokenFileProvider.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.28.0
+ * generated by Xtext 2.34.0
  */
 package org.omg.kerml.xtext.parser.antlr;
 

diff --git a/org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/KerMLParser.java b/org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/KerMLParser.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.28.0
+ * generated by Xtext 2.34.0
  */
 package org.omg.kerml.xtext.parser.antlr;
 

diff --git a/org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/internal/InternalKerML.g b/org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/internal/InternalKerML.g
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.28.0
+ * generated by Xtext 2.34.0
  */
 grammar InternalKerML;
 
@@ -1427,7 +1427,7 @@ ruleImportPrefix[EObject in_current]  returns [EObject current=in_current]
 					afterParserOrEnumRuleCall();
 				}
 			)
-		)?
+		)
 		otherlv_1='import'
 		{
 			newLeafNode(otherlv_1, grammarAccess.getImportPrefixAccess().getImportKeyword_1());