2 files changed, 1 insertions, 94 deletions

diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageAdapterFactory.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageAdapterFactory.java
index e76e359a..9931598c 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageAdapterFactory.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageAdapterFactory.java
@@ -28,7 +28,6 @@ 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.ErrorPredicate;

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

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

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

@@ -48,7 +47,6 @@ 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.PredicateSymbol;

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

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

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

@@ -258,16 +256,6 @@ public class SolverLanguageAdapterFactory extends AdapterFactoryImpl
         return createPredicateAdapter();

       }

       @Override

-      public Adapter casePredicateSymbol(PredicateSymbol object)

-      {

-        return createPredicateSymbolAdapter();

-      }

-      @Override

-      public Adapter caseErrorPredicate(ErrorPredicate object)

-      {

-        return createErrorPredicateAdapter();

-      }

-      @Override

       public Adapter caseParameter(Parameter object)

       {

         return createParameterAdapter();

@@ -810,36 +798,6 @@ public class SolverLanguageAdapterFactory extends AdapterFactoryImpl
   }

 

   /**

-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateSymbol <em>Predicate Symbol</em>}'.

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

-   * This default implementation returns null so that we can easily ignore cases;

-   * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

-   * @return the new adapter.

-   * @see org.eclipse.viatra.solver.language.solverLanguage.PredicateSymbol

-   * @generated

-   */

-  public Adapter createPredicateSymbolAdapter()

-  {

-    return null;

-  }

-

-  /**

-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ErrorPredicate <em>Error Predicate</em>}'.

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

-   * This default implementation returns null so that we can easily ignore cases;

-   * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

-   * @return the new adapter.

-   * @see org.eclipse.viatra.solver.language.solverLanguage.ErrorPredicate

-   * @generated

-   */

-  public Adapter createErrorPredicateAdapter()

-  {

-    return null;

-  }

-

-  /**

    * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Parameter <em>Parameter</em>}'.

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

    * This default implementation returns null so that we can easily ignore cases;

diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageSwitch.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageSwitch.java
index 9bc874e3..6f6bcd17 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageSwitch.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageSwitch.java
@@ -26,7 +26,6 @@ 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.ErrorPredicate;

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

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

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

@@ -46,7 +45,6 @@ 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.PredicateSymbol;

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

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

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

@@ -275,6 +273,7 @@ public class SolverLanguageSwitch<T> extends Switch<T>
         NamedObject namedObject = (NamedObject)theEObject;

         T result = caseNamedObject(namedObject);

         if (result == null) result = caseObject(namedObject);

+        if (result == null) result = caseLiteral(namedObject);

         if (result == null) result = caseComplexObject(namedObject);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -350,24 +349,6 @@ public class SolverLanguageSwitch<T> extends Switch<T>
         if (result == null) result = defaultCase(theEObject);

         return result;

       }

-      case SolverLanguagePackage.PREDICATE_SYMBOL:

-      {

-        PredicateSymbol predicateSymbol = (PredicateSymbol)theEObject;

-        T result = casePredicateSymbol(predicateSymbol);

-        if (result == null) result = casePredicate(predicateSymbol);

-        if (result == null) result = caseStatement(predicateSymbol);

-        if (result == null) result = defaultCase(theEObject);

-        return result;

-      }

-      case SolverLanguagePackage.ERROR_PREDICATE:

-      {

-        ErrorPredicate errorPredicate = (ErrorPredicate)theEObject;

-        T result = caseErrorPredicate(errorPredicate);

-        if (result == null) result = casePredicate(errorPredicate);

-        if (result == null) result = caseStatement(errorPredicate);

-        if (result == null) result = defaultCase(theEObject);

-        return result;

-      }

       case SolverLanguagePackage.PARAMETER:

       {

         Parameter parameter = (Parameter)theEObject;

@@ -997,38 +978,6 @@ public class SolverLanguageSwitch<T> extends Switch<T>
   }

 

   /**

-   * Returns the result of interpreting the object as an instance of '<em>Predicate Symbol</em>'.

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

-   * This implementation returns null;

-   * returning a non-null result will terminate the switch.

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

-   * @param object the target of the switch.

-   * @return the result of interpreting the object as an instance of '<em>Predicate Symbol</em>'.

-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-   * @generated

-   */

-  public T casePredicateSymbol(PredicateSymbol object)

-  {

-    return null;

-  }

-

-  /**

-   * Returns the result of interpreting the object as an instance of '<em>Error Predicate</em>'.

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

-   * This implementation returns null;

-   * returning a non-null result will terminate the switch.

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

-   * @param object the target of the switch.

-   * @return the result of interpreting the object as an instance of '<em>Error Predicate</em>'.

-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-   * @generated

-   */

-  public T caseErrorPredicate(ErrorPredicate object)

-  {

-    return null;

-  }

-

-  /**

    * Returns the result of interpreting the object as an instance of '<em>Parameter</em>'.

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

    * This implementation returns null;