Update solver language grammar

First version, still needs TokenSource and Linker to work.

1 files changed, 133 insertions, 187 deletions

diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguageFactory.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguageFactory.java
index c5d4cbff..cf5c8e62 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguageFactory.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguageFactory.java
@@ -1,5 +1,5 @@
 /**

- * generated by Xtext 2.18.0.M3

+ * generated by Xtext 2.21.0

  */

 package org.eclipse.viatra.solver.language.solverLanguage;

 

@@ -42,454 +42,400 @@ public interface SolverLanguageFactory extends EFactory
   Statement createStatement();

 

   /**

-   * Returns a new object of class '<em>Boolean Value</em>'.

+   * Returns a new object of class '<em>Predicate Definition</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Boolean Value</em>'.

+   * @return a new object of class '<em>Predicate Definition</em>'.

    * @generated

    */

-  BooleanValue createBooleanValue();

+  PredicateDefinition createPredicateDefinition();

 

   /**

-   * Returns a new object of class '<em>Truth Value</em>'.

+   * Returns a new object of class '<em>Unnamed Error Prediate Definition</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Truth Value</em>'.

+   * @return a new object of class '<em>Unnamed Error Prediate Definition</em>'.

    * @generated

    */

-  TruthValue createTruthValue();

+  UnnamedErrorPrediateDefinition createUnnamedErrorPrediateDefinition();

 

   /**

-   * Returns a new object of class '<em>Interpretation</em>'.

+   * Returns a new object of class '<em>Default Definition</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Interpretation</em>'.

+   * @return a new object of class '<em>Default Definition</em>'.

    * @generated

    */

-  Interpretation createInterpretation();

+  DefaultDefinition createDefaultDefinition();

 

   /**

-   * Returns a new object of class '<em>Basic Interpretation</em>'.

+   * Returns a new object of class '<em>Extern Predicate Definition</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Basic Interpretation</em>'.

+   * @return a new object of class '<em>Extern Predicate Definition</em>'.

    * @generated

    */

-  BasicInterpretation createBasicInterpretation();

+  ExternPredicateDefinition createExternPredicateDefinition();

 

   /**

-   * Returns a new object of class '<em>Symbol</em>'.

+   * Returns a new object of class '<em>Metric Definition</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Symbol</em>'.

+   * @return a new object of class '<em>Metric Definition</em>'.

    * @generated

    */

-  Symbol createSymbol();

+  MetricDefinition createMetricDefinition();

 

   /**

-   * Returns a new object of class '<em>Model Symbol</em>'.

+   * Returns a new object of class '<em>Extern Metric Definition</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Model Symbol</em>'.

+   * @return a new object of class '<em>Extern Metric Definition</em>'.

    * @generated

    */

-  ModelSymbol createModelSymbol();

+  ExternMetricDefinition createExternMetricDefinition();

 

   /**

-   * Returns a new object of class '<em>Partiality Symbol</em>'.

+   * Returns a new object of class '<em>Expression</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Partiality Symbol</em>'.

+   * @return a new object of class '<em>Expression</em>'.

    * @generated

    */

-  PartialitySymbol createPartialitySymbol();

+  Expression createExpression();

 

   /**

-   * Returns a new object of class '<em>Exist Symbol</em>'.

+   * Returns a new object of class '<em>If Else</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Exist Symbol</em>'.

+   * @return a new object of class '<em>If Else</em>'.

    * @generated

    */

-  ExistSymbol createExistSymbol();

+  IfElse createIfElse();

 

   /**

-   * Returns a new object of class '<em>Equals Symbol</em>'.

+   * Returns a new object of class '<em>Case</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Equals Symbol</em>'.

+   * @return a new object of class '<em>Case</em>'.

    * @generated

    */

-  EqualsSymbol createEqualsSymbol();

+  Case createCase();

 

   /**

-   * Returns a new object of class '<em>Data Symbol</em>'.

+   * Returns a new object of class '<em>Count</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Data Symbol</em>'.

+   * @return a new object of class '<em>Count</em>'.

    * @generated

    */

-  DataSymbol createDataSymbol();

+  Count createCount();

 

   /**

-   * Returns a new object of class '<em>Boolean Symbol</em>'.

+   * Returns a new object of class '<em>Aggregation</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Boolean Symbol</em>'.

+   * @return a new object of class '<em>Aggregation</em>'.

    * @generated

    */

