Synthetic tokens for solver language

5 files changed, 495 insertions, 416 deletions

diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CallImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CallImpl.java
index fde31be5..01712ad3 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CallImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CallImpl.java
@@ -25,9 +25,9 @@ import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
  * </p>

  * <ul>

  *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CallImpl#getFunctor <em>Functor</em>}</li>

- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CallImpl#getArgumentList <em>Argument List</em>}</li>

  *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CallImpl#isTransitiveClosure <em>Transitive Closure</em>}</li>

  *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CallImpl#isReflexiveTransitiveClosure <em>Reflexive Transitive Closure</em>}</li>

+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CallImpl#getArgumentList <em>Argument List</em>}</li>

  * </ul>

  *

  * @generated

@@ -45,16 +45,6 @@ public class CallImpl extends ExpressionImpl implements Call
   protected Reference functor;

 

   /**

-   * The cached value of the '{@link #getArgumentList() <em>Argument List</em>}' containment reference.

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

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

-   * @see #getArgumentList()

-   * @generated

-   * @ordered

-   */

-  protected ArgumentList argumentList;

-

-  /**

    * The default value of the '{@link #isTransitiveClosure() <em>Transitive Closure</em>}' attribute.

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

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

@@ -95,6 +85,16 @@ public class CallImpl extends ExpressionImpl implements Call
   protected boolean reflexiveTransitiveClosure = REFLEXIVE_TRANSITIVE_CLOSURE_EDEFAULT;

 

   /**

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

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

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

+   * @see #getArgumentList()

+   * @generated

+   * @ordered

+   */

+  protected ArgumentList argumentList;

+

+  /**

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

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

    * @generated

@@ -171,9 +171,9 @@ public class CallImpl extends ExpressionImpl implements Call
    * @generated

    */

   @Override

-  public ArgumentList getArgumentList()

+  public boolean isTransitiveClosure()

   {

-    return argumentList;

+    return transitiveClosure;

   }

 

   /**

@@ -181,16 +181,13 @@ public class CallImpl extends ExpressionImpl implements Call
    * <!-- end-user-doc -->

    * @generated

    */

-  public NotificationChain basicSetArgumentList(ArgumentList newArgumentList, NotificationChain msgs)

+  @Override

+  public void setTransitiveClosure(boolean newTransitiveClosure)

   {

-    ArgumentList oldArgumentList = argumentList;

-    argumentList = newArgumentList;

+    boolean oldTransitiveClosure = transitiveClosure;

+    transitiveClosure = newTransitiveClosure;

     if (eNotificationRequired())

-    {

-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__ARGUMENT_LIST, oldArgumentList, newArgumentList);

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

-    }

-    return msgs;

+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__TRANSITIVE_CLOSURE, oldTransitiveClosure, transitiveClosure));

   }

 

   /**

@@ -199,20 +196,9 @@ public class CallImpl extends ExpressionImpl implements Call
    * @generated

    */

   @Override

-  public void setArgumentList(ArgumentList newArgumentList)

+  public boolean isReflexiveTransitiveClosure()

   {

-    if (newArgumentList != argumentList)

-    {

-      NotificationChain msgs = null;

-      if (argumentList != null)

-        msgs = ((InternalEObject)argumentList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CALL__ARGUMENT_LIST, null, msgs);

-      if (newArgumentList != null)

-        msgs = ((InternalEObject)newArgumentList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CALL__ARGUMENT_LIST, null, msgs);

-      msgs = basicSetArgumentList(newArgumentList, msgs);

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

-    }

-    else if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__ARGUMENT_LIST, newArgumentList, newArgumentList));

+    return reflexiveTransitiveClosure;

   }

 

   /**

@@ -221,9 +207,12 @@ public class CallImpl extends ExpressionImpl implements Call
    * @generated

    */

   @Override

-  public boolean isTransitiveClosure()

+  public void setReflexiveTransitiveClosure(boolean newReflexiveTransitiveClosure)

   {

-    return transitiveClosure;

+    boolean oldReflexiveTransitiveClosure = reflexiveTransitiveClosure;

+    reflexiveTransitiveClosure = newReflexiveTransitiveClosure;

+    if (eNotificationRequired())

+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__REFLEXIVE_TRANSITIVE_CLOSURE, oldReflexiveTransitiveClosure, reflexiveTransitiveClosure));

   }

 

   /**

@@ -232,12 +221,9 @@ public class CallImpl extends ExpressionImpl implements Call
    * @generated

    */

   @Override

-  public void setTransitiveClosure(boolean newTransitiveClosure)

+  public ArgumentList getArgumentList()

   {

-    boolean oldTransitiveClosure = transitiveClosure;

-    transitiveClosure = newTransitiveClosure;

-    if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__TRANSITIVE_CLOSURE, oldTransitiveClosure, transitiveClosure));

+    return argumentList;

   }

 

   /**

@@ -245,10 +231,16 @@ public class CallImpl extends ExpressionImpl implements Call
    * <!-- end-user-doc -->

    * @generated

    */

-  @Override

-  public boolean isReflexiveTransitiveClosure()

+  public NotificationChain basicSetArgumentList(ArgumentList newArgumentList, NotificationChain msgs)

   {

-    return reflexiveTransitiveClosure;

+    ArgumentList oldArgumentList = argumentList;

+    argumentList = newArgumentList;

+    if (eNotificationRequired())

+    {

+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__ARGUMENT_LIST, oldArgumentList, newArgumentList);

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

+    }

+    return msgs;

   }

 

   /**

@@ -257,12 +249,20 @@ public class CallImpl extends ExpressionImpl implements Call
    * @generated

    */

   @Override

-  public void setReflexiveTransitiveClosure(boolean newReflexiveTransitiveClosure)

+  public void setArgumentList(ArgumentList newArgumentList)

   {

-    boolean oldReflexiveTransitiveClosure = reflexiveTransitiveClosure;

-    reflexiveTransitiveClosure = newReflexiveTransitiveClosure;

-    if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__REFLEXIVE_TRANSITIVE_CLOSURE, oldReflexiveTransitiveClosure, reflexiveTransitiveClosure));

+    if (newArgumentList != argumentList)

+    {

+      NotificationChain msgs = null;

+      if (argumentList != null)

+        msgs = ((InternalEObject)argumentList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CALL__ARGUMENT_LIST, null, msgs);

+      if (newArgumentList != null)

+        msgs = ((InternalEObject)newArgumentList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CALL__ARGUMENT_LIST, null, msgs);

+      msgs = basicSetArgumentList(newArgumentList, msgs);

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

+    }

+    else if (eNotificationRequired())

