Skip to content

Commit 66123a6

Browse files
authored
Merge pull request #589 from Systems-Modeling/ST6RI-791
ST6RI-791 Remove ability to have import declarations without explicit visibility
2 parents 740efda + 997a1d6 commit 66123a6

35 files changed

Lines changed: 11907 additions & 12064 deletions

File tree

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
//*
2+
XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
3+
ResourceSet {
4+
ThisFile {}
5+
File {from ="/library/Base.kerml"}
6+
File {from ="/library/ScalarValues.kerml"}
7+
}
8+
Workspace {
9+
JavaProject {
10+
SrcFolder {
11+
ThisFile {}
12+
File {from ="/library/Base.kerml"}
13+
File {from ="/library/ScalarValues.kerml"}
14+
}
15+
}
16+
}
17+
END_SETUP
18+
*/
19+
package ImportVisibility {
20+
public import ScalarValues;
21+
private import ScalarValues;
22+
protected import ScalarValues;
23+
// XPECT errors ---> "mismatched input 'import' expecting '}'" at "import"
24+
import ScalarValues;
25+
// XPECT errors ---> "extraneous input '}' expecting EOF" at "}"
26+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//*
2+
XPECT_SETUP org.omg.kerml.xpect.tests.validation.KerMLValidationTest
3+
ResourceSet {
4+
ThisFile {}
5+
File {from ="/library/Base.kerml"}
6+
File {from ="/library/ScalarValues.kerml"}
7+
}
8+
Workspace {
9+
JavaProject {
10+
SrcFolder {
11+
ThisFile {}
12+
File {from ="/library/Base.kerml"}
13+
File {from ="/library/ScalarValues.kerml"}
14+
}
15+
}
16+
}
17+
END_SETUP
18+
*/
19+
// XPECT errors ---> "Top level import must be private" at "public import ScalarValues"
20+
public import ScalarValues;
21+
22+
private import Import_RootNamespace;
23+
24+
package Import_RootNamespace {
25+
}

org.omg.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/AbstractKerMLIdeModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.28.0
2+
* generated by Xtext 2.34.0
33
*/
44
package org.omg.kerml.xtext.ide;
55

org.omg.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/contentassist/antlr/KerMLParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.28.0
2+
* generated by Xtext 2.34.0
33
*/
44
package org.omg.kerml.xtext.ide.contentassist.antlr;
55

org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/AbstractKerMLUiModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.28.0
2+
* generated by Xtext 2.34.0
33
*/
44
package org.omg.kerml.xtext.ui;
55

org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/KerMLExecutableExtensionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.28.0
2+
* generated by Xtext 2.34.0
33
*/
44
package org.omg.kerml.xtext.ui;
55

org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/internal/XtextActivator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.28.0
2+
* generated by Xtext 2.34.0
33
*/
44
package org.omg.kerml.xtext.ui.internal;
55

org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/AbstractKerMLRuntimeModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.28.0
2+
* generated by Xtext 2.34.0
33
*/
44
package org.omg.kerml.xtext;
55

-3 Bytes
Binary file not shown.

org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerMLStandaloneSetupGenerated.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.28.0
2+
* generated by Xtext 2.34.0
33
*/
44
package org.omg.kerml.xtext;
55

0 commit comments

Comments
 (0)