diff options
Diffstat (limited to 'language/src/main/java/org/eclipse')
3 files changed, 14 insertions, 14 deletions
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 b/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 index 76563e2c..a63681c8 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 +++ b/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 | |||
@@ -3,6 +3,8 @@ module org.eclipse.viatra.solver.language.GenerateProblem | |||
3 | import org.eclipse.xtext.xtext.generator.* | 3 | import org.eclipse.xtext.xtext.generator.* |
4 | import org.eclipse.xtext.xtext.generator.model.project.* | 4 | import org.eclipse.xtext.xtext.generator.model.project.* |
5 | 5 | ||
6 | import org.eclipse.viatra.solver.language.mwe2.* | ||
7 | |||
6 | var rootPath = ".." | 8 | var rootPath = ".." |
7 | 9 | ||
8 | Workflow { | 10 | Workflow { |
@@ -14,12 +16,12 @@ Workflow { | |||
14 | runtimeTest = { | 16 | runtimeTest = { |
15 | enabled = true | 17 | enabled = true |
16 | } | 18 | } |
17 | genericIde = { | 19 | genericIde = { |
18 | name = "language-ide" | 20 | name = "language-ide" |
19 | } | 21 | } |
20 | web = { | 22 | web = { |
21 | enabled = true | 23 | enabled = true |
22 | name = "language-web" | 24 | name = "language-web" |
23 | } | 25 | } |
24 | mavenLayout = true | 26 | mavenLayout = true |
25 | } | 27 | } |
@@ -30,18 +32,15 @@ Workflow { | |||
30 | preferXtendStubs = false | 32 | preferXtendStubs = false |
31 | } | 33 | } |
32 | } | 34 | } |
33 | 35 | ||
34 | language = StandardLanguage { | 36 | language = StandardLanguage { |
35 | name = "org.eclipse.viatra.solver.language.Problem" | 37 | name = "org.eclipse.viatra.solver.language.Problem" |
36 | fileExtensions = "problem" | 38 | fileExtensions = "problem" |
37 | referencedResource = "platform:/resource/language-model/model/problem.genmodel" | 39 | referencedResource = "platform:/resource/language-model/model/problem.genmodel" |
38 | |||
39 | serializer = { | 40 | serializer = { |
40 | generateStub = false | 41 | generateStub = false |
41 | } | 42 | } |
42 | validator = { | 43 | validator = { |
43 | // composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator" | ||
44 | // Generates checks for @Deprecated grammar annotations, an IssueProvider and a corresponding PropertyPage | ||
45 | generateDeprecationValidation = true | 44 | generateDeprecationValidation = true |
46 | } | 45 | } |
47 | generator = { | 46 | generator = { |
@@ -50,10 +49,7 @@ Workflow { | |||
50 | junitSupport = { | 49 | junitSupport = { |
51 | junitVersion = "5" | 50 | junitVersion = "5" |
52 | } | 51 | } |
53 | webSupport = { | 52 | webSupport = ProblemWebIntegrationFragment {} |
54 | framework = "CodeMirror" | ||
55 | suppressPattern = "string_singleQuote" | ||
56 | } | ||
57 | } | 53 | } |
58 | } | 54 | } |
59 | } | 55 | } |
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext b/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext index 5f8b35f3..466988d8 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext +++ b/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext | |||
@@ -103,7 +103,7 @@ QuotedOrUnquotedId: | |||
103 | QUOTED_ID | Identifier; | 103 | QUOTED_ID | Identifier; |
104 | 104 | ||
105 | QualifiedName: | 105 | QualifiedName: |
106 | QUOTED_ID | Identifier (":" Identifier)* (":" QUOTED_ID)?; | 106 | QUOTED_ID | Identifier ("::" Identifier)* ("::" QUOTED_ID)?; |
107 | 107 | ||
108 | Identifier: | 108 | Identifier: |
109 | ID | "true" | "false"; | 109 | ID | "true" | "false"; |
@@ -114,3 +114,7 @@ terminal STRING: | |||
114 | 114 | ||
115 | terminal QUOTED_ID: | 115 | terminal QUOTED_ID: |
116 | "'" ('\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\' | "'"))* "'"; | 116 | "'" ('\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\' | "'"))* "'"; |
117 | |||
118 | @Override | ||
119 | terminal SL_COMMENT: | ||
120 | ('%' | '//') !('\n'|'\r')* ('\r'? '\n')?; | ||
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java b/language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java index 3cee31f3..e55e5dda 100644 --- a/language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java +++ b/language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java | |||
@@ -6,7 +6,7 @@ import com.google.inject.Singleton; | |||
6 | 6 | ||
7 | @Singleton | 7 | @Singleton |
8 | public class ProblemQualifiedNameConverter extends IQualifiedNameConverter.DefaultImpl { | 8 | public class ProblemQualifiedNameConverter extends IQualifiedNameConverter.DefaultImpl { |
9 | public static final String DELIMITER = ":"; | 9 | public static final String DELIMITER = "::"; |
10 | 10 | ||
11 | @Override | 11 | @Override |
12 | public String getDelimiter() { | 12 | public String getDelimiter() { |