1 files changed, 83 insertions, 59 deletions

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