+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__ARGUMENT_LIST, newArgumentList, newArgumentList));

   }

 

   /**

@@ -295,12 +295,12 @@ public class CallImpl extends ExpressionImpl implements Call
     {

       case SolverLanguagePackage.CALL__FUNCTOR:

         return getFunctor();

-      case SolverLanguagePackage.CALL__ARGUMENT_LIST:

-        return getArgumentList();

       case SolverLanguagePackage.CALL__TRANSITIVE_CLOSURE:

         return isTransitiveClosure();

       case SolverLanguagePackage.CALL__REFLEXIVE_TRANSITIVE_CLOSURE:

         return isReflexiveTransitiveClosure();

+      case SolverLanguagePackage.CALL__ARGUMENT_LIST:

+        return getArgumentList();

     }

     return super.eGet(featureID, resolve, coreType);

   }

@@ -318,15 +318,15 @@ public class CallImpl extends ExpressionImpl implements Call
       case SolverLanguagePackage.CALL__FUNCTOR:

         setFunctor((Reference)newValue);

         return;

-      case SolverLanguagePackage.CALL__ARGUMENT_LIST:

-        setArgumentList((ArgumentList)newValue);

-        return;

       case SolverLanguagePackage.CALL__TRANSITIVE_CLOSURE:

         setTransitiveClosure((Boolean)newValue);

         return;

       case SolverLanguagePackage.CALL__REFLEXIVE_TRANSITIVE_CLOSURE:

         setReflexiveTransitiveClosure((Boolean)newValue);

         return;

+      case SolverLanguagePackage.CALL__ARGUMENT_LIST:

+        setArgumentList((ArgumentList)newValue);

+        return;

     }

     super.eSet(featureID, newValue);

   }

@@ -344,15 +344,15 @@ public class CallImpl extends ExpressionImpl implements Call
       case SolverLanguagePackage.CALL__FUNCTOR:

         setFunctor((Reference)null);

         return;

-      case SolverLanguagePackage.CALL__ARGUMENT_LIST:

-        setArgumentList((ArgumentList)null);

-        return;

       case SolverLanguagePackage.CALL__TRANSITIVE_CLOSURE:

         setTransitiveClosure(TRANSITIVE_CLOSURE_EDEFAULT);

         return;

       case SolverLanguagePackage.CALL__REFLEXIVE_TRANSITIVE_CLOSURE:

         setReflexiveTransitiveClosure(REFLEXIVE_TRANSITIVE_CLOSURE_EDEFAULT);

         return;

+      case SolverLanguagePackage.CALL__ARGUMENT_LIST:

+        setArgumentList((ArgumentList)null);

+        return;

     }

     super.eUnset(featureID);

   }

@@ -369,12 +369,12 @@ public class CallImpl extends ExpressionImpl implements Call
     {

       case SolverLanguagePackage.CALL__FUNCTOR:

         return functor != null;

-      case SolverLanguagePackage.CALL__ARGUMENT_LIST:

-        return argumentList != null;

       case SolverLanguagePackage.CALL__TRANSITIVE_CLOSURE:

         return transitiveClosure != TRANSITIVE_CLOSURE_EDEFAULT;

       case SolverLanguagePackage.CALL__REFLEXIVE_TRANSITIVE_CLOSURE:

         return reflexiveTransitiveClosure != REFLEXIVE_TRANSITIVE_CLOSURE_EDEFAULT;

+      case SolverLanguagePackage.CALL__ARGUMENT_LIST:

+        return argumentList != null;

     }

     return super.eIsSet(featureID);

   }

diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ClassDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ClassDefinitionImpl.java
new file mode 100644
index 00000000..f0a81764
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ClassDefinitionImpl.java
@@ -0,0 +1,340 @@
+/**

+ * generated by Xtext 2.21.0

+ */

+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;

+

+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.EObjectResolvingEList;

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

+

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

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

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

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

+

+/**

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

+ * An implementation of the model object '<em><b>Class Definition</b></em>'.

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

+ * <p>

+ * The following features are implemented:

+ * </p>

+ * <ul>

+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassDefinitionImpl#isAbstract <em>Abstract</em>}</li>

+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassDefinitionImpl#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassDefinitionImpl#getSuperclasses <em>Superclasses</em>}</li>

+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassDefinitionImpl#getMembers <em>Members</em>}</li>

+ * </ul>

+ *

+ * @generated

+ */

+public class ClassDefinitionImpl extends StatementImpl implements ClassDefinition

