-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #589 from Systems-Modeling/ST6RI-791
ST6RI-791 Remove ability to have import declarations without explicit visibility
- Loading branch information
Showing
35 changed files
with
11,907 additions
and
12,064 deletions.
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
...xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_Import_Visibility.kerml.xt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 "}" | ||
} |
25 changes: 25 additions & 0 deletions
25
...xpect.tests/src/org/omg/kerml/xpect/tests/validation/Import_RootNamspace_invalid.kerml.xt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 { | ||
} |
2 changes: 1 addition & 1 deletion
2
org.omg.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/AbstractKerMLIdeModule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* generated by Xtext 2.28.0 | ||
* generated by Xtext 2.34.0 | ||
*/ | ||
package org.omg.kerml.xtext.ide; | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
org.omg.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/contentassist/antlr/KerMLParser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/AbstractKerMLUiModule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* generated by Xtext 2.28.0 | ||
* generated by Xtext 2.34.0 | ||
*/ | ||
package org.omg.kerml.xtext.ui; | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/KerMLExecutableExtensionFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* generated by Xtext 2.28.0 | ||
* generated by Xtext 2.34.0 | ||
*/ | ||
package org.omg.kerml.xtext.ui; | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/internal/XtextActivator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* generated by Xtext 2.28.0 | ||
* generated by Xtext 2.34.0 | ||
*/ | ||
package org.omg.kerml.xtext.ui.internal; | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/AbstractKerMLRuntimeModule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* generated by Xtext 2.28.0 | ||
* generated by Xtext 2.34.0 | ||
*/ | ||
package org.omg.kerml.xtext; | ||
|
||
|
Binary file modified
BIN
-3 Bytes
(100%)
org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerML.xtextbin
Binary file not shown.
2 changes: 1 addition & 1 deletion
2
org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerMLStandaloneSetupGenerated.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* generated by Xtext 2.28.0 | ||
* generated by Xtext 2.34.0 | ||
*/ | ||
package org.omg.kerml.xtext; | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
...omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/KerMLAntlrTokenFileProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* generated by Xtext 2.28.0 | ||
* generated by Xtext 2.34.0 | ||
*/ | ||
package org.omg.kerml.xtext.parser.antlr; | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/KerMLParser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* generated by Xtext 2.28.0 | ||
* generated by Xtext 2.34.0 | ||
*/ | ||
package org.omg.kerml.xtext.parser.antlr; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.