Update solver language grammar

First version, still needs TokenSource and Linker to work.

1 files changed, 316 insertions, 258 deletions

diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java
index 5cb1dcdc..8a5976c2 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java
@@ -1,9 +1,10 @@
 /**

- * generated by Xtext 2.18.0.M3

+ * generated by Xtext 2.21.0

  */

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

 

 import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EDataType;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 

@@ -11,58 +12,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

 

-import org.eclipse.viatra.solver.language.solverLanguage.AllInstances;

-import org.eclipse.viatra.solver.language.solverLanguage.AllObjects;

-import org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation;

-import org.eclipse.viatra.solver.language.solverLanguage.BooleanFalse;

-import org.eclipse.viatra.solver.language.solverLanguage.BooleanObject;

-import org.eclipse.viatra.solver.language.solverLanguage.BooleanSymbol;

-import org.eclipse.viatra.solver.language.solverLanguage.BooleanTrue;

-import org.eclipse.viatra.solver.language.solverLanguage.BooleanValue;

-import org.eclipse.viatra.solver.language.solverLanguage.CDInterpretation;

-import org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation;

-import org.eclipse.viatra.solver.language.solverLanguage.ClosureType;

-import org.eclipse.viatra.solver.language.solverLanguage.ComplexObject;

-import org.eclipse.viatra.solver.language.solverLanguage.Constraint;

-import org.eclipse.viatra.solver.language.solverLanguage.DataObject;

-import org.eclipse.viatra.solver.language.solverLanguage.DataSymbol;

-import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation;

-import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation;

-import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol;

-import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol;

-import org.eclipse.viatra.solver.language.solverLanguage.False;

-import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation;

-import org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation;

-import org.eclipse.viatra.solver.language.solverLanguage.IntObject;

-import org.eclipse.viatra.solver.language.solverLanguage.IntegerSymbol;

-import org.eclipse.viatra.solver.language.solverLanguage.Interpretation;

-import org.eclipse.viatra.solver.language.solverLanguage.IrreflexiveClosure;

-import org.eclipse.viatra.solver.language.solverLanguage.Literal;

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

-import org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition;

-import org.eclipse.viatra.solver.language.solverLanguage.NamedObject;

-import org.eclipse.viatra.solver.language.solverLanguage.Negative;

-import org.eclipse.viatra.solver.language.solverLanguage.Parameter;

-import org.eclipse.viatra.solver.language.solverLanguage.PartialitySymbol;

-import org.eclipse.viatra.solver.language.solverLanguage.PatternBody;

-import org.eclipse.viatra.solver.language.solverLanguage.Polarity;

-import org.eclipse.viatra.solver.language.solverLanguage.Positive;

-import org.eclipse.viatra.solver.language.solverLanguage.Predicate;

-import org.eclipse.viatra.solver.language.solverLanguage.Problem;

-import org.eclipse.viatra.solver.language.solverLanguage.RealObject;

-import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol;

-import org.eclipse.viatra.solver.language.solverLanguage.ReflexiveClosure;

-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguageFactory;

-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;

-import org.eclipse.viatra.solver.language.solverLanguage.Statement;

-import org.eclipse.viatra.solver.language.solverLanguage.StringObject;

-import org.eclipse.viatra.solver.language.solverLanguage.StringSymbol;

-import org.eclipse.viatra.solver.language.solverLanguage.Symbol;

-import org.eclipse.viatra.solver.language.solverLanguage.True;

-import org.eclipse.viatra.solver.language.solverLanguage.TruthValue;

-import org.eclipse.viatra.solver.language.solverLanguage.Unknown;

-import org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject;

-import org.eclipse.viatra.solver.language.solverLanguage.Variable;

+import org.eclipse.viatra.solver.language.solverLanguage.*;

 

 /**

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

@@ -118,56 +68,50 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
     {

       case SolverLanguagePackage.PROBLEM: return createProblem();

       case SolverLanguagePackage.STATEMENT: return createStatement();

-      case SolverLanguagePackage.BOOLEAN_VALUE: return createBooleanValue();

-      case SolverLanguagePackage.TRUTH_VALUE: return createTruthValue();

-      case SolverLanguagePackage.INTERPRETATION: return createInterpretation();

-      case SolverLanguagePackage.BASIC_INTERPRETATION: return createBasicInterpretation();

-      case SolverLanguagePackage.SYMBOL: return createSymbol();

-      case SolverLanguagePackage.MODEL_SYMBOL: return createModelSymbol();

-      case SolverLanguagePackage.PARTIALITY_SYMBOL: return createPartialitySymbol();

-      case SolverLanguagePackage.EXIST_SYMBOL: return createExistSymbol();

-      case SolverLanguagePackage.EQUALS_SYMBOL: return createEqualsSymbol();

-      case SolverLanguagePackage.DATA_SYMBOL: return createDataSymbol();

-      case SolverLanguagePackage.BOOLEAN_SYMBOL: return createBooleanSymbol();

-      case SolverLanguagePackage.INTEGER_SYMBOL: return createIntegerSymbol();

-      case SolverLanguagePackage.REAL_SYMBOL: return createRealSymbol();

-      case SolverLanguagePackage.STRING_SYMBOL: return createStringSymbol();

-      case SolverLanguagePackage.COMPLEX_OBJECT: return createComplexObject();

-      case SolverLanguagePackage.OBJECT: return createObject();

-      case SolverLanguagePackage.NAMED_OBJECT: return createNamedObject();

-      case SolverLanguagePackage.UNNAMED_OBJECT: return createUnnamedObject();

-      case SolverLanguagePackage.DATA_OBJECT: return createDataObject();

-      case SolverLanguagePackage.BOOLEAN_OBJECT: return createBooleanObject();

-      case SolverLanguagePackage.INT_OBJECT: return createIntObject();

-      case SolverLanguagePackage.REAL_OBJECT: return createRealObject();

-      case SolverLanguagePackage.STRING_OBJECT: return createStringObject();

-      case SolverLanguagePackage.PREDICATE: return createPredicate();

-      case SolverLanguagePackage.PARAMETER: return createParameter();

-      case SolverLanguagePackage.PATTERN_BODY: return createPatternBody();

-      case SolverLanguagePackage.POLARITY: return createPolarity();

-      case SolverLanguagePackage.CONSTRAINT: return createConstraint();

-      case SolverLanguagePackage.CLOSURE_TYPE: return createClosureType();

+      case SolverLanguagePackage.PREDICATE_DEFINITION: return createPredicateDefinition();

+      case SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION: return createUnnamedErrorPrediateDefinition();

+      case SolverLanguagePackage.DEFAULT_DEFINITION: return createDefaultDefinition();

+      case SolverLanguagePackage.EXTERN_PREDICATE_DEFINITION: return createExternPredicateDefinition();

+      case SolverLanguagePackage.METRIC_DEFINITION: return createMetricDefinition();

+      case SolverLanguagePackage.EXTERN_METRIC_DEFINITION: return createExternMetricDefinition();

+      case SolverLanguagePackage.EXPRESSION: return createExpression();

+      case SolverLanguagePackage.IF_ELSE: return createIfElse();

+      case SolverLanguagePackage.CASE: return createCase();

+      case SolverLanguagePackage.COUNT: return createCount();

+      case SolverLanguagePackage.AGGREGATION: return createAggregation();

+      case SolverLanguagePackage.CALL: return createCall();

+      case SolverLanguagePackage.ARGUMENT_LIST: return createArgumentList();

+      case SolverLanguagePackage.ARGUMENT: return createArgument();

+      case SolverLanguagePackage.EXPRESSION_ARGUMENT: return createExpressionArgument();

+      case SolverLanguagePackage.STAR_ARGUMENT: return createStarArgument();

+      case SolverLanguagePackage.TYPED_ARGUMENT: return createTypedArgument();

+      case SolverLanguagePackage.TYPED_STAR_ARGUMENT: return createTypedStarArgument();

+      case SolverLanguagePackage.REFERENCE: return createReference();

+      case SolverLanguagePackage.INTERVAL: return createInterval();

       case SolverLanguagePackage.LITERAL: return createLiteral();

-      case SolverLanguagePackage.VARIABLE: return createVariable();

-      case SolverLanguagePackage.ALL_INSTANCES: return createAllInstances();

-      case SolverLanguagePackage.ALL_OBJECTS: return createAllObjects();

-      case SolverLanguagePackage.DEFAULT_INTERPRETATION: return createDefaultInterpretation();

-      case SolverLanguagePackage.CD_INTERPRETATION: return createCDInterpretation();

-      case SolverLanguagePackage.CLASS_INTERPRETATION: return createClassInterpretation();

-      case SolverLanguagePackage.ENUM_INTERPRETATION: return createEnumInterpretation();

-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION: return createFieldRelationInterpretation();

-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION: return createGlobalRelationInterpretation();

-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION: return createMultiplicityDefinition();

-      case SolverLanguagePackage.BOOLEAN_TRUE: return createBooleanTrue();

-      case SolverLanguagePackage.BOOLEAN_FALSE: return createBooleanFalse();

-      case SolverLanguagePackage.TRUE: return createTrue();

-      case SolverLanguagePackage.FALSE: return createFalse();

-      case SolverLanguagePackage.UNKNOWN: return createUnknown();

-      case SolverLanguagePackage.ERROR: return createError();

-      case SolverLanguagePackage.POSITIVE: return createPositive();

-      case SolverLanguagePackage.NEGATIVE: return createNegative();

-      case SolverLanguagePackage.REFLEXIVE_CLOSURE: return createReflexiveClosure();

-      case SolverLanguagePackage.IRREFLEXIVE_CLOSURE: return createIrreflexiveClosure();

+      case SolverLanguagePackage.LOGIC_LITERAL: return createLogicLiteral();

+      case SolverLanguagePackage.NUMERIC_LITERAL: return createNumericLiteral();

+      case SolverLanguagePackage.INFINITY_LITERAL: return createInfinityLiteral();

+      case SolverLanguagePackage.EMPTY_INTERVAL_LITERAL: return createEmptyIntervalLiteral();

+      case SolverLanguagePackage.STRING_LITERAL: return createStringLiteral();

+      case SolverLanguagePackage.MEMBER_DEFINITION: return createMemberDefinition();

+      case SolverLanguagePackage.MULTIPLICITY: return createMultiplicity();

+      case SolverLanguagePackage.MANY_MULTIPLICITY: return createManyMultiplicity();

+      case SolverLanguagePackage.EXACT_MULTIPLICITY: return createExactMultiplicity();

+      case SolverLanguagePackage.BOUNDED_MULTIPLICITY: return createBoundedMultiplicity();

+      case SolverLanguagePackage.SCOPE_DEFINITION: return createScopeDefinition();

+      case SolverLanguagePackage.EXACT_SCOPE_DEFINITION: return createExactScopeDefinition();

+      case SolverLanguagePackage.BOUNDED_SCOPE_DEFINITION: return createBoundedScopeDefinition();

+      case SolverLanguagePackage.LOWER_BOUNDED_SCOPE_DEFINITION: return createLowerBoundedScopeDefinition();

+      case SolverLanguagePackage.OBJECTIVE_DEFINITION: return createObjectiveDefinition();

+      case SolverLanguagePackage.NAMED_ELEMENT: return createNamedElement();

+      case SolverLanguagePackage.ASSERTION: return createAssertion();

+      case SolverLanguagePackage.DISJUNCTION: return createDisjunction();

+      case SolverLanguagePackage.SWITCH: return createSwitch();

+      case SolverLanguagePackage.CONJUNCTION: return createConjunction();

+      case SolverLanguagePackage.COMPARISON: return createComparison();

+      case SolverLanguagePackage.BINARY_EXPRESSION: return createBinaryExpression();

+      case SolverLanguagePackage.UNARY_EXPRESSION: return createUnaryExpression();

       default:

         throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

     }

@@ -179,6 +123,60 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

+  public Object createFromString(EDataType eDataType, String initialValue)

+  {

+    switch (eDataType.getClassifierID())

+    {

+      case SolverLanguagePackage.METRIC_TYPE:

+        return createMetricTypeFromString(eDataType, initialValue);

+      case SolverLanguagePackage.BINARY_OPERATOR:

+        return createBinaryOperatorFromString(eDataType, initialValue);

+      case SolverLanguagePackage.UNARY_OP:

+        return createUnaryOpFromString(eDataType, initialValue);

+      case SolverLanguagePackage.AGGREGATION_OP:

+        return createAggregationOpFromString(eDataType, initialValue);

+      case SolverLanguagePackage.LOGIC_VALUE:

+        return createLogicValueFromString(eDataType, initialValue);

+      case SolverLanguagePackage.OBJECTIVE_KIND:

+        return createObjectiveKindFromString(eDataType, initialValue);

+      default:

+        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+    }

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public String convertToString(EDataType eDataType, Object instanceValue)

+  {

+    switch (eDataType.getClassifierID())

+    {

+      case SolverLanguagePackage.METRIC_TYPE:

+        return convertMetricTypeToString(eDataType, instanceValue);

+      case SolverLanguagePackage.BINARY_OPERATOR:

+        return convertBinaryOperatorToString(eDataType, instanceValue);

+      case SolverLanguagePackage.UNARY_OP:

+        return convertUnaryOpToString(eDataType, instanceValue);

+      case SolverLanguagePackage.AGGREGATION_OP:

+        return convertAggregationOpToString(eDataType, instanceValue);

+      case SolverLanguagePackage.LOGIC_VALUE:

+        return convertLogicValueToString(eDataType, instanceValue);

+      case SolverLanguagePackage.OBJECTIVE_KIND:

+        return convertObjectiveKindToString(eDataType, instanceValue);

+      default:

+        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+    }

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

   public Problem createProblem()

   {

     ProblemImpl problem = new ProblemImpl();

@@ -203,10 +201,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public BooleanValue createBooleanValue()

+  public PredicateDefinition createPredicateDefinition()

   {

-    BooleanValueImpl booleanValue = new BooleanValueImpl();

-    return booleanValue;

+    PredicateDefinitionImpl predicateDefinition = new PredicateDefinitionImpl();

+    return predicateDefinition;

   }

 

   /**

@@ -215,10 +213,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public TruthValue createTruthValue()

+  public UnnamedErrorPrediateDefinition createUnnamedErrorPrediateDefinition()

   {

-    TruthValueImpl truthValue = new TruthValueImpl();

-    return truthValue;

+    UnnamedErrorPrediateDefinitionImpl unnamedErrorPrediateDefinition = new UnnamedErrorPrediateDefinitionImpl();

+    return unnamedErrorPrediateDefinition;

   }

 

   /**

@@ -227,10 +225,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public Interpretation createInterpretation()

+  public DefaultDefinition createDefaultDefinition()

   {

-    InterpretationImpl interpretation = new InterpretationImpl();

-    return interpretation;

+    DefaultDefinitionImpl defaultDefinition = new DefaultDefinitionImpl();

+    return defaultDefinition;

   }

 

   /**

@@ -239,10 +237,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public BasicInterpretation createBasicInterpretation()

+  public ExternPredicateDefinition createExternPredicateDefinition()

   {

-    BasicInterpretationImpl basicInterpretation = new BasicInterpretationImpl();

-    return basicInterpretation;

+    ExternPredicateDefinitionImpl externPredicateDefinition = new ExternPredicateDefinitionImpl();

+    return externPredicateDefinition;

   }

 

   /**

@@ -251,10 +249,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public Symbol createSymbol()

+  public MetricDefinition createMetricDefinition()

   {

-    SymbolImpl symbol = new SymbolImpl();

-    return symbol;

+    MetricDefinitionImpl metricDefinition = new MetricDefinitionImpl();

+    return metricDefinition;

   }

 

   /**

@@ -263,10 +261,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public ModelSymbol createModelSymbol()

+  public ExternMetricDefinition createExternMetricDefinition()

   {

-    ModelSymbolImpl modelSymbol = new ModelSymbolImpl();

-    return modelSymbol;

+    ExternMetricDefinitionImpl externMetricDefinition = new ExternMetricDefinitionImpl();

+    return externMetricDefinition;

   }

 

   /**

@@ -275,10 +273,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public PartialitySymbol createPartialitySymbol()

+  public Expression createExpression()

   {

-    PartialitySymbolImpl partialitySymbol = new PartialitySymbolImpl();

-    return partialitySymbol;

+    ExpressionImpl expression = new ExpressionImpl();

+    return expression;

   }

 

   /**

@@ -287,10 +285,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public ExistSymbol createExistSymbol()

+  public IfElse createIfElse()

   {

-    ExistSymbolImpl existSymbol = new ExistSymbolImpl();

-    return existSymbol;

+    IfElseImpl ifElse = new IfElseImpl();

+    return ifElse;

   }

 

   /**

@@ -299,10 +297,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public EqualsSymbol createEqualsSymbol()

+  public Case createCase()

   {

-    EqualsSymbolImpl equalsSymbol = new EqualsSymbolImpl();

-    return equalsSymbol;

+    CaseImpl case_ = new CaseImpl();

+    return case_;

   }

 

   /**

@@ -311,10 +309,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public DataSymbol createDataSymbol()

+  public Count createCount()

   {

-    DataSymbolImpl dataSymbol = new DataSymbolImpl();

-    return dataSymbol;

+    CountImpl count = new CountImpl();

+    return count;

   }

 

   /**

@@ -323,10 +321,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public BooleanSymbol createBooleanSymbol()

+  public Aggregation createAggregation()

   {

-    BooleanSymbolImpl booleanSymbol = new BooleanSymbolImpl();

-    return booleanSymbol;

+    AggregationImpl aggregation = new AggregationImpl();

+    return aggregation;

   }

 

   /**

@@ -335,10 +333,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public IntegerSymbol createIntegerSymbol()

+  public Call createCall()

   {

-    IntegerSymbolImpl integerSymbol = new IntegerSymbolImpl();

-    return integerSymbol;

+    CallImpl call = new CallImpl();

+    return call;

   }

 

   /**

@@ -347,10 +345,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public RealSymbol createRealSymbol()

+  public ArgumentList createArgumentList()

   {

-    RealSymbolImpl realSymbol = new RealSymbolImpl();

-    return realSymbol;

+    ArgumentListImpl argumentList = new ArgumentListImpl();

+    return argumentList;

   }

 

   /**

@@ -359,10 +357,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public StringSymbol createStringSymbol()

+  public Argument createArgument()

   {

-    StringSymbolImpl stringSymbol = new StringSymbolImpl();

-    return stringSymbol;

+    ArgumentImpl argument = new ArgumentImpl();

+    return argument;

   }

 

   /**

@@ -371,10 +369,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public ComplexObject createComplexObject()

+  public ExpressionArgument createExpressionArgument()

   {

-    ComplexObjectImpl complexObject = new ComplexObjectImpl();

-    return complexObject;

+    ExpressionArgumentImpl expressionArgument = new ExpressionArgumentImpl();

+    return expressionArgument;

   }

 

   /**

@@ -383,10 +381,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public org.eclipse.viatra.solver.language.solverLanguage.Object createObject()

+  public StarArgument createStarArgument()

   {

-    ObjectImpl object = new ObjectImpl();

-    return object;

+    StarArgumentImpl starArgument = new StarArgumentImpl();

+    return starArgument;

   }

 

   /**

@@ -395,10 +393,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public NamedObject createNamedObject()

+  public TypedArgument createTypedArgument()

   {

-    NamedObjectImpl namedObject = new NamedObjectImpl();

-    return namedObject;

+    TypedArgumentImpl typedArgument = new TypedArgumentImpl();

+    return typedArgument;

   }

 

   /**

@@ -407,10 +405,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public UnnamedObject createUnnamedObject()

+  public TypedStarArgument createTypedStarArgument()

   {

-    UnnamedObjectImpl unnamedObject = new UnnamedObjectImpl();

-    return unnamedObject;

+    TypedStarArgumentImpl typedStarArgument = new TypedStarArgumentImpl();

+    return typedStarArgument;

   }

 

   /**

@@ -419,10 +417,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public DataObject createDataObject()

+  public Reference createReference()

   {

-    DataObjectImpl dataObject = new DataObjectImpl();

-    return dataObject;

+    ReferenceImpl reference = new ReferenceImpl();

+    return reference;

   }

 

   /**

@@ -431,10 +429,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public BooleanObject createBooleanObject()

+  public Interval createInterval()

   {

-    BooleanObjectImpl booleanObject = new BooleanObjectImpl();

-    return booleanObject;

+    IntervalImpl interval = new IntervalImpl();

+    return interval;

   }

 

   /**

@@ -443,10 +441,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public IntObject createIntObject()

+  public Literal createLiteral()

   {

-    IntObjectImpl intObject = new IntObjectImpl();

-    return intObject;

+    LiteralImpl literal = new LiteralImpl();

+    return literal;

   }

 

   /**

@@ -455,10 +453,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public RealObject createRealObject()

+  public LogicLiteral createLogicLiteral()

   {

-    RealObjectImpl realObject = new RealObjectImpl();

-    return realObject;

+    LogicLiteralImpl logicLiteral = new LogicLiteralImpl();

+    return logicLiteral;

   }

 

   /**

@@ -467,10 +465,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public StringObject createStringObject()

+  public NumericLiteral createNumericLiteral()

   {

-    StringObjectImpl stringObject = new StringObjectImpl();

-    return stringObject;

+    NumericLiteralImpl numericLiteral = new NumericLiteralImpl();

+    return numericLiteral;

   }

 

   /**

@@ -479,10 +477,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public Predicate createPredicate()

+  public InfinityLiteral createInfinityLiteral()

   {

-    PredicateImpl predicate = new PredicateImpl();

-    return predicate;

+    InfinityLiteralImpl infinityLiteral = new InfinityLiteralImpl();

+    return infinityLiteral;

   }

 

   /**

@@ -491,10 +489,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public Parameter createParameter()

+  public EmptyIntervalLiteral createEmptyIntervalLiteral()

   {

-    ParameterImpl parameter = new ParameterImpl();

-    return parameter;

+    EmptyIntervalLiteralImpl emptyIntervalLiteral = new EmptyIntervalLiteralImpl();

+    return emptyIntervalLiteral;

   }

 

   /**

@@ -503,10 +501,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public PatternBody createPatternBody()

+  public StringLiteral createStringLiteral()

   {

-    PatternBodyImpl patternBody = new PatternBodyImpl();

-    return patternBody;

+    StringLiteralImpl stringLiteral = new StringLiteralImpl();

+    return stringLiteral;

   }

 

   /**

@@ -515,10 +513,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public Polarity createPolarity()

+  public MemberDefinition createMemberDefinition()

   {

-    PolarityImpl polarity = new PolarityImpl();

-    return polarity;

+    MemberDefinitionImpl memberDefinition = new MemberDefinitionImpl();

+    return memberDefinition;

   }

 

   /**

@@ -527,10 +525,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public Constraint createConstraint()

+  public Multiplicity createMultiplicity()

   {

-    ConstraintImpl constraint = new ConstraintImpl();

-    return constraint;

+    MultiplicityImpl multiplicity = new MultiplicityImpl();

+    return multiplicity;

   }

 

   /**

@@ -539,10 +537,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public ClosureType createClosureType()

+  public ManyMultiplicity createManyMultiplicity()

   {

-    ClosureTypeImpl closureType = new ClosureTypeImpl();

-    return closureType;

+    ManyMultiplicityImpl manyMultiplicity = new ManyMultiplicityImpl();

+    return manyMultiplicity;

   }

 

   /**

@@ -551,10 +549,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public Literal createLiteral()

+  public ExactMultiplicity createExactMultiplicity()

   {

-    LiteralImpl literal = new LiteralImpl();

-    return literal;

+    ExactMultiplicityImpl exactMultiplicity = new ExactMultiplicityImpl();

+    return exactMultiplicity;

   }

 

   /**

@@ -563,10 +561,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public Variable createVariable()

+  public BoundedMultiplicity createBoundedMultiplicity()

   {

-    VariableImpl variable = new VariableImpl();

-    return variable;

+    BoundedMultiplicityImpl boundedMultiplicity = new BoundedMultiplicityImpl();

+    return boundedMultiplicity;

   }

 

   /**

@@ -575,10 +573,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public AllInstances createAllInstances()

+  public ScopeDefinition createScopeDefinition()

   {

-    AllInstancesImpl allInstances = new AllInstancesImpl();

-    return allInstances;

+    ScopeDefinitionImpl scopeDefinition = new ScopeDefinitionImpl();

+    return scopeDefinition;

   }

 

   /**

@@ -587,10 +585,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public AllObjects createAllObjects()

+  public ExactScopeDefinition createExactScopeDefinition()

   {

-    AllObjectsImpl allObjects = new AllObjectsImpl();

-    return allObjects;

+    ExactScopeDefinitionImpl exactScopeDefinition = new ExactScopeDefinitionImpl();

+    return exactScopeDefinition;

   }

 

   /**

@@ -599,10 +597,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public DefaultInterpretation createDefaultInterpretation()

+  public BoundedScopeDefinition createBoundedScopeDefinition()

   {

-    DefaultInterpretationImpl defaultInterpretation = new DefaultInterpretationImpl();

-    return defaultInterpretation;

+    BoundedScopeDefinitionImpl boundedScopeDefinition = new BoundedScopeDefinitionImpl();

+    return boundedScopeDefinition;

   }

 

   /**

@@ -611,10 +609,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public CDInterpretation createCDInterpretation()

+  public LowerBoundedScopeDefinition createLowerBoundedScopeDefinition()

   {

-    CDInterpretationImpl cdInterpretation = new CDInterpretationImpl();

-    return cdInterpretation;

+    LowerBoundedScopeDefinitionImpl lowerBoundedScopeDefinition = new LowerBoundedScopeDefinitionImpl();

+    return lowerBoundedScopeDefinition;

   }

 

   /**

@@ -623,10 +621,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public ClassInterpretation createClassInterpretation()

+  public ObjectiveDefinition createObjectiveDefinition()

   {

-    ClassInterpretationImpl classInterpretation = new ClassInterpretationImpl();

-    return classInterpretation;

+    ObjectiveDefinitionImpl objectiveDefinition = new ObjectiveDefinitionImpl();

+    return objectiveDefinition;

   }

 

   /**

@@ -635,10 +633,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public EnumInterpretation createEnumInterpretation()

+  public NamedElement createNamedElement()

   {

-    EnumInterpretationImpl enumInterpretation = new EnumInterpretationImpl();

-    return enumInterpretation;

+    NamedElementImpl namedElement = new NamedElementImpl();

+    return namedElement;

   }

 

   /**

@@ -647,10 +645,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public FieldRelationInterpretation createFieldRelationInterpretation()

+  public Assertion createAssertion()

   {

-    FieldRelationInterpretationImpl fieldRelationInterpretation = new FieldRelationInterpretationImpl();

-    return fieldRelationInterpretation;

+    AssertionImpl assertion = new AssertionImpl();

+    return assertion;

   }

 

   /**

@@ -659,10 +657,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public GlobalRelationInterpretation createGlobalRelationInterpretation()

+  public Disjunction createDisjunction()

   {

-    GlobalRelationInterpretationImpl globalRelationInterpretation = new GlobalRelationInterpretationImpl();

-    return globalRelationInterpretation;

+    DisjunctionImpl disjunction = new DisjunctionImpl();

+    return disjunction;

   }

 

   /**

@@ -671,10 +669,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public MultiplicityDefinition createMultiplicityDefinition()

+  public Switch createSwitch()

   {

-    MultiplicityDefinitionImpl multiplicityDefinition = new MultiplicityDefinitionImpl();

-    return multiplicityDefinition;

+    SwitchImpl switch_ = new SwitchImpl();

+    return switch_;

   }

 

   /**

@@ -683,10 +681,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public BooleanTrue createBooleanTrue()

+  public Conjunction createConjunction()

   {

-    BooleanTrueImpl booleanTrue = new BooleanTrueImpl();

-    return booleanTrue;

+    ConjunctionImpl conjunction = new ConjunctionImpl();

+    return conjunction;

   }

 

   /**

@@ -695,10 +693,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public BooleanFalse createBooleanFalse()

+  public Comparison createComparison()

   {

-    BooleanFalseImpl booleanFalse = new BooleanFalseImpl();

-    return booleanFalse;

+    ComparisonImpl comparison = new ComparisonImpl();

+    return comparison;

   }

 

   /**

@@ -707,10 +705,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public True createTrue()

+  public BinaryExpression createBinaryExpression()

   {

-    TrueImpl true_ = new TrueImpl();

-    return true_;

+    BinaryExpressionImpl binaryExpression = new BinaryExpressionImpl();

+    return binaryExpression;

   }

 

   /**

@@ -719,10 +717,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public False createFalse()

+  public UnaryExpression createUnaryExpression()

   {

-    FalseImpl false_ = new FalseImpl();

-    return false_;

+    UnaryExpressionImpl unaryExpression = new UnaryExpressionImpl();

+    return unaryExpression;

   }

 

   /**

@@ -730,11 +728,11 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * <!-- end-user-doc -->

    * @generated

    */

-  @Override

-  public Unknown createUnknown()

+  public MetricType createMetricTypeFromString(EDataType eDataType, String initialValue)

   {

-    UnknownImpl unknown = new UnknownImpl();

-    return unknown;

+    MetricType result = MetricType.get(initialValue);

+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+    return result;

   }

 

   /**

@@ -742,11 +740,9 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * <!-- end-user-doc -->

    * @generated

    */

-  @Override

-  public org.eclipse.viatra.solver.language.solverLanguage.Error createError()

+  public String convertMetricTypeToString(EDataType eDataType, Object instanceValue)

   {

-    ErrorImpl error = new ErrorImpl();

-    return error;

+    return instanceValue == null ? null : instanceValue.toString();

   }

 

   /**

@@ -754,11 +750,11 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * <!-- end-user-doc -->

    * @generated

    */

-  @Override

-  public Positive createPositive()

+  public BinaryOperator createBinaryOperatorFromString(EDataType eDataType, String initialValue)

   {

-    PositiveImpl positive = new PositiveImpl();

-    return positive;

+    BinaryOperator result = BinaryOperator.get(initialValue);

+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+    return result;

   }

 

   /**

@@ -766,11 +762,9 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * <!-- end-user-doc -->

    * @generated

    */

-  @Override

-  public Negative createNegative()

