Implement Enum handling and study hierarchy handling

3 files changed, 25 insertions, 16 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/AbstractVampireLanguageUiModule.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/AbstractVampireLanguageUiModule.java
index 5ef7b226..726c20f5 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/AbstractVampireLanguageUiModule.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/AbstractVampireLanguageUiModule.java
@@ -1,5 +1,5 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 package ca.mcgill.ecse.dslreasoner.ui;

 

@@ -11,6 +11,7 @@ import ca.mcgill.ecse.dslreasoner.ui.labeling.VampireLanguageDescriptionLabelPro
 import ca.mcgill.ecse.dslreasoner.ui.labeling.VampireLanguageLabelProvider;

 import ca.mcgill.ecse.dslreasoner.ui.outline.VampireLanguageOutlineTreeProvider;

 import ca.mcgill.ecse.dslreasoner.ui.quickfix.VampireLanguageQuickfixProvider;

+import ca.mcgill.ecse.dslreasoner.validation.VampireLanguageValidatorConfigurationBlock;

 import com.google.inject.Binder;

 import com.google.inject.Provider;

 import com.google.inject.name.Names;

@@ -78,6 +79,7 @@ import org.eclipse.xtext.ui.refactoring.ui.IRenameSupport;
 import org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferences;

 import org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider;

 import org.eclipse.xtext.ui.shared.Access;

+import org.eclipse.xtext.ui.validation.AbstractValidatorConfigurationBlock;

 

 /**

  * Manual modifications go to {@link VampireLanguageUiModule}.

@@ -135,6 +137,11 @@ public abstract class AbstractVampireLanguageUiModule extends DefaultUiModule {
                 binder.bind(InternalVampireLanguageLexer.class).toProvider(LexerProvider.create(InternalVampireLanguageLexer.class));

         }

         

+        // contributed by org.eclipse.xtext.xtext.generator.validation.ValidatorFragment2

+        public Class<? extends AbstractValidatorConfigurationBlock> bindAbstractValidatorConfigurationBlock() {

+                return VampireLanguageValidatorConfigurationBlock.class;

+        }

+        

         // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2

         public Class<? extends PrefixMatcher> bindPrefixMatcher() {

                 return FQNPrefixMatcher.class;

@@ -223,6 +230,13 @@ public abstract class AbstractVampireLanguageUiModule extends DefaultUiModule {
         }

         

         // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

+        public void configureIPreferenceStoreInitializer(Binder binder) {

+                binder.bind(IPreferenceStoreInitializer.class)

+                        .annotatedWith(Names.named("RefactoringPreferences"))

+                        .to(RefactoringPreferences.Initializer.class);

+        }

+        

+        // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

         public Class<? extends IRenameStrategy> bindIRenameStrategy() {

                 return DefaultRenameStrategy.class;

         }

@@ -233,13 +247,6 @@ public abstract class AbstractVampireLanguageUiModule extends DefaultUiModule {
         }

         

         // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

-        public void configureIPreferenceStoreInitializer(Binder binder) {

-                binder.bind(IPreferenceStoreInitializer.class)

-                        .annotatedWith(Names.named("RefactoringPreferences"))

-                        .to(RefactoringPreferences.Initializer.class);

-        }

-        

-        // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

         public Class<? extends IRenameRefactoringProvider> bindIRenameRefactoringProvider() {

                 return DefaultRenameRefactoringProvider.class;

         }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/VampireLanguageExecutableExtensionFactory.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/VampireLanguageExecutableExtensionFactory.java
index 18440e58..1dc2d4cb 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/VampireLanguageExecutableExtensionFactory.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/VampireLanguageExecutableExtensionFactory.java
@@ -1,10 +1,11 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 package ca.mcgill.ecse.dslreasoner.ui;

 

 import ca.mcgill.ecse.dslreasoner.vampire.language.ui.internal.LanguageActivator;

 import com.google.inject.Injector;

+import org.eclipse.core.runtime.Platform;

 import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;

 import org.osgi.framework.Bundle;

 

@@ -16,12 +17,13 @@ public class VampireLanguageExecutableExtensionFactory extends AbstractGuiceAwar
 

         @Override

         protected Bundle getBundle() {

-                return LanguageActivator.getInstance().getBundle();

+                return Platform.getBundle(LanguageActivator.PLUGIN_ID);

         }

         

         @Override

         protected Injector getInjector() {

-                return LanguageActivator.getInstance().getInjector(LanguageActivator.CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE);

+                LanguageActivator activator = LanguageActivator.getInstance();

+                return activator != null ? activator.getInjector(LanguageActivator.CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE) : null;

         }

-        

+

 }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java
index aead1baf..8e11f8c7 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java
@@ -1,5 +1,5 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 package ca.mcgill.ecse.dslreasoner.ui.contentassist;

 

@@ -131,13 +131,13 @@ public abstract class AbstractVampireLanguageProposalProvider extends TerminalsP
         public void completeVLSVariable_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);

         }

-        public void completeVLSFunctionFof_Functor(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+        public void completeVLSFunctionAsTerm_Functor(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(0)), context, acceptor);

                 completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(1)), context, acceptor);

                 completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(2)), context, acceptor);

                 completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(3)), context, acceptor);

         }

-        public void completeVLSFunctionFof_Terms(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+        public void completeVLSFunctionAsTerm_Terms(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);

         }

         public void completeVLSDefinedTerm_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

@@ -267,7 +267,7 @@ public abstract class AbstractVampireLanguageProposalProvider extends TerminalsP
         public void complete_VLSFofTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 // subclasses may override

         }

-        public void complete_VLSFunctionFof(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+        public void complete_VLSFunctionAsTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 // subclasses may override

         }

         public void complete_VLSDefinedTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {