3 files changed, 162 insertions, 87 deletions

diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java
index 947d74bb..d3c7366d 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java
@@ -5,6 +5,7 @@ package org.eclipse.viatra.solver.language.solverLanguage.impl;
 

 import java.util.Collection;

 

+import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

 

 import org.eclipse.emf.common.util.EList;

@@ -12,9 +13,12 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

 

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

 

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

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

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

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

@@ -28,6 +32,8 @@ import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
  * The following features are implemented:

  * </p>

  * <ul>

+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#isIsError <em>Is Error</em>}</li>

+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#getSymbol <em>Symbol</em>}</li>

  *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#getParameters <em>Parameters</em>}</li>

  *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#getBodies <em>Bodies</em>}</li>

  * </ul>

@@ -37,6 +43,36 @@ import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 public class PredicateImpl extends StatementImpl implements Predicate

 {

   /**

+   * The default value of the '{@link #isIsError() <em>Is Error</em>}' attribute.

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

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

+   * @see #isIsError()

+   * @generated

+   * @ordered

+   */

+  protected static final boolean IS_ERROR_EDEFAULT = false;

+

+  /**

+   * The cached value of the '{@link #isIsError() <em>Is Error</em>}' attribute.

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

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

+   * @see #isIsError()

+   * @generated

+   * @ordered

+   */

+  protected boolean isError = IS_ERROR_EDEFAULT;

+

+  /**

+   * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' containment reference.

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

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

+   * @see #getSymbol()

+   * @generated

+   * @ordered

+   */

+  protected ModelSymbol symbol;

+

+  /**

    * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.

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

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

@@ -83,6 +119,81 @@ public class PredicateImpl extends StatementImpl implements Predicate
    * @generated

    */

   @Override

+  public boolean isIsError()

+  {

+    return isError;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public void setIsError(boolean newIsError)

+  {

+    boolean oldIsError = isError;

+    isError = newIsError;

+    if (eNotificationRequired())

+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE__IS_ERROR, oldIsError, isError));

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public ModelSymbol getSymbol()

+  {

+    return symbol;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public NotificationChain basicSetSymbol(ModelSymbol newSymbol, NotificationChain msgs)

+  {

+    ModelSymbol oldSymbol = symbol;

+    symbol = newSymbol;

+    if (eNotificationRequired())

+    {

+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE__SYMBOL, oldSymbol, newSymbol);

+      if (msgs == null) msgs = notification; else msgs.add(notification);

+    }

+    return msgs;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public void setSymbol(ModelSymbol newSymbol)

+  {

+    if (newSymbol != symbol)

+    {

+      NotificationChain msgs = null;

+      if (symbol != null)

+        msgs = ((InternalEObject)symbol).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PREDICATE__SYMBOL, null, msgs);

+      if (newSymbol != null)

+        msgs = ((InternalEObject)newSymbol).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PREDICATE__SYMBOL, null, msgs);

+      msgs = basicSetSymbol(newSymbol, msgs);

+      if (msgs != null) msgs.dispatch();

+    }

+    else if (eNotificationRequired())

+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE__SYMBOL, newSymbol, newSymbol));

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

   public EList<Parameter> getParameters()

   {

     if (parameters == null)

@@ -117,6 +228,8 @@ public class PredicateImpl extends StatementImpl implements Predicate
   {

     switch (featureID)

     {

+      case SolverLanguagePackage.PREDICATE__SYMBOL:

+        return basicSetSymbol(null, msgs);

       case SolverLanguagePackage.PREDICATE__PARAMETERS:

         return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);

       case SolverLanguagePackage.PREDICATE__BODIES:

@@ -135,6 +248,10 @@ public class PredicateImpl extends StatementImpl implements Predicate
   {

     switch (featureID)

     {

+      case SolverLanguagePackage.PREDICATE__IS_ERROR:

+        return isIsError();

+      case SolverLanguagePackage.PREDICATE__SYMBOL:

+        return getSymbol();

       case SolverLanguagePackage.PREDICATE__PARAMETERS:

         return getParameters();

       case SolverLanguagePackage.PREDICATE__BODIES:

@@ -154,6 +271,12 @@ public class PredicateImpl extends StatementImpl implements Predicate
   {

     switch (featureID)

     {

+      case SolverLanguagePackage.PREDICATE__IS_ERROR:

+        setIsError((Boolean)newValue);

+        return;

+      case SolverLanguagePackage.PREDICATE__SYMBOL:

+        setSymbol((ModelSymbol)newValue);

+        return;

       case SolverLanguagePackage.PREDICATE__PARAMETERS:

         getParameters().clear();

         getParameters().addAll((Collection<? extends Parameter>)newValue);

@@ -176,6 +299,12 @@ public class PredicateImpl extends StatementImpl implements Predicate
   {

     switch (featureID)

     {

+      case SolverLanguagePackage.PREDICATE__IS_ERROR:

+        setIsError(IS_ERROR_EDEFAULT);

+        return;

+      case SolverLanguagePackage.PREDICATE__SYMBOL:

+        setSymbol((ModelSymbol)null);

+        return;

       case SolverLanguagePackage.PREDICATE__PARAMETERS:

         getParameters().clear();

         return;

@@ -196,6 +325,10 @@ public class PredicateImpl extends StatementImpl implements Predicate
   {

     switch (featureID)

     {

+      case SolverLanguagePackage.PREDICATE__IS_ERROR:

+        return isError != IS_ERROR_EDEFAULT;

+      case SolverLanguagePackage.PREDICATE__SYMBOL:

+        return symbol != null;

       case SolverLanguagePackage.PREDICATE__PARAMETERS:

         return parameters != null && !parameters.isEmpty();

       case SolverLanguagePackage.PREDICATE__BODIES:

@@ -204,4 +337,21 @@ public class PredicateImpl extends StatementImpl implements Predicate
     return super.eIsSet(featureID);

   }

 

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public String toString()

+  {

+    if (eIsProxy()) return super.toString();

+

+    StringBuilder result = new StringBuilder(super.toString());

+    result.append(" (isError: ");

+    result.append(isError);

+    result.append(')');

+    return result.toString();

+  }

+

 } //PredicateImpl

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 12ffc551..5cb1dcdc 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
@@ -29,7 +29,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;

@@ -49,7 +48,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;

@@ -144,8 +142,6 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
       case SolverLanguagePackage.REAL_OBJECT: return createRealObject();

       case SolverLanguagePackage.STRING_OBJECT: return createStringObject();

       case SolverLanguagePackage.PREDICATE: return createPredicate();

-      case SolverLanguagePackage.PREDICATE_SYMBOL: return createPredicateSymbol();

-      case SolverLanguagePackage.ERROR_PREDICATE: return createErrorPredicate();

       case SolverLanguagePackage.PARAMETER: return createParameter();

       case SolverLanguagePackage.PATTERN_BODY: return createPatternBody();

       case SolverLanguagePackage.POLARITY: return createPolarity();

@@ -495,30 +491,6 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

-  public PredicateSymbol createPredicateSymbol()

-  {

-    PredicateSymbolImpl predicateSymbol = new PredicateSymbolImpl();

-    return predicateSymbol;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public ErrorPredicate createErrorPredicate()

-  {

-    ErrorPredicateImpl errorPredicate = new ErrorPredicateImpl();

-    return errorPredicate;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

   public Parameter createParameter()

   {

     ParameterImpl parameter = new ParameterImpl();

diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java
index 9e5d391b..f617be3f 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.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;

@@ -260,20 +258,6 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
    * <!-- end-user-doc -->

    * @generated

    */

-  private EClass predicateSymbolEClass = null;

-

-  /**

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

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

-   * @generated

-   */

-  private EClass errorPredicateEClass = null;

-

-  /**

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

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

-   * @generated

-   */

   private EClass parameterEClass = null;

 

   /**

@@ -927,9 +911,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
    * @generated

    */

   @Override

-  public EReference getPredicate_Parameters()

+  public EAttribute getPredicate_IsError()

   {

-    return (EReference)predicateEClass.getEStructuralFeatures().get(0);

+    return (EAttribute)predicateEClass.getEStructuralFeatures().get(0);

   }

 

   /**

@@ -938,7 +922,7 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
    * @generated

    */

   @Override

-  public EReference getPredicate_Bodies()

+  public EReference getPredicate_Symbol()

   {

     return (EReference)predicateEClass.getEStructuralFeatures().get(1);

   }

@@ -949,31 +933,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
    * @generated

    */

   @Override

-  public EClass getPredicateSymbol()

-  {

-    return predicateSymbolEClass;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public EReference getPredicateSymbol_Symbol()

-  {

-    return (EReference)predicateSymbolEClass.getEStructuralFeatures().get(0);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public EClass getErrorPredicate()

+  public EReference getPredicate_Parameters()

   {

-    return errorPredicateEClass;

+    return (EReference)predicateEClass.getEStructuralFeatures().get(2);

   }

 

   /**

@@ -982,9 +944,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
    * @generated

    */

   @Override

-  public EAttribute getErrorPredicate_Name()

+  public EReference getPredicate_Bodies()

   {

-    return (EAttribute)errorPredicateEClass.getEStructuralFeatures().get(0);

+    return (EReference)predicateEClass.getEStructuralFeatures().get(3);

   }

 

   /**

@@ -1685,15 +1647,11 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
     createEAttribute(stringObjectEClass, STRING_OBJECT__VALUE);

 

     predicateEClass = createEClass(PREDICATE);

+    createEAttribute(predicateEClass, PREDICATE__IS_ERROR);

+    createEReference(predicateEClass, PREDICATE__SYMBOL);

     createEReference(predicateEClass, PREDICATE__PARAMETERS);

     createEReference(predicateEClass, PREDICATE__BODIES);

 

-    predicateSymbolEClass = createEClass(PREDICATE_SYMBOL);

-    createEReference(predicateSymbolEClass, PREDICATE_SYMBOL__SYMBOL);

-

-    errorPredicateEClass = createEClass(ERROR_PREDICATE);

-    createEAttribute(errorPredicateEClass, ERROR_PREDICATE__NAME);

-

     parameterEClass = createEClass(PARAMETER);

     createEReference(parameterEClass, PARAMETER__VARIABLE);

     createEReference(parameterEClass, PARAMETER__TYPE);

@@ -1818,6 +1776,7 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
     stringSymbolEClass.getESuperTypes().add(this.getDataSymbol());

     objectEClass.getESuperTypes().add(this.getComplexObject());

     namedObjectEClass.getESuperTypes().add(this.getObject());

+    namedObjectEClass.getESuperTypes().add(this.getLiteral());

     unnamedObjectEClass.getESuperTypes().add(this.getObject());

     dataObjectEClass.getESuperTypes().add(this.getObject());

     dataObjectEClass.getESuperTypes().add(this.getLiteral());

@@ -1826,8 +1785,6 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
     realObjectEClass.getESuperTypes().add(this.getDataObject());

     stringObjectEClass.getESuperTypes().add(this.getDataObject());

     predicateEClass.getESuperTypes().add(this.getStatement());

-    predicateSymbolEClass.getESuperTypes().add(this.getPredicate());

-    errorPredicateEClass.getESuperTypes().add(this.getPredicate());

     variableEClass.getESuperTypes().add(this.getLiteral());

     allInstancesEClass.getESuperTypes().add(this.getComplexObject());

     allObjectsEClass.getESuperTypes().add(this.getComplexObject());

@@ -1910,15 +1867,11 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
     initEAttribute(getStringObject_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(predicateEClass, Predicate.class, "Predicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getPredicate_IsError(), ecorePackage.getEBoolean(), "isError", null, 0, 1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getPredicate_Symbol(), this.getModelSymbol(), null, "symbol", null, 0, 1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getPredicate_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getPredicate_Bodies(), this.getPatternBody(), null, "bodies", null, 0, -1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-    initEClass(predicateSymbolEClass, PredicateSymbol.class, "PredicateSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-    initEReference(getPredicateSymbol_Symbol(), this.getModelSymbol(), null, "symbol", null, 0, 1, PredicateSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-    initEClass(errorPredicateEClass, ErrorPredicate.class, "ErrorPredicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-    initEAttribute(getErrorPredicate_Name(), ecorePackage.getEString(), "name", null, 0, 1, ErrorPredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

     initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEReference(getParameter_Variable(), this.getVariable(), null, "variable", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getParameter_Type(), this.getSymbol(), null, "type", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);