+{

+  /**

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

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

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

+   * @see #isAbstract()

+   * @generated

+   * @ordered

+   */

+  protected static final boolean ABSTRACT_EDEFAULT = false;

+

+  /**

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

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

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

+   * @see #isAbstract()

+   * @generated

+   * @ordered

+   */

+  protected boolean abstract_ = ABSTRACT_EDEFAULT;

+

+  /**

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

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

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

+   * @see #getName()

+   * @generated

+   * @ordered

+   */

+  protected static final String NAME_EDEFAULT = null;

+

+  /**

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

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

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

+   * @see #getName()

+   * @generated

+   * @ordered

+   */

+  protected String name = NAME_EDEFAULT;

+

+  /**

+   * The cached value of the '{@link #getSuperclasses() <em>Superclasses</em>}' reference list.

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

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

+   * @see #getSuperclasses()

+   * @generated

+   * @ordered

+   */

+  protected EList<NamedElement> superclasses;

+

+  /**

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

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

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

+   * @see #getMembers()

+   * @generated

+   * @ordered

+   */

+  protected EList<MemberDefinition> members;

+

+  /**

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

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

+   * @generated

+   */

+  protected ClassDefinitionImpl()

+  {

+    super();

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  protected EClass eStaticClass()

+  {

+    return SolverLanguagePackage.Literals.CLASS_DEFINITION;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public boolean isAbstract()

+  {

+    return abstract_;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public void setAbstract(boolean newAbstract)

+  {

+    boolean oldAbstract = abstract_;

+    abstract_ = newAbstract;

+    if (eNotificationRequired())

+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CLASS_DEFINITION__ABSTRACT, oldAbstract, abstract_));

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public String getName()

+  {

+    return name;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public void setName(String newName)

+  {

+    String oldName = name;

+    name = newName;

+    if (eNotificationRequired())

+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CLASS_DEFINITION__NAME, oldName, name));

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public EList<NamedElement> getSuperclasses()

+  {

+    if (superclasses == null)

+    {

+      superclasses = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, SolverLanguagePackage.CLASS_DEFINITION__SUPERCLASSES);

+    }

+    return superclasses;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public EList<MemberDefinition> getMembers()

+  {

+    if (members == null)

+    {

+      members = new EObjectContainmentEList<MemberDefinition>(MemberDefinition.class, this, SolverLanguagePackage.CLASS_DEFINITION__MEMBERS);

+    }

+    return members;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+  {

+    switch (featureID)

+    {

+      case SolverLanguagePackage.CLASS_DEFINITION__MEMBERS:

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

+    }

+    return super.eInverseRemove(otherEnd, featureID, msgs);

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public Object eGet(int featureID, boolean resolve, boolean coreType)

+  {

+    switch (featureID)

+    {

+      case SolverLanguagePackage.CLASS_DEFINITION__ABSTRACT:

+        return isAbstract();

+      case SolverLanguagePackage.CLASS_DEFINITION__NAME:

+        return getName();

+      case SolverLanguagePackage.CLASS_DEFINITION__SUPERCLASSES:

+        return getSuperclasses();

+      case SolverLanguagePackage.CLASS_DEFINITION__MEMBERS:

+        return getMembers();

+    }

+    return super.eGet(featureID, resolve, coreType);

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @SuppressWarnings("unchecked")

+  @Override

+  public void eSet(int featureID, Object newValue)

+  {

+    switch (featureID)

+    {

+      case SolverLanguagePackage.CLASS_DEFINITION__ABSTRACT:

+        setAbstract((Boolean)newValue);

+        return;

+      case SolverLanguagePackage.CLASS_DEFINITION__NAME:

+        setName((String)newValue);

+        return;

+      case SolverLanguagePackage.CLASS_DEFINITION__SUPERCLASSES:

+        getSuperclasses().clear();

+        getSuperclasses().addAll((Collection<? extends NamedElement>)newValue);

+        return;

+      case SolverLanguagePackage.CLASS_DEFINITION__MEMBERS:

+        getMembers().clear();

+        getMembers().addAll((Collection<? extends MemberDefinition>)newValue);

+        return;

+    }

+    super.eSet(featureID, newValue);

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public void eUnset(int featureID)

+  {

+    switch (featureID)

+    {

+      case SolverLanguagePackage.CLASS_DEFINITION__ABSTRACT:

+        setAbstract(ABSTRACT_EDEFAULT);

+        return;

+      case SolverLanguagePackage.CLASS_DEFINITION__NAME:

+        setName(NAME_EDEFAULT);

+        return;

+      case SolverLanguagePackage.CLASS_DEFINITION__SUPERCLASSES:

+        getSuperclasses().clear();

+        return;

+      case SolverLanguagePackage.CLASS_DEFINITION__MEMBERS:

+        getMembers().clear();

+        return;

+    }

+    super.eUnset(featureID);

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public boolean eIsSet(int featureID)

+  {

+    switch (featureID)

+    {

+      case SolverLanguagePackage.CLASS_DEFINITION__ABSTRACT:

+        return abstract_ != ABSTRACT_EDEFAULT;

+      case SolverLanguagePackage.CLASS_DEFINITION__NAME:

+        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+      case SolverLanguagePackage.CLASS_DEFINITION__SUPERCLASSES:

+        return superclasses != null && !superclasses.isEmpty();

+      case SolverLanguagePackage.CLASS_DEFINITION__MEMBERS:

+        return members != null && !members.isEmpty();

+    }

+    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(" (abstract: ");

+    result.append(abstract_);

+    result.append(", name: ");

+    result.append(name);

+    result.append(')');

+    return result.toString();

+  }

+

+} //ClassDefinitionImpl

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 8a5976c2..509d7568 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
@@ -94,6 +94,7 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
       case SolverLanguagePackage.INFINITY_LITERAL: return createInfinityLiteral();

       case SolverLanguagePackage.EMPTY_INTERVAL_LITERAL: return createEmptyIntervalLiteral();

       case SolverLanguagePackage.STRING_LITERAL: return createStringLiteral();

+      case SolverLanguagePackage.CLASS_DEFINITION: return createClassDefinition();

       case SolverLanguagePackage.MEMBER_DEFINITION: return createMemberDefinition();

       case SolverLanguagePackage.MULTIPLICITY: return createMultiplicity();

       case SolverLanguagePackage.MANY_MULTIPLICITY: return createManyMultiplicity();

@@ -513,6 +514,18 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    * @generated

    */

   @Override

+  public ClassDefinition createClassDefinition()

+  {

+    ClassDefinitionImpl classDefinition = new ClassDefinitionImpl();

+    return classDefinition;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

   public MemberDefinition createMemberDefinition()

   {

     MemberDefinitionImpl memberDefinition = new MemberDefinitionImpl();

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 393a2545..39f811b9 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
@@ -22,6 +22,7 @@ import org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity;
 import org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition;

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

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

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

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

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

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

@@ -275,6 +276,13 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
    * <!-- end-user-doc -->

    * @generated

    */

+  private EClass classDefinitionEClass = null;

+

+  /**

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

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

+   * @generated

+   */

   private EClass memberDefinitionEClass = null;

 

   /**

@@ -540,50 +548,6 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
    * @generated

    */

   @Override

-  public EAttribute getStatement_Abstract()

-  {

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

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public EAttribute getStatement_Name()

-  {

-    return (EAttribute)statementEClass.getEStructuralFeatures().get(1);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public EReference getStatement_Superclasses()

-  {

-    return (EReference)statementEClass.getEStructuralFeatures().get(2);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public EReference getStatement_Members()

-  {

-    return (EReference)statementEClass.getEStructuralFeatures().get(3);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

   public EClass getPredicateDefinition()

   {

     return predicateDefinitionEClass;

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

    */

   @Override

-  public EReference getCall_ArgumentList()

+  public EAttribute getCall_TransitiveClosure()

   {

-    return (EReference)callEClass.getEStructuralFeatures().get(1);

+    return (EAttribute)callEClass.getEStructuralFeatures().get(1);

   }

 

   /**

@@ -991,7 +955,7 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
    * @generated

    */

   @Override

-  public EAttribute getCall_TransitiveClosure()

+  public EAttribute getCall_ReflexiveTransitiveClosure()

   {

     return (EAttribute)callEClass.getEStructuralFeatures().get(2);

   }

@@ -1002,9 +966,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
    * @generated

    */

   @Override

-  public EAttribute getCall_ReflexiveTransitiveClosure()

+  public EReference getCall_ArgumentList()

   {

-    return (EAttribute)callEClass.getEStructuralFeatures().get(3);

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

   }

 

   /**

@@ -1288,6 +1252,61 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
    * @generated

    */

   @Override

+  public EClass getClassDefinition()

+  {

+    return classDefinitionEClass;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public EAttribute getClassDefinition_Abstract()

+  {

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

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public EAttribute getClassDefinition_Name()

+  {

+    return (EAttribute)classDefinitionEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public EReference getClassDefinition_Superclasses()

+  {

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

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public EReference getClassDefinition_Members()

+  {

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

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

   public EClass getMemberDefinition()

   {

     return memberDefinitionEClass;

@@ -1900,10 +1919,6 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
     createEReference(problemEClass, PROBLEM__STATEMENTS);

 

     statementEClass = createEClass(STATEMENT);

-    createEAttribute(statementEClass, STATEMENT__ABSTRACT);

-    createEAttribute(statementEClass, STATEMENT__NAME);

-    createEReference(statementEClass, STATEMENT__SUPERCLASSES);

-    createEReference(statementEClass, STATEMENT__MEMBERS);

 

     predicateDefinitionEClass = createEClass(PREDICATE_DEFINITION);

     createEReference(predicateDefinitionEClass, PREDICATE_DEFINITION__HEAD);

@@ -1952,9 +1967,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
 

     callEClass = createEClass(CALL);

     createEReference(callEClass, CALL__FUNCTOR);

-    createEReference(callEClass, CALL__ARGUMENT_LIST);

     createEAttribute(callEClass, CALL__TRANSITIVE_CLOSURE);

     createEAttribute(callEClass, CALL__REFLEXIVE_TRANSITIVE_CLOSURE);

+    createEReference(callEClass, CALL__ARGUMENT_LIST);

 

     argumentListEClass = createEClass(ARGUMENT_LIST);

     createEReference(argumentListEClass, ARGUMENT_LIST__ARGUMENTS);

@@ -1995,6 +2010,12 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
     stringLiteralEClass = createEClass(STRING_LITERAL);

     createEAttribute(stringLiteralEClass, STRING_LITERAL__VALUE);

 

+    classDefinitionEClass = createEClass(CLASS_DEFINITION);

+    createEAttribute(classDefinitionEClass, CLASS_DEFINITION__ABSTRACT);

+    createEAttribute(classDefinitionEClass, CLASS_DEFINITION__NAME);

+    createEReference(classDefinitionEClass, CLASS_DEFINITION__SUPERCLASSES);

+    createEReference(classDefinitionEClass, CLASS_DEFINITION__MEMBERS);

+

     memberDefinitionEClass = createEClass(MEMBER_DEFINITION);

     createEAttribute(memberDefinitionEClass, MEMBER_DEFINITION__CONTAINMENT);

     createEReference(memberDefinitionEClass, MEMBER_DEFINITION__TYPE);

@@ -2122,6 +2143,7 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
     infinityLiteralEClass.getESuperTypes().add(this.getLiteral());

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

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

+    classDefinitionEClass.getESuperTypes().add(this.getStatement());

     manyMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());

     exactMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());

     boundedMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());

@@ -2143,10 +2165,6 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
     initEReference(getProblem_Statements(), this.getStatement(), null, "statements", null, 0, -1, Problem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(statementEClass, Statement.class, "Statement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-    initEAttribute(getStatement_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

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

-    initEReference(getStatement_Superclasses(), this.getNamedElement(), null, "superclasses", null, 0, -1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-    initEReference(getStatement_Members(), this.getMemberDefinition(), null, "members", null, 0, -1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(predicateDefinitionEClass, PredicateDefinition.class, "PredicateDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEReference(getPredicateDefinition_Head(), this.getExpression(), null, "head", null, 0, 1, PredicateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -2195,9 +2213,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
 

     initEClass(callEClass, Call.class, "Call", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEReference(getCall_Functor(), this.getReference(), null, "functor", null, 0, 1, Call.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-    initEReference(getCall_ArgumentList(), this.getArgumentList(), null, "argumentList", null, 0, 1, Call.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEAttribute(getCall_TransitiveClosure(), ecorePackage.getEBoolean(), "transitiveClosure", null, 0, 1, Call.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEAttribute(getCall_ReflexiveTransitiveClosure(), ecorePackage.getEBoolean(), "reflexiveTransitiveClosure", null, 0, 1, Call.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getCall_ArgumentList(), this.getArgumentList(), null, "argumentList", null, 0, 1, Call.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(argumentListEClass, ArgumentList.class, "ArgumentList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEReference(getArgumentList_Arguments(), this.getArgument(), null, "arguments", null, 0, -1, ArgumentList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -2238,6 +2256,12 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
     initEClass(stringLiteralEClass, StringLiteral.class, "StringLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEAttribute(getStringLiteral_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

+    initEClass(classDefinitionEClass, ClassDefinition.class, "ClassDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getClassDefinition_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 0, 1, ClassDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEAttribute(getClassDefinition_Name(), ecorePackage.getEString(), "name", null, 0, 1, ClassDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getClassDefinition_Superclasses(), this.getNamedElement(), null, "superclasses", null, 0, -1, ClassDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getClassDefinition_Members(), this.getMemberDefinition(), null, "members", null, 0, -1, ClassDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

     initEClass(memberDefinitionEClass, MemberDefinition.class, "MemberDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEAttribute(getMemberDefinition_Containment(), ecorePackage.getEBoolean(), "containment", null, 0, 1, MemberDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getMemberDefinition_Type(), this.getNamedElement(), null, "type", null, 0, 1, MemberDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StatementImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StatementImpl.java
index dbd697ec..d349d1a4 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StatementImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StatementImpl.java
@@ -3,25 +3,10 @@
  */

 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;

-

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

 

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

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

 

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

-import org.eclipse.emf.ecore.util.EObjectResolvingEList;

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

-

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

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

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

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

 

@@ -29,81 +14,12 @@ import org.eclipse.viatra.solver.language.solverLanguage.Statement;
  * <!-- begin-user-doc -->

  * An implementation of the model object '<em><b>Statement</b></em>'.

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

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StatementImpl#isAbstract <em>Abstract</em>}</li>

- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StatementImpl#getName <em>Name</em>}</li>

- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StatementImpl#getSuperclasses <em>Superclasses</em>}</li>

- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StatementImpl#getMembers <em>Members</em>}</li>

- * </ul>

  *

  * @generated

  */

 public class StatementImpl extends MinimalEObjectImpl.Container implements Statement

 {

   /**

-   * The default value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.

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

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

-   * @see #isAbstract()

-   * @generated

-   * @ordered

-   */

-  protected static final boolean ABSTRACT_EDEFAULT = false;

-

-  /**

-   * The cached value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.

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

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

-   * @see #isAbstract()

-   * @generated

-   * @ordered

-   */

-  protected boolean abstract_ = ABSTRACT_EDEFAULT;

-

-  /**

-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.

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

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

-   * @see #getName()

-   * @generated

-   * @ordered

-   */

-  protected static final String NAME_EDEFAULT = null;

-

-  /**

-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

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

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

-   * @see #getName()

-   * @generated

-   * @ordered

-   */

-  protected String name = NAME_EDEFAULT;

-

-  /**

-   * The cached value of the '{@link #getSuperclasses() <em>Superclasses</em>}' reference list.

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

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

-   * @see #getSuperclasses()

-   * @generated

-   * @ordered

-   */

-  protected EList<NamedElement> superclasses;

-

-  /**

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

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

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

-   * @see #getMembers()

-   * @generated

-   * @ordered

-   */

-  protected EList<MemberDefinition> members;

-

-  /**

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

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

    * @generated

@@ -124,218 +40,4 @@ public class StatementImpl extends MinimalEObjectImpl.Container implements State
     return SolverLanguagePackage.Literals.STATEMENT;

   }

 

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public boolean isAbstract()

-  {

-    return abstract_;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public void setAbstract(boolean newAbstract)

-  {

-    boolean oldAbstract = abstract_;

-    abstract_ = newAbstract;

-    if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.STATEMENT__ABSTRACT, oldAbstract, abstract_));

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public String getName()

-  {

-    return name;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public void setName(String newName)

-  {

-    String oldName = name;

-    name = newName;

-    if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.STATEMENT__NAME, oldName, name));

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public EList<NamedElement> getSuperclasses()

-  {

-    if (superclasses == null)

-    {

-      superclasses = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, SolverLanguagePackage.STATEMENT__SUPERCLASSES);

-    }

-    return superclasses;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public EList<MemberDefinition> getMembers()

-  {

-    if (members == null)

-    {

-      members = new EObjectContainmentEList<MemberDefinition>(MemberDefinition.class, this, SolverLanguagePackage.STATEMENT__MEMBERS);

-    }

-    return members;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-  {

-    switch (featureID)

-    {

-      case SolverLanguagePackage.STATEMENT__MEMBERS:

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

-    }

-    return super.eInverseRemove(otherEnd, featureID, msgs);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public Object eGet(int featureID, boolean resolve, boolean coreType)

-  {

-    switch (featureID)

-    {

-      case SolverLanguagePackage.STATEMENT__ABSTRACT:

-        return isAbstract();

-      case SolverLanguagePackage.STATEMENT__NAME:

-        return getName();

-      case SolverLanguagePackage.STATEMENT__SUPERCLASSES:

-        return getSuperclasses();

-      case SolverLanguagePackage.STATEMENT__MEMBERS:

-        return getMembers();

-    }

-    return super.eGet(featureID, resolve, coreType);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @SuppressWarnings("unchecked")

-  @Override

-  public void eSet(int featureID, Object newValue)

-  {

-    switch (featureID)

-    {

-      case SolverLanguagePackage.STATEMENT__ABSTRACT:

-        setAbstract((Boolean)newValue);

-        return;

-      case SolverLanguagePackage.STATEMENT__NAME:

-        setName((String)newValue);

-        return;

-      case SolverLanguagePackage.STATEMENT__SUPERCLASSES:

-        getSuperclasses().clear();

-        getSuperclasses().addAll((Collection<? extends NamedElement>)newValue);

-        return;

-      case SolverLanguagePackage.STATEMENT__MEMBERS:

-        getMembers().clear();

-        getMembers().addAll((Collection<? extends MemberDefinition>)newValue);

-        return;

-    }

-    super.eSet(featureID, newValue);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public void eUnset(int featureID)

-  {

-    switch (featureID)

-    {

-      case SolverLanguagePackage.STATEMENT__ABSTRACT:

-        setAbstract(ABSTRACT_EDEFAULT);

-        return;

-      case SolverLanguagePackage.STATEMENT__NAME:

-        setName(NAME_EDEFAULT);

-        return;

-      case SolverLanguagePackage.STATEMENT__SUPERCLASSES:

-        getSuperclasses().clear();

-        return;

-      case SolverLanguagePackage.STATEMENT__MEMBERS:

-        getMembers().clear();

-        return;

-    }

-    super.eUnset(featureID);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public boolean eIsSet(int featureID)

-  {

-    switch (featureID)

-    {

-      case SolverLanguagePackage.STATEMENT__ABSTRACT:

-        return abstract_ != ABSTRACT_EDEFAULT;

-      case SolverLanguagePackage.STATEMENT__NAME:

-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-      case SolverLanguagePackage.STATEMENT__SUPERCLASSES:

-        return superclasses != null && !superclasses.isEmpty();

-      case SolverLanguagePackage.STATEMENT__MEMBERS:

-        return members != null && !members.isEmpty();

-    }

-    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(" (abstract: ");

-    result.append(abstract_);

-    result.append(", name: ");

-    result.append(name);

-    result.append(')');

-    return result.toString();

-  }

-

 } //StatementImpl