-  BooleanSymbol createBooleanSymbol();

+  Aggregation createAggregation();

 

   /**

-   * Returns a new object of class '<em>Integer Symbol</em>'.

+   * Returns a new object of class '<em>Call</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Integer Symbol</em>'.

+   * @return a new object of class '<em>Call</em>'.

    * @generated

    */

-  IntegerSymbol createIntegerSymbol();

+  Call createCall();

 

   /**

-   * Returns a new object of class '<em>Real Symbol</em>'.

+   * Returns a new object of class '<em>Argument List</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Real Symbol</em>'.

+   * @return a new object of class '<em>Argument List</em>'.

    * @generated

    */

-  RealSymbol createRealSymbol();

+  ArgumentList createArgumentList();

 

   /**

-   * Returns a new object of class '<em>String Symbol</em>'.

+   * Returns a new object of class '<em>Argument</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>String Symbol</em>'.

+   * @return a new object of class '<em>Argument</em>'.

    * @generated

    */

-  StringSymbol createStringSymbol();

+  Argument createArgument();

 

   /**

-   * Returns a new object of class '<em>Complex Object</em>'.

+   * Returns a new object of class '<em>Expression Argument</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Complex Object</em>'.

+   * @return a new object of class '<em>Expression Argument</em>'.

    * @generated

    */

-  ComplexObject createComplexObject();

+  ExpressionArgument createExpressionArgument();

 

   /**

-   * Returns a new object of class '<em>Object</em>'.

+   * Returns a new object of class '<em>Star Argument</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Object</em>'.

+   * @return a new object of class '<em>Star Argument</em>'.

    * @generated

    */

-  Object createObject();

+  StarArgument createStarArgument();

 

   /**

-   * Returns a new object of class '<em>Named Object</em>'.

+   * Returns a new object of class '<em>Typed Argument</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Named Object</em>'.

+   * @return a new object of class '<em>Typed Argument</em>'.

    * @generated

    */

-  NamedObject createNamedObject();

+  TypedArgument createTypedArgument();

 

   /**

-   * Returns a new object of class '<em>Unnamed Object</em>'.

+   * Returns a new object of class '<em>Typed Star Argument</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Unnamed Object</em>'.

+   * @return a new object of class '<em>Typed Star Argument</em>'.

    * @generated

    */

-  UnnamedObject createUnnamedObject();

+  TypedStarArgument createTypedStarArgument();

 

   /**

-   * Returns a new object of class '<em>Data Object</em>'.

+   * Returns a new object of class '<em>Reference</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Data Object</em>'.

+   * @return a new object of class '<em>Reference</em>'.

    * @generated

    */

-  DataObject createDataObject();

+  Reference createReference();

 

   /**

-   * Returns a new object of class '<em>Boolean Object</em>'.

+   * Returns a new object of class '<em>Interval</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Boolean Object</em>'.

+   * @return a new object of class '<em>Interval</em>'.

    * @generated

    */

-  BooleanObject createBooleanObject();

+  Interval createInterval();

 

   /**

-   * Returns a new object of class '<em>Int Object</em>'.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @return a new object of class '<em>Int Object</em>'.

-   * @generated

-   */

-  IntObject createIntObject();

-

-  /**

-   * Returns a new object of class '<em>Real Object</em>'.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @return a new object of class '<em>Real Object</em>'.

-   * @generated

-   */

-  RealObject createRealObject();

-

-  /**

-   * Returns a new object of class '<em>String Object</em>'.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @return a new object of class '<em>String Object</em>'.

-   * @generated

-   */

-  StringObject createStringObject();

-

-  /**

-   * Returns a new object of class '<em>Predicate</em>'.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @return a new object of class '<em>Predicate</em>'.

-   * @generated

-   */

-  Predicate createPredicate();

-

-  /**

-   * Returns a new object of class '<em>Parameter</em>'.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @return a new object of class '<em>Parameter</em>'.

-   * @generated

-   */

-  Parameter createParameter();

-

-  /**

-   * Returns a new object of class '<em>Pattern Body</em>'.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @return a new object of class '<em>Pattern Body</em>'.

-   * @generated

-   */