+  public String convertBinaryOperatorToString(EDataType eDataType, Object instanceValue)

   {

-    NegativeImpl negative = new NegativeImpl();

-    return negative;

+    return instanceValue == null ? null : instanceValue.toString();

   }

 

   /**

@@ -778,11 +772,11 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * <!-- end-user-doc -->

    * @generated

    */

-  @Override

-  public ReflexiveClosure createReflexiveClosure()

+  public UnaryOp createUnaryOpFromString(EDataType eDataType, String initialValue)

   {

-    ReflexiveClosureImpl reflexiveClosure = new ReflexiveClosureImpl();

-    return reflexiveClosure;

+    UnaryOp result = UnaryOp.get(initialValue);

+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+    return result;

   }

 

   /**

@@ -790,11 +784,75 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * <!-- end-user-doc -->

    * @generated

    */

-  @Override

-  public IrreflexiveClosure createIrreflexiveClosure()

+  public String convertUnaryOpToString(EDataType eDataType, Object instanceValue)

+  {

+    return instanceValue == null ? null : instanceValue.toString();

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public AggregationOp createAggregationOpFromString(EDataType eDataType, String initialValue)

+  {

+    AggregationOp result = AggregationOp.get(initialValue);

+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+    return result;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public String convertAggregationOpToString(EDataType eDataType, Object instanceValue)

+  {

+    return instanceValue == null ? null : instanceValue.toString();

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public LogicValue createLogicValueFromString(EDataType eDataType, String initialValue)

+  {

+    LogicValue result = LogicValue.get(initialValue);

+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+    return result;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public String convertLogicValueToString(EDataType eDataType, Object instanceValue)

+  {

+    return instanceValue == null ? null : instanceValue.toString();

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public ObjectiveKind createObjectiveKindFromString(EDataType eDataType, String initialValue)

+  {

+    ObjectiveKind result = ObjectiveKind.get(initialValue);

+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+    return result;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public String convertObjectiveKindToString(EDataType eDataType, Object instanceValue)

   {

-    IrreflexiveClosureImpl irreflexiveClosure = new IrreflexiveClosureImpl();

-    return irreflexiveClosure;

+    return instanceValue == null ? null : instanceValue.toString();

   }

 

   /**