From 2c05097ccbeeadd70b20f5001ebeb22ffdc465de Mon Sep 17 00:00:00 2001 From: ArenBabikian Date: Mon, 4 Mar 2019 17:31:16 -0500 Subject: Begin handing of scope and fix type definitions. --- .../vampireLanguage/VampireLanguageFactory.java | 18 --- .../vampireLanguage/VampireLanguagePackage.java | 166 ++++----------------- .../impl/VampireLanguageFactoryImpl.java | 24 --- .../impl/VampireLanguagePackageImpl.java | 56 ------- .../util/VampireLanguageAdapterFactory.java | 40 ----- .../util/VampireLanguageSwitch.java | 46 ------ 6 files changed, 30 insertions(+), 320 deletions(-) (limited to 'Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage') diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguageFactory.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguageFactory.java index a89885ee..84b65a59 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguageFactory.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguageFactory.java @@ -77,24 +77,6 @@ public interface VampireLanguageFactory extends EFactory */ VLSSatisfiable createVLSSatisfiable(); - /** - * Returns a new object of class 'VLS Trying'. - * - * - * @return a new object of class 'VLS Trying'. - * @generated - */ - VLSTrying createVLSTrying(); - - /** - * Returns a new object of class 'VLS Finite Model'. - * - * - * @return a new object of class 'VLS Finite Model'. - * @generated - */ - VLSFiniteModel createVLSFiniteModel(); - /** * Returns a new object of class 'VLS Fof Formula'. * diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java index a9334a48..e7df5378 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java @@ -252,53 +252,6 @@ public interface VampireLanguagePackage extends EPackage */ int VLS_SATISFIABLE_FEATURE_COUNT = VLS_CONFIRMATIONS_FEATURE_COUNT + 0; - /** - * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTryingImpl VLS Trying}' class. - * - * - * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTryingImpl - * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTrying() - * @generated - */ - int VLS_TRYING = 6; - - /** - * The feature id for the 'Name' attribute. - * - * - * @generated - * @ordered - */ - int VLS_TRYING__NAME = 0; - - /** - * The number of structural features of the 'VLS Trying' class. - * - * - * @generated - * @ordered - */ - int VLS_TRYING_FEATURE_COUNT = 1; - - /** - * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFiniteModelImpl VLS Finite Model}' class. - * - * - * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFiniteModelImpl - * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFiniteModel() - * @generated - */ - int VLS_FINITE_MODEL = 7; - - /** - * The number of structural features of the 'VLS Finite Model' class. - * - * - * @generated - * @ordered - */ - int VLS_FINITE_MODEL_FEATURE_COUNT = 0; - /** * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFofFormulaImpl VLS Fof Formula}' class. * @@ -307,7 +260,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFofFormula() * @generated */ - int VLS_FOF_FORMULA = 8; + int VLS_FOF_FORMULA = 6; /** * The feature id for the 'Name' attribute. @@ -362,7 +315,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTffFormula() * @generated */ - int VLS_TFF_FORMULA = 9; + int VLS_TFF_FORMULA = 7; /** * The feature id for the 'Name' attribute. @@ -417,7 +370,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSAnnotation() * @generated */ - int VLS_ANNOTATION = 10; + int VLS_ANNOTATION = 8; /** * The feature id for the 'Name' attribute. @@ -463,7 +416,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTerm() * @generated */ - int VLS_TERM = 11; + int VLS_TERM = 9; /** * The number of structural features of the 'VLS Term' class. @@ -482,7 +435,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSVariable() * @generated */ - int VLS_VARIABLE = 12; + int VLS_VARIABLE = 10; /** * The feature id for the 'Name' attribute. @@ -510,7 +463,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFunctionFof() * @generated */ - int VLS_FUNCTION_FOF = 13; + int VLS_FUNCTION_FOF = 11; /** * The feature id for the 'Functor' attribute. @@ -547,7 +500,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSDefinedTerm() * @generated */ - int VLS_DEFINED_TERM = 14; + int VLS_DEFINED_TERM = 12; /** * The feature id for the 'Value' attribute. @@ -575,7 +528,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSEquivalent() * @generated */ - int VLS_EQUIVALENT = 15; + int VLS_EQUIVALENT = 13; /** * The feature id for the 'Left' containment reference. @@ -612,7 +565,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSImplies() * @generated */ - int VLS_IMPLIES = 16; + int VLS_IMPLIES = 14; /** * The feature id for the 'Left' containment reference. @@ -649,7 +602,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSRevImplies() * @generated */ - int VLS_REV_IMPLIES = 17; + int VLS_REV_IMPLIES = 15; /** * The feature id for the 'Left' containment reference. @@ -686,7 +639,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSXnor() * @generated */ - int VLS_XNOR = 18; + int VLS_XNOR = 16; /** * The feature id for the 'Left' containment reference. @@ -723,7 +676,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSNor() * @generated */ - int VLS_NOR = 19; + int VLS_NOR = 17; /** * The feature id for the 'Left' containment reference. @@ -760,7 +713,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSNand() * @generated */ - int VLS_NAND = 20; + int VLS_NAND = 18; /** * The feature id for the 'Left' containment reference. @@ -797,7 +750,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSAnd() * @generated */ - int VLS_AND = 21; + int VLS_AND = 19; /** * The feature id for the 'Left' containment reference. @@ -834,7 +787,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSOr() * @generated */ - int VLS_OR = 22; + int VLS_OR = 20; /** * The feature id for the 'Left' containment reference. @@ -871,7 +824,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSUniversalQuantifier() * @generated */ - int VLS_UNIVERSAL_QUANTIFIER = 23; + int VLS_UNIVERSAL_QUANTIFIER = 21; /** * The feature id for the 'Variables' containment reference list. @@ -908,7 +861,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSExistentialQuantifier() * @generated */ - int VLS_EXISTENTIAL_QUANTIFIER = 24; + int VLS_EXISTENTIAL_QUANTIFIER = 22; /** * The feature id for the 'Variables' containment reference list. @@ -945,7 +898,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSUnaryNegation() * @generated */ - int VLS_UNARY_NEGATION = 25; + int VLS_UNARY_NEGATION = 23; /** * The feature id for the 'Operand' containment reference. @@ -973,7 +926,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSInequality() * @generated */ - int VLS_INEQUALITY = 26; + int VLS_INEQUALITY = 24; /** * The feature id for the 'Left' containment reference. @@ -1010,7 +963,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSEquality() * @generated */ - int VLS_EQUALITY = 27; + int VLS_EQUALITY = 25; /** * The feature id for the 'Left' containment reference. @@ -1047,7 +1000,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSAssignment() * @generated */ - int VLS_ASSIGNMENT = 28; + int VLS_ASSIGNMENT = 26; /** * The feature id for the 'Left' containment reference. @@ -1084,7 +1037,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSConstant() * @generated */ - int VLS_CONSTANT = 29; + int VLS_CONSTANT = 27; /** * The feature id for the 'Name' attribute. @@ -1112,7 +1065,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTrue() * @generated */ - int VLS_TRUE = 30; + int VLS_TRUE = 28; /** * The number of structural features of the 'VLS True' class. @@ -1131,7 +1084,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFalse() * @generated */ - int VLS_FALSE = 31; + int VLS_FALSE = 29; /** * The number of structural features of the 'VLS False' class. @@ -1150,7 +1103,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFunction() * @generated */ - int VLS_FUNCTION = 32; + int VLS_FUNCTION = 30; /** * The feature id for the 'Constant' attribute. @@ -1187,7 +1140,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSLess() * @generated */ - int VLS_LESS = 33; + int VLS_LESS = 31; /** * The feature id for the 'Name' attribute. @@ -1224,7 +1177,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSInt() * @generated */ - int VLS_INT = 34; + int VLS_INT = 32; /** * The feature id for the 'Value' attribute. @@ -1252,7 +1205,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSReal() * @generated */ - int VLS_REAL = 35; + int VLS_REAL = 33; /** * The feature id for the 'Value' attribute. @@ -1280,7 +1233,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSRational() * @generated */ - int VLS_RATIONAL = 36; + int VLS_RATIONAL = 34; /** * The feature id for the 'Value' attribute. @@ -1308,7 +1261,7 @@ public interface VampireLanguagePackage extends EPackage * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSDoubleQuote() * @generated */ - int VLS_DOUBLE_QUOTE = 37; + int VLS_DOUBLE_QUOTE = 35; /** * The feature id for the 'Value' attribute. @@ -1488,37 +1441,6 @@ public interface VampireLanguagePackage extends EPackage */ EClass getVLSSatisfiable(); - /** - * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying VLS Trying}'. - * - * - * @return the meta object for class 'VLS Trying'. - * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying - * @generated - */ - EClass getVLSTrying(); - - /** - * Returns the meta object for the attribute '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying#getName Name}'. - * - * - * @return the meta object for the attribute 'Name'. - * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying#getName() - * @see #getVLSTrying() - * @generated - */ - EAttribute getVLSTrying_Name(); - - /** - * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFiniteModel VLS Finite Model}'. - * - * - * @return the meta object for class 'VLS Finite Model'. - * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFiniteModel - * @generated - */ - EClass getVLSFiniteModel(); - /** * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula VLS Fof Formula}'. * @@ -2491,34 +2413,6 @@ public interface VampireLanguagePackage extends EPackage */ EClass VLS_SATISFIABLE = eINSTANCE.getVLSSatisfiable(); - /** - * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTryingImpl VLS Trying}' class. - * - * - * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTryingImpl - * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTrying() - * @generated - */ - EClass VLS_TRYING = eINSTANCE.getVLSTrying(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * - * @generated - */ - EAttribute VLS_TRYING__NAME = eINSTANCE.getVLSTrying_Name(); - - /** - * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFiniteModelImpl VLS Finite Model}' class. - * - * - * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFiniteModelImpl - * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFiniteModel() - * @generated - */ - EClass VLS_FINITE_MODEL = eINSTANCE.getVLSFiniteModel(); - /** * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFofFormulaImpl VLS Fof Formula}' class. * diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguageFactoryImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguageFactoryImpl.java index cd4a7a01..c3c74fe9 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguageFactoryImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguageFactoryImpl.java @@ -71,8 +71,6 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL case VampireLanguagePackage.VLS_COMMENT: return createVLSComment(); case VampireLanguagePackage.VLS_CONFIRMATIONS: return createVLSConfirmations(); case VampireLanguagePackage.VLS_SATISFIABLE: return createVLSSatisfiable(); - case VampireLanguagePackage.VLS_TRYING: return createVLSTrying(); - case VampireLanguagePackage.VLS_FINITE_MODEL: return createVLSFiniteModel(); case VampireLanguagePackage.VLS_FOF_FORMULA: return createVLSFofFormula(); case VampireLanguagePackage.VLS_TFF_FORMULA: return createVLSTffFormula(); case VampireLanguagePackage.VLS_ANNOTATION: return createVLSAnnotation(); @@ -174,28 +172,6 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL return vlsSatisfiable; } - /** - * - * - * @generated - */ - public VLSTrying createVLSTrying() - { - VLSTryingImpl vlsTrying = new VLSTryingImpl(); - return vlsTrying; - } - - /** - * - * - * @generated - */ - public VLSFiniteModel createVLSFiniteModel() - { - VLSFiniteModelImpl vlsFiniteModel = new VLSFiniteModelImpl(); - return vlsFiniteModel; - } - /** * * diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java index ff71ff74..2b131272 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java @@ -15,7 +15,6 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquality; import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent; import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier; import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFalse; -import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFiniteModel; import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula; import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction; import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof; @@ -35,7 +34,6 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSSatisfiable; import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm; import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula; import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrue; -import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying; import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation; import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier; import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable; @@ -101,20 +99,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL */ private EClass vlsSatisfiableEClass = null; - /** - * - * - * @generated - */ - private EClass vlsTryingEClass = null; - - /** - * - * - * @generated - */ - private EClass vlsFiniteModelEClass = null; - /** * * @@ -538,36 +522,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL return vlsSatisfiableEClass; } - /** - * - * - * @generated - */ - public EClass getVLSTrying() - { - return vlsTryingEClass; - } - - /** - * - * - * @generated - */ - public EAttribute getVLSTrying_Name() - { - return (EAttribute)vlsTryingEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EClass getVLSFiniteModel() - { - return vlsFiniteModelEClass; - } - /** * * @@ -1389,11 +1343,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL vlsSatisfiableEClass = createEClass(VLS_SATISFIABLE); - vlsTryingEClass = createEClass(VLS_TRYING); - createEAttribute(vlsTryingEClass, VLS_TRYING__NAME); - - vlsFiniteModelEClass = createEClass(VLS_FINITE_MODEL); - vlsFofFormulaEClass = createEClass(VLS_FOF_FORMULA); createEAttribute(vlsFofFormulaEClass, VLS_FOF_FORMULA__NAME); createEAttribute(vlsFofFormulaEClass, VLS_FOF_FORMULA__FOF_ROLE); @@ -1581,11 +1530,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL initEClass(vlsSatisfiableEClass, VLSSatisfiable.class, "VLSSatisfiable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(vlsTryingEClass, VLSTrying.class, "VLSTrying", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getVLSTrying_Name(), ecorePackage.getEString(), "name", null, 0, 1, VLSTrying.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(vlsFiniteModelEClass, VLSFiniteModel.class, "VLSFiniteModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(vlsFofFormulaEClass, VLSFofFormula.class, "VLSFofFormula", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getVLSFofFormula_Name(), ecorePackage.getEString(), "name", null, 0, 1, VLSFofFormula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getVLSFofFormula_FofRole(), ecorePackage.getEString(), "fofRole", null, 0, 1, VLSFofFormula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java index 90781f47..41e073ca 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java @@ -106,16 +106,6 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl return createVLSSatisfiableAdapter(); } @Override - public Adapter caseVLSTrying(VLSTrying object) - { - return createVLSTryingAdapter(); - } - @Override - public Adapter caseVLSFiniteModel(VLSFiniteModel object) - { - return createVLSFiniteModelAdapter(); - } - @Override public Adapter caseVLSFofFormula(VLSFofFormula object) { return createVLSFofFormulaAdapter(); @@ -377,36 +367,6 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl return null; } - /** - * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying VLS Trying}'. - * - * 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. - * - * @return the new adapter. - * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying - * @generated - */ - public Adapter createVLSTryingAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFiniteModel VLS Finite Model}'. - * - * 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. - * - * @return the new adapter. - * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFiniteModel - * @generated - */ - public Adapter createVLSFiniteModelAdapter() - { - return null; - } - /** * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula VLS Fof Formula}'. * diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java index eddb3b4c..24ad4238 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java @@ -116,20 +116,6 @@ public class VampireLanguageSwitch extends Switch if (result == null) result = defaultCase(theEObject); return result; } - case VampireLanguagePackage.VLS_TRYING: - { - VLSTrying vlsTrying = (VLSTrying)theEObject; - T result = caseVLSTrying(vlsTrying); - if (result == null) result = defaultCase(theEObject); - return result; - } - case VampireLanguagePackage.VLS_FINITE_MODEL: - { - VLSFiniteModel vlsFiniteModel = (VLSFiniteModel)theEObject; - T result = caseVLSFiniteModel(vlsFiniteModel); - if (result == null) result = defaultCase(theEObject); - return result; - } case VampireLanguagePackage.VLS_FOF_FORMULA: { VLSFofFormula vlsFofFormula = (VLSFofFormula)theEObject; @@ -470,38 +456,6 @@ public class VampireLanguageSwitch extends Switch return null; } - /** - * Returns the result of interpreting the object as an instance of 'VLS Trying'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'VLS Trying'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseVLSTrying(VLSTrying object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'VLS Finite Model'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'VLS Finite Model'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseVLSFiniteModel(VLSFiniteModel object) - { - return null; - } - /** * Returns the result of interpreting the object as an instance of 'VLS Fof Formula'. * -- cgit v1.2.3-54-g00ecf