-  PatternBody createPatternBody();

-

-  /**

-   * Returns a new object of class '<em>Polarity</em>'.

+   * Returns a new object of class '<em>Literal</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Polarity</em>'.

+   * @return a new object of class '<em>Literal</em>'.

    * @generated

    */

-  Polarity createPolarity();

+  Literal createLiteral();

 

   /**

-   * Returns a new object of class '<em>Constraint</em>'.

+   * Returns a new object of class '<em>Logic Literal</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Constraint</em>'.

+   * @return a new object of class '<em>Logic Literal</em>'.

    * @generated

    */

-  Constraint createConstraint();

+  LogicLiteral createLogicLiteral();

 

   /**

-   * Returns a new object of class '<em>Closure Type</em>'.

+   * Returns a new object of class '<em>Numeric Literal</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Closure Type</em>'.

+   * @return a new object of class '<em>Numeric Literal</em>'.

    * @generated

    */

-  ClosureType createClosureType();

+  NumericLiteral createNumericLiteral();

 

   /**

-   * Returns a new object of class '<em>Literal</em>'.

+   * Returns a new object of class '<em>Infinity Literal</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Literal</em>'.

+   * @return a new object of class '<em>Infinity Literal</em>'.

    * @generated

    */

-  Literal createLiteral();

+  InfinityLiteral createInfinityLiteral();

 

   /**

-   * Returns a new object of class '<em>Variable</em>'.

+   * Returns a new object of class '<em>Empty Interval Literal</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Variable</em>'.

+   * @return a new object of class '<em>Empty Interval Literal</em>'.

    * @generated

    */

-  Variable createVariable();

+  EmptyIntervalLiteral createEmptyIntervalLiteral();

 

   /**

-   * Returns a new object of class '<em>All Instances</em>'.

+   * Returns a new object of class '<em>String Literal</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>All Instances</em>'.

+   * @return a new object of class '<em>String Literal</em>'.

    * @generated

    */

-  AllInstances createAllInstances();

+  StringLiteral createStringLiteral();

 

   /**

-   * Returns a new object of class '<em>All Objects</em>'.

+   * Returns a new object of class '<em>Member Definition</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>All Objects</em>'.

+   * @return a new object of class '<em>Member Definition</em>'.

    * @generated

    */

-  AllObjects createAllObjects();

+  MemberDefinition createMemberDefinition();

 

   /**

-   * Returns a new object of class '<em>Default Interpretation</em>'.

+   * Returns a new object of class '<em>Multiplicity</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Default Interpretation</em>'.

+   * @return a new object of class '<em>Multiplicity</em>'.

    * @generated

    */

-  DefaultInterpretation createDefaultInterpretation();

+  Multiplicity createMultiplicity();

 

   /**

-   * Returns a new object of class '<em>CD Interpretation</em>'.

+   * Returns a new object of class '<em>Many Multiplicity</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>CD Interpretation</em>'.

+   * @return a new object of class '<em>Many Multiplicity</em>'.

    * @generated

    */

-  CDInterpretation createCDInterpretation();

+  ManyMultiplicity createManyMultiplicity();

 

   /**

-   * Returns a new object of class '<em>Class Interpretation</em>'.

+   * Returns a new object of class '<em>Exact Multiplicity</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Class Interpretation</em>'.

+   * @return a new object of class '<em>Exact Multiplicity</em>'.

    * @generated

    */

-  ClassInterpretation createClassInterpretation();

+  ExactMultiplicity createExactMultiplicity();

 

   /**

-   * Returns a new object of class '<em>Enum Interpretation</em>'.

+   * Returns a new object of class '<em>Bounded Multiplicity</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Enum Interpretation</em>'.

+   * @return a new object of class '<em>Bounded Multiplicity</em>'.

    * @generated

    */

-  EnumInterpretation createEnumInterpretation();

+  BoundedMultiplicity createBoundedMultiplicity();

 

   /**

-   * Returns a new object of class '<em>Field Relation Interpretation</em>'.

+   * Returns a new object of class '<em>Scope Definition</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Field Relation Interpretation</em>'.

+   * @return a new object of class '<em>Scope Definition</em>'.

    * @generated

    */

-  FieldRelationInterpretation createFieldRelationInterpretation();

