Update solver language grammar

First version, still needs TokenSource and Linker to work.

4 files changed, 72 insertions, 52 deletions

diff --git a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/SolverLanguageUiModule.xtend b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/SolverLanguageUiModule.xtend
index 1c165a0a..602646aa 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/SolverLanguageUiModule.xtend
+++ b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/SolverLanguageUiModule.xtend
@@ -4,21 +4,17 @@
 package org.eclipse.viatra.solver.language.ui

 

 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor

-import org.eclipse.xtext.ide.editor.syntaxcoloring.ISemanticHighlightingCalculator

-import org.eclipse.xtext.ui.editor.syntaxcoloring.ITextAttributeProvider

-import org.eclipse.viatra.solver.language.ui.highlight.SolverSemanticHighlightCalculator

-import org.eclipse.viatra.solver.language.ui.highlight.SolverSemanticTextAttributeProvider

 

 /**

  * Use this class to register components to be used within the Eclipse IDE.

  */

 @FinalFieldsConstructor

 class SolverLanguageUiModule extends AbstractSolverLanguageUiModule {

-        def Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {

-                SolverSemanticHighlightCalculator

-        }

-        

-        def Class<? extends ITextAttributeProvider> bindITextAttributeProvider() {

-                SolverSemanticTextAttributeProvider

-        }

+//      def Class<? extends ISemanticHighlightingCalculator> bindISemanticHighlightingCalculator() {

+//              SolverSemanticHighlightCalculator

+//      }

+//      

+//      def Class<? extends ITextAttributeProvider> bindITextAttributeProvider() {

+//              SolverSemanticTextAttributeProvider

+//      }

 }

diff --git a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/highlight/SolverSemanticHighlightCalculator.xtend b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticHighlightCalculator.xtend
index cb10ebf4..5242a82e 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/highlight/SolverSemanticHighlightCalculator.xtend
+++ b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticHighlightCalculator.xtend
@@ -1,8 +1,8 @@
-package org.eclipse.viatra.solver.language.ui.highlight

+package org.eclipse.viatra.solver.language.ui.syntaxcoloring

 

 import java.util.Random

 import java.util.WeakHashMap

-import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol

+import org.eclipse.viatra.solver.language.solverLanguage.Reference

 import org.eclipse.xtext.ide.editor.syntaxcoloring.DefaultSemanticHighlightingCalculator

 import org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor

 import org.eclipse.xtext.nodemodel.util.NodeModelUtils

@@ -10,49 +10,50 @@ import org.eclipse.xtext.resource.XtextResource
 import org.eclipse.xtext.util.CancelIndicator

 

 class SolverSemanticHighlightCalculator extends DefaultSemanticHighlightingCalculator {

-        public static val SmybolCode = "SymbolCode"

-        

-        val symbolName2ID = new WeakHashMap<String,String>

-        

-        override provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor, CancelIndicator cancelIndicator) {

+        public static val SYMBOL_CODE = "SymbolCode::"

+

+        val symbolName2ID = new WeakHashMap<String, String>

+

+        override provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor,

+                CancelIndicator cancelIndicator) {

                 if (resource === null || resource.getParseResult() === null) {

                         return

                 } else {

-                        val modelSymbols = resource.allContents.filter(ModelSymbol)

-                        while(modelSymbols.hasNext) {

+                        val modelSymbols = resource.allContents.filter(Reference)

+                        while (modelSymbols.hasNext) {

                                 val symbolElement = modelSymbols.next

-                                val node = NodeModelUtils::getNode(symbolElement)

+                                val node = NodeModelUtils.getNode(symbolElement)

                                 acceptor.addPosition(

                                         node.getOffset(),

                                         node.getLength(),

-                                        getSymbolCode(symbolElement.name)

+                                        getSymbolCode(node.text)

                                 )

                         }

                 }

         }

-        

+

         def getSymbolCode(String name) {

-                if(symbolName2ID.containsKey(name)) {

+                if (symbolName2ID.containsKey(name)) {

                         return symbolName2ID.get(name)

                 } else {

                         val id = calculateSymbolCode(name)

-                        symbolName2ID.put(name,id)

+                        symbolName2ID.put(name, id)

                         return id

                 }

         }

-        

+

         def String calculateSymbolCode(String name) {

                 val Random random = new Random(name.hashCode)

                 val hue = huePick(random.nextFloat)

-                val saturation = 0.2+random.nextFloat*0.3

-                val brightness = random.nextFloat*0.2+0.7f

-                return '''«SmybolCode» «hue» «saturation» «brightness»'''

+                val saturation = 0.2 + random.nextFloat * 0.3

+                val brightness = random.nextFloat * 0.2 + 0.7f

+                return '''«SYMBOL_CODE» «hue» «saturation» «brightness»'''

         }

+

         private def huePick(float random) {

                 val pink = 300

                 val tolerance = 10

-                val degree = random*(360-2*tolerance)

-                if(degree<pink-tolerance) return degree

-                else return degree+2*tolerance

+                val degree = random * (360 - 2 * tolerance)

+                if(degree < pink - tolerance) return degree else return degree + 2 * tolerance

         }

-}
\ No newline at end of file
+}

