From 7febe0b4781c5bb0fab34895ad642040ae143a8b Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sun, 27 Jun 2021 23:21:42 +0200 Subject: Add data constant support --- .../viatra/solver/language/mwe2/ProblemWebIntegrationFragment.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'language-mwe2/src/main/java/org/eclipse/viatra/solver') diff --git a/language-mwe2/src/main/java/org/eclipse/viatra/solver/language/mwe2/ProblemWebIntegrationFragment.java b/language-mwe2/src/main/java/org/eclipse/viatra/solver/language/mwe2/ProblemWebIntegrationFragment.java index c8a2c58c..18e13245 100644 --- a/language-mwe2/src/main/java/org/eclipse/viatra/solver/language/mwe2/ProblemWebIntegrationFragment.java +++ b/language-mwe2/src/main/java/org/eclipse/viatra/solver/language/mwe2/ProblemWebIntegrationFragment.java @@ -9,6 +9,8 @@ import com.google.common.collect.Multimap; public class ProblemWebIntegrationFragment extends WebIntegrationFragment { public ProblemWebIntegrationFragment() { setFramework(Framework.CODEMIRROR.name()); + // The exponential operators e and E are not keywords + setKeywordsFilter("[^eE]|\\w\\w+"); // We use our custom token style for single-quoted names addSuppressPattern("string_singleQuote"); // Use the CodeMirror default .cm-number instead of .cm-constant.cm-numeric @@ -47,7 +49,7 @@ public class ProblemWebIntegrationFragment extends WebIntegrationFragment { patterns.put("meta", "lineComment: \"%\""); // Override indentation behavior patterns.put("start", "{token: \"lparen\", indent: true, regex: \"[[({]\"}"); - patterns.put("start", "{token: \"rparen\", dedent: true, dedentIfLineStart: true, regex: \"[\\\\])}]\"}"); + patterns.put("start", "{token: \"rparen\", dedent: true, regex: \"[\\\\])}]\"}"); patterns.putAll("predicateBody", patterns.get("start")); patterns.put("start", "{indent: true, push: \"predicateBody\", regex: \":-\"}"); patterns.put("predicateBody", "{dedent: true, dedentIfLineStart: false, pop: true, regex: \"\\\\.\\\\s*$\"}"); -- cgit v1.2.3-70-g09d2