+  ScopeDefinition createScopeDefinition();

 

   /**

-   * Returns a new object of class '<em>Global Relation Interpretation</em>'.

+   * Returns a new object of class '<em>Exact Scope Definition</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Global Relation Interpretation</em>'.

+   * @return a new object of class '<em>Exact Scope Definition</em>'.

    * @generated

    */

-  GlobalRelationInterpretation createGlobalRelationInterpretation();

+  ExactScopeDefinition createExactScopeDefinition();

 

   /**

-   * Returns a new object of class '<em>Multiplicity Definition</em>'.

+   * Returns a new object of class '<em>Bounded Scope Definition</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Multiplicity Definition</em>'.

+   * @return a new object of class '<em>Bounded Scope Definition</em>'.

    * @generated

    */

-  MultiplicityDefinition createMultiplicityDefinition();

+  BoundedScopeDefinition createBoundedScopeDefinition();

 

   /**

-   * Returns a new object of class '<em>Boolean True</em>'.

+   * Returns a new object of class '<em>Lower Bounded Scope Definition</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Boolean True</em>'.

+   * @return a new object of class '<em>Lower Bounded Scope Definition</em>'.

    * @generated

    */

-  BooleanTrue createBooleanTrue();

+  LowerBoundedScopeDefinition createLowerBoundedScopeDefinition();

 

   /**

-   * Returns a new object of class '<em>Boolean False</em>'.

+   * Returns a new object of class '<em>Objective Definition</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Boolean False</em>'.

+   * @return a new object of class '<em>Objective Definition</em>'.

    * @generated

    */

-  BooleanFalse createBooleanFalse();

+  ObjectiveDefinition createObjectiveDefinition();

 

   /**

-   * Returns a new object of class '<em>True</em>'.

+   * Returns a new object of class '<em>Named Element</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>True</em>'.

+   * @return a new object of class '<em>Named Element</em>'.

    * @generated

    */

-  True createTrue();

+  NamedElement createNamedElement();

 

   /**

-   * Returns a new object of class '<em>False</em>'.

+   * Returns a new object of class '<em>Assertion</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>False</em>'.

+   * @return a new object of class '<em>Assertion</em>'.

    * @generated

    */

-  False createFalse();

+  Assertion createAssertion();

 

   /**

-   * Returns a new object of class '<em>Unknown</em>'.

+   * Returns a new object of class '<em>Disjunction</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Unknown</em>'.

+   * @return a new object of class '<em>Disjunction</em>'.

    * @generated

    */

-  Unknown createUnknown();

+  Disjunction createDisjunction();

 

   /**

-   * Returns a new object of class '<em>Error</em>'.

+   * Returns a new object of class '<em>Switch</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Error</em>'.

+   * @return a new object of class '<em>Switch</em>'.

    * @generated

    */

-  Error createError();

+  Switch createSwitch();

 

   /**

-   * Returns a new object of class '<em>Positive</em>'.

+   * Returns a new object of class '<em>Conjunction</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Positive</em>'.

+   * @return a new object of class '<em>Conjunction</em>'.

    * @generated

    */

-  Positive createPositive();

+  Conjunction createConjunction();

 

   /**

-   * Returns a new object of class '<em>Negative</em>'.

+   * Returns a new object of class '<em>Comparison</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Negative</em>'.

+   * @return a new object of class '<em>Comparison</em>'.

    * @generated

    */

-  Negative createNegative();

+  Comparison createComparison();

 

   /**

-   * Returns a new object of class '<em>Reflexive Closure</em>'.

+   * Returns a new object of class '<em>Binary Expression</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Reflexive Closure</em>'.

+   * @return a new object of class '<em>Binary Expression</em>'.

    * @generated

    */

-  ReflexiveClosure createReflexiveClosure();

+  BinaryExpression createBinaryExpression();

 

   /**

-   * Returns a new object of class '<em>Irreflexive Closure</em>'.

+   * Returns a new object of class '<em>Unary Expression</em>'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

-   * @return a new object of class '<em>Irreflexive Closure</em>'.

+   * @return a new object of class '<em>Unary Expression</em>'.

    * @generated

    */

-  IrreflexiveClosure createIrreflexiveClosure();

+  UnaryExpression createUnaryExpression();

 

   /**

    * Returns the package supported by this factory.