diff --git a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/highlight/SolverSemanticTextAttributeProvider.xtend b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticTextAttributeProvider.xtend
index 4eed59ce..ca74a9a2 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/highlight/SolverSemanticTextAttributeProvider.xtend
+++ b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/ui/syntaxcoloring/SolverSemanticTextAttributeProvider.xtend
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.language.ui.highlight

+package org.eclipse.viatra.solver.language.ui.syntaxcoloring

 

 import com.google.inject.Inject

 import java.util.WeakHashMap

@@ -12,34 +12,34 @@ import org.eclipse.xtext.ui.editor.utils.EditorUtils
 import org.eclipse.xtext.ui.editor.utils.TextStyle

 

 class SolverSemanticTextAttributeProvider extends TextAttributeProvider {

-        

+

         val defaultTextStyle = new TextStyle

-        val colorID2TextAttribute = new WeakHashMap<String,TextAttribute>

-        

+        val colorID2TextAttribute = new WeakHashMap<String, TextAttribute>

+

         @Inject

-        new(IHighlightingConfiguration highlightingConfig, IPreferenceStoreAccess preferenceStoreAccess, PreferenceStoreAccessor prefStoreAccessor) {

+        new(IHighlightingConfiguration highlightingConfig, IPreferenceStoreAccess preferenceStoreAccess,

+                PreferenceStoreAccessor prefStoreAccessor) {

                 super(highlightingConfig, preferenceStoreAccess, prefStoreAccessor)

         }

-        

-        

+

         override getAttribute(String id) {

-                if(isMetamodelElementColorID(id)) {

-                        if(colorID2TextAttribute.containsKey(id)) {

+                if (isMetamodelElementColorID(id)) {

+                        if (colorID2TextAttribute.containsKey(id)) {

                                 return colorID2TextAttribute.get(id)

                         } else {

                                 val style = metamodelElementTextStyle(id)

-                                colorID2TextAttribute.put(id,style)

+                                colorID2TextAttribute.put(id, style)

                                 return style

                         }

                 } else {

                         super.getAttribute(id)

                 }

         }

-        

+

         private def isMetamodelElementColorID(String id) {

-                id.startsWith(SolverSemanticHighlightCalculator::SmybolCode)

+                id.startsWith(SolverSemanticHighlightCalculator.SYMBOL_CODE)

         }

-        

+

         private def TextAttribute metamodelElementTextStyle(String id) {

                 val texts = id.split(' ')

                 val backgroundColor = new RGB(

@@ -47,11 +47,9 @@ class SolverSemanticTextAttributeProvider extends TextAttributeProvider {
                         Float.parseFloat(texts.get(2)),

                         Float.parseFloat(texts.get(3))

                 )

-                return new TextAttribute(

-                        EditorUtils.colorFromRGB(defaultTextStyle.color),

-                        EditorUtils.colorFromRGB(backgroundColor),

-                        defaultTextStyle.style,

+                return new TextAttribute(EditorUtils.colorFromRGB(defaultTextStyle.color),

+                        EditorUtils.colorFromRGB(backgroundColor), defaultTextStyle.style,

                         EditorUtils.fontFromFontData(defaultTextStyle.getFontData()));

         }

-        

-}
\ No newline at end of file
+

+}

diff --git a/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/validation/SolverLanguageValidator.xtend b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/validation/SolverLanguageValidator.xtend
new file mode 100644
index 00000000..a7ff7252
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.ui/src/org/eclipse/viatra/solver/language/validation/SolverLanguageValidator.xtend
@@ -0,0 +1,25 @@
+/*

+ * generated by Xtext 2.18.0.M3

+ */

+package org.eclipse.viatra.solver.language.validation

+

+

+/**

+ * This class contains custom validation rules. 

+ *

+ * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation

+ */

+class SolverLanguageValidator extends AbstractSolverLanguageValidator {

+        

+//      public static val INVALID_NAME = 'invalidName'

+//

+//      @Check

+//      def checkGreetingStartsWithCapital(Greeting greeting) {

+//              if (!Character.isUpperCase(greeting.name.charAt(0))) {

+//                      warning('Name should start with a capital', 

+//                                      SolverLanguagePackage.Literals.GREETING__NAME,

+//                                      INVALID_NAME)

+//              }

+//      }

+        

+}