diff options
author | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-03-06 17:26:43 -0500 |
---|---|---|
committer | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2020-06-07 19:22:45 -0400 |
commit | 6cac004e4935f4cdbfaf1004c74ba7604f990ddc (patch) | |
tree | 8dff613a63e8f3125365c49d01b551f0b088fa3d /Solvers/Vampire-Solver | |
parent | Restructure Vampire Reasoner project (diff) | |
download | VIATRA-Generator-6cac004e4935f4cdbfaf1004c74ba7604f990ddc.tar.gz VIATRA-Generator-6cac004e4935f4cdbfaf1004c74ba7604f990ddc.tar.zst VIATRA-Generator-6cac004e4935f4cdbfaf1004c74ba7604f990ddc.zip |
Implement Enum handling and study hierarchy handling
Diffstat (limited to 'Solvers/Vampire-Solver')
142 files changed, 1817 insertions, 777 deletions
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/AbstractVampireLanguageIdeModule.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/AbstractVampireLanguageIdeModule.java index 323e4df4..d3d4b54d 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/AbstractVampireLanguageIdeModule.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/AbstractVampireLanguageIdeModule.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.ide; | 4 | package ca.mcgill.ecse.dslreasoner.ide; |
5 | 5 | ||
@@ -15,6 +15,9 @@ import org.eclipse.xtext.ide.editor.contentassist.IProposalConflictHelper; | |||
15 | import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper; | 15 | import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper; |
16 | import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; | 16 | import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; |
17 | import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; | 17 | import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; |
18 | import org.eclipse.xtext.ide.refactoring.IRenameStrategy2; | ||
19 | import org.eclipse.xtext.ide.server.rename.IRenameService; | ||
20 | import org.eclipse.xtext.ide.server.rename.RenameService; | ||
18 | 21 | ||
19 | /** | 22 | /** |
20 | * Manual modifications go to {@link VampireLanguageIdeModule}. | 23 | * Manual modifications go to {@link VampireLanguageIdeModule}. |
@@ -44,4 +47,14 @@ public abstract class AbstractVampireLanguageIdeModule extends DefaultIdeModule | |||
44 | return FQNPrefixMatcher.class; | 47 | return FQNPrefixMatcher.class; |
45 | } | 48 | } |
46 | 49 | ||
50 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | ||
51 | public Class<? extends IRenameService> bindIRenameService() { | ||
52 | return RenameService.class; | ||
53 | } | ||
54 | |||
55 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | ||
56 | public Class<? extends IRenameStrategy2> bindIRenameStrategy2() { | ||
57 | return IRenameStrategy2.DefaultImpl.class; | ||
58 | } | ||
59 | |||
47 | } | 60 | } |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/PartialVampireLanguageContentAssistParser.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/PartialVampireLanguageContentAssistParser.java index 67ea9dca..3e7d7281 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/PartialVampireLanguageContentAssistParser.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/PartialVampireLanguageContentAssistParser.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.ide.contentassist.antlr; | 4 | package ca.mcgill.ecse.dslreasoner.ide.contentassist.antlr; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/VampireLanguageParser.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/VampireLanguageParser.java index 9004026e..8f952c29 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/VampireLanguageParser.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/VampireLanguageParser.java | |||
@@ -1,22 +1,160 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.ide.contentassist.antlr; | 4 | package ca.mcgill.ecse.dslreasoner.ide.contentassist.antlr; |
5 | 5 | ||
6 | import ca.mcgill.ecse.dslreasoner.ide.contentassist.antlr.internal.InternalVampireLanguageParser; | 6 | import ca.mcgill.ecse.dslreasoner.ide.contentassist.antlr.internal.InternalVampireLanguageParser; |
7 | import ca.mcgill.ecse.dslreasoner.services.VampireLanguageGrammarAccess; | 7 | import ca.mcgill.ecse.dslreasoner.services.VampireLanguageGrammarAccess; |
8 | import com.google.common.collect.ImmutableMap; | ||
8 | import com.google.inject.Inject; | 9 | import com.google.inject.Inject; |
9 | import java.util.HashMap; | 10 | import com.google.inject.Singleton; |
10 | import java.util.Map; | 11 | import java.util.Map; |
11 | import org.eclipse.xtext.AbstractElement; | 12 | import org.eclipse.xtext.AbstractElement; |
12 | import org.eclipse.xtext.ide.editor.contentassist.antlr.AbstractContentAssistParser; | 13 | import org.eclipse.xtext.ide.editor.contentassist.antlr.AbstractContentAssistParser; |
13 | 14 | ||
14 | public class VampireLanguageParser extends AbstractContentAssistParser { | 15 | public class VampireLanguageParser extends AbstractContentAssistParser { |
15 | 16 | ||
17 | @Singleton | ||
18 | public static final class NameMappings { | ||
19 | |||
20 | private final Map<AbstractElement, String> mappings; | ||
21 | |||
22 | @Inject | ||
23 | public NameMappings(VampireLanguageGrammarAccess grammarAccess) { | ||
24 | ImmutableMap.Builder<AbstractElement, String> builder = ImmutableMap.builder(); | ||
25 | init(builder, grammarAccess); | ||
26 | this.mappings = builder.build(); | ||
27 | } | ||
28 | |||
29 | public String getRuleName(AbstractElement element) { | ||
30 | return mappings.get(element); | ||
31 | } | ||
32 | |||
33 | private static void init(ImmutableMap.Builder<AbstractElement, String> builder, VampireLanguageGrammarAccess grammarAccess) { | ||
34 | builder.put(grammarAccess.getVampireModelAccess().getAlternatives(), "rule__VampireModel__Alternatives"); | ||
35 | builder.put(grammarAccess.getVLSNameAccess().getNameAlternatives_0(), "rule__VLSName__NameAlternatives_0"); | ||
36 | builder.put(grammarAccess.getVLSFofFormulaAccess().getNameAlternatives_2_0(), "rule__VLSFofFormula__NameAlternatives_2_0"); | ||
37 | builder.put(grammarAccess.getVLSTffFormulaAccess().getNameAlternatives_2_0(), "rule__VLSTffFormula__NameAlternatives_2_0"); | ||
38 | builder.put(grammarAccess.getVLSRoleAccess().getAlternatives(), "rule__VLSRole__Alternatives"); | ||
39 | builder.put(grammarAccess.getVLSAnnotationAccess().getNameAlternatives_1_0(), "rule__VLSAnnotation__NameAlternatives_1_0"); | ||
40 | builder.put(grammarAccess.getVLSBinaryAccess().getAlternatives_1(), "rule__VLSBinary__Alternatives_1"); | ||
41 | builder.put(grammarAccess.getVLSBinaryAccess().getAlternatives_1_0_0(), "rule__VLSBinary__Alternatives_1_0_0"); | ||
42 | builder.put(grammarAccess.getVLSUnitaryFormulaAccess().getAlternatives(), "rule__VLSUnitaryFormula__Alternatives"); | ||
43 | builder.put(grammarAccess.getVLSUnaryInfixAccess().getAlternatives_1_0(), "rule__VLSUnaryInfix__Alternatives_1_0"); | ||
44 | builder.put(grammarAccess.getVLSAtomicAccess().getAlternatives(), "rule__VLSAtomic__Alternatives"); | ||
45 | builder.put(grammarAccess.getVLSAtomicConstantAccess().getAlternatives(), "rule__VLSAtomicConstant__Alternatives"); | ||
46 | builder.put(grammarAccess.getVLSAtomicConstantAccess().getNameAlternatives_0_1_0(), "rule__VLSAtomicConstant__NameAlternatives_0_1_0"); | ||
47 | builder.put(grammarAccess.getVLSAtomicFunctionAccess().getAlternatives(), "rule__VLSAtomicFunction__Alternatives"); | ||
48 | builder.put(grammarAccess.getVLSAtomicFunctionAccess().getConstantAlternatives_0_1_0(), "rule__VLSAtomicFunction__ConstantAlternatives_0_1_0"); | ||
49 | builder.put(grammarAccess.getVLSFofTermAccess().getAlternatives(), "rule__VLSFofTerm__Alternatives"); | ||
50 | builder.put(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAlternatives_0_0(), "rule__VLSFunctionAsTerm__FunctorAlternatives_0_0"); | ||
51 | builder.put(grammarAccess.getVLSDefinedTermAccess().getAlternatives(), "rule__VLSDefinedTerm__Alternatives"); | ||
52 | builder.put(grammarAccess.getVLSIncludeAccess().getGroup(), "rule__VLSInclude__Group__0"); | ||
53 | builder.put(grammarAccess.getVLSIncludeAccess().getGroup_2(), "rule__VLSInclude__Group_2__0"); | ||
54 | builder.put(grammarAccess.getVLSIncludeAccess().getGroup_2_2(), "rule__VLSInclude__Group_2_2__0"); | ||
55 | builder.put(grammarAccess.getVLSCommentAccess().getGroup(), "rule__VLSComment__Group__0"); | ||
56 | builder.put(grammarAccess.getVLSSatisfiableAccess().getGroup(), "rule__VLSSatisfiable__Group__0"); | ||
57 | builder.put(grammarAccess.getVLSFofFormulaAccess().getGroup(), "rule__VLSFofFormula__Group__0"); | ||
58 | builder.put(grammarAccess.getVLSFofFormulaAccess().getGroup_7(), "rule__VLSFofFormula__Group_7__0"); | ||
59 | builder.put(grammarAccess.getVLSTffFormulaAccess().getGroup(), "rule__VLSTffFormula__Group__0"); | ||
60 | builder.put(grammarAccess.getVLSTffFormulaAccess().getGroup_7(), "rule__VLSTffFormula__Group_7__0"); | ||
61 | builder.put(grammarAccess.getVLSAnnotationAccess().getGroup(), "rule__VLSAnnotation__Group__0"); | ||
62 | builder.put(grammarAccess.getVLSAnnotationAccess().getGroup_2(), "rule__VLSAnnotation__Group_2__0"); | ||
63 | builder.put(grammarAccess.getVLSAnnotationTermsAccess().getGroup(), "rule__VLSAnnotationTerms__Group__0"); | ||
64 | builder.put(grammarAccess.getVLSAnnotationTermsAccess().getGroup_1(), "rule__VLSAnnotationTerms__Group_1__0"); | ||
65 | builder.put(grammarAccess.getVLSBinaryAccess().getGroup(), "rule__VLSBinary__Group__0"); | ||
66 | builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0(), "rule__VLSBinary__Group_1_0__0"); | ||
67 | builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_0(), "rule__VLSBinary__Group_1_0_0_0__0"); | ||
68 | builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_1(), "rule__VLSBinary__Group_1_0_0_1__0"); | ||
69 | builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_2(), "rule__VLSBinary__Group_1_0_0_2__0"); | ||
70 | builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_3(), "rule__VLSBinary__Group_1_0_0_3__0"); | ||
71 | builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_4(), "rule__VLSBinary__Group_1_0_0_4__0"); | ||
72 | builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_5(), "rule__VLSBinary__Group_1_0_0_5__0"); | ||
73 | builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_1(), "rule__VLSBinary__Group_1_1__0"); | ||
74 | builder.put(grammarAccess.getVLSBinaryAccess().getGroup_1_2(), "rule__VLSBinary__Group_1_2__0"); | ||
75 | builder.put(grammarAccess.getVLSUnitaryFormulaAccess().getGroup_4(), "rule__VLSUnitaryFormula__Group_4__0"); | ||
76 | builder.put(grammarAccess.getVLSUniversalQuantifierAccess().getGroup(), "rule__VLSUniversalQuantifier__Group__0"); | ||
77 | builder.put(grammarAccess.getVLSUniversalQuantifierAccess().getGroup_1(), "rule__VLSUniversalQuantifier__Group_1__0"); | ||
78 | builder.put(grammarAccess.getVLSUniversalQuantifierAccess().getGroup_1_3(), "rule__VLSUniversalQuantifier__Group_1_3__0"); | ||
79 | builder.put(grammarAccess.getVLSExistentialQuantifierAccess().getGroup(), "rule__VLSExistentialQuantifier__Group__0"); | ||
80 | builder.put(grammarAccess.getVLSExistentialQuantifierAccess().getGroup_1(), "rule__VLSExistentialQuantifier__Group_1__0"); | ||
81 | builder.put(grammarAccess.getVLSExistentialQuantifierAccess().getGroup_1_3(), "rule__VLSExistentialQuantifier__Group_1_3__0"); | ||
82 | builder.put(grammarAccess.getVLSUnaryNegationAccess().getGroup(), "rule__VLSUnaryNegation__Group__0"); | ||
83 | builder.put(grammarAccess.getVLSUnaryInfixAccess().getGroup(), "rule__VLSUnaryInfix__Group__0"); | ||
84 | builder.put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1(), "rule__VLSUnaryInfix__Group_1__0"); | ||
85 | builder.put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1_0_0(), "rule__VLSUnaryInfix__Group_1_0_0__0"); | ||
86 | builder.put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1_0_1(), "rule__VLSUnaryInfix__Group_1_0_1__0"); | ||
87 | builder.put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1_0_2(), "rule__VLSUnaryInfix__Group_1_0_2__0"); | ||
88 | builder.put(grammarAccess.getVLSAtomicConstantAccess().getGroup_0(), "rule__VLSAtomicConstant__Group_0__0"); | ||
89 | builder.put(grammarAccess.getVLSAtomicConstantAccess().getGroup_1(), "rule__VLSAtomicConstant__Group_1__0"); | ||
90 | builder.put(grammarAccess.getVLSAtomicConstantAccess().getGroup_2(), "rule__VLSAtomicConstant__Group_2__0"); | ||
91 | builder.put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_0(), "rule__VLSAtomicFunction__Group_0__0"); | ||
92 | builder.put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_0_2(), "rule__VLSAtomicFunction__Group_0_2__0"); | ||
93 | builder.put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_0_2_2(), "rule__VLSAtomicFunction__Group_0_2_2__0"); | ||
94 | builder.put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_1(), "rule__VLSAtomicFunction__Group_1__0"); | ||
95 | builder.put(grammarAccess.getVLSFunctionAsTermAccess().getGroup(), "rule__VLSFunctionAsTerm__Group__0"); | ||
96 | builder.put(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1(), "rule__VLSFunctionAsTerm__Group_1__0"); | ||
97 | builder.put(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1_2(), "rule__VLSFunctionAsTerm__Group_1_2__0"); | ||
98 | builder.put(grammarAccess.getVLSDefinedTermAccess().getGroup_0(), "rule__VLSDefinedTerm__Group_0__0"); | ||
99 | builder.put(grammarAccess.getVLSDefinedTermAccess().getGroup_1(), "rule__VLSDefinedTerm__Group_1__0"); | ||
100 | builder.put(grammarAccess.getVLSDefinedTermAccess().getGroup_2(), "rule__VLSDefinedTerm__Group_2__0"); | ||
101 | builder.put(grammarAccess.getVLSDefinedTermAccess().getGroup_3(), "rule__VLSDefinedTerm__Group_3__0"); | ||
102 | builder.put(grammarAccess.getVampireModelAccess().getIncludesAssignment_0(), "rule__VampireModel__IncludesAssignment_0"); | ||
103 | builder.put(grammarAccess.getVampireModelAccess().getCommentsAssignment_1(), "rule__VampireModel__CommentsAssignment_1"); | ||
104 | builder.put(grammarAccess.getVampireModelAccess().getConfirmationsAssignment_2(), "rule__VampireModel__ConfirmationsAssignment_2"); | ||
105 | builder.put(grammarAccess.getVampireModelAccess().getFormulasAssignment_3(), "rule__VampireModel__FormulasAssignment_3"); | ||
106 | builder.put(grammarAccess.getVampireModelAccess().getTfformulasAssignment_4(), "rule__VampireModel__TfformulasAssignment_4"); | ||
107 | builder.put(grammarAccess.getVLSIncludeAccess().getFileNameAssignment_1(), "rule__VLSInclude__FileNameAssignment_1"); | ||
108 | builder.put(grammarAccess.getVLSIncludeAccess().getNamesAssignment_2_1(), "rule__VLSInclude__NamesAssignment_2_1"); | ||
109 | builder.put(grammarAccess.getVLSIncludeAccess().getNamesAssignment_2_2_1(), "rule__VLSInclude__NamesAssignment_2_2_1"); | ||
110 | builder.put(grammarAccess.getVLSNameAccess().getNameAssignment(), "rule__VLSName__NameAssignment"); | ||
111 | builder.put(grammarAccess.getVLSCommentAccess().getCommentAssignment_1(), "rule__VLSComment__CommentAssignment_1"); | ||
112 | builder.put(grammarAccess.getVLSFofFormulaAccess().getNameAssignment_2(), "rule__VLSFofFormula__NameAssignment_2"); | ||
113 | builder.put(grammarAccess.getVLSFofFormulaAccess().getFofRoleAssignment_4(), "rule__VLSFofFormula__FofRoleAssignment_4"); | ||
114 | builder.put(grammarAccess.getVLSFofFormulaAccess().getFofFormulaAssignment_6(), "rule__VLSFofFormula__FofFormulaAssignment_6"); | ||
115 | builder.put(grammarAccess.getVLSFofFormulaAccess().getAnnotationsAssignment_7_1(), "rule__VLSFofFormula__AnnotationsAssignment_7_1"); | ||
116 | builder.put(grammarAccess.getVLSTffFormulaAccess().getNameAssignment_2(), "rule__VLSTffFormula__NameAssignment_2"); | ||
117 | builder.put(grammarAccess.getVLSTffFormulaAccess().getFofRoleAssignment_4(), "rule__VLSTffFormula__FofRoleAssignment_4"); | ||
118 | builder.put(grammarAccess.getVLSTffFormulaAccess().getFofFormulaAssignment_6(), "rule__VLSTffFormula__FofFormulaAssignment_6"); | ||
119 | builder.put(grammarAccess.getVLSTffFormulaAccess().getAnnotationsAssignment_7_1(), "rule__VLSTffFormula__AnnotationsAssignment_7_1"); | ||
120 | builder.put(grammarAccess.getVLSAnnotationAccess().getNameAssignment_1(), "rule__VLSAnnotation__NameAssignment_1"); | ||
121 | builder.put(grammarAccess.getVLSAnnotationAccess().getFollowupAssignment_2_1(), "rule__VLSAnnotation__FollowupAssignment_2_1"); | ||
122 | builder.put(grammarAccess.getVLSAnnotationTermsAccess().getTermsAssignment_0(), "rule__VLSAnnotationTerms__TermsAssignment_0"); | ||
123 | builder.put(grammarAccess.getVLSAnnotationTermsAccess().getTermsAssignment_1_1(), "rule__VLSAnnotationTerms__TermsAssignment_1_1"); | ||
124 | builder.put(grammarAccess.getVLSBinaryAccess().getRightAssignment_1_0_1(), "rule__VLSBinary__RightAssignment_1_0_1"); | ||
125 | builder.put(grammarAccess.getVLSBinaryAccess().getRightAssignment_1_1_2(), "rule__VLSBinary__RightAssignment_1_1_2"); | ||
126 | builder.put(grammarAccess.getVLSBinaryAccess().getRightAssignment_1_2_2(), "rule__VLSBinary__RightAssignment_1_2_2"); | ||
127 | builder.put(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesAssignment_1_2(), "rule__VLSUniversalQuantifier__VariablesAssignment_1_2"); | ||
128 | builder.put(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesAssignment_1_3_1(), "rule__VLSUniversalQuantifier__VariablesAssignment_1_3_1"); | ||
129 | builder.put(grammarAccess.getVLSUniversalQuantifierAccess().getOperandAssignment_2(), "rule__VLSUniversalQuantifier__OperandAssignment_2"); | ||
130 | builder.put(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesAssignment_1_2(), "rule__VLSExistentialQuantifier__VariablesAssignment_1_2"); | ||
131 | builder.put(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesAssignment_1_3_1(), "rule__VLSExistentialQuantifier__VariablesAssignment_1_3_1"); | ||
132 | builder.put(grammarAccess.getVLSExistentialQuantifierAccess().getOperandAssignment_2(), "rule__VLSExistentialQuantifier__OperandAssignment_2"); | ||
133 | builder.put(grammarAccess.getVLSUnaryNegationAccess().getOperandAssignment_2(), "rule__VLSUnaryNegation__OperandAssignment_2"); | ||
134 | builder.put(grammarAccess.getVLSUnaryInfixAccess().getRightAssignment_1_1(), "rule__VLSUnaryInfix__RightAssignment_1_1"); | ||
135 | builder.put(grammarAccess.getVLSAtomicConstantAccess().getNameAssignment_0_1(), "rule__VLSAtomicConstant__NameAssignment_0_1"); | ||
136 | builder.put(grammarAccess.getVLSAtomicFunctionAccess().getConstantAssignment_0_1(), "rule__VLSAtomicFunction__ConstantAssignment_0_1"); | ||
137 | builder.put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_0_2_1(), "rule__VLSAtomicFunction__TermsAssignment_0_2_1"); | ||
138 | builder.put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_0_2_2_1(), "rule__VLSAtomicFunction__TermsAssignment_0_2_2_1"); | ||
139 | builder.put(grammarAccess.getVLSAtomicFunctionAccess().getNameAssignment_1_1(), "rule__VLSAtomicFunction__NameAssignment_1_1"); | ||
140 | builder.put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_1_3(), "rule__VLSAtomicFunction__TermsAssignment_1_3"); | ||
141 | builder.put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_1_5(), "rule__VLSAtomicFunction__TermsAssignment_1_5"); | ||
142 | builder.put(grammarAccess.getVLSVariableAccess().getNameAssignment(), "rule__VLSVariable__NameAssignment"); | ||
143 | builder.put(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAssignment_0(), "rule__VLSFunctionAsTerm__FunctorAssignment_0"); | ||
144 | builder.put(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_1(), "rule__VLSFunctionAsTerm__TermsAssignment_1_1"); | ||
145 | builder.put(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_2_1(), "rule__VLSFunctionAsTerm__TermsAssignment_1_2_1"); | ||
146 | builder.put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_0_1(), "rule__VLSDefinedTerm__ValueAssignment_0_1"); | ||
147 | builder.put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_1_1(), "rule__VLSDefinedTerm__ValueAssignment_1_1"); | ||
148 | builder.put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_2_1(), "rule__VLSDefinedTerm__ValueAssignment_2_1"); | ||
149 | builder.put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_3_1(), "rule__VLSDefinedTerm__ValueAssignment_3_1"); | ||
150 | } | ||
151 | } | ||
152 | |||
16 | @Inject | 153 | @Inject |
17 | private VampireLanguageGrammarAccess grammarAccess; | 154 | private NameMappings nameMappings; |
18 | 155 | ||
19 | private Map<AbstractElement, String> nameMappings; | 156 | @Inject |
157 | private VampireLanguageGrammarAccess grammarAccess; | ||
20 | 158 | ||
21 | @Override | 159 | @Override |
22 | protected InternalVampireLanguageParser createParser() { | 160 | protected InternalVampireLanguageParser createParser() { |
@@ -27,132 +165,9 @@ public class VampireLanguageParser extends AbstractContentAssistParser { | |||
27 | 165 | ||
28 | @Override | 166 | @Override |
29 | protected String getRuleName(AbstractElement element) { | 167 | protected String getRuleName(AbstractElement element) { |
30 | if (nameMappings == null) { | 168 | return nameMappings.getRuleName(element); |
31 | nameMappings = new HashMap<AbstractElement, String>() { | ||
32 | private static final long serialVersionUID = 1L; | ||
33 | { | ||
34 | put(grammarAccess.getVampireModelAccess().getAlternatives(), "rule__VampireModel__Alternatives"); | ||
35 | put(grammarAccess.getVLSNameAccess().getNameAlternatives_0(), "rule__VLSName__NameAlternatives_0"); | ||
36 | put(grammarAccess.getVLSFofFormulaAccess().getNameAlternatives_2_0(), "rule__VLSFofFormula__NameAlternatives_2_0"); | ||
37 | put(grammarAccess.getVLSTffFormulaAccess().getNameAlternatives_2_0(), "rule__VLSTffFormula__NameAlternatives_2_0"); | ||
38 | put(grammarAccess.getVLSRoleAccess().getAlternatives(), "rule__VLSRole__Alternatives"); | ||
39 | put(grammarAccess.getVLSAnnotationAccess().getNameAlternatives_1_0(), "rule__VLSAnnotation__NameAlternatives_1_0"); | ||
40 | put(grammarAccess.getVLSBinaryAccess().getAlternatives_1(), "rule__VLSBinary__Alternatives_1"); | ||
41 | put(grammarAccess.getVLSBinaryAccess().getAlternatives_1_0_0(), "rule__VLSBinary__Alternatives_1_0_0"); | ||
42 | put(grammarAccess.getVLSUnitaryFormulaAccess().getAlternatives(), "rule__VLSUnitaryFormula__Alternatives"); | ||
43 | put(grammarAccess.getVLSUnaryInfixAccess().getAlternatives_1_0(), "rule__VLSUnaryInfix__Alternatives_1_0"); | ||
44 | put(grammarAccess.getVLSAtomicAccess().getAlternatives(), "rule__VLSAtomic__Alternatives"); | ||
45 | put(grammarAccess.getVLSAtomicConstantAccess().getAlternatives(), "rule__VLSAtomicConstant__Alternatives"); | ||
46 | put(grammarAccess.getVLSAtomicConstantAccess().getNameAlternatives_0_1_0(), "rule__VLSAtomicConstant__NameAlternatives_0_1_0"); | ||
47 | put(grammarAccess.getVLSAtomicFunctionAccess().getAlternatives(), "rule__VLSAtomicFunction__Alternatives"); | ||
48 | put(grammarAccess.getVLSAtomicFunctionAccess().getConstantAlternatives_0_1_0(), "rule__VLSAtomicFunction__ConstantAlternatives_0_1_0"); | ||
49 | put(grammarAccess.getVLSFofTermAccess().getAlternatives(), "rule__VLSFofTerm__Alternatives"); | ||
50 | put(grammarAccess.getVLSFunctionFofAccess().getFunctorAlternatives_0_0(), "rule__VLSFunctionFof__FunctorAlternatives_0_0"); | ||
51 | put(grammarAccess.getVLSDefinedTermAccess().getAlternatives(), "rule__VLSDefinedTerm__Alternatives"); | ||
52 | put(grammarAccess.getVLSIncludeAccess().getGroup(), "rule__VLSInclude__Group__0"); | ||
53 | put(grammarAccess.getVLSIncludeAccess().getGroup_2(), "rule__VLSInclude__Group_2__0"); | ||
54 | put(grammarAccess.getVLSIncludeAccess().getGroup_2_2(), "rule__VLSInclude__Group_2_2__0"); | ||
55 | put(grammarAccess.getVLSCommentAccess().getGroup(), "rule__VLSComment__Group__0"); | ||
56 | put(grammarAccess.getVLSSatisfiableAccess().getGroup(), "rule__VLSSatisfiable__Group__0"); | ||
57 | put(grammarAccess.getVLSFofFormulaAccess().getGroup(), "rule__VLSFofFormula__Group__0"); | ||
58 | put(grammarAccess.getVLSFofFormulaAccess().getGroup_7(), "rule__VLSFofFormula__Group_7__0"); | ||
59 | put(grammarAccess.getVLSTffFormulaAccess().getGroup(), "rule__VLSTffFormula__Group__0"); | ||
60 | put(grammarAccess.getVLSTffFormulaAccess().getGroup_7(), "rule__VLSTffFormula__Group_7__0"); | ||
61 | put(grammarAccess.getVLSAnnotationAccess().getGroup(), "rule__VLSAnnotation__Group__0"); | ||
62 | put(grammarAccess.getVLSAnnotationAccess().getGroup_2(), "rule__VLSAnnotation__Group_2__0"); | ||
63 | put(grammarAccess.getVLSAnnotationTermsAccess().getGroup(), "rule__VLSAnnotationTerms__Group__0"); | ||
64 | put(grammarAccess.getVLSAnnotationTermsAccess().getGroup_1(), "rule__VLSAnnotationTerms__Group_1__0"); | ||
65 | put(grammarAccess.getVLSBinaryAccess().getGroup(), "rule__VLSBinary__Group__0"); | ||
66 | put(grammarAccess.getVLSBinaryAccess().getGroup_1_0(), "rule__VLSBinary__Group_1_0__0"); | ||
67 | put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_0(), "rule__VLSBinary__Group_1_0_0_0__0"); | ||
68 | put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_1(), "rule__VLSBinary__Group_1_0_0_1__0"); | ||
69 | put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_2(), "rule__VLSBinary__Group_1_0_0_2__0"); | ||
70 | put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_3(), "rule__VLSBinary__Group_1_0_0_3__0"); | ||
71 | put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_4(), "rule__VLSBinary__Group_1_0_0_4__0"); | ||
72 | put(grammarAccess.getVLSBinaryAccess().getGroup_1_0_0_5(), "rule__VLSBinary__Group_1_0_0_5__0"); | ||
73 | put(grammarAccess.getVLSBinaryAccess().getGroup_1_1(), "rule__VLSBinary__Group_1_1__0"); | ||
74 | put(grammarAccess.getVLSBinaryAccess().getGroup_1_2(), "rule__VLSBinary__Group_1_2__0"); | ||
75 | put(grammarAccess.getVLSUnitaryFormulaAccess().getGroup_4(), "rule__VLSUnitaryFormula__Group_4__0"); | ||
76 | put(grammarAccess.getVLSUniversalQuantifierAccess().getGroup(), "rule__VLSUniversalQuantifier__Group__0"); | ||
77 | put(grammarAccess.getVLSUniversalQuantifierAccess().getGroup_1(), "rule__VLSUniversalQuantifier__Group_1__0"); | ||
78 | put(grammarAccess.getVLSUniversalQuantifierAccess().getGroup_1_3(), "rule__VLSUniversalQuantifier__Group_1_3__0"); | ||
79 | put(grammarAccess.getVLSExistentialQuantifierAccess().getGroup(), "rule__VLSExistentialQuantifier__Group__0"); | ||
80 | put(grammarAccess.getVLSExistentialQuantifierAccess().getGroup_1(), "rule__VLSExistentialQuantifier__Group_1__0"); | ||
81 | put(grammarAccess.getVLSExistentialQuantifierAccess().getGroup_1_3(), "rule__VLSExistentialQuantifier__Group_1_3__0"); | ||
82 | put(grammarAccess.getVLSUnaryNegationAccess().getGroup(), "rule__VLSUnaryNegation__Group__0"); | ||
83 | put(grammarAccess.getVLSUnaryInfixAccess().getGroup(), "rule__VLSUnaryInfix__Group__0"); | ||
84 | put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1(), "rule__VLSUnaryInfix__Group_1__0"); | ||
85 | put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1_0_0(), "rule__VLSUnaryInfix__Group_1_0_0__0"); | ||
86 | put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1_0_1(), "rule__VLSUnaryInfix__Group_1_0_1__0"); | ||
87 | put(grammarAccess.getVLSUnaryInfixAccess().getGroup_1_0_2(), "rule__VLSUnaryInfix__Group_1_0_2__0"); | ||
88 | put(grammarAccess.getVLSAtomicConstantAccess().getGroup_0(), "rule__VLSAtomicConstant__Group_0__0"); | ||
89 | put(grammarAccess.getVLSAtomicConstantAccess().getGroup_1(), "rule__VLSAtomicConstant__Group_1__0"); | ||
90 | put(grammarAccess.getVLSAtomicConstantAccess().getGroup_2(), "rule__VLSAtomicConstant__Group_2__0"); | ||
91 | put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_0(), "rule__VLSAtomicFunction__Group_0__0"); | ||
92 | put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_0_2(), "rule__VLSAtomicFunction__Group_0_2__0"); | ||
93 | put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_0_2_2(), "rule__VLSAtomicFunction__Group_0_2_2__0"); | ||
94 | put(grammarAccess.getVLSAtomicFunctionAccess().getGroup_1(), "rule__VLSAtomicFunction__Group_1__0"); | ||
95 | put(grammarAccess.getVLSFunctionFofAccess().getGroup(), "rule__VLSFunctionFof__Group__0"); | ||
96 | put(grammarAccess.getVLSFunctionFofAccess().getGroup_1(), "rule__VLSFunctionFof__Group_1__0"); | ||
97 | put(grammarAccess.getVLSFunctionFofAccess().getGroup_1_2(), "rule__VLSFunctionFof__Group_1_2__0"); | ||
98 | put(grammarAccess.getVLSDefinedTermAccess().getGroup_0(), "rule__VLSDefinedTerm__Group_0__0"); | ||
99 | put(grammarAccess.getVLSDefinedTermAccess().getGroup_1(), "rule__VLSDefinedTerm__Group_1__0"); | ||
100 | put(grammarAccess.getVLSDefinedTermAccess().getGroup_2(), "rule__VLSDefinedTerm__Group_2__0"); | ||
101 | put(grammarAccess.getVLSDefinedTermAccess().getGroup_3(), "rule__VLSDefinedTerm__Group_3__0"); | ||
102 | put(grammarAccess.getVampireModelAccess().getIncludesAssignment_0(), "rule__VampireModel__IncludesAssignment_0"); | ||
103 | put(grammarAccess.getVampireModelAccess().getCommentsAssignment_1(), "rule__VampireModel__CommentsAssignment_1"); | ||
104 | put(grammarAccess.getVampireModelAccess().getConfirmationsAssignment_2(), "rule__VampireModel__ConfirmationsAssignment_2"); | ||
105 | put(grammarAccess.getVampireModelAccess().getFormulasAssignment_3(), "rule__VampireModel__FormulasAssignment_3"); | ||
106 | put(grammarAccess.getVampireModelAccess().getTfformulasAssignment_4(), "rule__VampireModel__TfformulasAssignment_4"); | ||
107 | put(grammarAccess.getVLSIncludeAccess().getFileNameAssignment_1(), "rule__VLSInclude__FileNameAssignment_1"); | ||
108 | put(grammarAccess.getVLSIncludeAccess().getNamesAssignment_2_1(), "rule__VLSInclude__NamesAssignment_2_1"); | ||
109 | put(grammarAccess.getVLSIncludeAccess().getNamesAssignment_2_2_1(), "rule__VLSInclude__NamesAssignment_2_2_1"); | ||
110 | put(grammarAccess.getVLSNameAccess().getNameAssignment(), "rule__VLSName__NameAssignment"); | ||
111 | put(grammarAccess.getVLSCommentAccess().getCommentAssignment_1(), "rule__VLSComment__CommentAssignment_1"); | ||
112 | put(grammarAccess.getVLSFofFormulaAccess().getNameAssignment_2(), "rule__VLSFofFormula__NameAssignment_2"); | ||
113 | put(grammarAccess.getVLSFofFormulaAccess().getFofRoleAssignment_4(), "rule__VLSFofFormula__FofRoleAssignment_4"); | ||
114 | put(grammarAccess.getVLSFofFormulaAccess().getFofFormulaAssignment_6(), "rule__VLSFofFormula__FofFormulaAssignment_6"); | ||
115 | put(grammarAccess.getVLSFofFormulaAccess().getAnnotationsAssignment_7_1(), "rule__VLSFofFormula__AnnotationsAssignment_7_1"); | ||
116 | put(grammarAccess.getVLSTffFormulaAccess().getNameAssignment_2(), "rule__VLSTffFormula__NameAssignment_2"); | ||
117 | put(grammarAccess.getVLSTffFormulaAccess().getFofRoleAssignment_4(), "rule__VLSTffFormula__FofRoleAssignment_4"); | ||
118 | put(grammarAccess.getVLSTffFormulaAccess().getFofFormulaAssignment_6(), "rule__VLSTffFormula__FofFormulaAssignment_6"); | ||
119 | put(grammarAccess.getVLSTffFormulaAccess().getAnnotationsAssignment_7_1(), "rule__VLSTffFormula__AnnotationsAssignment_7_1"); | ||
120 | put(grammarAccess.getVLSAnnotationAccess().getNameAssignment_1(), "rule__VLSAnnotation__NameAssignment_1"); | ||
121 | put(grammarAccess.getVLSAnnotationAccess().getFollowupAssignment_2_1(), "rule__VLSAnnotation__FollowupAssignment_2_1"); | ||
122 | put(grammarAccess.getVLSAnnotationTermsAccess().getTermsAssignment_0(), "rule__VLSAnnotationTerms__TermsAssignment_0"); | ||
123 | put(grammarAccess.getVLSAnnotationTermsAccess().getTermsAssignment_1_1(), "rule__VLSAnnotationTerms__TermsAssignment_1_1"); | ||
124 | put(grammarAccess.getVLSBinaryAccess().getRightAssignment_1_0_1(), "rule__VLSBinary__RightAssignment_1_0_1"); | ||
125 | put(grammarAccess.getVLSBinaryAccess().getRightAssignment_1_1_2(), "rule__VLSBinary__RightAssignment_1_1_2"); | ||
126 | put(grammarAccess.getVLSBinaryAccess().getRightAssignment_1_2_2(), "rule__VLSBinary__RightAssignment_1_2_2"); | ||
127 | put(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesAssignment_1_2(), "rule__VLSUniversalQuantifier__VariablesAssignment_1_2"); | ||
128 | put(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesAssignment_1_3_1(), "rule__VLSUniversalQuantifier__VariablesAssignment_1_3_1"); | ||
129 | put(grammarAccess.getVLSUniversalQuantifierAccess().getOperandAssignment_2(), "rule__VLSUniversalQuantifier__OperandAssignment_2"); | ||
130 | put(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesAssignment_1_2(), "rule__VLSExistentialQuantifier__VariablesAssignment_1_2"); | ||
131 | put(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesAssignment_1_3_1(), "rule__VLSExistentialQuantifier__VariablesAssignment_1_3_1"); | ||
132 | put(grammarAccess.getVLSExistentialQuantifierAccess().getOperandAssignment_2(), "rule__VLSExistentialQuantifier__OperandAssignment_2"); | ||
133 | put(grammarAccess.getVLSUnaryNegationAccess().getOperandAssignment_2(), "rule__VLSUnaryNegation__OperandAssignment_2"); | ||
134 | put(grammarAccess.getVLSUnaryInfixAccess().getRightAssignment_1_1(), "rule__VLSUnaryInfix__RightAssignment_1_1"); | ||
135 | put(grammarAccess.getVLSAtomicConstantAccess().getNameAssignment_0_1(), "rule__VLSAtomicConstant__NameAssignment_0_1"); | ||
136 | put(grammarAccess.getVLSAtomicFunctionAccess().getConstantAssignment_0_1(), "rule__VLSAtomicFunction__ConstantAssignment_0_1"); | ||
137 | put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_0_2_1(), "rule__VLSAtomicFunction__TermsAssignment_0_2_1"); | ||
138 | put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_0_2_2_1(), "rule__VLSAtomicFunction__TermsAssignment_0_2_2_1"); | ||
139 | put(grammarAccess.getVLSAtomicFunctionAccess().getNameAssignment_1_1(), "rule__VLSAtomicFunction__NameAssignment_1_1"); | ||
140 | put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_1_3(), "rule__VLSAtomicFunction__TermsAssignment_1_3"); | ||
141 | put(grammarAccess.getVLSAtomicFunctionAccess().getTermsAssignment_1_5(), "rule__VLSAtomicFunction__TermsAssignment_1_5"); | ||
142 | put(grammarAccess.getVLSVariableAccess().getNameAssignment(), "rule__VLSVariable__NameAssignment"); | ||
143 | put(grammarAccess.getVLSFunctionFofAccess().getFunctorAssignment_0(), "rule__VLSFunctionFof__FunctorAssignment_0"); | ||
144 | put(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_1(), "rule__VLSFunctionFof__TermsAssignment_1_1"); | ||
145 | put(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_2_1(), "rule__VLSFunctionFof__TermsAssignment_1_2_1"); | ||
146 | put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_0_1(), "rule__VLSDefinedTerm__ValueAssignment_0_1"); | ||
147 | put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_1_1(), "rule__VLSDefinedTerm__ValueAssignment_1_1"); | ||
148 | put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_2_1(), "rule__VLSDefinedTerm__ValueAssignment_2_1"); | ||
149 | put(grammarAccess.getVLSDefinedTermAccess().getValueAssignment_3_1(), "rule__VLSDefinedTerm__ValueAssignment_3_1"); | ||
150 | } | ||
151 | }; | ||
152 | } | ||
153 | return nameMappings.get(element); | ||
154 | } | 169 | } |
155 | 170 | ||
156 | @Override | 171 | @Override |
157 | protected String[] getInitialHiddenTokens() { | 172 | protected String[] getInitialHiddenTokens() { |
158 | return new String[] { "RULE_WS" }; | 173 | return new String[] { "RULE_WS" }; |
@@ -165,4 +180,12 @@ public class VampireLanguageParser extends AbstractContentAssistParser { | |||
165 | public void setGrammarAccess(VampireLanguageGrammarAccess grammarAccess) { | 180 | public void setGrammarAccess(VampireLanguageGrammarAccess grammarAccess) { |
166 | this.grammarAccess = grammarAccess; | 181 | this.grammarAccess = grammarAccess; |
167 | } | 182 | } |
183 | |||
184 | public NameMappings getNameMappings() { | ||
185 | return nameMappings; | ||
186 | } | ||
187 | |||
188 | public void setNameMappings(NameMappings nameMappings) { | ||
189 | this.nameMappings = nameMappings; | ||
190 | } | ||
168 | } | 191 | } |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguage.g b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguage.g index 24768ec3..c5f2bcd0 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguage.g +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguage.g | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | grammar InternalVampireLanguage; | 4 | grammar InternalVampireLanguage; |
5 | 5 | ||
@@ -624,25 +624,25 @@ finally { | |||
624 | restoreStackSize(stackSize); | 624 | restoreStackSize(stackSize); |
625 | } | 625 | } |
626 | 626 | ||
627 | // Entry rule entryRuleVLSFunctionFof | 627 | // Entry rule entryRuleVLSFunctionAsTerm |
628 | entryRuleVLSFunctionFof | 628 | entryRuleVLSFunctionAsTerm |
629 | : | 629 | : |
630 | { before(grammarAccess.getVLSFunctionFofRule()); } | 630 | { before(grammarAccess.getVLSFunctionAsTermRule()); } |
631 | ruleVLSFunctionFof | 631 | ruleVLSFunctionAsTerm |
632 | { after(grammarAccess.getVLSFunctionFofRule()); } | 632 | { after(grammarAccess.getVLSFunctionAsTermRule()); } |
633 | EOF | 633 | EOF |
634 | ; | 634 | ; |
635 | 635 | ||
636 | // Rule VLSFunctionFof | 636 | // Rule VLSFunctionAsTerm |
637 | ruleVLSFunctionFof | 637 | ruleVLSFunctionAsTerm |
638 | @init { | 638 | @init { |
639 | int stackSize = keepStackSize(); | 639 | int stackSize = keepStackSize(); |
640 | } | 640 | } |
641 | : | 641 | : |
642 | ( | 642 | ( |
643 | { before(grammarAccess.getVLSFunctionFofAccess().getGroup()); } | 643 | { before(grammarAccess.getVLSFunctionAsTermAccess().getGroup()); } |
644 | (rule__VLSFunctionFof__Group__0) | 644 | (rule__VLSFunctionAsTerm__Group__0) |
645 | { after(grammarAccess.getVLSFunctionFofAccess().getGroup()); } | 645 | { after(grammarAccess.getVLSFunctionAsTermAccess().getGroup()); } |
646 | ) | 646 | ) |
647 | ; | 647 | ; |
648 | finally { | 648 | finally { |
@@ -1249,9 +1249,9 @@ rule__VLSFofTerm__Alternatives | |||
1249 | ) | 1249 | ) |
1250 | | | 1250 | | |
1251 | ( | 1251 | ( |
1252 | { before(grammarAccess.getVLSFofTermAccess().getVLSFunctionFofParserRuleCall_1()); } | 1252 | { before(grammarAccess.getVLSFofTermAccess().getVLSFunctionAsTermParserRuleCall_1()); } |
1253 | ruleVLSFunctionFof | 1253 | ruleVLSFunctionAsTerm |
1254 | { after(grammarAccess.getVLSFofTermAccess().getVLSFunctionFofParserRuleCall_1()); } | 1254 | { after(grammarAccess.getVLSFofTermAccess().getVLSFunctionAsTermParserRuleCall_1()); } |
1255 | ) | 1255 | ) |
1256 | | | 1256 | | |
1257 | ( | 1257 | ( |
@@ -1264,33 +1264,33 @@ finally { | |||
1264 | restoreStackSize(stackSize); | 1264 | restoreStackSize(stackSize); |
1265 | } | 1265 | } |
1266 | 1266 | ||
1267 | rule__VLSFunctionFof__FunctorAlternatives_0_0 | 1267 | rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 |
1268 | @init { | 1268 | @init { |
1269 | int stackSize = keepStackSize(); | 1269 | int stackSize = keepStackSize(); |
1270 | } | 1270 | } |
1271 | : | 1271 | : |
1272 | ( | 1272 | ( |
1273 | { before(grammarAccess.getVLSFunctionFofAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); } | 1273 | { before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); } |
1274 | RULE_LOWER_WORD_ID | 1274 | RULE_LOWER_WORD_ID |
1275 | { after(grammarAccess.getVLSFunctionFofAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); } | 1275 | { after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); } |
1276 | ) | 1276 | ) |
1277 | | | 1277 | | |
1278 | ( | 1278 | ( |
1279 | { before(grammarAccess.getVLSFunctionFofAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); } | 1279 | { before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); } |
1280 | RULE_SINGLE_QUOTE | 1280 | RULE_SINGLE_QUOTE |
1281 | { after(grammarAccess.getVLSFunctionFofAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); } | 1281 | { after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); } |
1282 | ) | 1282 | ) |
1283 | | | 1283 | | |
1284 | ( | 1284 | ( |
1285 | { before(grammarAccess.getVLSFunctionFofAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); } | 1285 | { before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); } |
1286 | RULE_DOLLAR_ID | 1286 | RULE_DOLLAR_ID |
1287 | { after(grammarAccess.getVLSFunctionFofAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); } | 1287 | { after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); } |
1288 | ) | 1288 | ) |
1289 | | | 1289 | | |
1290 | ( | 1290 | ( |
1291 | { before(grammarAccess.getVLSFunctionFofAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); } | 1291 | { before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); } |
1292 | RULE_DOUBLE_DOLLAR_ID | 1292 | RULE_DOUBLE_DOLLAR_ID |
1293 | { after(grammarAccess.getVLSFunctionFofAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); } | 1293 | { after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); } |
1294 | ) | 1294 | ) |
1295 | ; | 1295 | ; |
1296 | finally { | 1296 | finally { |
@@ -4840,53 +4840,53 @@ finally { | |||
4840 | } | 4840 | } |
4841 | 4841 | ||
4842 | 4842 | ||
4843 | rule__VLSFunctionFof__Group__0 | 4843 | rule__VLSFunctionAsTerm__Group__0 |
4844 | @init { | 4844 | @init { |
4845 | int stackSize = keepStackSize(); | 4845 | int stackSize = keepStackSize(); |
4846 | } | 4846 | } |
4847 | : | 4847 | : |
4848 | rule__VLSFunctionFof__Group__0__Impl | 4848 | rule__VLSFunctionAsTerm__Group__0__Impl |
4849 | rule__VLSFunctionFof__Group__1 | 4849 | rule__VLSFunctionAsTerm__Group__1 |
4850 | ; | 4850 | ; |
4851 | finally { | 4851 | finally { |
4852 | restoreStackSize(stackSize); | 4852 | restoreStackSize(stackSize); |
4853 | } | 4853 | } |
4854 | 4854 | ||
4855 | rule__VLSFunctionFof__Group__0__Impl | 4855 | rule__VLSFunctionAsTerm__Group__0__Impl |
4856 | @init { | 4856 | @init { |
4857 | int stackSize = keepStackSize(); | 4857 | int stackSize = keepStackSize(); |
4858 | } | 4858 | } |
4859 | : | 4859 | : |
4860 | ( | 4860 | ( |
4861 | { before(grammarAccess.getVLSFunctionFofAccess().getFunctorAssignment_0()); } | 4861 | { before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAssignment_0()); } |
4862 | (rule__VLSFunctionFof__FunctorAssignment_0) | 4862 | (rule__VLSFunctionAsTerm__FunctorAssignment_0) |
4863 | { after(grammarAccess.getVLSFunctionFofAccess().getFunctorAssignment_0()); } | 4863 | { after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAssignment_0()); } |
4864 | ) | 4864 | ) |
4865 | ; | 4865 | ; |
4866 | finally { | 4866 | finally { |
4867 | restoreStackSize(stackSize); | 4867 | restoreStackSize(stackSize); |
4868 | } | 4868 | } |
4869 | 4869 | ||
4870 | rule__VLSFunctionFof__Group__1 | 4870 | rule__VLSFunctionAsTerm__Group__1 |
4871 | @init { | 4871 | @init { |
4872 | int stackSize = keepStackSize(); | 4872 | int stackSize = keepStackSize(); |
4873 | } | 4873 | } |
4874 | : | 4874 | : |
4875 | rule__VLSFunctionFof__Group__1__Impl | 4875 | rule__VLSFunctionAsTerm__Group__1__Impl |
4876 | ; | 4876 | ; |
4877 | finally { | 4877 | finally { |
4878 | restoreStackSize(stackSize); | 4878 | restoreStackSize(stackSize); |
4879 | } | 4879 | } |
4880 | 4880 | ||
4881 | rule__VLSFunctionFof__Group__1__Impl | 4881 | rule__VLSFunctionAsTerm__Group__1__Impl |
4882 | @init { | 4882 | @init { |
4883 | int stackSize = keepStackSize(); | 4883 | int stackSize = keepStackSize(); |
4884 | } | 4884 | } |
4885 | : | 4885 | : |
4886 | ( | 4886 | ( |
4887 | { before(grammarAccess.getVLSFunctionFofAccess().getGroup_1()); } | 4887 | { before(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1()); } |
4888 | (rule__VLSFunctionFof__Group_1__0)? | 4888 | (rule__VLSFunctionAsTerm__Group_1__0)? |
4889 | { after(grammarAccess.getVLSFunctionFofAccess().getGroup_1()); } | 4889 | { after(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1()); } |
4890 | ) | 4890 | ) |
4891 | ; | 4891 | ; |
4892 | finally { | 4892 | finally { |
@@ -4894,107 +4894,107 @@ finally { | |||
4894 | } | 4894 | } |
4895 | 4895 | ||
4896 | 4896 | ||
4897 | rule__VLSFunctionFof__Group_1__0 | 4897 | rule__VLSFunctionAsTerm__Group_1__0 |
4898 | @init { | 4898 | @init { |
4899 | int stackSize = keepStackSize(); | 4899 | int stackSize = keepStackSize(); |
4900 | } | 4900 | } |
4901 | : | 4901 | : |
4902 | rule__VLSFunctionFof__Group_1__0__Impl | 4902 | rule__VLSFunctionAsTerm__Group_1__0__Impl |
4903 | rule__VLSFunctionFof__Group_1__1 | 4903 | rule__VLSFunctionAsTerm__Group_1__1 |
4904 | ; | 4904 | ; |
4905 | finally { | 4905 | finally { |
4906 | restoreStackSize(stackSize); | 4906 | restoreStackSize(stackSize); |
4907 | } | 4907 | } |
4908 | 4908 | ||
4909 | rule__VLSFunctionFof__Group_1__0__Impl | 4909 | rule__VLSFunctionAsTerm__Group_1__0__Impl |
4910 | @init { | 4910 | @init { |
4911 | int stackSize = keepStackSize(); | 4911 | int stackSize = keepStackSize(); |
4912 | } | 4912 | } |
4913 | : | 4913 | : |
4914 | ( | 4914 | ( |
4915 | { before(grammarAccess.getVLSFunctionFofAccess().getLeftParenthesisKeyword_1_0()); } | 4915 | { before(grammarAccess.getVLSFunctionAsTermAccess().getLeftParenthesisKeyword_1_0()); } |
4916 | '(' | 4916 | '(' |
4917 | { after(grammarAccess.getVLSFunctionFofAccess().getLeftParenthesisKeyword_1_0()); } | 4917 | { after(grammarAccess.getVLSFunctionAsTermAccess().getLeftParenthesisKeyword_1_0()); } |
4918 | ) | 4918 | ) |
4919 | ; | 4919 | ; |
4920 | finally { | 4920 | finally { |
4921 | restoreStackSize(stackSize); | 4921 | restoreStackSize(stackSize); |
4922 | } | 4922 | } |
4923 | 4923 | ||
4924 | rule__VLSFunctionFof__Group_1__1 | 4924 | rule__VLSFunctionAsTerm__Group_1__1 |
4925 | @init { | 4925 | @init { |
4926 | int stackSize = keepStackSize(); | 4926 | int stackSize = keepStackSize(); |
4927 | } | 4927 | } |
4928 | : | 4928 | : |
4929 | rule__VLSFunctionFof__Group_1__1__Impl | 4929 | rule__VLSFunctionAsTerm__Group_1__1__Impl |
4930 | rule__VLSFunctionFof__Group_1__2 | 4930 | rule__VLSFunctionAsTerm__Group_1__2 |
4931 | ; | 4931 | ; |
4932 | finally { | 4932 | finally { |
4933 | restoreStackSize(stackSize); | 4933 | restoreStackSize(stackSize); |
4934 | } | 4934 | } |
4935 | 4935 | ||
4936 | rule__VLSFunctionFof__Group_1__1__Impl | 4936 | rule__VLSFunctionAsTerm__Group_1__1__Impl |
4937 | @init { | 4937 | @init { |
4938 | int stackSize = keepStackSize(); | 4938 | int stackSize = keepStackSize(); |
4939 | } | 4939 | } |
4940 | : | 4940 | : |
4941 | ( | 4941 | ( |
4942 | { before(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_1()); } | 4942 | { before(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_1()); } |
4943 | (rule__VLSFunctionFof__TermsAssignment_1_1) | 4943 | (rule__VLSFunctionAsTerm__TermsAssignment_1_1) |
4944 | { after(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_1()); } | 4944 | { after(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_1()); } |
4945 | ) | 4945 | ) |
4946 | ; | 4946 | ; |
4947 | finally { | 4947 | finally { |
4948 | restoreStackSize(stackSize); | 4948 | restoreStackSize(stackSize); |
4949 | } | 4949 | } |
4950 | 4950 | ||
4951 | rule__VLSFunctionFof__Group_1__2 | 4951 | rule__VLSFunctionAsTerm__Group_1__2 |
4952 | @init { | 4952 | @init { |
4953 | int stackSize = keepStackSize(); | 4953 | int stackSize = keepStackSize(); |
4954 | } | 4954 | } |
4955 | : | 4955 | : |
4956 | rule__VLSFunctionFof__Group_1__2__Impl | 4956 | rule__VLSFunctionAsTerm__Group_1__2__Impl |
4957 | rule__VLSFunctionFof__Group_1__3 | 4957 | rule__VLSFunctionAsTerm__Group_1__3 |
4958 | ; | 4958 | ; |
4959 | finally { | 4959 | finally { |
4960 | restoreStackSize(stackSize); | 4960 | restoreStackSize(stackSize); |
4961 | } | 4961 | } |
4962 | 4962 | ||
4963 | rule__VLSFunctionFof__Group_1__2__Impl | 4963 | rule__VLSFunctionAsTerm__Group_1__2__Impl |
4964 | @init { | 4964 | @init { |
4965 | int stackSize = keepStackSize(); | 4965 | int stackSize = keepStackSize(); |
4966 | } | 4966 | } |
4967 | : | 4967 | : |
4968 | ( | 4968 | ( |
4969 | { before(grammarAccess.getVLSFunctionFofAccess().getGroup_1_2()); } | 4969 | { before(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1_2()); } |
4970 | (rule__VLSFunctionFof__Group_1_2__0)* | 4970 | (rule__VLSFunctionAsTerm__Group_1_2__0)* |
4971 | { after(grammarAccess.getVLSFunctionFofAccess().getGroup_1_2()); } | 4971 | { after(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1_2()); } |
4972 | ) | 4972 | ) |
4973 | ; | 4973 | ; |
4974 | finally { | 4974 | finally { |
4975 | restoreStackSize(stackSize); | 4975 | restoreStackSize(stackSize); |
4976 | } | 4976 | } |
4977 | 4977 | ||
4978 | rule__VLSFunctionFof__Group_1__3 | 4978 | rule__VLSFunctionAsTerm__Group_1__3 |
4979 | @init { | 4979 | @init { |
4980 | int stackSize = keepStackSize(); | 4980 | int stackSize = keepStackSize(); |
4981 | } | 4981 | } |
4982 | : | 4982 | : |
4983 | rule__VLSFunctionFof__Group_1__3__Impl | 4983 | rule__VLSFunctionAsTerm__Group_1__3__Impl |
4984 | ; | 4984 | ; |
4985 | finally { | 4985 | finally { |
4986 | restoreStackSize(stackSize); | 4986 | restoreStackSize(stackSize); |
4987 | } | 4987 | } |
4988 | 4988 | ||
4989 | rule__VLSFunctionFof__Group_1__3__Impl | 4989 | rule__VLSFunctionAsTerm__Group_1__3__Impl |
4990 | @init { | 4990 | @init { |
4991 | int stackSize = keepStackSize(); | 4991 | int stackSize = keepStackSize(); |
4992 | } | 4992 | } |
4993 | : | 4993 | : |
4994 | ( | 4994 | ( |
4995 | { before(grammarAccess.getVLSFunctionFofAccess().getRightParenthesisKeyword_1_3()); } | 4995 | { before(grammarAccess.getVLSFunctionAsTermAccess().getRightParenthesisKeyword_1_3()); } |
4996 | ')' | 4996 | ')' |
4997 | { after(grammarAccess.getVLSFunctionFofAccess().getRightParenthesisKeyword_1_3()); } | 4997 | { after(grammarAccess.getVLSFunctionAsTermAccess().getRightParenthesisKeyword_1_3()); } |
4998 | ) | 4998 | ) |
4999 | ; | 4999 | ; |
5000 | finally { | 5000 | finally { |
@@ -5002,53 +5002,53 @@ finally { | |||
5002 | } | 5002 | } |
5003 | 5003 | ||
5004 | 5004 | ||
5005 | rule__VLSFunctionFof__Group_1_2__0 | 5005 | rule__VLSFunctionAsTerm__Group_1_2__0 |
5006 | @init { | 5006 | @init { |
5007 | int stackSize = keepStackSize(); | 5007 | int stackSize = keepStackSize(); |
5008 | } | 5008 | } |
5009 | : | 5009 | : |
5010 | rule__VLSFunctionFof__Group_1_2__0__Impl | 5010 | rule__VLSFunctionAsTerm__Group_1_2__0__Impl |
5011 | rule__VLSFunctionFof__Group_1_2__1 | 5011 | rule__VLSFunctionAsTerm__Group_1_2__1 |
5012 | ; | 5012 | ; |
5013 | finally { | 5013 | finally { |
5014 | restoreStackSize(stackSize); | 5014 | restoreStackSize(stackSize); |
5015 | } | 5015 | } |
5016 | 5016 | ||
5017 | rule__VLSFunctionFof__Group_1_2__0__Impl | 5017 | rule__VLSFunctionAsTerm__Group_1_2__0__Impl |
5018 | @init { | 5018 | @init { |
5019 | int stackSize = keepStackSize(); | 5019 | int stackSize = keepStackSize(); |
5020 | } | 5020 | } |
5021 | : | 5021 | : |
5022 | ( | 5022 | ( |
5023 | { before(grammarAccess.getVLSFunctionFofAccess().getCommaKeyword_1_2_0()); } | 5023 | { before(grammarAccess.getVLSFunctionAsTermAccess().getCommaKeyword_1_2_0()); } |
5024 | ',' | 5024 | ',' |
5025 | { after(grammarAccess.getVLSFunctionFofAccess().getCommaKeyword_1_2_0()); } | 5025 | { after(grammarAccess.getVLSFunctionAsTermAccess().getCommaKeyword_1_2_0()); } |
5026 | ) | 5026 | ) |
5027 | ; | 5027 | ; |
5028 | finally { | 5028 | finally { |
5029 | restoreStackSize(stackSize); | 5029 | restoreStackSize(stackSize); |
5030 | } | 5030 | } |
5031 | 5031 | ||
5032 | rule__VLSFunctionFof__Group_1_2__1 | 5032 | rule__VLSFunctionAsTerm__Group_1_2__1 |
5033 | @init { | 5033 | @init { |
5034 | int stackSize = keepStackSize(); | 5034 | int stackSize = keepStackSize(); |
5035 | } | 5035 | } |
5036 | : | 5036 | : |
5037 | rule__VLSFunctionFof__Group_1_2__1__Impl | 5037 | rule__VLSFunctionAsTerm__Group_1_2__1__Impl |
5038 | ; | 5038 | ; |
5039 | finally { | 5039 | finally { |
5040 | restoreStackSize(stackSize); | 5040 | restoreStackSize(stackSize); |
5041 | } | 5041 | } |
5042 | 5042 | ||
5043 | rule__VLSFunctionFof__Group_1_2__1__Impl | 5043 | rule__VLSFunctionAsTerm__Group_1_2__1__Impl |
5044 | @init { | 5044 | @init { |
5045 | int stackSize = keepStackSize(); | 5045 | int stackSize = keepStackSize(); |
5046 | } | 5046 | } |
5047 | : | 5047 | : |
5048 | ( | 5048 | ( |
5049 | { before(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_2_1()); } | 5049 | { before(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_2_1()); } |
5050 | (rule__VLSFunctionFof__TermsAssignment_1_2_1) | 5050 | (rule__VLSFunctionAsTerm__TermsAssignment_1_2_1) |
5051 | { after(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_2_1()); } | 5051 | { after(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_2_1()); } |
5052 | ) | 5052 | ) |
5053 | ; | 5053 | ; |
5054 | finally { | 5054 | finally { |
@@ -5891,45 +5891,45 @@ finally { | |||
5891 | restoreStackSize(stackSize); | 5891 | restoreStackSize(stackSize); |
5892 | } | 5892 | } |
5893 | 5893 | ||
5894 | rule__VLSFunctionFof__FunctorAssignment_0 | 5894 | rule__VLSFunctionAsTerm__FunctorAssignment_0 |
5895 | @init { | 5895 | @init { |
5896 | int stackSize = keepStackSize(); | 5896 | int stackSize = keepStackSize(); |
5897 | } | 5897 | } |
5898 | : | 5898 | : |
5899 | ( | 5899 | ( |
5900 | { before(grammarAccess.getVLSFunctionFofAccess().getFunctorAlternatives_0_0()); } | 5900 | { before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAlternatives_0_0()); } |
5901 | (rule__VLSFunctionFof__FunctorAlternatives_0_0) | 5901 | (rule__VLSFunctionAsTerm__FunctorAlternatives_0_0) |
5902 | { after(grammarAccess.getVLSFunctionFofAccess().getFunctorAlternatives_0_0()); } | 5902 | { after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAlternatives_0_0()); } |
5903 | ) | 5903 | ) |
5904 | ; | 5904 | ; |
5905 | finally { | 5905 | finally { |
5906 | restoreStackSize(stackSize); | 5906 | restoreStackSize(stackSize); |
5907 | } | 5907 | } |
5908 | 5908 | ||
5909 | rule__VLSFunctionFof__TermsAssignment_1_1 | 5909 | rule__VLSFunctionAsTerm__TermsAssignment_1_1 |
5910 | @init { | 5910 | @init { |
5911 | int stackSize = keepStackSize(); | 5911 | int stackSize = keepStackSize(); |
5912 | } | 5912 | } |
5913 | : | 5913 | : |
5914 | ( | 5914 | ( |
5915 | { before(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); } | 5915 | { before(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); } |
5916 | ruleVLSFofTerm | 5916 | ruleVLSFofTerm |
5917 | { after(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); } | 5917 | { after(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); } |
5918 | ) | 5918 | ) |
5919 | ; | 5919 | ; |
5920 | finally { | 5920 | finally { |
5921 | restoreStackSize(stackSize); | 5921 | restoreStackSize(stackSize); |
5922 | } | 5922 | } |
5923 | 5923 | ||
5924 | rule__VLSFunctionFof__TermsAssignment_1_2_1 | 5924 | rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 |
5925 | @init { | 5925 | @init { |
5926 | int stackSize = keepStackSize(); | 5926 | int stackSize = keepStackSize(); |
5927 | } | 5927 | } |
5928 | : | 5928 | : |
5929 | ( | 5929 | ( |
5930 | { before(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); } | 5930 | { before(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); } |
5931 | ruleVLSFofTerm | 5931 | ruleVLSFofTerm |
5932 | { after(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); } | 5932 | { after(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); } |
5933 | ) | 5933 | ) |
5934 | ; | 5934 | ; |
5935 | finally { | 5935 | finally { |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageParser.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageParser.java index 70e67806..8f5196ca 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageParser.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageParser.java | |||
@@ -1906,20 +1906,20 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
1906 | // $ANTLR end "ruleVLSFofTerm" | 1906 | // $ANTLR end "ruleVLSFofTerm" |
1907 | 1907 | ||
1908 | 1908 | ||
1909 | // $ANTLR start "entryRuleVLSFunctionFof" | 1909 | // $ANTLR start "entryRuleVLSFunctionAsTerm" |
1910 | // InternalVampireLanguage.g:628:1: entryRuleVLSFunctionFof : ruleVLSFunctionFof EOF ; | 1910 | // InternalVampireLanguage.g:628:1: entryRuleVLSFunctionAsTerm : ruleVLSFunctionAsTerm EOF ; |
1911 | public final void entryRuleVLSFunctionFof() throws RecognitionException { | 1911 | public final void entryRuleVLSFunctionAsTerm() throws RecognitionException { |
1912 | try { | 1912 | try { |
1913 | // InternalVampireLanguage.g:629:1: ( ruleVLSFunctionFof EOF ) | 1913 | // InternalVampireLanguage.g:629:1: ( ruleVLSFunctionAsTerm EOF ) |
1914 | // InternalVampireLanguage.g:630:1: ruleVLSFunctionFof EOF | 1914 | // InternalVampireLanguage.g:630:1: ruleVLSFunctionAsTerm EOF |
1915 | { | 1915 | { |
1916 | before(grammarAccess.getVLSFunctionFofRule()); | 1916 | before(grammarAccess.getVLSFunctionAsTermRule()); |
1917 | pushFollow(FOLLOW_1); | 1917 | pushFollow(FOLLOW_1); |
1918 | ruleVLSFunctionFof(); | 1918 | ruleVLSFunctionAsTerm(); |
1919 | 1919 | ||
1920 | state._fsp--; | 1920 | state._fsp--; |
1921 | 1921 | ||
1922 | after(grammarAccess.getVLSFunctionFofRule()); | 1922 | after(grammarAccess.getVLSFunctionAsTermRule()); |
1923 | match(input,EOF,FOLLOW_2); | 1923 | match(input,EOF,FOLLOW_2); |
1924 | 1924 | ||
1925 | } | 1925 | } |
@@ -1933,35 +1933,35 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
1933 | } | 1933 | } |
1934 | return ; | 1934 | return ; |
1935 | } | 1935 | } |
1936 | // $ANTLR end "entryRuleVLSFunctionFof" | 1936 | // $ANTLR end "entryRuleVLSFunctionAsTerm" |
1937 | 1937 | ||
1938 | 1938 | ||
1939 | // $ANTLR start "ruleVLSFunctionFof" | 1939 | // $ANTLR start "ruleVLSFunctionAsTerm" |
1940 | // InternalVampireLanguage.g:637:1: ruleVLSFunctionFof : ( ( rule__VLSFunctionFof__Group__0 ) ) ; | 1940 | // InternalVampireLanguage.g:637:1: ruleVLSFunctionAsTerm : ( ( rule__VLSFunctionAsTerm__Group__0 ) ) ; |
1941 | public final void ruleVLSFunctionFof() throws RecognitionException { | 1941 | public final void ruleVLSFunctionAsTerm() throws RecognitionException { |
1942 | 1942 | ||
1943 | int stackSize = keepStackSize(); | 1943 | int stackSize = keepStackSize(); |
1944 | 1944 | ||
1945 | try { | 1945 | try { |
1946 | // InternalVampireLanguage.g:641:2: ( ( ( rule__VLSFunctionFof__Group__0 ) ) ) | 1946 | // InternalVampireLanguage.g:641:2: ( ( ( rule__VLSFunctionAsTerm__Group__0 ) ) ) |
1947 | // InternalVampireLanguage.g:642:2: ( ( rule__VLSFunctionFof__Group__0 ) ) | 1947 | // InternalVampireLanguage.g:642:2: ( ( rule__VLSFunctionAsTerm__Group__0 ) ) |
1948 | { | 1948 | { |
1949 | // InternalVampireLanguage.g:642:2: ( ( rule__VLSFunctionFof__Group__0 ) ) | 1949 | // InternalVampireLanguage.g:642:2: ( ( rule__VLSFunctionAsTerm__Group__0 ) ) |
1950 | // InternalVampireLanguage.g:643:3: ( rule__VLSFunctionFof__Group__0 ) | 1950 | // InternalVampireLanguage.g:643:3: ( rule__VLSFunctionAsTerm__Group__0 ) |
1951 | { | 1951 | { |
1952 | before(grammarAccess.getVLSFunctionFofAccess().getGroup()); | 1952 | before(grammarAccess.getVLSFunctionAsTermAccess().getGroup()); |
1953 | // InternalVampireLanguage.g:644:3: ( rule__VLSFunctionFof__Group__0 ) | 1953 | // InternalVampireLanguage.g:644:3: ( rule__VLSFunctionAsTerm__Group__0 ) |
1954 | // InternalVampireLanguage.g:644:4: rule__VLSFunctionFof__Group__0 | 1954 | // InternalVampireLanguage.g:644:4: rule__VLSFunctionAsTerm__Group__0 |
1955 | { | 1955 | { |
1956 | pushFollow(FOLLOW_2); | 1956 | pushFollow(FOLLOW_2); |
1957 | rule__VLSFunctionFof__Group__0(); | 1957 | rule__VLSFunctionAsTerm__Group__0(); |
1958 | 1958 | ||
1959 | state._fsp--; | 1959 | state._fsp--; |
1960 | 1960 | ||
1961 | 1961 | ||
1962 | } | 1962 | } |
1963 | 1963 | ||
1964 | after(grammarAccess.getVLSFunctionFofAccess().getGroup()); | 1964 | after(grammarAccess.getVLSFunctionAsTermAccess().getGroup()); |
1965 | 1965 | ||
1966 | } | 1966 | } |
1967 | 1967 | ||
@@ -1980,7 +1980,7 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
1980 | } | 1980 | } |
1981 | return ; | 1981 | return ; |
1982 | } | 1982 | } |
1983 | // $ANTLR end "ruleVLSFunctionFof" | 1983 | // $ANTLR end "ruleVLSFunctionAsTerm" |
1984 | 1984 | ||
1985 | 1985 | ||
1986 | // $ANTLR start "entryRuleVLSDefinedTerm" | 1986 | // $ANTLR start "entryRuleVLSDefinedTerm" |
@@ -4386,13 +4386,13 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
4386 | 4386 | ||
4387 | 4387 | ||
4388 | // $ANTLR start "rule__VLSFofTerm__Alternatives" | 4388 | // $ANTLR start "rule__VLSFofTerm__Alternatives" |
4389 | // InternalVampireLanguage.g:1240:1: rule__VLSFofTerm__Alternatives : ( ( ruleVLSVariable ) | ( ruleVLSFunctionFof ) | ( ruleVLSDefinedTerm ) ); | 4389 | // InternalVampireLanguage.g:1240:1: rule__VLSFofTerm__Alternatives : ( ( ruleVLSVariable ) | ( ruleVLSFunctionAsTerm ) | ( ruleVLSDefinedTerm ) ); |
4390 | public final void rule__VLSFofTerm__Alternatives() throws RecognitionException { | 4390 | public final void rule__VLSFofTerm__Alternatives() throws RecognitionException { |
4391 | 4391 | ||
4392 | int stackSize = keepStackSize(); | 4392 | int stackSize = keepStackSize(); |
4393 | 4393 | ||
4394 | try { | 4394 | try { |
4395 | // InternalVampireLanguage.g:1244:1: ( ( ruleVLSVariable ) | ( ruleVLSFunctionFof ) | ( ruleVLSDefinedTerm ) ) | 4395 | // InternalVampireLanguage.g:1244:1: ( ( ruleVLSVariable ) | ( ruleVLSFunctionAsTerm ) | ( ruleVLSDefinedTerm ) ) |
4396 | int alt19=3; | 4396 | int alt19=3; |
4397 | switch ( input.LA(1) ) { | 4397 | switch ( input.LA(1) ) { |
4398 | case RULE_UPPER_WORD_ID: | 4398 | case RULE_UPPER_WORD_ID: |
@@ -4444,18 +4444,18 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
4444 | } | 4444 | } |
4445 | break; | 4445 | break; |
4446 | case 2 : | 4446 | case 2 : |
4447 | // InternalVampireLanguage.g:1251:2: ( ruleVLSFunctionFof ) | 4447 | // InternalVampireLanguage.g:1251:2: ( ruleVLSFunctionAsTerm ) |
4448 | { | 4448 | { |
4449 | // InternalVampireLanguage.g:1251:2: ( ruleVLSFunctionFof ) | 4449 | // InternalVampireLanguage.g:1251:2: ( ruleVLSFunctionAsTerm ) |
4450 | // InternalVampireLanguage.g:1252:3: ruleVLSFunctionFof | 4450 | // InternalVampireLanguage.g:1252:3: ruleVLSFunctionAsTerm |
4451 | { | 4451 | { |
4452 | before(grammarAccess.getVLSFofTermAccess().getVLSFunctionFofParserRuleCall_1()); | 4452 | before(grammarAccess.getVLSFofTermAccess().getVLSFunctionAsTermParserRuleCall_1()); |
4453 | pushFollow(FOLLOW_2); | 4453 | pushFollow(FOLLOW_2); |
4454 | ruleVLSFunctionFof(); | 4454 | ruleVLSFunctionAsTerm(); |
4455 | 4455 | ||
4456 | state._fsp--; | 4456 | state._fsp--; |
4457 | 4457 | ||
4458 | after(grammarAccess.getVLSFofTermAccess().getVLSFunctionFofParserRuleCall_1()); | 4458 | after(grammarAccess.getVLSFofTermAccess().getVLSFunctionAsTermParserRuleCall_1()); |
4459 | 4459 | ||
4460 | } | 4460 | } |
4461 | 4461 | ||
@@ -4498,9 +4498,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
4498 | // $ANTLR end "rule__VLSFofTerm__Alternatives" | 4498 | // $ANTLR end "rule__VLSFofTerm__Alternatives" |
4499 | 4499 | ||
4500 | 4500 | ||
4501 | // $ANTLR start "rule__VLSFunctionFof__FunctorAlternatives_0_0" | 4501 | // $ANTLR start "rule__VLSFunctionAsTerm__FunctorAlternatives_0_0" |
4502 | // InternalVampireLanguage.g:1267:1: rule__VLSFunctionFof__FunctorAlternatives_0_0 : ( ( RULE_LOWER_WORD_ID ) | ( RULE_SINGLE_QUOTE ) | ( RULE_DOLLAR_ID ) | ( RULE_DOUBLE_DOLLAR_ID ) ); | 4502 | // InternalVampireLanguage.g:1267:1: rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 : ( ( RULE_LOWER_WORD_ID ) | ( RULE_SINGLE_QUOTE ) | ( RULE_DOLLAR_ID ) | ( RULE_DOUBLE_DOLLAR_ID ) ); |
4503 | public final void rule__VLSFunctionFof__FunctorAlternatives_0_0() throws RecognitionException { | 4503 | public final void rule__VLSFunctionAsTerm__FunctorAlternatives_0_0() throws RecognitionException { |
4504 | 4504 | ||
4505 | int stackSize = keepStackSize(); | 4505 | int stackSize = keepStackSize(); |
4506 | 4506 | ||
@@ -4542,9 +4542,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
4542 | // InternalVampireLanguage.g:1272:2: ( RULE_LOWER_WORD_ID ) | 4542 | // InternalVampireLanguage.g:1272:2: ( RULE_LOWER_WORD_ID ) |
4543 | // InternalVampireLanguage.g:1273:3: RULE_LOWER_WORD_ID | 4543 | // InternalVampireLanguage.g:1273:3: RULE_LOWER_WORD_ID |
4544 | { | 4544 | { |
4545 | before(grammarAccess.getVLSFunctionFofAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); | 4545 | before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); |
4546 | match(input,RULE_LOWER_WORD_ID,FOLLOW_2); | 4546 | match(input,RULE_LOWER_WORD_ID,FOLLOW_2); |
4547 | after(grammarAccess.getVLSFunctionFofAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); | 4547 | after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); |
4548 | 4548 | ||
4549 | } | 4549 | } |
4550 | 4550 | ||
@@ -4557,9 +4557,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
4557 | // InternalVampireLanguage.g:1278:2: ( RULE_SINGLE_QUOTE ) | 4557 | // InternalVampireLanguage.g:1278:2: ( RULE_SINGLE_QUOTE ) |
4558 | // InternalVampireLanguage.g:1279:3: RULE_SINGLE_QUOTE | 4558 | // InternalVampireLanguage.g:1279:3: RULE_SINGLE_QUOTE |
4559 | { | 4559 | { |
4560 | before(grammarAccess.getVLSFunctionFofAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); | 4560 | before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); |
4561 | match(input,RULE_SINGLE_QUOTE,FOLLOW_2); | 4561 | match(input,RULE_SINGLE_QUOTE,FOLLOW_2); |
4562 | after(grammarAccess.getVLSFunctionFofAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); | 4562 | after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); |
4563 | 4563 | ||
4564 | } | 4564 | } |
4565 | 4565 | ||
@@ -4572,9 +4572,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
4572 | // InternalVampireLanguage.g:1284:2: ( RULE_DOLLAR_ID ) | 4572 | // InternalVampireLanguage.g:1284:2: ( RULE_DOLLAR_ID ) |
4573 | // InternalVampireLanguage.g:1285:3: RULE_DOLLAR_ID | 4573 | // InternalVampireLanguage.g:1285:3: RULE_DOLLAR_ID |
4574 | { | 4574 | { |
4575 | before(grammarAccess.getVLSFunctionFofAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); | 4575 | before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); |
4576 | match(input,RULE_DOLLAR_ID,FOLLOW_2); | 4576 | match(input,RULE_DOLLAR_ID,FOLLOW_2); |
4577 | after(grammarAccess.getVLSFunctionFofAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); | 4577 | after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); |
4578 | 4578 | ||
4579 | } | 4579 | } |
4580 | 4580 | ||
@@ -4587,9 +4587,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
4587 | // InternalVampireLanguage.g:1290:2: ( RULE_DOUBLE_DOLLAR_ID ) | 4587 | // InternalVampireLanguage.g:1290:2: ( RULE_DOUBLE_DOLLAR_ID ) |
4588 | // InternalVampireLanguage.g:1291:3: RULE_DOUBLE_DOLLAR_ID | 4588 | // InternalVampireLanguage.g:1291:3: RULE_DOUBLE_DOLLAR_ID |
4589 | { | 4589 | { |
4590 | before(grammarAccess.getVLSFunctionFofAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); | 4590 | before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); |
4591 | match(input,RULE_DOUBLE_DOLLAR_ID,FOLLOW_2); | 4591 | match(input,RULE_DOUBLE_DOLLAR_ID,FOLLOW_2); |
4592 | after(grammarAccess.getVLSFunctionFofAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); | 4592 | after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); |
4593 | 4593 | ||
4594 | } | 4594 | } |
4595 | 4595 | ||
@@ -4610,7 +4610,7 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
4610 | } | 4610 | } |
4611 | return ; | 4611 | return ; |
4612 | } | 4612 | } |
4613 | // $ANTLR end "rule__VLSFunctionFof__FunctorAlternatives_0_0" | 4613 | // $ANTLR end "rule__VLSFunctionAsTerm__FunctorAlternatives_0_0" |
4614 | 4614 | ||
4615 | 4615 | ||
4616 | // $ANTLR start "rule__VLSDefinedTerm__Alternatives" | 4616 | // $ANTLR start "rule__VLSDefinedTerm__Alternatives" |
@@ -15016,23 +15016,23 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15016 | // $ANTLR end "rule__VLSAtomicFunction__Group_1__6__Impl" | 15016 | // $ANTLR end "rule__VLSAtomicFunction__Group_1__6__Impl" |
15017 | 15017 | ||
15018 | 15018 | ||
15019 | // $ANTLR start "rule__VLSFunctionFof__Group__0" | 15019 | // $ANTLR start "rule__VLSFunctionAsTerm__Group__0" |
15020 | // InternalVampireLanguage.g:4843:1: rule__VLSFunctionFof__Group__0 : rule__VLSFunctionFof__Group__0__Impl rule__VLSFunctionFof__Group__1 ; | 15020 | // InternalVampireLanguage.g:4843:1: rule__VLSFunctionAsTerm__Group__0 : rule__VLSFunctionAsTerm__Group__0__Impl rule__VLSFunctionAsTerm__Group__1 ; |
15021 | public final void rule__VLSFunctionFof__Group__0() throws RecognitionException { | 15021 | public final void rule__VLSFunctionAsTerm__Group__0() throws RecognitionException { |
15022 | 15022 | ||
15023 | int stackSize = keepStackSize(); | 15023 | int stackSize = keepStackSize(); |
15024 | 15024 | ||
15025 | try { | 15025 | try { |
15026 | // InternalVampireLanguage.g:4847:1: ( rule__VLSFunctionFof__Group__0__Impl rule__VLSFunctionFof__Group__1 ) | 15026 | // InternalVampireLanguage.g:4847:1: ( rule__VLSFunctionAsTerm__Group__0__Impl rule__VLSFunctionAsTerm__Group__1 ) |
15027 | // InternalVampireLanguage.g:4848:2: rule__VLSFunctionFof__Group__0__Impl rule__VLSFunctionFof__Group__1 | 15027 | // InternalVampireLanguage.g:4848:2: rule__VLSFunctionAsTerm__Group__0__Impl rule__VLSFunctionAsTerm__Group__1 |
15028 | { | 15028 | { |
15029 | pushFollow(FOLLOW_13); | 15029 | pushFollow(FOLLOW_13); |
15030 | rule__VLSFunctionFof__Group__0__Impl(); | 15030 | rule__VLSFunctionAsTerm__Group__0__Impl(); |
15031 | 15031 | ||
15032 | state._fsp--; | 15032 | state._fsp--; |
15033 | 15033 | ||
15034 | pushFollow(FOLLOW_2); | 15034 | pushFollow(FOLLOW_2); |
15035 | rule__VLSFunctionFof__Group__1(); | 15035 | rule__VLSFunctionAsTerm__Group__1(); |
15036 | 15036 | ||
15037 | state._fsp--; | 15037 | state._fsp--; |
15038 | 15038 | ||
@@ -15051,35 +15051,35 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15051 | } | 15051 | } |
15052 | return ; | 15052 | return ; |
15053 | } | 15053 | } |
15054 | // $ANTLR end "rule__VLSFunctionFof__Group__0" | 15054 | // $ANTLR end "rule__VLSFunctionAsTerm__Group__0" |
15055 | 15055 | ||
15056 | 15056 | ||
15057 | // $ANTLR start "rule__VLSFunctionFof__Group__0__Impl" | 15057 | // $ANTLR start "rule__VLSFunctionAsTerm__Group__0__Impl" |
15058 | // InternalVampireLanguage.g:4855:1: rule__VLSFunctionFof__Group__0__Impl : ( ( rule__VLSFunctionFof__FunctorAssignment_0 ) ) ; | 15058 | // InternalVampireLanguage.g:4855:1: rule__VLSFunctionAsTerm__Group__0__Impl : ( ( rule__VLSFunctionAsTerm__FunctorAssignment_0 ) ) ; |
15059 | public final void rule__VLSFunctionFof__Group__0__Impl() throws RecognitionException { | 15059 | public final void rule__VLSFunctionAsTerm__Group__0__Impl() throws RecognitionException { |
15060 | 15060 | ||
15061 | int stackSize = keepStackSize(); | 15061 | int stackSize = keepStackSize(); |
15062 | 15062 | ||
15063 | try { | 15063 | try { |
15064 | // InternalVampireLanguage.g:4859:1: ( ( ( rule__VLSFunctionFof__FunctorAssignment_0 ) ) ) | 15064 | // InternalVampireLanguage.g:4859:1: ( ( ( rule__VLSFunctionAsTerm__FunctorAssignment_0 ) ) ) |
15065 | // InternalVampireLanguage.g:4860:1: ( ( rule__VLSFunctionFof__FunctorAssignment_0 ) ) | 15065 | // InternalVampireLanguage.g:4860:1: ( ( rule__VLSFunctionAsTerm__FunctorAssignment_0 ) ) |
15066 | { | 15066 | { |
15067 | // InternalVampireLanguage.g:4860:1: ( ( rule__VLSFunctionFof__FunctorAssignment_0 ) ) | 15067 | // InternalVampireLanguage.g:4860:1: ( ( rule__VLSFunctionAsTerm__FunctorAssignment_0 ) ) |
15068 | // InternalVampireLanguage.g:4861:2: ( rule__VLSFunctionFof__FunctorAssignment_0 ) | 15068 | // InternalVampireLanguage.g:4861:2: ( rule__VLSFunctionAsTerm__FunctorAssignment_0 ) |
15069 | { | 15069 | { |
15070 | before(grammarAccess.getVLSFunctionFofAccess().getFunctorAssignment_0()); | 15070 | before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAssignment_0()); |
15071 | // InternalVampireLanguage.g:4862:2: ( rule__VLSFunctionFof__FunctorAssignment_0 ) | 15071 | // InternalVampireLanguage.g:4862:2: ( rule__VLSFunctionAsTerm__FunctorAssignment_0 ) |
15072 | // InternalVampireLanguage.g:4862:3: rule__VLSFunctionFof__FunctorAssignment_0 | 15072 | // InternalVampireLanguage.g:4862:3: rule__VLSFunctionAsTerm__FunctorAssignment_0 |
15073 | { | 15073 | { |
15074 | pushFollow(FOLLOW_2); | 15074 | pushFollow(FOLLOW_2); |
15075 | rule__VLSFunctionFof__FunctorAssignment_0(); | 15075 | rule__VLSFunctionAsTerm__FunctorAssignment_0(); |
15076 | 15076 | ||
15077 | state._fsp--; | 15077 | state._fsp--; |
15078 | 15078 | ||
15079 | 15079 | ||
15080 | } | 15080 | } |
15081 | 15081 | ||
15082 | after(grammarAccess.getVLSFunctionFofAccess().getFunctorAssignment_0()); | 15082 | after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAssignment_0()); |
15083 | 15083 | ||
15084 | } | 15084 | } |
15085 | 15085 | ||
@@ -15098,21 +15098,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15098 | } | 15098 | } |
15099 | return ; | 15099 | return ; |
15100 | } | 15100 | } |
15101 | // $ANTLR end "rule__VLSFunctionFof__Group__0__Impl" | 15101 | // $ANTLR end "rule__VLSFunctionAsTerm__Group__0__Impl" |
15102 | 15102 | ||
15103 | 15103 | ||
15104 | // $ANTLR start "rule__VLSFunctionFof__Group__1" | 15104 | // $ANTLR start "rule__VLSFunctionAsTerm__Group__1" |
15105 | // InternalVampireLanguage.g:4870:1: rule__VLSFunctionFof__Group__1 : rule__VLSFunctionFof__Group__1__Impl ; | 15105 | // InternalVampireLanguage.g:4870:1: rule__VLSFunctionAsTerm__Group__1 : rule__VLSFunctionAsTerm__Group__1__Impl ; |
15106 | public final void rule__VLSFunctionFof__Group__1() throws RecognitionException { | 15106 | public final void rule__VLSFunctionAsTerm__Group__1() throws RecognitionException { |
15107 | 15107 | ||
15108 | int stackSize = keepStackSize(); | 15108 | int stackSize = keepStackSize(); |
15109 | 15109 | ||
15110 | try { | 15110 | try { |
15111 | // InternalVampireLanguage.g:4874:1: ( rule__VLSFunctionFof__Group__1__Impl ) | 15111 | // InternalVampireLanguage.g:4874:1: ( rule__VLSFunctionAsTerm__Group__1__Impl ) |
15112 | // InternalVampireLanguage.g:4875:2: rule__VLSFunctionFof__Group__1__Impl | 15112 | // InternalVampireLanguage.g:4875:2: rule__VLSFunctionAsTerm__Group__1__Impl |
15113 | { | 15113 | { |
15114 | pushFollow(FOLLOW_2); | 15114 | pushFollow(FOLLOW_2); |
15115 | rule__VLSFunctionFof__Group__1__Impl(); | 15115 | rule__VLSFunctionAsTerm__Group__1__Impl(); |
15116 | 15116 | ||
15117 | state._fsp--; | 15117 | state._fsp--; |
15118 | 15118 | ||
@@ -15131,24 +15131,24 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15131 | } | 15131 | } |
15132 | return ; | 15132 | return ; |
15133 | } | 15133 | } |
15134 | // $ANTLR end "rule__VLSFunctionFof__Group__1" | 15134 | // $ANTLR end "rule__VLSFunctionAsTerm__Group__1" |
15135 | 15135 | ||
15136 | 15136 | ||
15137 | // $ANTLR start "rule__VLSFunctionFof__Group__1__Impl" | 15137 | // $ANTLR start "rule__VLSFunctionAsTerm__Group__1__Impl" |
15138 | // InternalVampireLanguage.g:4881:1: rule__VLSFunctionFof__Group__1__Impl : ( ( rule__VLSFunctionFof__Group_1__0 )? ) ; | 15138 | // InternalVampireLanguage.g:4881:1: rule__VLSFunctionAsTerm__Group__1__Impl : ( ( rule__VLSFunctionAsTerm__Group_1__0 )? ) ; |
15139 | public final void rule__VLSFunctionFof__Group__1__Impl() throws RecognitionException { | 15139 | public final void rule__VLSFunctionAsTerm__Group__1__Impl() throws RecognitionException { |
15140 | 15140 | ||
15141 | int stackSize = keepStackSize(); | 15141 | int stackSize = keepStackSize(); |
15142 | 15142 | ||
15143 | try { | 15143 | try { |
15144 | // InternalVampireLanguage.g:4885:1: ( ( ( rule__VLSFunctionFof__Group_1__0 )? ) ) | 15144 | // InternalVampireLanguage.g:4885:1: ( ( ( rule__VLSFunctionAsTerm__Group_1__0 )? ) ) |
15145 | // InternalVampireLanguage.g:4886:1: ( ( rule__VLSFunctionFof__Group_1__0 )? ) | 15145 | // InternalVampireLanguage.g:4886:1: ( ( rule__VLSFunctionAsTerm__Group_1__0 )? ) |
15146 | { | 15146 | { |
15147 | // InternalVampireLanguage.g:4886:1: ( ( rule__VLSFunctionFof__Group_1__0 )? ) | 15147 | // InternalVampireLanguage.g:4886:1: ( ( rule__VLSFunctionAsTerm__Group_1__0 )? ) |
15148 | // InternalVampireLanguage.g:4887:2: ( rule__VLSFunctionFof__Group_1__0 )? | 15148 | // InternalVampireLanguage.g:4887:2: ( rule__VLSFunctionAsTerm__Group_1__0 )? |
15149 | { | 15149 | { |
15150 | before(grammarAccess.getVLSFunctionFofAccess().getGroup_1()); | 15150 | before(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1()); |
15151 | // InternalVampireLanguage.g:4888:2: ( rule__VLSFunctionFof__Group_1__0 )? | 15151 | // InternalVampireLanguage.g:4888:2: ( rule__VLSFunctionAsTerm__Group_1__0 )? |
15152 | int alt36=2; | 15152 | int alt36=2; |
15153 | int LA36_0 = input.LA(1); | 15153 | int LA36_0 = input.LA(1); |
15154 | 15154 | ||
@@ -15157,10 +15157,10 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15157 | } | 15157 | } |
15158 | switch (alt36) { | 15158 | switch (alt36) { |
15159 | case 1 : | 15159 | case 1 : |
15160 | // InternalVampireLanguage.g:4888:3: rule__VLSFunctionFof__Group_1__0 | 15160 | // InternalVampireLanguage.g:4888:3: rule__VLSFunctionAsTerm__Group_1__0 |
15161 | { | 15161 | { |
15162 | pushFollow(FOLLOW_2); | 15162 | pushFollow(FOLLOW_2); |
15163 | rule__VLSFunctionFof__Group_1__0(); | 15163 | rule__VLSFunctionAsTerm__Group_1__0(); |
15164 | 15164 | ||
15165 | state._fsp--; | 15165 | state._fsp--; |
15166 | 15166 | ||
@@ -15170,7 +15170,7 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15170 | 15170 | ||
15171 | } | 15171 | } |
15172 | 15172 | ||
15173 | after(grammarAccess.getVLSFunctionFofAccess().getGroup_1()); | 15173 | after(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1()); |
15174 | 15174 | ||
15175 | } | 15175 | } |
15176 | 15176 | ||
@@ -15189,26 +15189,26 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15189 | } | 15189 | } |
15190 | return ; | 15190 | return ; |
15191 | } | 15191 | } |
15192 | // $ANTLR end "rule__VLSFunctionFof__Group__1__Impl" | 15192 | // $ANTLR end "rule__VLSFunctionAsTerm__Group__1__Impl" |
15193 | 15193 | ||
15194 | 15194 | ||
15195 | // $ANTLR start "rule__VLSFunctionFof__Group_1__0" | 15195 | // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__0" |
15196 | // InternalVampireLanguage.g:4897:1: rule__VLSFunctionFof__Group_1__0 : rule__VLSFunctionFof__Group_1__0__Impl rule__VLSFunctionFof__Group_1__1 ; | 15196 | // InternalVampireLanguage.g:4897:1: rule__VLSFunctionAsTerm__Group_1__0 : rule__VLSFunctionAsTerm__Group_1__0__Impl rule__VLSFunctionAsTerm__Group_1__1 ; |
15197 | public final void rule__VLSFunctionFof__Group_1__0() throws RecognitionException { | 15197 | public final void rule__VLSFunctionAsTerm__Group_1__0() throws RecognitionException { |
15198 | 15198 | ||
15199 | int stackSize = keepStackSize(); | 15199 | int stackSize = keepStackSize(); |
15200 | 15200 | ||
15201 | try { | 15201 | try { |
15202 | // InternalVampireLanguage.g:4901:1: ( rule__VLSFunctionFof__Group_1__0__Impl rule__VLSFunctionFof__Group_1__1 ) | 15202 | // InternalVampireLanguage.g:4901:1: ( rule__VLSFunctionAsTerm__Group_1__0__Impl rule__VLSFunctionAsTerm__Group_1__1 ) |
15203 | // InternalVampireLanguage.g:4902:2: rule__VLSFunctionFof__Group_1__0__Impl rule__VLSFunctionFof__Group_1__1 | 15203 | // InternalVampireLanguage.g:4902:2: rule__VLSFunctionAsTerm__Group_1__0__Impl rule__VLSFunctionAsTerm__Group_1__1 |
15204 | { | 15204 | { |
15205 | pushFollow(FOLLOW_38); | 15205 | pushFollow(FOLLOW_38); |
15206 | rule__VLSFunctionFof__Group_1__0__Impl(); | 15206 | rule__VLSFunctionAsTerm__Group_1__0__Impl(); |
15207 | 15207 | ||
15208 | state._fsp--; | 15208 | state._fsp--; |
15209 | 15209 | ||
15210 | pushFollow(FOLLOW_2); | 15210 | pushFollow(FOLLOW_2); |
15211 | rule__VLSFunctionFof__Group_1__1(); | 15211 | rule__VLSFunctionAsTerm__Group_1__1(); |
15212 | 15212 | ||
15213 | state._fsp--; | 15213 | state._fsp--; |
15214 | 15214 | ||
@@ -15227,12 +15227,12 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15227 | } | 15227 | } |
15228 | return ; | 15228 | return ; |
15229 | } | 15229 | } |
15230 | // $ANTLR end "rule__VLSFunctionFof__Group_1__0" | 15230 | // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__0" |
15231 | 15231 | ||
15232 | 15232 | ||
15233 | // $ANTLR start "rule__VLSFunctionFof__Group_1__0__Impl" | 15233 | // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__0__Impl" |
15234 | // InternalVampireLanguage.g:4909:1: rule__VLSFunctionFof__Group_1__0__Impl : ( '(' ) ; | 15234 | // InternalVampireLanguage.g:4909:1: rule__VLSFunctionAsTerm__Group_1__0__Impl : ( '(' ) ; |
15235 | public final void rule__VLSFunctionFof__Group_1__0__Impl() throws RecognitionException { | 15235 | public final void rule__VLSFunctionAsTerm__Group_1__0__Impl() throws RecognitionException { |
15236 | 15236 | ||
15237 | int stackSize = keepStackSize(); | 15237 | int stackSize = keepStackSize(); |
15238 | 15238 | ||
@@ -15243,9 +15243,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15243 | // InternalVampireLanguage.g:4914:1: ( '(' ) | 15243 | // InternalVampireLanguage.g:4914:1: ( '(' ) |
15244 | // InternalVampireLanguage.g:4915:2: '(' | 15244 | // InternalVampireLanguage.g:4915:2: '(' |
15245 | { | 15245 | { |
15246 | before(grammarAccess.getVLSFunctionFofAccess().getLeftParenthesisKeyword_1_0()); | 15246 | before(grammarAccess.getVLSFunctionAsTermAccess().getLeftParenthesisKeyword_1_0()); |
15247 | match(input,49,FOLLOW_2); | 15247 | match(input,49,FOLLOW_2); |
15248 | after(grammarAccess.getVLSFunctionFofAccess().getLeftParenthesisKeyword_1_0()); | 15248 | after(grammarAccess.getVLSFunctionAsTermAccess().getLeftParenthesisKeyword_1_0()); |
15249 | 15249 | ||
15250 | } | 15250 | } |
15251 | 15251 | ||
@@ -15264,26 +15264,26 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15264 | } | 15264 | } |
15265 | return ; | 15265 | return ; |
15266 | } | 15266 | } |
15267 | // $ANTLR end "rule__VLSFunctionFof__Group_1__0__Impl" | 15267 | // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__0__Impl" |
15268 | 15268 | ||
15269 | 15269 | ||
15270 | // $ANTLR start "rule__VLSFunctionFof__Group_1__1" | 15270 | // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__1" |
15271 | // InternalVampireLanguage.g:4924:1: rule__VLSFunctionFof__Group_1__1 : rule__VLSFunctionFof__Group_1__1__Impl rule__VLSFunctionFof__Group_1__2 ; | 15271 | // InternalVampireLanguage.g:4924:1: rule__VLSFunctionAsTerm__Group_1__1 : rule__VLSFunctionAsTerm__Group_1__1__Impl rule__VLSFunctionAsTerm__Group_1__2 ; |
15272 | public final void rule__VLSFunctionFof__Group_1__1() throws RecognitionException { | 15272 | public final void rule__VLSFunctionAsTerm__Group_1__1() throws RecognitionException { |
15273 | 15273 | ||
15274 | int stackSize = keepStackSize(); | 15274 | int stackSize = keepStackSize(); |
15275 | 15275 | ||
15276 | try { | 15276 | try { |
15277 | // InternalVampireLanguage.g:4928:1: ( rule__VLSFunctionFof__Group_1__1__Impl rule__VLSFunctionFof__Group_1__2 ) | 15277 | // InternalVampireLanguage.g:4928:1: ( rule__VLSFunctionAsTerm__Group_1__1__Impl rule__VLSFunctionAsTerm__Group_1__2 ) |
15278 | // InternalVampireLanguage.g:4929:2: rule__VLSFunctionFof__Group_1__1__Impl rule__VLSFunctionFof__Group_1__2 | 15278 | // InternalVampireLanguage.g:4929:2: rule__VLSFunctionAsTerm__Group_1__1__Impl rule__VLSFunctionAsTerm__Group_1__2 |
15279 | { | 15279 | { |
15280 | pushFollow(FOLLOW_18); | 15280 | pushFollow(FOLLOW_18); |
15281 | rule__VLSFunctionFof__Group_1__1__Impl(); | 15281 | rule__VLSFunctionAsTerm__Group_1__1__Impl(); |
15282 | 15282 | ||
15283 | state._fsp--; | 15283 | state._fsp--; |
15284 | 15284 | ||
15285 | pushFollow(FOLLOW_2); | 15285 | pushFollow(FOLLOW_2); |
15286 | rule__VLSFunctionFof__Group_1__2(); | 15286 | rule__VLSFunctionAsTerm__Group_1__2(); |
15287 | 15287 | ||
15288 | state._fsp--; | 15288 | state._fsp--; |
15289 | 15289 | ||
@@ -15302,35 +15302,35 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15302 | } | 15302 | } |
15303 | return ; | 15303 | return ; |
15304 | } | 15304 | } |
15305 | // $ANTLR end "rule__VLSFunctionFof__Group_1__1" | 15305 | // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__1" |
15306 | 15306 | ||
15307 | 15307 | ||
15308 | // $ANTLR start "rule__VLSFunctionFof__Group_1__1__Impl" | 15308 | // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__1__Impl" |
15309 | // InternalVampireLanguage.g:4936:1: rule__VLSFunctionFof__Group_1__1__Impl : ( ( rule__VLSFunctionFof__TermsAssignment_1_1 ) ) ; | 15309 | // InternalVampireLanguage.g:4936:1: rule__VLSFunctionAsTerm__Group_1__1__Impl : ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_1 ) ) ; |
15310 | public final void rule__VLSFunctionFof__Group_1__1__Impl() throws RecognitionException { | 15310 | public final void rule__VLSFunctionAsTerm__Group_1__1__Impl() throws RecognitionException { |
15311 | 15311 | ||
15312 | int stackSize = keepStackSize(); | 15312 | int stackSize = keepStackSize(); |
15313 | 15313 | ||
15314 | try { | 15314 | try { |
15315 | // InternalVampireLanguage.g:4940:1: ( ( ( rule__VLSFunctionFof__TermsAssignment_1_1 ) ) ) | 15315 | // InternalVampireLanguage.g:4940:1: ( ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_1 ) ) ) |
15316 | // InternalVampireLanguage.g:4941:1: ( ( rule__VLSFunctionFof__TermsAssignment_1_1 ) ) | 15316 | // InternalVampireLanguage.g:4941:1: ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_1 ) ) |
15317 | { | 15317 | { |
15318 | // InternalVampireLanguage.g:4941:1: ( ( rule__VLSFunctionFof__TermsAssignment_1_1 ) ) | 15318 | // InternalVampireLanguage.g:4941:1: ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_1 ) ) |
15319 | // InternalVampireLanguage.g:4942:2: ( rule__VLSFunctionFof__TermsAssignment_1_1 ) | 15319 | // InternalVampireLanguage.g:4942:2: ( rule__VLSFunctionAsTerm__TermsAssignment_1_1 ) |
15320 | { | 15320 | { |
15321 | before(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_1()); | 15321 | before(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_1()); |
15322 | // InternalVampireLanguage.g:4943:2: ( rule__VLSFunctionFof__TermsAssignment_1_1 ) | 15322 | // InternalVampireLanguage.g:4943:2: ( rule__VLSFunctionAsTerm__TermsAssignment_1_1 ) |
15323 | // InternalVampireLanguage.g:4943:3: rule__VLSFunctionFof__TermsAssignment_1_1 | 15323 | // InternalVampireLanguage.g:4943:3: rule__VLSFunctionAsTerm__TermsAssignment_1_1 |
15324 | { | 15324 | { |
15325 | pushFollow(FOLLOW_2); | 15325 | pushFollow(FOLLOW_2); |
15326 | rule__VLSFunctionFof__TermsAssignment_1_1(); | 15326 | rule__VLSFunctionAsTerm__TermsAssignment_1_1(); |
15327 | 15327 | ||
15328 | state._fsp--; | 15328 | state._fsp--; |
15329 | 15329 | ||
15330 | 15330 | ||
15331 | } | 15331 | } |
15332 | 15332 | ||
15333 | after(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_1()); | 15333 | after(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_1()); |
15334 | 15334 | ||
15335 | } | 15335 | } |
15336 | 15336 | ||
@@ -15349,26 +15349,26 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15349 | } | 15349 | } |
15350 | return ; | 15350 | return ; |
15351 | } | 15351 | } |
15352 | // $ANTLR end "rule__VLSFunctionFof__Group_1__1__Impl" | 15352 | // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__1__Impl" |
15353 | 15353 | ||
15354 | 15354 | ||
15355 | // $ANTLR start "rule__VLSFunctionFof__Group_1__2" | 15355 | // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__2" |
15356 | // InternalVampireLanguage.g:4951:1: rule__VLSFunctionFof__Group_1__2 : rule__VLSFunctionFof__Group_1__2__Impl rule__VLSFunctionFof__Group_1__3 ; | 15356 | // InternalVampireLanguage.g:4951:1: rule__VLSFunctionAsTerm__Group_1__2 : rule__VLSFunctionAsTerm__Group_1__2__Impl rule__VLSFunctionAsTerm__Group_1__3 ; |
15357 | public final void rule__VLSFunctionFof__Group_1__2() throws RecognitionException { | 15357 | public final void rule__VLSFunctionAsTerm__Group_1__2() throws RecognitionException { |
15358 | 15358 | ||
15359 | int stackSize = keepStackSize(); | 15359 | int stackSize = keepStackSize(); |
15360 | 15360 | ||
15361 | try { | 15361 | try { |
15362 | // InternalVampireLanguage.g:4955:1: ( rule__VLSFunctionFof__Group_1__2__Impl rule__VLSFunctionFof__Group_1__3 ) | 15362 | // InternalVampireLanguage.g:4955:1: ( rule__VLSFunctionAsTerm__Group_1__2__Impl rule__VLSFunctionAsTerm__Group_1__3 ) |
15363 | // InternalVampireLanguage.g:4956:2: rule__VLSFunctionFof__Group_1__2__Impl rule__VLSFunctionFof__Group_1__3 | 15363 | // InternalVampireLanguage.g:4956:2: rule__VLSFunctionAsTerm__Group_1__2__Impl rule__VLSFunctionAsTerm__Group_1__3 |
15364 | { | 15364 | { |
15365 | pushFollow(FOLLOW_18); | 15365 | pushFollow(FOLLOW_18); |
15366 | rule__VLSFunctionFof__Group_1__2__Impl(); | 15366 | rule__VLSFunctionAsTerm__Group_1__2__Impl(); |
15367 | 15367 | ||
15368 | state._fsp--; | 15368 | state._fsp--; |
15369 | 15369 | ||
15370 | pushFollow(FOLLOW_2); | 15370 | pushFollow(FOLLOW_2); |
15371 | rule__VLSFunctionFof__Group_1__3(); | 15371 | rule__VLSFunctionAsTerm__Group_1__3(); |
15372 | 15372 | ||
15373 | state._fsp--; | 15373 | state._fsp--; |
15374 | 15374 | ||
@@ -15387,24 +15387,24 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15387 | } | 15387 | } |
15388 | return ; | 15388 | return ; |
15389 | } | 15389 | } |
15390 | // $ANTLR end "rule__VLSFunctionFof__Group_1__2" | 15390 | // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__2" |
15391 | 15391 | ||
15392 | 15392 | ||
15393 | // $ANTLR start "rule__VLSFunctionFof__Group_1__2__Impl" | 15393 | // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__2__Impl" |
15394 | // InternalVampireLanguage.g:4963:1: rule__VLSFunctionFof__Group_1__2__Impl : ( ( rule__VLSFunctionFof__Group_1_2__0 )* ) ; | 15394 | // InternalVampireLanguage.g:4963:1: rule__VLSFunctionAsTerm__Group_1__2__Impl : ( ( rule__VLSFunctionAsTerm__Group_1_2__0 )* ) ; |
15395 | public final void rule__VLSFunctionFof__Group_1__2__Impl() throws RecognitionException { | 15395 | public final void rule__VLSFunctionAsTerm__Group_1__2__Impl() throws RecognitionException { |
15396 | 15396 | ||
15397 | int stackSize = keepStackSize(); | 15397 | int stackSize = keepStackSize(); |
15398 | 15398 | ||
15399 | try { | 15399 | try { |
15400 | // InternalVampireLanguage.g:4967:1: ( ( ( rule__VLSFunctionFof__Group_1_2__0 )* ) ) | 15400 | // InternalVampireLanguage.g:4967:1: ( ( ( rule__VLSFunctionAsTerm__Group_1_2__0 )* ) ) |
15401 | // InternalVampireLanguage.g:4968:1: ( ( rule__VLSFunctionFof__Group_1_2__0 )* ) | 15401 | // InternalVampireLanguage.g:4968:1: ( ( rule__VLSFunctionAsTerm__Group_1_2__0 )* ) |
15402 | { | 15402 | { |
15403 | // InternalVampireLanguage.g:4968:1: ( ( rule__VLSFunctionFof__Group_1_2__0 )* ) | 15403 | // InternalVampireLanguage.g:4968:1: ( ( rule__VLSFunctionAsTerm__Group_1_2__0 )* ) |
15404 | // InternalVampireLanguage.g:4969:2: ( rule__VLSFunctionFof__Group_1_2__0 )* | 15404 | // InternalVampireLanguage.g:4969:2: ( rule__VLSFunctionAsTerm__Group_1_2__0 )* |
15405 | { | 15405 | { |
15406 | before(grammarAccess.getVLSFunctionFofAccess().getGroup_1_2()); | 15406 | before(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1_2()); |
15407 | // InternalVampireLanguage.g:4970:2: ( rule__VLSFunctionFof__Group_1_2__0 )* | 15407 | // InternalVampireLanguage.g:4970:2: ( rule__VLSFunctionAsTerm__Group_1_2__0 )* |
15408 | loop37: | 15408 | loop37: |
15409 | do { | 15409 | do { |
15410 | int alt37=2; | 15410 | int alt37=2; |
@@ -15417,10 +15417,10 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15417 | 15417 | ||
15418 | switch (alt37) { | 15418 | switch (alt37) { |
15419 | case 1 : | 15419 | case 1 : |
15420 | // InternalVampireLanguage.g:4970:3: rule__VLSFunctionFof__Group_1_2__0 | 15420 | // InternalVampireLanguage.g:4970:3: rule__VLSFunctionAsTerm__Group_1_2__0 |
15421 | { | 15421 | { |
15422 | pushFollow(FOLLOW_10); | 15422 | pushFollow(FOLLOW_10); |
15423 | rule__VLSFunctionFof__Group_1_2__0(); | 15423 | rule__VLSFunctionAsTerm__Group_1_2__0(); |
15424 | 15424 | ||
15425 | state._fsp--; | 15425 | state._fsp--; |
15426 | 15426 | ||
@@ -15433,7 +15433,7 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15433 | } | 15433 | } |
15434 | } while (true); | 15434 | } while (true); |
15435 | 15435 | ||
15436 | after(grammarAccess.getVLSFunctionFofAccess().getGroup_1_2()); | 15436 | after(grammarAccess.getVLSFunctionAsTermAccess().getGroup_1_2()); |
15437 | 15437 | ||
15438 | } | 15438 | } |
15439 | 15439 | ||
@@ -15452,21 +15452,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15452 | } | 15452 | } |
15453 | return ; | 15453 | return ; |
15454 | } | 15454 | } |
15455 | // $ANTLR end "rule__VLSFunctionFof__Group_1__2__Impl" | 15455 | // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__2__Impl" |
15456 | 15456 | ||
15457 | 15457 | ||
15458 | // $ANTLR start "rule__VLSFunctionFof__Group_1__3" | 15458 | // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__3" |
15459 | // InternalVampireLanguage.g:4978:1: rule__VLSFunctionFof__Group_1__3 : rule__VLSFunctionFof__Group_1__3__Impl ; | 15459 | // InternalVampireLanguage.g:4978:1: rule__VLSFunctionAsTerm__Group_1__3 : rule__VLSFunctionAsTerm__Group_1__3__Impl ; |
15460 | public final void rule__VLSFunctionFof__Group_1__3() throws RecognitionException { | 15460 | public final void rule__VLSFunctionAsTerm__Group_1__3() throws RecognitionException { |
15461 | 15461 | ||
15462 | int stackSize = keepStackSize(); | 15462 | int stackSize = keepStackSize(); |
15463 | 15463 | ||
15464 | try { | 15464 | try { |
15465 | // InternalVampireLanguage.g:4982:1: ( rule__VLSFunctionFof__Group_1__3__Impl ) | 15465 | // InternalVampireLanguage.g:4982:1: ( rule__VLSFunctionAsTerm__Group_1__3__Impl ) |
15466 | // InternalVampireLanguage.g:4983:2: rule__VLSFunctionFof__Group_1__3__Impl | 15466 | // InternalVampireLanguage.g:4983:2: rule__VLSFunctionAsTerm__Group_1__3__Impl |
15467 | { | 15467 | { |
15468 | pushFollow(FOLLOW_2); | 15468 | pushFollow(FOLLOW_2); |
15469 | rule__VLSFunctionFof__Group_1__3__Impl(); | 15469 | rule__VLSFunctionAsTerm__Group_1__3__Impl(); |
15470 | 15470 | ||
15471 | state._fsp--; | 15471 | state._fsp--; |
15472 | 15472 | ||
@@ -15485,12 +15485,12 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15485 | } | 15485 | } |
15486 | return ; | 15486 | return ; |
15487 | } | 15487 | } |
15488 | // $ANTLR end "rule__VLSFunctionFof__Group_1__3" | 15488 | // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__3" |
15489 | 15489 | ||
15490 | 15490 | ||
15491 | // $ANTLR start "rule__VLSFunctionFof__Group_1__3__Impl" | 15491 | // $ANTLR start "rule__VLSFunctionAsTerm__Group_1__3__Impl" |
15492 | // InternalVampireLanguage.g:4989:1: rule__VLSFunctionFof__Group_1__3__Impl : ( ')' ) ; | 15492 | // InternalVampireLanguage.g:4989:1: rule__VLSFunctionAsTerm__Group_1__3__Impl : ( ')' ) ; |
15493 | public final void rule__VLSFunctionFof__Group_1__3__Impl() throws RecognitionException { | 15493 | public final void rule__VLSFunctionAsTerm__Group_1__3__Impl() throws RecognitionException { |
15494 | 15494 | ||
15495 | int stackSize = keepStackSize(); | 15495 | int stackSize = keepStackSize(); |
15496 | 15496 | ||
@@ -15501,9 +15501,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15501 | // InternalVampireLanguage.g:4994:1: ( ')' ) | 15501 | // InternalVampireLanguage.g:4994:1: ( ')' ) |
15502 | // InternalVampireLanguage.g:4995:2: ')' | 15502 | // InternalVampireLanguage.g:4995:2: ')' |
15503 | { | 15503 | { |
15504 | before(grammarAccess.getVLSFunctionFofAccess().getRightParenthesisKeyword_1_3()); | 15504 | before(grammarAccess.getVLSFunctionAsTermAccess().getRightParenthesisKeyword_1_3()); |
15505 | match(input,50,FOLLOW_2); | 15505 | match(input,50,FOLLOW_2); |
15506 | after(grammarAccess.getVLSFunctionFofAccess().getRightParenthesisKeyword_1_3()); | 15506 | after(grammarAccess.getVLSFunctionAsTermAccess().getRightParenthesisKeyword_1_3()); |
15507 | 15507 | ||
15508 | } | 15508 | } |
15509 | 15509 | ||
@@ -15522,26 +15522,26 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15522 | } | 15522 | } |
15523 | return ; | 15523 | return ; |
15524 | } | 15524 | } |
15525 | // $ANTLR end "rule__VLSFunctionFof__Group_1__3__Impl" | 15525 | // $ANTLR end "rule__VLSFunctionAsTerm__Group_1__3__Impl" |
15526 | 15526 | ||
15527 | 15527 | ||
15528 | // $ANTLR start "rule__VLSFunctionFof__Group_1_2__0" | 15528 | // $ANTLR start "rule__VLSFunctionAsTerm__Group_1_2__0" |
15529 | // InternalVampireLanguage.g:5005:1: rule__VLSFunctionFof__Group_1_2__0 : rule__VLSFunctionFof__Group_1_2__0__Impl rule__VLSFunctionFof__Group_1_2__1 ; | 15529 | // InternalVampireLanguage.g:5005:1: rule__VLSFunctionAsTerm__Group_1_2__0 : rule__VLSFunctionAsTerm__Group_1_2__0__Impl rule__VLSFunctionAsTerm__Group_1_2__1 ; |
15530 | public final void rule__VLSFunctionFof__Group_1_2__0() throws RecognitionException { | 15530 | public final void rule__VLSFunctionAsTerm__Group_1_2__0() throws RecognitionException { |
15531 | 15531 | ||
15532 | int stackSize = keepStackSize(); | 15532 | int stackSize = keepStackSize(); |
15533 | 15533 | ||
15534 | try { | 15534 | try { |
15535 | // InternalVampireLanguage.g:5009:1: ( rule__VLSFunctionFof__Group_1_2__0__Impl rule__VLSFunctionFof__Group_1_2__1 ) | 15535 | // InternalVampireLanguage.g:5009:1: ( rule__VLSFunctionAsTerm__Group_1_2__0__Impl rule__VLSFunctionAsTerm__Group_1_2__1 ) |
15536 | // InternalVampireLanguage.g:5010:2: rule__VLSFunctionFof__Group_1_2__0__Impl rule__VLSFunctionFof__Group_1_2__1 | 15536 | // InternalVampireLanguage.g:5010:2: rule__VLSFunctionAsTerm__Group_1_2__0__Impl rule__VLSFunctionAsTerm__Group_1_2__1 |
15537 | { | 15537 | { |
15538 | pushFollow(FOLLOW_38); | 15538 | pushFollow(FOLLOW_38); |
15539 | rule__VLSFunctionFof__Group_1_2__0__Impl(); | 15539 | rule__VLSFunctionAsTerm__Group_1_2__0__Impl(); |
15540 | 15540 | ||
15541 | state._fsp--; | 15541 | state._fsp--; |
15542 | 15542 | ||
15543 | pushFollow(FOLLOW_2); | 15543 | pushFollow(FOLLOW_2); |
15544 | rule__VLSFunctionFof__Group_1_2__1(); | 15544 | rule__VLSFunctionAsTerm__Group_1_2__1(); |
15545 | 15545 | ||
15546 | state._fsp--; | 15546 | state._fsp--; |
15547 | 15547 | ||
@@ -15560,12 +15560,12 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15560 | } | 15560 | } |
15561 | return ; | 15561 | return ; |
15562 | } | 15562 | } |
15563 | // $ANTLR end "rule__VLSFunctionFof__Group_1_2__0" | 15563 | // $ANTLR end "rule__VLSFunctionAsTerm__Group_1_2__0" |
15564 | 15564 | ||
15565 | 15565 | ||
15566 | // $ANTLR start "rule__VLSFunctionFof__Group_1_2__0__Impl" | 15566 | // $ANTLR start "rule__VLSFunctionAsTerm__Group_1_2__0__Impl" |
15567 | // InternalVampireLanguage.g:5017:1: rule__VLSFunctionFof__Group_1_2__0__Impl : ( ',' ) ; | 15567 | // InternalVampireLanguage.g:5017:1: rule__VLSFunctionAsTerm__Group_1_2__0__Impl : ( ',' ) ; |
15568 | public final void rule__VLSFunctionFof__Group_1_2__0__Impl() throws RecognitionException { | 15568 | public final void rule__VLSFunctionAsTerm__Group_1_2__0__Impl() throws RecognitionException { |
15569 | 15569 | ||
15570 | int stackSize = keepStackSize(); | 15570 | int stackSize = keepStackSize(); |
15571 | 15571 | ||
@@ -15576,9 +15576,9 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15576 | // InternalVampireLanguage.g:5022:1: ( ',' ) | 15576 | // InternalVampireLanguage.g:5022:1: ( ',' ) |
15577 | // InternalVampireLanguage.g:5023:2: ',' | 15577 | // InternalVampireLanguage.g:5023:2: ',' |
15578 | { | 15578 | { |
15579 | before(grammarAccess.getVLSFunctionFofAccess().getCommaKeyword_1_2_0()); | 15579 | before(grammarAccess.getVLSFunctionAsTermAccess().getCommaKeyword_1_2_0()); |
15580 | match(input,45,FOLLOW_2); | 15580 | match(input,45,FOLLOW_2); |
15581 | after(grammarAccess.getVLSFunctionFofAccess().getCommaKeyword_1_2_0()); | 15581 | after(grammarAccess.getVLSFunctionAsTermAccess().getCommaKeyword_1_2_0()); |
15582 | 15582 | ||
15583 | } | 15583 | } |
15584 | 15584 | ||
@@ -15597,21 +15597,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15597 | } | 15597 | } |
15598 | return ; | 15598 | return ; |
15599 | } | 15599 | } |
15600 | // $ANTLR end "rule__VLSFunctionFof__Group_1_2__0__Impl" | 15600 | // $ANTLR end "rule__VLSFunctionAsTerm__Group_1_2__0__Impl" |
15601 | 15601 | ||
15602 | 15602 | ||
15603 | // $ANTLR start "rule__VLSFunctionFof__Group_1_2__1" | 15603 | // $ANTLR start "rule__VLSFunctionAsTerm__Group_1_2__1" |
15604 | // InternalVampireLanguage.g:5032:1: rule__VLSFunctionFof__Group_1_2__1 : rule__VLSFunctionFof__Group_1_2__1__Impl ; | 15604 | // InternalVampireLanguage.g:5032:1: rule__VLSFunctionAsTerm__Group_1_2__1 : rule__VLSFunctionAsTerm__Group_1_2__1__Impl ; |
15605 | public final void rule__VLSFunctionFof__Group_1_2__1() throws RecognitionException { | 15605 | public final void rule__VLSFunctionAsTerm__Group_1_2__1() throws RecognitionException { |
15606 | 15606 | ||
15607 | int stackSize = keepStackSize(); | 15607 | int stackSize = keepStackSize(); |
15608 | 15608 | ||
15609 | try { | 15609 | try { |
15610 | // InternalVampireLanguage.g:5036:1: ( rule__VLSFunctionFof__Group_1_2__1__Impl ) | 15610 | // InternalVampireLanguage.g:5036:1: ( rule__VLSFunctionAsTerm__Group_1_2__1__Impl ) |
15611 | // InternalVampireLanguage.g:5037:2: rule__VLSFunctionFof__Group_1_2__1__Impl | 15611 | // InternalVampireLanguage.g:5037:2: rule__VLSFunctionAsTerm__Group_1_2__1__Impl |
15612 | { | 15612 | { |
15613 | pushFollow(FOLLOW_2); | 15613 | pushFollow(FOLLOW_2); |
15614 | rule__VLSFunctionFof__Group_1_2__1__Impl(); | 15614 | rule__VLSFunctionAsTerm__Group_1_2__1__Impl(); |
15615 | 15615 | ||
15616 | state._fsp--; | 15616 | state._fsp--; |
15617 | 15617 | ||
@@ -15630,35 +15630,35 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15630 | } | 15630 | } |
15631 | return ; | 15631 | return ; |
15632 | } | 15632 | } |
15633 | // $ANTLR end "rule__VLSFunctionFof__Group_1_2__1" | 15633 | // $ANTLR end "rule__VLSFunctionAsTerm__Group_1_2__1" |
15634 | 15634 | ||
15635 | 15635 | ||
15636 | // $ANTLR start "rule__VLSFunctionFof__Group_1_2__1__Impl" | 15636 | // $ANTLR start "rule__VLSFunctionAsTerm__Group_1_2__1__Impl" |
15637 | // InternalVampireLanguage.g:5043:1: rule__VLSFunctionFof__Group_1_2__1__Impl : ( ( rule__VLSFunctionFof__TermsAssignment_1_2_1 ) ) ; | 15637 | // InternalVampireLanguage.g:5043:1: rule__VLSFunctionAsTerm__Group_1_2__1__Impl : ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 ) ) ; |
15638 | public final void rule__VLSFunctionFof__Group_1_2__1__Impl() throws RecognitionException { | 15638 | public final void rule__VLSFunctionAsTerm__Group_1_2__1__Impl() throws RecognitionException { |
15639 | 15639 | ||
15640 | int stackSize = keepStackSize(); | 15640 | int stackSize = keepStackSize(); |
15641 | 15641 | ||
15642 | try { | 15642 | try { |
15643 | // InternalVampireLanguage.g:5047:1: ( ( ( rule__VLSFunctionFof__TermsAssignment_1_2_1 ) ) ) | 15643 | // InternalVampireLanguage.g:5047:1: ( ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 ) ) ) |
15644 | // InternalVampireLanguage.g:5048:1: ( ( rule__VLSFunctionFof__TermsAssignment_1_2_1 ) ) | 15644 | // InternalVampireLanguage.g:5048:1: ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 ) ) |
15645 | { | 15645 | { |
15646 | // InternalVampireLanguage.g:5048:1: ( ( rule__VLSFunctionFof__TermsAssignment_1_2_1 ) ) | 15646 | // InternalVampireLanguage.g:5048:1: ( ( rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 ) ) |
15647 | // InternalVampireLanguage.g:5049:2: ( rule__VLSFunctionFof__TermsAssignment_1_2_1 ) | 15647 | // InternalVampireLanguage.g:5049:2: ( rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 ) |
15648 | { | 15648 | { |
15649 | before(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_2_1()); | 15649 | before(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_2_1()); |
15650 | // InternalVampireLanguage.g:5050:2: ( rule__VLSFunctionFof__TermsAssignment_1_2_1 ) | 15650 | // InternalVampireLanguage.g:5050:2: ( rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 ) |
15651 | // InternalVampireLanguage.g:5050:3: rule__VLSFunctionFof__TermsAssignment_1_2_1 | 15651 | // InternalVampireLanguage.g:5050:3: rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 |
15652 | { | 15652 | { |
15653 | pushFollow(FOLLOW_2); | 15653 | pushFollow(FOLLOW_2); |
15654 | rule__VLSFunctionFof__TermsAssignment_1_2_1(); | 15654 | rule__VLSFunctionAsTerm__TermsAssignment_1_2_1(); |
15655 | 15655 | ||
15656 | state._fsp--; | 15656 | state._fsp--; |
15657 | 15657 | ||
15658 | 15658 | ||
15659 | } | 15659 | } |
15660 | 15660 | ||
15661 | after(grammarAccess.getVLSFunctionFofAccess().getTermsAssignment_1_2_1()); | 15661 | after(grammarAccess.getVLSFunctionAsTermAccess().getTermsAssignment_1_2_1()); |
15662 | 15662 | ||
15663 | } | 15663 | } |
15664 | 15664 | ||
@@ -15677,7 +15677,7 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
15677 | } | 15677 | } |
15678 | return ; | 15678 | return ; |
15679 | } | 15679 | } |
15680 | // $ANTLR end "rule__VLSFunctionFof__Group_1_2__1__Impl" | 15680 | // $ANTLR end "rule__VLSFunctionAsTerm__Group_1_2__1__Impl" |
15681 | 15681 | ||
15682 | 15682 | ||
15683 | // $ANTLR start "rule__VLSDefinedTerm__Group_0__0" | 15683 | // $ANTLR start "rule__VLSDefinedTerm__Group_0__0" |
@@ -18009,32 +18009,32 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
18009 | // $ANTLR end "rule__VLSVariable__NameAssignment" | 18009 | // $ANTLR end "rule__VLSVariable__NameAssignment" |
18010 | 18010 | ||
18011 | 18011 | ||
18012 | // $ANTLR start "rule__VLSFunctionFof__FunctorAssignment_0" | 18012 | // $ANTLR start "rule__VLSFunctionAsTerm__FunctorAssignment_0" |
18013 | // InternalVampireLanguage.g:5894:1: rule__VLSFunctionFof__FunctorAssignment_0 : ( ( rule__VLSFunctionFof__FunctorAlternatives_0_0 ) ) ; | 18013 | // InternalVampireLanguage.g:5894:1: rule__VLSFunctionAsTerm__FunctorAssignment_0 : ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) ) ; |
18014 | public final void rule__VLSFunctionFof__FunctorAssignment_0() throws RecognitionException { | 18014 | public final void rule__VLSFunctionAsTerm__FunctorAssignment_0() throws RecognitionException { |
18015 | 18015 | ||
18016 | int stackSize = keepStackSize(); | 18016 | int stackSize = keepStackSize(); |
18017 | 18017 | ||
18018 | try { | 18018 | try { |
18019 | // InternalVampireLanguage.g:5898:1: ( ( ( rule__VLSFunctionFof__FunctorAlternatives_0_0 ) ) ) | 18019 | // InternalVampireLanguage.g:5898:1: ( ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) ) ) |
18020 | // InternalVampireLanguage.g:5899:2: ( ( rule__VLSFunctionFof__FunctorAlternatives_0_0 ) ) | 18020 | // InternalVampireLanguage.g:5899:2: ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) ) |
18021 | { | 18021 | { |
18022 | // InternalVampireLanguage.g:5899:2: ( ( rule__VLSFunctionFof__FunctorAlternatives_0_0 ) ) | 18022 | // InternalVampireLanguage.g:5899:2: ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) ) |
18023 | // InternalVampireLanguage.g:5900:3: ( rule__VLSFunctionFof__FunctorAlternatives_0_0 ) | 18023 | // InternalVampireLanguage.g:5900:3: ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) |
18024 | { | 18024 | { |
18025 | before(grammarAccess.getVLSFunctionFofAccess().getFunctorAlternatives_0_0()); | 18025 | before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAlternatives_0_0()); |
18026 | // InternalVampireLanguage.g:5901:3: ( rule__VLSFunctionFof__FunctorAlternatives_0_0 ) | 18026 | // InternalVampireLanguage.g:5901:3: ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) |
18027 | // InternalVampireLanguage.g:5901:4: rule__VLSFunctionFof__FunctorAlternatives_0_0 | 18027 | // InternalVampireLanguage.g:5901:4: rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 |
18028 | { | 18028 | { |
18029 | pushFollow(FOLLOW_2); | 18029 | pushFollow(FOLLOW_2); |
18030 | rule__VLSFunctionFof__FunctorAlternatives_0_0(); | 18030 | rule__VLSFunctionAsTerm__FunctorAlternatives_0_0(); |
18031 | 18031 | ||
18032 | state._fsp--; | 18032 | state._fsp--; |
18033 | 18033 | ||
18034 | 18034 | ||
18035 | } | 18035 | } |
18036 | 18036 | ||
18037 | after(grammarAccess.getVLSFunctionFofAccess().getFunctorAlternatives_0_0()); | 18037 | after(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAlternatives_0_0()); |
18038 | 18038 | ||
18039 | } | 18039 | } |
18040 | 18040 | ||
@@ -18053,12 +18053,12 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
18053 | } | 18053 | } |
18054 | return ; | 18054 | return ; |
18055 | } | 18055 | } |
18056 | // $ANTLR end "rule__VLSFunctionFof__FunctorAssignment_0" | 18056 | // $ANTLR end "rule__VLSFunctionAsTerm__FunctorAssignment_0" |
18057 | 18057 | ||
18058 | 18058 | ||
18059 | // $ANTLR start "rule__VLSFunctionFof__TermsAssignment_1_1" | 18059 | // $ANTLR start "rule__VLSFunctionAsTerm__TermsAssignment_1_1" |
18060 | // InternalVampireLanguage.g:5909:1: rule__VLSFunctionFof__TermsAssignment_1_1 : ( ruleVLSFofTerm ) ; | 18060 | // InternalVampireLanguage.g:5909:1: rule__VLSFunctionAsTerm__TermsAssignment_1_1 : ( ruleVLSFofTerm ) ; |
18061 | public final void rule__VLSFunctionFof__TermsAssignment_1_1() throws RecognitionException { | 18061 | public final void rule__VLSFunctionAsTerm__TermsAssignment_1_1() throws RecognitionException { |
18062 | 18062 | ||
18063 | int stackSize = keepStackSize(); | 18063 | int stackSize = keepStackSize(); |
18064 | 18064 | ||
@@ -18069,13 +18069,13 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
18069 | // InternalVampireLanguage.g:5914:2: ( ruleVLSFofTerm ) | 18069 | // InternalVampireLanguage.g:5914:2: ( ruleVLSFofTerm ) |
18070 | // InternalVampireLanguage.g:5915:3: ruleVLSFofTerm | 18070 | // InternalVampireLanguage.g:5915:3: ruleVLSFofTerm |
18071 | { | 18071 | { |
18072 | before(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); | 18072 | before(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); |
18073 | pushFollow(FOLLOW_2); | 18073 | pushFollow(FOLLOW_2); |
18074 | ruleVLSFofTerm(); | 18074 | ruleVLSFofTerm(); |
18075 | 18075 | ||
18076 | state._fsp--; | 18076 | state._fsp--; |
18077 | 18077 | ||
18078 | after(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); | 18078 | after(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); |
18079 | 18079 | ||
18080 | } | 18080 | } |
18081 | 18081 | ||
@@ -18094,12 +18094,12 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
18094 | } | 18094 | } |
18095 | return ; | 18095 | return ; |
18096 | } | 18096 | } |
18097 | // $ANTLR end "rule__VLSFunctionFof__TermsAssignment_1_1" | 18097 | // $ANTLR end "rule__VLSFunctionAsTerm__TermsAssignment_1_1" |
18098 | 18098 | ||
18099 | 18099 | ||
18100 | // $ANTLR start "rule__VLSFunctionFof__TermsAssignment_1_2_1" | 18100 | // $ANTLR start "rule__VLSFunctionAsTerm__TermsAssignment_1_2_1" |
18101 | // InternalVampireLanguage.g:5924:1: rule__VLSFunctionFof__TermsAssignment_1_2_1 : ( ruleVLSFofTerm ) ; | 18101 | // InternalVampireLanguage.g:5924:1: rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 : ( ruleVLSFofTerm ) ; |
18102 | public final void rule__VLSFunctionFof__TermsAssignment_1_2_1() throws RecognitionException { | 18102 | public final void rule__VLSFunctionAsTerm__TermsAssignment_1_2_1() throws RecognitionException { |
18103 | 18103 | ||
18104 | int stackSize = keepStackSize(); | 18104 | int stackSize = keepStackSize(); |
18105 | 18105 | ||
@@ -18110,13 +18110,13 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
18110 | // InternalVampireLanguage.g:5929:2: ( ruleVLSFofTerm ) | 18110 | // InternalVampireLanguage.g:5929:2: ( ruleVLSFofTerm ) |
18111 | // InternalVampireLanguage.g:5930:3: ruleVLSFofTerm | 18111 | // InternalVampireLanguage.g:5930:3: ruleVLSFofTerm |
18112 | { | 18112 | { |
18113 | before(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); | 18113 | before(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); |
18114 | pushFollow(FOLLOW_2); | 18114 | pushFollow(FOLLOW_2); |
18115 | ruleVLSFofTerm(); | 18115 | ruleVLSFofTerm(); |
18116 | 18116 | ||
18117 | state._fsp--; | 18117 | state._fsp--; |
18118 | 18118 | ||
18119 | after(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); | 18119 | after(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); |
18120 | 18120 | ||
18121 | } | 18121 | } |
18122 | 18122 | ||
@@ -18135,7 +18135,7 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist | |||
18135 | } | 18135 | } |
18136 | return ; | 18136 | return ; |
18137 | } | 18137 | } |
18138 | // $ANTLR end "rule__VLSFunctionFof__TermsAssignment_1_2_1" | 18138 | // $ANTLR end "rule__VLSFunctionAsTerm__TermsAssignment_1_2_1" |
18139 | 18139 | ||
18140 | 18140 | ||
18141 | // $ANTLR start "rule__VLSDefinedTerm__ValueAssignment_0_1" | 18141 | // $ANTLR start "rule__VLSDefinedTerm__ValueAssignment_0_1" |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin index 89a95266..059cb511 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin index 362c1696..3c6361f3 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/META-INF/MANIFEST.MF b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/META-INF/MANIFEST.MF index 7e9ef500..0667fc7f 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/META-INF/MANIFEST.MF +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/META-INF/MANIFEST.MF | |||
@@ -9,7 +9,7 @@ Require-Bundle: ca.mcgill.ecse.dslreasoner.vampire.language, | |||
9 | org.junit;bundle-version="4.12.0", | 9 | org.junit;bundle-version="4.12.0", |
10 | org.eclipse.xtext.testing, | 10 | org.eclipse.xtext.testing, |
11 | org.eclipse.xtext.xbase.testing, | 11 | org.eclipse.xtext.xbase.testing, |
12 | org.eclipse.xtext.xbase.lib | 12 | org.eclipse.xtext.xbase.lib;bundle-version="2.14.0" |
13 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | 13 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
14 | Export-Package: ca.mcgill.ecse.dslreasoner.tests;x-internal=true | 14 | Export-Package: ca.mcgill.ecse.dslreasoner.tests;x-internal=true |
15 | Import-Package: org.hamcrest.core, | 15 | Import-Package: org.hamcrest.core, |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/src-gen/ca/mcgill/ecse/dslreasoner/tests/VampireLanguageInjectorProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/src-gen/ca/mcgill/ecse/dslreasoner/tests/VampireLanguageInjectorProvider.java index f3c1588b..0362a2fa 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/src-gen/ca/mcgill/ecse/dslreasoner/tests/VampireLanguageInjectorProvider.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.tests/src-gen/ca/mcgill/ecse/dslreasoner/tests/VampireLanguageInjectorProvider.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.tests; | 4 | package ca.mcgill.ecse.dslreasoner.tests; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui.tests/src-gen/ca/mcgill/ecse/dslreasoner/ui/tests/VampireLanguageUiInjectorProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui.tests/src-gen/ca/mcgill/ecse/dslreasoner/ui/tests/VampireLanguageUiInjectorProvider.java index 68417ee9..1c2ad5b4 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui.tests/src-gen/ca/mcgill/ecse/dslreasoner/ui/tests/VampireLanguageUiInjectorProvider.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui.tests/src-gen/ca/mcgill/ecse/dslreasoner/ui/tests/VampireLanguageUiInjectorProvider.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.ui.tests; | 4 | package ca.mcgill.ecse.dslreasoner.ui.tests; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/META-INF/MANIFEST.MF b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/META-INF/MANIFEST.MF index baaefd41..48ee7417 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/META-INF/MANIFEST.MF +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/META-INF/MANIFEST.MF | |||
@@ -16,7 +16,7 @@ Require-Bundle: ca.mcgill.ecse.dslreasoner.vampire.language, | |||
16 | org.eclipse.compare, | 16 | org.eclipse.compare, |
17 | org.eclipse.xtext.builder, | 17 | org.eclipse.xtext.builder, |
18 | org.eclipse.xtend.lib;resolution:=optional, | 18 | org.eclipse.xtend.lib;resolution:=optional, |
19 | org.eclipse.xtext.xbase.lib | 19 | org.eclipse.xtext.xbase.lib;bundle-version="2.14.0" |
20 | Import-Package: org.apache.log4j | 20 | Import-Package: org.apache.log4j |
21 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | 21 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
22 | Export-Package: ca.mcgill.ecse.dslreasoner.ui.contentassist, | 22 | Export-Package: ca.mcgill.ecse.dslreasoner.ui.contentassist, |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/plugin.xml_gen b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/plugin.xml_gen new file mode 100644 index 00000000..cbb504dd --- /dev/null +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/plugin.xml_gen | |||
@@ -0,0 +1,434 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2 | <?eclipse version="3.0"?> | ||
3 | <plugin> | ||
4 | <extension | ||
5 | point="org.eclipse.ui.editors"> | ||
6 | <editor | ||
7 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor" | ||
8 | contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor" | ||
9 | default="true" | ||
10 | extensions="tptp" | ||
11 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
12 | name="VampireLanguage Editor"> | ||
13 | </editor> | ||
14 | </extension> | ||
15 | <extension | ||
16 | point="org.eclipse.ui.handlers"> | ||
17 | <handler | ||
18 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler" | ||
19 | commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration"> | ||
20 | <activeWhen> | ||
21 | <reference | ||
22 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
23 | </reference> | ||
24 | </activeWhen> | ||
25 | </handler> | ||
26 | <handler | ||
27 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler" | ||
28 | commandId="ca.mcgill.ecse.dslreasoner.VampireLanguage.validate"> | ||
29 | <activeWhen> | ||
30 | <reference | ||
31 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
32 | </reference> | ||
33 | </activeWhen> | ||
34 | </handler> | ||
35 | <!-- copy qualified name --> | ||
36 | <handler | ||
37 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler" | ||
38 | commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"> | ||
39 | <activeWhen> | ||
40 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" /> | ||
41 | </activeWhen> | ||
42 | </handler> | ||
43 | <handler | ||
44 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler" | ||
45 | commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"> | ||
46 | <activeWhen> | ||
47 | <and> | ||
48 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.XtextEditor.opened" /> | ||
49 | <iterate> | ||
50 | <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" /> | ||
51 | </iterate> | ||
52 | </and> | ||
53 | </activeWhen> | ||
54 | </handler> | ||
55 | </extension> | ||
56 | <extension point="org.eclipse.core.expressions.definitions"> | ||
57 | <definition id="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
58 | <and> | ||
59 | <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/> | ||
60 | <with variable="activeEditor"> | ||
61 | <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" | ||
62 | value="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
63 | forcePluginActivation="true"/> | ||
64 | </with> | ||
65 | </and> | ||
66 | </definition> | ||
67 | <definition id="ca.mcgill.ecse.dslreasoner.VampireLanguage.XtextEditor.opened"> | ||
68 | <and> | ||
69 | <reference definitionId="isXtextEditorActive"/> | ||
70 | <with variable="activeEditor"> | ||
71 | <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" | ||
72 | value="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
73 | forcePluginActivation="true"/> | ||
74 | </with> | ||
75 | </and> | ||
76 | </definition> | ||
77 | </extension> | ||
78 | <extension | ||
79 | point="org.eclipse.ui.preferencePages"> | ||
80 | <page | ||
81 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage" | ||
82 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
83 | name="VampireLanguage"> | ||
84 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
85 | </page> | ||
86 | <page | ||
87 | category="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
88 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage" | ||
89 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.coloring" | ||
90 | name="Syntax Coloring"> | ||
91 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
92 | </page> | ||
93 | <page | ||
94 | category="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
95 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage" | ||
96 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.templates" | ||
97 | name="Templates"> | ||
98 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
99 | </page> | ||
100 | </extension> | ||
101 | <extension | ||
102 | point="org.eclipse.ui.propertyPages"> | ||
103 | <page | ||
104 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage" | ||
105 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
106 | name="VampireLanguage"> | ||
107 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
108 | <enabledWhen> | ||
109 | <adapt type="org.eclipse.core.resources.IProject"/> | ||
110 | </enabledWhen> | ||
111 | <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/> | ||
112 | </page> | ||
113 | </extension> | ||
114 | <extension | ||
115 | point="org.eclipse.ui.keywords"> | ||
116 | <keyword | ||
117 | id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage" | ||
118 | label="VampireLanguage"/> | ||
119 | </extension> | ||
120 | <extension | ||
121 | point="org.eclipse.ui.commands"> | ||
122 | <command | ||
123 | description="Trigger expensive validation" | ||
124 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.validate" | ||
125 | name="Validate"> | ||
126 | </command> | ||
127 | <!-- copy qualified name --> | ||
128 | <command | ||
129 | id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" | ||
130 | categoryId="org.eclipse.ui.category.edit" | ||
131 | description="Copy the qualified name for the selected element" | ||
132 | name="Copy Qualified Name"> | ||
133 | </command> | ||
134 | <command | ||
135 | id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName" | ||
136 | categoryId="org.eclipse.ui.category.edit" | ||
137 | description="Copy the qualified name for the selected element" | ||
138 | name="Copy Qualified Name"> | ||
139 | </command> | ||
140 | </extension> | ||
141 | <extension point="org.eclipse.ui.menus"> | ||
142 | <menuContribution | ||
143 | locationURI="popup:#TextEditorContext?after=group.edit"> | ||
144 | <command | ||
145 | commandId="ca.mcgill.ecse.dslreasoner.VampireLanguage.validate" | ||
146 | style="push" | ||
147 | tooltip="Trigger expensive validation"> | ||
148 | <visibleWhen checkEnabled="false"> | ||
149 | <reference | ||
150 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
151 | </reference> | ||
152 | </visibleWhen> | ||
153 | </command> | ||
154 | </menuContribution> | ||
155 | <!-- copy qualified name --> | ||
156 | <menuContribution locationURI="popup:#TextEditorContext?after=copy"> | ||
157 | <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" | ||
158 | style="push" tooltip="Copy Qualified Name"> | ||
159 | <visibleWhen checkEnabled="false"> | ||
160 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" /> | ||
161 | </visibleWhen> | ||
162 | </command> | ||
163 | </menuContribution> | ||
164 | <menuContribution locationURI="menu:edit?after=copy"> | ||
165 | <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" | ||
166 | style="push" tooltip="Copy Qualified Name"> | ||
167 | <visibleWhen checkEnabled="false"> | ||
168 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" /> | ||
169 | </visibleWhen> | ||
170 | </command> | ||
171 | </menuContribution> | ||
172 | <menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions"> | ||
173 | <command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName" | ||
174 | style="push" tooltip="Copy Qualified Name"> | ||
175 | <visibleWhen checkEnabled="false"> | ||
176 | <and> | ||
177 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.XtextEditor.opened" /> | ||
178 | <iterate> | ||
179 | <adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" /> | ||
180 | </iterate> | ||
181 | </and> | ||
182 | </visibleWhen> | ||
183 | </command> | ||
184 | </menuContribution> | ||
185 | </extension> | ||
186 | <extension point="org.eclipse.ui.menus"> | ||
187 | <menuContribution locationURI="popup:#TextEditorContext?endof=group.find"> | ||
188 | <command commandId="org.eclipse.xtext.ui.editor.FindReferences"> | ||
189 | <visibleWhen checkEnabled="false"> | ||
190 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
191 | </reference> | ||
192 | </visibleWhen> | ||
193 | </command> | ||
194 | </menuContribution> | ||
195 | </extension> | ||
196 | <extension point="org.eclipse.ui.handlers"> | ||
197 | <handler | ||
198 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler" | ||
199 | commandId="org.eclipse.xtext.ui.editor.FindReferences"> | ||
200 | <activeWhen> | ||
201 | <reference | ||
202 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
203 | </reference> | ||
204 | </activeWhen> | ||
205 | </handler> | ||
206 | </extension> | ||
207 | <extension point="org.eclipse.core.contenttype.contentTypes"> | ||
208 | <content-type | ||
209 | base-type="org.eclipse.core.runtime.text" | ||
210 | file-extensions="tptp" | ||
211 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.contenttype" | ||
212 | name="VampireLanguage File" | ||
213 | priority="normal"> | ||
214 | </content-type> | ||
215 | </extension> | ||
216 | <!-- adding resource factories --> | ||
217 | <extension | ||
218 | point="org.eclipse.emf.ecore.extension_parser"> | ||
219 | <parser | ||
220 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory" | ||
221 | type="tptp"> | ||
222 | </parser> | ||
223 | </extension> | ||
224 | <extension point="org.eclipse.xtext.extension_resourceServiceProvider"> | ||
225 | <resourceServiceProvider | ||
226 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider" | ||
227 | uriExtension="tptp"> | ||
228 | </resourceServiceProvider> | ||
229 | </extension> | ||
230 | <!-- marker definitions for ca.mcgill.ecse.dslreasoner.VampireLanguage --> | ||
231 | <extension | ||
232 | id="vampirelanguage.check.fast" | ||
233 | name="VampireLanguage Problem" | ||
234 | point="org.eclipse.core.resources.markers"> | ||
235 | <super type="org.eclipse.xtext.ui.check.fast"/> | ||
236 | <persistent value="true"/> | ||
237 | </extension> | ||
238 | <extension | ||
239 | id="vampirelanguage.check.normal" | ||
240 | name="VampireLanguage Problem" | ||
241 | point="org.eclipse.core.resources.markers"> | ||
242 | <super type="org.eclipse.xtext.ui.check.normal"/> | ||
243 | <persistent value="true"/> | ||
244 | </extension> | ||
245 | <extension | ||
246 | id="vampirelanguage.check.expensive" | ||
247 | name="VampireLanguage Problem" | ||
248 | point="org.eclipse.core.resources.markers"> | ||
249 | <super type="org.eclipse.xtext.ui.check.expensive"/> | ||
250 | <persistent value="true"/> | ||
251 | </extension> | ||
252 | <extension point="org.eclipse.ui.preferencePages"> | ||
253 | <page | ||
254 | category="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
255 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.validation.ValidatorPreferencePage" | ||
256 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.validator.preferencePage" | ||
257 | name="Errors/Warnings"> | ||
258 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
259 | </page> | ||
260 | </extension> | ||
261 | <extension point="org.eclipse.xtext.builder.participant"> | ||
262 | <participant | ||
263 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant" | ||
264 | fileExtensions="tptp"/> | ||
265 | </extension> | ||
266 | <extension point="org.eclipse.ui.preferencePages"> | ||
267 | <page | ||
268 | category="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
269 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage" | ||
270 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.compiler.preferencePage" | ||
271 | name="Compiler"> | ||
272 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
273 | </page> | ||
274 | </extension> | ||
275 | <extension point="org.eclipse.ui.propertyPages"> | ||
276 | <page | ||
277 | category="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
278 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage" | ||
279 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.compiler.propertyPage" | ||
280 | name="Compiler"> | ||
281 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
282 | <enabledWhen> | ||
283 | <adapt type="org.eclipse.core.resources.IProject"/> | ||
284 | </enabledWhen> | ||
285 | <filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/> | ||
286 | </page> | ||
287 | </extension> | ||
288 | <extension point="org.eclipse.ui.menus"> | ||
289 | <menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration"> | ||
290 | <command | ||
291 | commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand" | ||
292 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.OpenGeneratedCode" | ||
293 | style="push"> | ||
294 | <visibleWhen checkEnabled="false"> | ||
295 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" /> | ||
296 | </visibleWhen> | ||
297 | </command> | ||
298 | </menuContribution> | ||
299 | </extension> | ||
300 | <extension point="org.eclipse.ui.handlers"> | ||
301 | <handler | ||
302 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler" | ||
303 | commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"> | ||
304 | <activeWhen> | ||
305 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened" /> | ||
306 | </activeWhen> | ||
307 | </handler> | ||
308 | </extension> | ||
309 | <!-- Quick Outline --> | ||
310 | <extension | ||
311 | point="org.eclipse.ui.handlers"> | ||
312 | <handler | ||
313 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler" | ||
314 | commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"> | ||
315 | <activeWhen> | ||
316 | <reference | ||
317 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
318 | </reference> | ||
319 | </activeWhen> | ||
320 | </handler> | ||
321 | </extension> | ||
322 | <extension | ||
323 | point="org.eclipse.ui.commands"> | ||
324 | <command | ||
325 | description="Open the quick outline." | ||
326 | id="org.eclipse.xtext.ui.editor.outline.QuickOutline" | ||
327 | name="Quick Outline"> | ||
328 | </command> | ||
329 | </extension> | ||
330 | <extension point="org.eclipse.ui.menus"> | ||
331 | <menuContribution | ||
332 | locationURI="popup:#TextEditorContext?after=group.open"> | ||
333 | <command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline" | ||
334 | style="push" | ||
335 | tooltip="Open Quick Outline"> | ||
336 | <visibleWhen checkEnabled="false"> | ||
337 | <reference definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"/> | ||
338 | </visibleWhen> | ||
339 | </command> | ||
340 | </menuContribution> | ||
341 | </extension> | ||
342 | <!-- quickfix marker resolution generator for ca.mcgill.ecse.dslreasoner.VampireLanguage --> | ||
343 | <extension | ||
344 | point="org.eclipse.ui.ide.markerResolution"> | ||
345 | <markerResolutionGenerator | ||
346 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator" | ||
347 | markerType="ca.mcgill.ecse.dslreasoner.vampire.language.ui.vampirelanguage.check.fast"> | ||
348 | <attribute | ||
349 | name="FIXABLE_KEY" | ||
350 | value="true"> | ||
351 | </attribute> | ||
352 | </markerResolutionGenerator> | ||
353 | <markerResolutionGenerator | ||
354 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator" | ||
355 | markerType="ca.mcgill.ecse.dslreasoner.vampire.language.ui.vampirelanguage.check.normal"> | ||
356 | <attribute | ||
357 | name="FIXABLE_KEY" | ||
358 | value="true"> | ||
359 | </attribute> | ||
360 | </markerResolutionGenerator> | ||
361 | <markerResolutionGenerator | ||
362 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator" | ||
363 | markerType="ca.mcgill.ecse.dslreasoner.vampire.language.ui.vampirelanguage.check.expensive"> | ||
364 | <attribute | ||
365 | name="FIXABLE_KEY" | ||
366 | value="true"> | ||
367 | </attribute> | ||
368 | </markerResolutionGenerator> | ||
369 | </extension> | ||
370 | <!-- Rename Refactoring --> | ||
371 | <extension point="org.eclipse.ui.handlers"> | ||
372 | <handler | ||
373 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler" | ||
374 | commandId="org.eclipse.xtext.ui.refactoring.RenameElement"> | ||
375 | <activeWhen> | ||
376 | <reference | ||
377 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
378 | </reference> | ||
379 | </activeWhen> | ||
380 | </handler> | ||
381 | </extension> | ||
382 | <extension point="org.eclipse.ui.menus"> | ||
383 | <menuContribution | ||
384 | locationURI="popup:#TextEditorContext?after=group.edit"> | ||
385 | <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement" | ||
386 | style="push"> | ||
387 | <visibleWhen checkEnabled="false"> | ||
388 | <reference | ||
389 | definitionId="ca.mcgill.ecse.dslreasoner.VampireLanguage.Editor.opened"> | ||
390 | </reference> | ||
391 | </visibleWhen> | ||
392 | </command> | ||
393 | </menuContribution> | ||
394 | </extension> | ||
395 | <extension point="org.eclipse.ui.preferencePages"> | ||
396 | <page | ||
397 | category="ca.mcgill.ecse.dslreasoner.VampireLanguage" | ||
398 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage" | ||
399 | id="ca.mcgill.ecse.dslreasoner.VampireLanguage.refactoring" | ||
400 | name="Refactoring"> | ||
401 | <keywordReference id="ca.mcgill.ecse.dslreasoner.ui.keyword_VampireLanguage"/> | ||
402 | </page> | ||
403 | </extension> | ||
404 | <extension point="org.eclipse.compare.contentViewers"> | ||
405 | <viewer id="ca.mcgill.ecse.dslreasoner.VampireLanguage.compare.contentViewers" | ||
406 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator" | ||
407 | extensions="tptp"> | ||
408 | </viewer> | ||
409 | <contentTypeBinding | ||
410 | contentTypeId="ca.mcgill.ecse.dslreasoner.VampireLanguage.contenttype" | ||
411 | contentViewerId="ca.mcgill.ecse.dslreasoner.VampireLanguage.compare.contentViewers" /> | ||
412 | </extension> | ||
413 | <extension point="org.eclipse.compare.contentMergeViewers"> | ||
414 | <viewer id="ca.mcgill.ecse.dslreasoner.VampireLanguage.compare.contentMergeViewers" | ||
415 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator" | ||
416 | extensions="tptp" label="VampireLanguage Compare"> | ||
417 | </viewer> | ||
418 | <contentTypeBinding | ||
419 | contentTypeId="ca.mcgill.ecse.dslreasoner.VampireLanguage.contenttype" | ||
420 | contentMergeViewerId="ca.mcgill.ecse.dslreasoner.VampireLanguage.compare.contentMergeViewers" /> | ||
421 | </extension> | ||
422 | <extension point="org.eclipse.ui.editors.documentProviders"> | ||
423 | <provider id="ca.mcgill.ecse.dslreasoner.VampireLanguage.editors.documentProviders" | ||
424 | class="ca.mcgill.ecse.dslreasoner.ui.VampireLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider" | ||
425 | extensions="tptp"> | ||
426 | </provider> | ||
427 | </extension> | ||
428 | <extension point="org.eclipse.team.core.fileTypes"> | ||
429 | <fileTypes | ||
430 | extension="tptp" | ||
431 | type="text"> | ||
432 | </fileTypes> | ||
433 | </extension> | ||
434 | </plugin> | ||
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 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.ui; | 4 | package ca.mcgill.ecse.dslreasoner.ui; |
5 | 5 | ||
@@ -11,6 +11,7 @@ import ca.mcgill.ecse.dslreasoner.ui.labeling.VampireLanguageDescriptionLabelPro | |||
11 | import ca.mcgill.ecse.dslreasoner.ui.labeling.VampireLanguageLabelProvider; | 11 | import ca.mcgill.ecse.dslreasoner.ui.labeling.VampireLanguageLabelProvider; |
12 | import ca.mcgill.ecse.dslreasoner.ui.outline.VampireLanguageOutlineTreeProvider; | 12 | import ca.mcgill.ecse.dslreasoner.ui.outline.VampireLanguageOutlineTreeProvider; |
13 | import ca.mcgill.ecse.dslreasoner.ui.quickfix.VampireLanguageQuickfixProvider; | 13 | import ca.mcgill.ecse.dslreasoner.ui.quickfix.VampireLanguageQuickfixProvider; |
14 | import ca.mcgill.ecse.dslreasoner.validation.VampireLanguageValidatorConfigurationBlock; | ||
14 | import com.google.inject.Binder; | 15 | import com.google.inject.Binder; |
15 | import com.google.inject.Provider; | 16 | import com.google.inject.Provider; |
16 | import com.google.inject.name.Names; | 17 | import com.google.inject.name.Names; |
@@ -78,6 +79,7 @@ import org.eclipse.xtext.ui.refactoring.ui.IRenameSupport; | |||
78 | import org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferences; | 79 | import org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferences; |
79 | import org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider; | 80 | import org.eclipse.xtext.ui.resource.ResourceServiceDescriptionLabelProvider; |
80 | import org.eclipse.xtext.ui.shared.Access; | 81 | import org.eclipse.xtext.ui.shared.Access; |
82 | import org.eclipse.xtext.ui.validation.AbstractValidatorConfigurationBlock; | ||
81 | 83 | ||
82 | /** | 84 | /** |
83 | * Manual modifications go to {@link VampireLanguageUiModule}. | 85 | * Manual modifications go to {@link VampireLanguageUiModule}. |
@@ -135,6 +137,11 @@ public abstract class AbstractVampireLanguageUiModule extends DefaultUiModule { | |||
135 | binder.bind(InternalVampireLanguageLexer.class).toProvider(LexerProvider.create(InternalVampireLanguageLexer.class)); | 137 | binder.bind(InternalVampireLanguageLexer.class).toProvider(LexerProvider.create(InternalVampireLanguageLexer.class)); |
136 | } | 138 | } |
137 | 139 | ||
140 | // contributed by org.eclipse.xtext.xtext.generator.validation.ValidatorFragment2 | ||
141 | public Class<? extends AbstractValidatorConfigurationBlock> bindAbstractValidatorConfigurationBlock() { | ||
142 | return VampireLanguageValidatorConfigurationBlock.class; | ||
143 | } | ||
144 | |||
138 | // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2 | 145 | // contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2 |
139 | public Class<? extends PrefixMatcher> bindPrefixMatcher() { | 146 | public Class<? extends PrefixMatcher> bindPrefixMatcher() { |
140 | return FQNPrefixMatcher.class; | 147 | return FQNPrefixMatcher.class; |
@@ -223,6 +230,13 @@ public abstract class AbstractVampireLanguageUiModule extends DefaultUiModule { | |||
223 | } | 230 | } |
224 | 231 | ||
225 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | 232 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 |
233 | public void configureIPreferenceStoreInitializer(Binder binder) { | ||
234 | binder.bind(IPreferenceStoreInitializer.class) | ||
235 | .annotatedWith(Names.named("RefactoringPreferences")) | ||
236 | .to(RefactoringPreferences.Initializer.class); | ||
237 | } | ||
238 | |||
239 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | ||
226 | public Class<? extends IRenameStrategy> bindIRenameStrategy() { | 240 | public Class<? extends IRenameStrategy> bindIRenameStrategy() { |
227 | return DefaultRenameStrategy.class; | 241 | return DefaultRenameStrategy.class; |
228 | } | 242 | } |
@@ -233,13 +247,6 @@ public abstract class AbstractVampireLanguageUiModule extends DefaultUiModule { | |||
233 | } | 247 | } |
234 | 248 | ||
235 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | 249 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 |
236 | public void configureIPreferenceStoreInitializer(Binder binder) { | ||
237 | binder.bind(IPreferenceStoreInitializer.class) | ||
238 | .annotatedWith(Names.named("RefactoringPreferences")) | ||
239 | .to(RefactoringPreferences.Initializer.class); | ||
240 | } | ||
241 | |||
242 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | ||
243 | public Class<? extends IRenameRefactoringProvider> bindIRenameRefactoringProvider() { | 250 | public Class<? extends IRenameRefactoringProvider> bindIRenameRefactoringProvider() { |
244 | return DefaultRenameRefactoringProvider.class; | 251 | return DefaultRenameRefactoringProvider.class; |
245 | } | 252 | } |
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 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.ui; | 4 | package ca.mcgill.ecse.dslreasoner.ui; |
5 | 5 | ||
6 | import ca.mcgill.ecse.dslreasoner.vampire.language.ui.internal.LanguageActivator; | 6 | import ca.mcgill.ecse.dslreasoner.vampire.language.ui.internal.LanguageActivator; |
7 | import com.google.inject.Injector; | 7 | import com.google.inject.Injector; |
8 | import org.eclipse.core.runtime.Platform; | ||
8 | import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory; | 9 | import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory; |
9 | import org.osgi.framework.Bundle; | 10 | import org.osgi.framework.Bundle; |
10 | 11 | ||
@@ -16,12 +17,13 @@ public class VampireLanguageExecutableExtensionFactory extends AbstractGuiceAwar | |||
16 | 17 | ||
17 | @Override | 18 | @Override |
18 | protected Bundle getBundle() { | 19 | protected Bundle getBundle() { |
19 | return LanguageActivator.getInstance().getBundle(); | 20 | return Platform.getBundle(LanguageActivator.PLUGIN_ID); |
20 | } | 21 | } |
21 | 22 | ||
22 | @Override | 23 | @Override |
23 | protected Injector getInjector() { | 24 | protected Injector getInjector() { |
24 | return LanguageActivator.getInstance().getInjector(LanguageActivator.CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE); | 25 | LanguageActivator activator = LanguageActivator.getInstance(); |
26 | return activator != null ? activator.getInjector(LanguageActivator.CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE) : null; | ||
25 | } | 27 | } |
26 | 28 | ||
27 | } | 29 | } |
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 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.ui.contentassist; | 4 | package ca.mcgill.ecse.dslreasoner.ui.contentassist; |
5 | 5 | ||
@@ -131,13 +131,13 @@ public abstract class AbstractVampireLanguageProposalProvider extends TerminalsP | |||
131 | public void completeVLSVariable_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 131 | public void completeVLSVariable_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
132 | completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); | 132 | completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); |
133 | } | 133 | } |
134 | public void completeVLSFunctionFof_Functor(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 134 | public void completeVLSFunctionAsTerm_Functor(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
135 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(0)), context, acceptor); | 135 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(0)), context, acceptor); |
136 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(1)), context, acceptor); | 136 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(1)), context, acceptor); |
137 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(2)), context, acceptor); | 137 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(2)), context, acceptor); |
138 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(3)), context, acceptor); | 138 | completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(3)), context, acceptor); |
139 | } | 139 | } |
140 | public void completeVLSFunctionFof_Terms(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 140 | public void completeVLSFunctionAsTerm_Terms(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
141 | completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); | 141 | completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); |
142 | } | 142 | } |
143 | public void completeVLSDefinedTerm_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 143 | public void completeVLSDefinedTerm_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
@@ -267,7 +267,7 @@ public abstract class AbstractVampireLanguageProposalProvider extends TerminalsP | |||
267 | public void complete_VLSFofTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 267 | public void complete_VLSFofTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
268 | // subclasses may override | 268 | // subclasses may override |
269 | } | 269 | } |
270 | public void complete_VLSFunctionFof(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 270 | public void complete_VLSFunctionAsTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
271 | // subclasses may override | 271 | // subclasses may override |
272 | } | 272 | } |
273 | public void complete_VLSDefinedTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { | 273 | public void complete_VLSDefinedTerm(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageValidatorConfigurationBlock.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageValidatorConfigurationBlock.java new file mode 100644 index 00000000..9faf6232 --- /dev/null +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageValidatorConfigurationBlock.java | |||
@@ -0,0 +1,65 @@ | |||
1 | /* | ||
2 | * generated by Xtext 2.14.0 | ||
3 | */ | ||
4 | package ca.mcgill.ecse.dslreasoner.validation; | ||
5 | |||
6 | import org.eclipse.core.resources.IProject; | ||
7 | import org.eclipse.core.resources.ResourcesPlugin; | ||
8 | import org.eclipse.core.runtime.jobs.Job; | ||
9 | import org.eclipse.jface.dialogs.IDialogSettings; | ||
10 | import org.eclipse.swt.widgets.Combo; | ||
11 | import org.eclipse.swt.widgets.Composite; | ||
12 | import org.eclipse.xtext.ui.preferences.OptionsConfigurationBlock; | ||
13 | import org.eclipse.xtext.ui.validation.AbstractValidatorConfigurationBlock; | ||
14 | import org.eclipse.xtext.validation.SeverityConverter; | ||
15 | |||
16 | @SuppressWarnings("restriction") | ||
17 | public class VampireLanguageValidatorConfigurationBlock extends AbstractValidatorConfigurationBlock { | ||
18 | |||
19 | @Override | ||
20 | protected void fillSettingsPage(Composite composite, int nColumns, int defaultIndent) { | ||
21 | addComboBox(VampireLanguageConfigurableIssueCodesProvider.DEPRECATED_MODEL_PART, "Deprecated Model Part", composite, defaultIndent); | ||
22 | } | ||
23 | |||
24 | @Override | ||
25 | protected Job getBuildJob(IProject project) { | ||
26 | Job buildJob = new OptionsConfigurationBlock.BuildJob("Validation Settings Changed", project); | ||
27 | buildJob.setRule(ResourcesPlugin.getWorkspace().getRuleFactory().buildRule()); | ||
28 | buildJob.setUser(true); | ||
29 | return buildJob; | ||
30 | } | ||
31 | |||
32 | @Override | ||
33 | protected String[] getFullBuildDialogStrings(boolean workspaceSettings) { | ||
34 | return new String[] { "Validation Settings Changed", | ||
35 | "Validation settings have changed. A full rebuild is required for changes to take effect. Do the full build now?" }; | ||
36 | } | ||
37 | |||
38 | @Override | ||
39 | protected void validateSettings(String changedKey, String oldValue, String newValue) { | ||
40 | } | ||
41 | |||
42 | protected Combo addComboBox(String prefKey, String label, Composite parent, int indent) { | ||
43 | String[] values = new String[] { SeverityConverter.SEVERITY_ERROR, SeverityConverter.SEVERITY_WARNING, | ||
44 | SeverityConverter.SEVERITY_INFO, SeverityConverter.SEVERITY_IGNORE }; | ||
45 | String[] valueLabels = new String[] { "Error", "Warning", "Info", "Ignore" }; | ||
46 | Combo comboBox = addComboBox(parent, label, prefKey, indent, values, valueLabels); | ||
47 | return comboBox; | ||
48 | } | ||
49 | |||
50 | @Override | ||
51 | public void dispose() { | ||
52 | storeSectionExpansionStates(getDialogSettings()); | ||
53 | super.dispose(); | ||
54 | } | ||
55 | |||
56 | @Override | ||
57 | protected IDialogSettings getDialogSettings() { | ||
58 | IDialogSettings dialogSettings = super.getDialogSettings(); | ||
59 | IDialogSettings section = dialogSettings.getSection("VampireLanguage"); | ||
60 | if (section == null) { | ||
61 | return dialogSettings.addNewSection("VampireLanguage"); | ||
62 | } | ||
63 | return section; | ||
64 | } | ||
65 | } | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java index eca3aa7f..b25ea8a3 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampire.language.ui.internal; | 4 | package ca.mcgill.ecse.dslreasoner.vampire.language.ui.internal; |
5 | 5 | ||
@@ -8,7 +8,6 @@ import ca.mcgill.ecse.dslreasoner.ui.VampireLanguageUiModule; | |||
8 | import com.google.common.collect.Maps; | 8 | import com.google.common.collect.Maps; |
9 | import com.google.inject.Guice; | 9 | import com.google.inject.Guice; |
10 | import com.google.inject.Injector; | 10 | import com.google.inject.Injector; |
11 | import com.google.inject.Module; | ||
12 | import java.util.Collections; | 11 | import java.util.Collections; |
13 | import java.util.Map; | 12 | import java.util.Map; |
14 | import org.apache.log4j.Logger; | 13 | import org.apache.log4j.Logger; |
@@ -23,6 +22,7 @@ import org.osgi.framework.BundleContext; | |||
23 | */ | 22 | */ |
24 | public class LanguageActivator extends AbstractUIPlugin { | 23 | public class LanguageActivator extends AbstractUIPlugin { |
25 | 24 | ||
25 | public static final String PLUGIN_ID = "ca.mcgill.ecse.dslreasoner.vampire.language.ui"; | ||
26 | public static final String CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE = "ca.mcgill.ecse.dslreasoner.VampireLanguage"; | 26 | public static final String CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE = "ca.mcgill.ecse.dslreasoner.VampireLanguage"; |
27 | 27 | ||
28 | private static final Logger logger = Logger.getLogger(LanguageActivator.class); | 28 | private static final Logger logger = Logger.getLogger(LanguageActivator.class); |
@@ -60,10 +60,10 @@ public class LanguageActivator extends AbstractUIPlugin { | |||
60 | 60 | ||
61 | protected Injector createInjector(String language) { | 61 | protected Injector createInjector(String language) { |
62 | try { | 62 | try { |
63 | Module runtimeModule = getRuntimeModule(language); | 63 | com.google.inject.Module runtimeModule = getRuntimeModule(language); |
64 | Module sharedStateModule = getSharedStateModule(); | 64 | com.google.inject.Module sharedStateModule = getSharedStateModule(); |
65 | Module uiModule = getUiModule(language); | 65 | com.google.inject.Module uiModule = getUiModule(language); |
66 | Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule); | 66 | com.google.inject.Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule); |
67 | return Guice.createInjector(mergedModule); | 67 | return Guice.createInjector(mergedModule); |
68 | } catch (Exception e) { | 68 | } catch (Exception e) { |
69 | logger.error("Failed to create injector for " + language); | 69 | logger.error("Failed to create injector for " + language); |
@@ -72,22 +72,23 @@ public class LanguageActivator extends AbstractUIPlugin { | |||
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | protected Module getRuntimeModule(String grammar) { | 75 | protected com.google.inject.Module getRuntimeModule(String grammar) { |
76 | if (CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE.equals(grammar)) { | 76 | if (CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE.equals(grammar)) { |
77 | return new VampireLanguageRuntimeModule(); | 77 | return new VampireLanguageRuntimeModule(); |
78 | } | 78 | } |
79 | throw new IllegalArgumentException(grammar); | 79 | throw new IllegalArgumentException(grammar); |
80 | } | 80 | } |
81 | 81 | ||
82 | protected Module getUiModule(String grammar) { | 82 | protected com.google.inject.Module getUiModule(String grammar) { |
83 | if (CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE.equals(grammar)) { | 83 | if (CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE.equals(grammar)) { |
84 | return new VampireLanguageUiModule(this); | 84 | return new VampireLanguageUiModule(this); |
85 | } | 85 | } |
86 | throw new IllegalArgumentException(grammar); | 86 | throw new IllegalArgumentException(grammar); |
87 | } | 87 | } |
88 | 88 | ||
89 | protected Module getSharedStateModule() { | 89 | protected com.google.inject.Module getSharedStateModule() { |
90 | return new SharedStateModule(); | 90 | return new SharedStateModule(); |
91 | } | 91 | } |
92 | 92 | ||
93 | |||
93 | } | 94 | } |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin index 67fbde4f..e00e853c 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin index 2f2eaa65..6f5209e7 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/META-INF/MANIFEST.MF b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/META-INF/MANIFEST.MF index 77c42047..9e28a551 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/META-INF/MANIFEST.MF +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/META-INF/MANIFEST.MF | |||
@@ -9,10 +9,10 @@ Require-Bundle: org.eclipse.xtext, | |||
9 | org.eclipse.xtext.xbase, | 9 | org.eclipse.xtext.xbase, |
10 | org.eclipse.equinox.common;bundle-version="3.5.0", | 10 | org.eclipse.equinox.common;bundle-version="3.5.0", |
11 | org.eclipse.emf.ecore, | 11 | org.eclipse.emf.ecore, |
12 | org.eclipse.xtext.xbase.lib, | 12 | org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", |
13 | org.antlr.runtime, | 13 | org.antlr.runtime, |
14 | org.eclipse.xtext.util, | 14 | org.eclipse.xtext.util, |
15 | org.eclipse.xtend.lib, | 15 | org.eclipse.xtend.lib;bundle-version="2.14.0", |
16 | org.eclipse.emf.common | 16 | org.eclipse.emf.common |
17 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | 17 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
18 | Export-Package: ca.mcgill.ecse.dslreasoner.generator, | 18 | Export-Package: ca.mcgill.ecse.dslreasoner.generator, |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore index ff954f57..e529b684 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore | |||
@@ -54,7 +54,7 @@ | |||
54 | <eClassifiers xsi:type="ecore:EClass" name="VLSVariable" eSuperTypes="#//VLSTerm"> | 54 | <eClassifiers xsi:type="ecore:EClass" name="VLSVariable" eSuperTypes="#//VLSTerm"> |
55 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> | 55 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> |
56 | </eClassifiers> | 56 | </eClassifiers> |
57 | <eClassifiers xsi:type="ecore:EClass" name="VLSFunctionFof" eSuperTypes="#//VLSTerm"> | 57 | <eClassifiers xsi:type="ecore:EClass" name="VLSFunctionAsTerm" eSuperTypes="#//VLSTerm"> |
58 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="functor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> | 58 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="functor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> |
59 | <eStructuralFeatures xsi:type="ecore:EReference" name="terms" upperBound="-1" | 59 | <eStructuralFeatures xsi:type="ecore:EReference" name="terms" upperBound="-1" |
60 | eType="#//VLSTerm" containment="true"/> | 60 | eType="#//VLSTerm" containment="true"/> |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel index 655f282b..ef216fb7 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel | |||
@@ -1,9 +1,9 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" | 2 | <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" |
3 | xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.12.0" modelDirectory="/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen" | 3 | xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.14.0" modelDirectory="/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen" |
4 | modelPluginID="ca.mcgill.ecse.dslreasoner.vampire.language" forceOverwrite="true" | 4 | modelPluginID="ca.mcgill.ecse.dslreasoner.vampire.language" forceOverwrite="true" |
5 | modelName="VampireLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" | 5 | modelName="VampireLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" |
6 | complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.13"> | 6 | complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.14"> |
7 | <genPackages prefix="VampireLanguage" basePackage="ca.mcgill.ecse.dslreasoner" disposableProviderFactory="true" | 7 | <genPackages prefix="VampireLanguage" basePackage="ca.mcgill.ecse.dslreasoner" disposableProviderFactory="true" |
8 | fileExtensions="tptp" ecorePackage="VampireLanguage.ecore#/"> | 8 | fileExtensions="tptp" ecorePackage="VampireLanguage.ecore#/"> |
9 | <genClasses ecoreClass="VampireLanguage.ecore#//VampireModel"> | 9 | <genClasses ecoreClass="VampireLanguage.ecore#//VampireModel"> |
@@ -46,9 +46,9 @@ | |||
46 | <genClasses ecoreClass="VampireLanguage.ecore#//VLSVariable"> | 46 | <genClasses ecoreClass="VampireLanguage.ecore#//VLSVariable"> |
47 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSVariable/name"/> | 47 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSVariable/name"/> |
48 | </genClasses> | 48 | </genClasses> |
49 | <genClasses ecoreClass="VampireLanguage.ecore#//VLSFunctionFof"> | 49 | <genClasses ecoreClass="VampireLanguage.ecore#//VLSFunctionAsTerm"> |
50 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSFunctionFof/functor"/> | 50 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSFunctionAsTerm/functor"/> |
51 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSFunctionFof/terms"/> | 51 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSFunctionAsTerm/terms"/> |
52 | </genClasses> | 52 | </genClasses> |
53 | <genClasses ecoreClass="VampireLanguage.ecore#//VLSDefinedTerm"> | 53 | <genClasses ecoreClass="VampireLanguage.ecore#//VLSDefinedTerm"> |
54 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSDefinedTerm/value"/> | 54 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSDefinedTerm/value"/> |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/AbstractVampireLanguageRuntimeModule.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/AbstractVampireLanguageRuntimeModule.java index 5d94a5bb..b5884df4 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/AbstractVampireLanguageRuntimeModule.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/AbstractVampireLanguageRuntimeModule.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner; | 4 | package ca.mcgill.ecse.dslreasoner; |
5 | 5 | ||
@@ -12,6 +12,7 @@ import ca.mcgill.ecse.dslreasoner.scoping.VampireLanguageScopeProvider; | |||
12 | import ca.mcgill.ecse.dslreasoner.serializer.VampireLanguageSemanticSequencer; | 12 | import ca.mcgill.ecse.dslreasoner.serializer.VampireLanguageSemanticSequencer; |
13 | import ca.mcgill.ecse.dslreasoner.serializer.VampireLanguageSyntacticSequencer; | 13 | import ca.mcgill.ecse.dslreasoner.serializer.VampireLanguageSyntacticSequencer; |
14 | import ca.mcgill.ecse.dslreasoner.services.VampireLanguageGrammarAccess; | 14 | import ca.mcgill.ecse.dslreasoner.services.VampireLanguageGrammarAccess; |
15 | import ca.mcgill.ecse.dslreasoner.validation.VampireLanguageConfigurableIssueCodesProvider; | ||
15 | import ca.mcgill.ecse.dslreasoner.validation.VampireLanguageValidator; | 16 | import ca.mcgill.ecse.dslreasoner.validation.VampireLanguageValidator; |
16 | import com.google.inject.Binder; | 17 | import com.google.inject.Binder; |
17 | import com.google.inject.Provider; | 18 | import com.google.inject.Provider; |
@@ -54,6 +55,7 @@ import org.eclipse.xtext.serializer.sequencer.ISemanticSequencer; | |||
54 | import org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer; | 55 | import org.eclipse.xtext.serializer.sequencer.ISyntacticSequencer; |
55 | import org.eclipse.xtext.service.DefaultRuntimeModule; | 56 | import org.eclipse.xtext.service.DefaultRuntimeModule; |
56 | import org.eclipse.xtext.service.SingletonBinding; | 57 | import org.eclipse.xtext.service.SingletonBinding; |
58 | import org.eclipse.xtext.validation.ConfigurableIssueCodesProvider; | ||
57 | 59 | ||
58 | /** | 60 | /** |
59 | * Manual modifications go to {@link VampireLanguageRuntimeModule}. | 61 | * Manual modifications go to {@link VampireLanguageRuntimeModule}. |
@@ -146,6 +148,11 @@ public abstract class AbstractVampireLanguageRuntimeModule extends DefaultRuntim | |||
146 | return VampireLanguageValidator.class; | 148 | return VampireLanguageValidator.class; |
147 | } | 149 | } |
148 | 150 | ||
151 | // contributed by org.eclipse.xtext.xtext.generator.validation.ValidatorFragment2 | ||
152 | public Class<? extends ConfigurableIssueCodesProvider> bindConfigurableIssueCodesProvider() { | ||
153 | return VampireLanguageConfigurableIssueCodesProvider.class; | ||
154 | } | ||
155 | |||
149 | // contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2 | 156 | // contributed by org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2 |
150 | public Class<? extends IScopeProvider> bindIScopeProvider() { | 157 | public Class<? extends IScopeProvider> bindIScopeProvider() { |
151 | return VampireLanguageScopeProvider.class; | 158 | return VampireLanguageScopeProvider.class; |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtextbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtextbin index 337977f1..7b781383 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtextbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtextbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageStandaloneSetupGenerated.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageStandaloneSetupGenerated.java index df52ec67..d2b4312b 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageStandaloneSetupGenerated.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageStandaloneSetupGenerated.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner; | 4 | package ca.mcgill.ecse.dslreasoner; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageAntlrTokenFileProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageAntlrTokenFileProvider.java index a4da8047..43a00009 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageAntlrTokenFileProvider.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageAntlrTokenFileProvider.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.parser.antlr; | 4 | package ca.mcgill.ecse.dslreasoner.parser.antlr; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageParser.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageParser.java index 0e487d5c..11a9d1ed 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageParser.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/VampireLanguageParser.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.parser.antlr; | 4 | package ca.mcgill.ecse.dslreasoner.parser.antlr; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguage.g b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguage.g index 2ab53393..62840209 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguage.g +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguage.g | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | grammar InternalVampireLanguage; | 4 | grammar InternalVampireLanguage; |
5 | 5 | ||
@@ -2187,11 +2187,11 @@ ruleVLSFofTerm returns [EObject current=null] | |||
2187 | } | 2187 | } |
2188 | | | 2188 | | |
2189 | { | 2189 | { |
2190 | newCompositeNode(grammarAccess.getVLSFofTermAccess().getVLSFunctionFofParserRuleCall_1()); | 2190 | newCompositeNode(grammarAccess.getVLSFofTermAccess().getVLSFunctionAsTermParserRuleCall_1()); |
2191 | } | 2191 | } |
2192 | this_VLSFunctionFof_1=ruleVLSFunctionFof | 2192 | this_VLSFunctionAsTerm_1=ruleVLSFunctionAsTerm |
2193 | { | 2193 | { |
2194 | $current = $this_VLSFunctionFof_1.current; | 2194 | $current = $this_VLSFunctionAsTerm_1.current; |
2195 | afterParserOrEnumRuleCall(); | 2195 | afterParserOrEnumRuleCall(); |
2196 | } | 2196 | } |
2197 | | | 2197 | | |
@@ -2206,15 +2206,15 @@ ruleVLSFofTerm returns [EObject current=null] | |||
2206 | ) | 2206 | ) |
2207 | ; | 2207 | ; |
2208 | 2208 | ||
2209 | // Entry rule entryRuleVLSFunctionFof | 2209 | // Entry rule entryRuleVLSFunctionAsTerm |
2210 | entryRuleVLSFunctionFof returns [EObject current=null]: | 2210 | entryRuleVLSFunctionAsTerm returns [EObject current=null]: |
2211 | { newCompositeNode(grammarAccess.getVLSFunctionFofRule()); } | 2211 | { newCompositeNode(grammarAccess.getVLSFunctionAsTermRule()); } |
2212 | iv_ruleVLSFunctionFof=ruleVLSFunctionFof | 2212 | iv_ruleVLSFunctionAsTerm=ruleVLSFunctionAsTerm |
2213 | { $current=$iv_ruleVLSFunctionFof.current; } | 2213 | { $current=$iv_ruleVLSFunctionAsTerm.current; } |
2214 | EOF; | 2214 | EOF; |
2215 | 2215 | ||
2216 | // Rule VLSFunctionFof | 2216 | // Rule VLSFunctionAsTerm |
2217 | ruleVLSFunctionFof returns [EObject current=null] | 2217 | ruleVLSFunctionAsTerm returns [EObject current=null] |
2218 | @init { | 2218 | @init { |
2219 | enterRule(); | 2219 | enterRule(); |
2220 | } | 2220 | } |
@@ -2227,11 +2227,11 @@ ruleVLSFunctionFof returns [EObject current=null] | |||
2227 | ( | 2227 | ( |
2228 | lv_functor_0_1=RULE_LOWER_WORD_ID | 2228 | lv_functor_0_1=RULE_LOWER_WORD_ID |
2229 | { | 2229 | { |
2230 | newLeafNode(lv_functor_0_1, grammarAccess.getVLSFunctionFofAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); | 2230 | newLeafNode(lv_functor_0_1, grammarAccess.getVLSFunctionAsTermAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); |
2231 | } | 2231 | } |
2232 | { | 2232 | { |
2233 | if ($current==null) { | 2233 | if ($current==null) { |
2234 | $current = createModelElement(grammarAccess.getVLSFunctionFofRule()); | 2234 | $current = createModelElement(grammarAccess.getVLSFunctionAsTermRule()); |
2235 | } | 2235 | } |
2236 | setWithLastConsumed( | 2236 | setWithLastConsumed( |
2237 | $current, | 2237 | $current, |
@@ -2242,11 +2242,11 @@ ruleVLSFunctionFof returns [EObject current=null] | |||
2242 | | | 2242 | | |
2243 | lv_functor_0_2=RULE_SINGLE_QUOTE | 2243 | lv_functor_0_2=RULE_SINGLE_QUOTE |
2244 | { | 2244 | { |
2245 | newLeafNode(lv_functor_0_2, grammarAccess.getVLSFunctionFofAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); | 2245 | newLeafNode(lv_functor_0_2, grammarAccess.getVLSFunctionAsTermAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); |
2246 | } | 2246 | } |
2247 | { | 2247 | { |
2248 | if ($current==null) { | 2248 | if ($current==null) { |
2249 | $current = createModelElement(grammarAccess.getVLSFunctionFofRule()); | 2249 | $current = createModelElement(grammarAccess.getVLSFunctionAsTermRule()); |
2250 | } | 2250 | } |
2251 | setWithLastConsumed( | 2251 | setWithLastConsumed( |
2252 | $current, | 2252 | $current, |
@@ -2257,11 +2257,11 @@ ruleVLSFunctionFof returns [EObject current=null] | |||
2257 | | | 2257 | | |
2258 | lv_functor_0_3=RULE_DOLLAR_ID | 2258 | lv_functor_0_3=RULE_DOLLAR_ID |
2259 | { | 2259 | { |
2260 | newLeafNode(lv_functor_0_3, grammarAccess.getVLSFunctionFofAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); | 2260 | newLeafNode(lv_functor_0_3, grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); |
2261 | } | 2261 | } |
2262 | { | 2262 | { |
2263 | if ($current==null) { | 2263 | if ($current==null) { |
2264 | $current = createModelElement(grammarAccess.getVLSFunctionFofRule()); | 2264 | $current = createModelElement(grammarAccess.getVLSFunctionAsTermRule()); |
2265 | } | 2265 | } |
2266 | setWithLastConsumed( | 2266 | setWithLastConsumed( |
2267 | $current, | 2267 | $current, |
@@ -2272,11 +2272,11 @@ ruleVLSFunctionFof returns [EObject current=null] | |||
2272 | | | 2272 | | |
2273 | lv_functor_0_4=RULE_DOUBLE_DOLLAR_ID | 2273 | lv_functor_0_4=RULE_DOUBLE_DOLLAR_ID |
2274 | { | 2274 | { |
2275 | newLeafNode(lv_functor_0_4, grammarAccess.getVLSFunctionFofAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); | 2275 | newLeafNode(lv_functor_0_4, grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); |
2276 | } | 2276 | } |
2277 | { | 2277 | { |
2278 | if ($current==null) { | 2278 | if ($current==null) { |
2279 | $current = createModelElement(grammarAccess.getVLSFunctionFofRule()); | 2279 | $current = createModelElement(grammarAccess.getVLSFunctionAsTermRule()); |
2280 | } | 2280 | } |
2281 | setWithLastConsumed( | 2281 | setWithLastConsumed( |
2282 | $current, | 2282 | $current, |
@@ -2290,17 +2290,17 @@ ruleVLSFunctionFof returns [EObject current=null] | |||
2290 | ( | 2290 | ( |
2291 | otherlv_1='(' | 2291 | otherlv_1='(' |
2292 | { | 2292 | { |
2293 | newLeafNode(otherlv_1, grammarAccess.getVLSFunctionFofAccess().getLeftParenthesisKeyword_1_0()); | 2293 | newLeafNode(otherlv_1, grammarAccess.getVLSFunctionAsTermAccess().getLeftParenthesisKeyword_1_0()); |
2294 | } | 2294 | } |
2295 | ( | 2295 | ( |
2296 | ( | 2296 | ( |
2297 | { | 2297 | { |
2298 | newCompositeNode(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); | 2298 | newCompositeNode(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); |
2299 | } | 2299 | } |
2300 | lv_terms_2_0=ruleVLSFofTerm | 2300 | lv_terms_2_0=ruleVLSFofTerm |
2301 | { | 2301 | { |
2302 | if ($current==null) { | 2302 | if ($current==null) { |
2303 | $current = createModelElementForParent(grammarAccess.getVLSFunctionFofRule()); | 2303 | $current = createModelElementForParent(grammarAccess.getVLSFunctionAsTermRule()); |
2304 | } | 2304 | } |
2305 | add( | 2305 | add( |
2306 | $current, | 2306 | $current, |
@@ -2314,17 +2314,17 @@ ruleVLSFunctionFof returns [EObject current=null] | |||
2314 | ( | 2314 | ( |
2315 | otherlv_3=',' | 2315 | otherlv_3=',' |
2316 | { | 2316 | { |
2317 | newLeafNode(otherlv_3, grammarAccess.getVLSFunctionFofAccess().getCommaKeyword_1_2_0()); | 2317 | newLeafNode(otherlv_3, grammarAccess.getVLSFunctionAsTermAccess().getCommaKeyword_1_2_0()); |
2318 | } | 2318 | } |
2319 | ( | 2319 | ( |
2320 | ( | 2320 | ( |
2321 | { | 2321 | { |
2322 | newCompositeNode(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); | 2322 | newCompositeNode(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); |
2323 | } | 2323 | } |
2324 | lv_terms_4_0=ruleVLSFofTerm | 2324 | lv_terms_4_0=ruleVLSFofTerm |
2325 | { | 2325 | { |
2326 | if ($current==null) { | 2326 | if ($current==null) { |
2327 | $current = createModelElementForParent(grammarAccess.getVLSFunctionFofRule()); | 2327 | $current = createModelElementForParent(grammarAccess.getVLSFunctionAsTermRule()); |
2328 | } | 2328 | } |
2329 | add( | 2329 | add( |
2330 | $current, | 2330 | $current, |
@@ -2338,7 +2338,7 @@ ruleVLSFunctionFof returns [EObject current=null] | |||
2338 | )* | 2338 | )* |
2339 | otherlv_5=')' | 2339 | otherlv_5=')' |
2340 | { | 2340 | { |
2341 | newLeafNode(otherlv_5, grammarAccess.getVLSFunctionFofAccess().getRightParenthesisKeyword_1_3()); | 2341 | newLeafNode(otherlv_5, grammarAccess.getVLSFunctionAsTermAccess().getRightParenthesisKeyword_1_3()); |
2342 | } | 2342 | } |
2343 | )? | 2343 | )? |
2344 | ) | 2344 | ) |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageParser.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageParser.java index 3d1e277b..f44428a0 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageParser.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageParser.java | |||
@@ -5509,13 +5509,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5509 | 5509 | ||
5510 | 5510 | ||
5511 | // $ANTLR start "ruleVLSFofTerm" | 5511 | // $ANTLR start "ruleVLSFofTerm" |
5512 | // InternalVampireLanguage.g:2172:1: ruleVLSFofTerm returns [EObject current=null] : (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionFof_1= ruleVLSFunctionFof | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) ; | 5512 | // InternalVampireLanguage.g:2172:1: ruleVLSFofTerm returns [EObject current=null] : (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) ; |
5513 | public final EObject ruleVLSFofTerm() throws RecognitionException { | 5513 | public final EObject ruleVLSFofTerm() throws RecognitionException { |
5514 | EObject current = null; | 5514 | EObject current = null; |
5515 | 5515 | ||
5516 | EObject this_VLSVariable_0 = null; | 5516 | EObject this_VLSVariable_0 = null; |
5517 | 5517 | ||
5518 | EObject this_VLSFunctionFof_1 = null; | 5518 | EObject this_VLSFunctionAsTerm_1 = null; |
5519 | 5519 | ||
5520 | EObject this_VLSDefinedTerm_2 = null; | 5520 | EObject this_VLSDefinedTerm_2 = null; |
5521 | 5521 | ||
@@ -5524,10 +5524,10 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5524 | enterRule(); | 5524 | enterRule(); |
5525 | 5525 | ||
5526 | try { | 5526 | try { |
5527 | // InternalVampireLanguage.g:2178:2: ( (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionFof_1= ruleVLSFunctionFof | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) ) | 5527 | // InternalVampireLanguage.g:2178:2: ( (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) ) |
5528 | // InternalVampireLanguage.g:2179:2: (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionFof_1= ruleVLSFunctionFof | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) | 5528 | // InternalVampireLanguage.g:2179:2: (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) |
5529 | { | 5529 | { |
5530 | // InternalVampireLanguage.g:2179:2: (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionFof_1= ruleVLSFunctionFof | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) | 5530 | // InternalVampireLanguage.g:2179:2: (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) |
5531 | int alt31=3; | 5531 | int alt31=3; |
5532 | switch ( input.LA(1) ) { | 5532 | switch ( input.LA(1) ) { |
5533 | case RULE_UPPER_WORD_ID: | 5533 | case RULE_UPPER_WORD_ID: |
@@ -5578,18 +5578,18 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5578 | } | 5578 | } |
5579 | break; | 5579 | break; |
5580 | case 2 : | 5580 | case 2 : |
5581 | // InternalVampireLanguage.g:2189:3: this_VLSFunctionFof_1= ruleVLSFunctionFof | 5581 | // InternalVampireLanguage.g:2189:3: this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm |
5582 | { | 5582 | { |
5583 | 5583 | ||
5584 | newCompositeNode(grammarAccess.getVLSFofTermAccess().getVLSFunctionFofParserRuleCall_1()); | 5584 | newCompositeNode(grammarAccess.getVLSFofTermAccess().getVLSFunctionAsTermParserRuleCall_1()); |
5585 | 5585 | ||
5586 | pushFollow(FOLLOW_2); | 5586 | pushFollow(FOLLOW_2); |
5587 | this_VLSFunctionFof_1=ruleVLSFunctionFof(); | 5587 | this_VLSFunctionAsTerm_1=ruleVLSFunctionAsTerm(); |
5588 | 5588 | ||
5589 | state._fsp--; | 5589 | state._fsp--; |
5590 | 5590 | ||
5591 | 5591 | ||
5592 | current = this_VLSFunctionFof_1; | 5592 | current = this_VLSFunctionAsTerm_1; |
5593 | afterParserOrEnumRuleCall(); | 5593 | afterParserOrEnumRuleCall(); |
5594 | 5594 | ||
5595 | 5595 | ||
@@ -5635,25 +5635,25 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5635 | // $ANTLR end "ruleVLSFofTerm" | 5635 | // $ANTLR end "ruleVLSFofTerm" |
5636 | 5636 | ||
5637 | 5637 | ||
5638 | // $ANTLR start "entryRuleVLSFunctionFof" | 5638 | // $ANTLR start "entryRuleVLSFunctionAsTerm" |
5639 | // InternalVampireLanguage.g:2210:1: entryRuleVLSFunctionFof returns [EObject current=null] : iv_ruleVLSFunctionFof= ruleVLSFunctionFof EOF ; | 5639 | // InternalVampireLanguage.g:2210:1: entryRuleVLSFunctionAsTerm returns [EObject current=null] : iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm EOF ; |
5640 | public final EObject entryRuleVLSFunctionFof() throws RecognitionException { | 5640 | public final EObject entryRuleVLSFunctionAsTerm() throws RecognitionException { |
5641 | EObject current = null; | 5641 | EObject current = null; |
5642 | 5642 | ||
5643 | EObject iv_ruleVLSFunctionFof = null; | 5643 | EObject iv_ruleVLSFunctionAsTerm = null; |
5644 | 5644 | ||
5645 | 5645 | ||
5646 | try { | 5646 | try { |
5647 | // InternalVampireLanguage.g:2210:55: (iv_ruleVLSFunctionFof= ruleVLSFunctionFof EOF ) | 5647 | // InternalVampireLanguage.g:2210:58: (iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm EOF ) |
5648 | // InternalVampireLanguage.g:2211:2: iv_ruleVLSFunctionFof= ruleVLSFunctionFof EOF | 5648 | // InternalVampireLanguage.g:2211:2: iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm EOF |
5649 | { | 5649 | { |
5650 | newCompositeNode(grammarAccess.getVLSFunctionFofRule()); | 5650 | newCompositeNode(grammarAccess.getVLSFunctionAsTermRule()); |
5651 | pushFollow(FOLLOW_1); | 5651 | pushFollow(FOLLOW_1); |
5652 | iv_ruleVLSFunctionFof=ruleVLSFunctionFof(); | 5652 | iv_ruleVLSFunctionAsTerm=ruleVLSFunctionAsTerm(); |
5653 | 5653 | ||
5654 | state._fsp--; | 5654 | state._fsp--; |
5655 | 5655 | ||
5656 | current =iv_ruleVLSFunctionFof; | 5656 | current =iv_ruleVLSFunctionAsTerm; |
5657 | match(input,EOF,FOLLOW_2); | 5657 | match(input,EOF,FOLLOW_2); |
5658 | 5658 | ||
5659 | } | 5659 | } |
@@ -5668,12 +5668,12 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5668 | } | 5668 | } |
5669 | return current; | 5669 | return current; |
5670 | } | 5670 | } |
5671 | // $ANTLR end "entryRuleVLSFunctionFof" | 5671 | // $ANTLR end "entryRuleVLSFunctionAsTerm" |
5672 | 5672 | ||
5673 | 5673 | ||
5674 | // $ANTLR start "ruleVLSFunctionFof" | 5674 | // $ANTLR start "ruleVLSFunctionAsTerm" |
5675 | // InternalVampireLanguage.g:2217:1: ruleVLSFunctionFof returns [EObject current=null] : ( ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )? ) ; | 5675 | // InternalVampireLanguage.g:2217:1: ruleVLSFunctionAsTerm returns [EObject current=null] : ( ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )? ) ; |
5676 | public final EObject ruleVLSFunctionFof() throws RecognitionException { | 5676 | public final EObject ruleVLSFunctionAsTerm() throws RecognitionException { |
5677 | EObject current = null; | 5677 | EObject current = null; |
5678 | 5678 | ||
5679 | Token lv_functor_0_1=null; | 5679 | Token lv_functor_0_1=null; |
@@ -5740,11 +5740,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5740 | { | 5740 | { |
5741 | lv_functor_0_1=(Token)match(input,RULE_LOWER_WORD_ID,FOLLOW_31); | 5741 | lv_functor_0_1=(Token)match(input,RULE_LOWER_WORD_ID,FOLLOW_31); |
5742 | 5742 | ||
5743 | newLeafNode(lv_functor_0_1, grammarAccess.getVLSFunctionFofAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); | 5743 | newLeafNode(lv_functor_0_1, grammarAccess.getVLSFunctionAsTermAccess().getFunctorLOWER_WORD_IDTerminalRuleCall_0_0_0()); |
5744 | 5744 | ||
5745 | 5745 | ||
5746 | if (current==null) { | 5746 | if (current==null) { |
5747 | current = createModelElement(grammarAccess.getVLSFunctionFofRule()); | 5747 | current = createModelElement(grammarAccess.getVLSFunctionAsTermRule()); |
5748 | } | 5748 | } |
5749 | setWithLastConsumed( | 5749 | setWithLastConsumed( |
5750 | current, | 5750 | current, |
@@ -5760,11 +5760,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5760 | { | 5760 | { |
5761 | lv_functor_0_2=(Token)match(input,RULE_SINGLE_QUOTE,FOLLOW_31); | 5761 | lv_functor_0_2=(Token)match(input,RULE_SINGLE_QUOTE,FOLLOW_31); |
5762 | 5762 | ||
5763 | newLeafNode(lv_functor_0_2, grammarAccess.getVLSFunctionFofAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); | 5763 | newLeafNode(lv_functor_0_2, grammarAccess.getVLSFunctionAsTermAccess().getFunctorSINGLE_QUOTETerminalRuleCall_0_0_1()); |
5764 | 5764 | ||
5765 | 5765 | ||
5766 | if (current==null) { | 5766 | if (current==null) { |
5767 | current = createModelElement(grammarAccess.getVLSFunctionFofRule()); | 5767 | current = createModelElement(grammarAccess.getVLSFunctionAsTermRule()); |
5768 | } | 5768 | } |
5769 | setWithLastConsumed( | 5769 | setWithLastConsumed( |
5770 | current, | 5770 | current, |
@@ -5780,11 +5780,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5780 | { | 5780 | { |
5781 | lv_functor_0_3=(Token)match(input,RULE_DOLLAR_ID,FOLLOW_31); | 5781 | lv_functor_0_3=(Token)match(input,RULE_DOLLAR_ID,FOLLOW_31); |
5782 | 5782 | ||
5783 | newLeafNode(lv_functor_0_3, grammarAccess.getVLSFunctionFofAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); | 5783 | newLeafNode(lv_functor_0_3, grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOLLAR_IDTerminalRuleCall_0_0_2()); |
5784 | 5784 | ||
5785 | 5785 | ||
5786 | if (current==null) { | 5786 | if (current==null) { |
5787 | current = createModelElement(grammarAccess.getVLSFunctionFofRule()); | 5787 | current = createModelElement(grammarAccess.getVLSFunctionAsTermRule()); |
5788 | } | 5788 | } |
5789 | setWithLastConsumed( | 5789 | setWithLastConsumed( |
5790 | current, | 5790 | current, |
@@ -5800,11 +5800,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5800 | { | 5800 | { |
5801 | lv_functor_0_4=(Token)match(input,RULE_DOUBLE_DOLLAR_ID,FOLLOW_31); | 5801 | lv_functor_0_4=(Token)match(input,RULE_DOUBLE_DOLLAR_ID,FOLLOW_31); |
5802 | 5802 | ||
5803 | newLeafNode(lv_functor_0_4, grammarAccess.getVLSFunctionFofAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); | 5803 | newLeafNode(lv_functor_0_4, grammarAccess.getVLSFunctionAsTermAccess().getFunctorDOUBLE_DOLLAR_IDTerminalRuleCall_0_0_3()); |
5804 | 5804 | ||
5805 | 5805 | ||
5806 | if (current==null) { | 5806 | if (current==null) { |
5807 | current = createModelElement(grammarAccess.getVLSFunctionFofRule()); | 5807 | current = createModelElement(grammarAccess.getVLSFunctionAsTermRule()); |
5808 | } | 5808 | } |
5809 | setWithLastConsumed( | 5809 | setWithLastConsumed( |
5810 | current, | 5810 | current, |
@@ -5837,7 +5837,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5837 | { | 5837 | { |
5838 | otherlv_1=(Token)match(input,34,FOLLOW_30); | 5838 | otherlv_1=(Token)match(input,34,FOLLOW_30); |
5839 | 5839 | ||
5840 | newLeafNode(otherlv_1, grammarAccess.getVLSFunctionFofAccess().getLeftParenthesisKeyword_1_0()); | 5840 | newLeafNode(otherlv_1, grammarAccess.getVLSFunctionAsTermAccess().getLeftParenthesisKeyword_1_0()); |
5841 | 5841 | ||
5842 | // InternalVampireLanguage.g:2295:4: ( (lv_terms_2_0= ruleVLSFofTerm ) ) | 5842 | // InternalVampireLanguage.g:2295:4: ( (lv_terms_2_0= ruleVLSFofTerm ) ) |
5843 | // InternalVampireLanguage.g:2296:5: (lv_terms_2_0= ruleVLSFofTerm ) | 5843 | // InternalVampireLanguage.g:2296:5: (lv_terms_2_0= ruleVLSFofTerm ) |
@@ -5846,7 +5846,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5846 | // InternalVampireLanguage.g:2297:6: lv_terms_2_0= ruleVLSFofTerm | 5846 | // InternalVampireLanguage.g:2297:6: lv_terms_2_0= ruleVLSFofTerm |
5847 | { | 5847 | { |
5848 | 5848 | ||
5849 | newCompositeNode(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); | 5849 | newCompositeNode(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); |
5850 | 5850 | ||
5851 | pushFollow(FOLLOW_14); | 5851 | pushFollow(FOLLOW_14); |
5852 | lv_terms_2_0=ruleVLSFofTerm(); | 5852 | lv_terms_2_0=ruleVLSFofTerm(); |
@@ -5855,7 +5855,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5855 | 5855 | ||
5856 | 5856 | ||
5857 | if (current==null) { | 5857 | if (current==null) { |
5858 | current = createModelElementForParent(grammarAccess.getVLSFunctionFofRule()); | 5858 | current = createModelElementForParent(grammarAccess.getVLSFunctionAsTermRule()); |
5859 | } | 5859 | } |
5860 | add( | 5860 | add( |
5861 | current, | 5861 | current, |
@@ -5887,7 +5887,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5887 | { | 5887 | { |
5888 | otherlv_3=(Token)match(input,29,FOLLOW_30); | 5888 | otherlv_3=(Token)match(input,29,FOLLOW_30); |
5889 | 5889 | ||
5890 | newLeafNode(otherlv_3, grammarAccess.getVLSFunctionFofAccess().getCommaKeyword_1_2_0()); | 5890 | newLeafNode(otherlv_3, grammarAccess.getVLSFunctionAsTermAccess().getCommaKeyword_1_2_0()); |
5891 | 5891 | ||
5892 | // InternalVampireLanguage.g:2319:5: ( (lv_terms_4_0= ruleVLSFofTerm ) ) | 5892 | // InternalVampireLanguage.g:2319:5: ( (lv_terms_4_0= ruleVLSFofTerm ) ) |
5893 | // InternalVampireLanguage.g:2320:6: (lv_terms_4_0= ruleVLSFofTerm ) | 5893 | // InternalVampireLanguage.g:2320:6: (lv_terms_4_0= ruleVLSFofTerm ) |
@@ -5896,7 +5896,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5896 | // InternalVampireLanguage.g:2321:7: lv_terms_4_0= ruleVLSFofTerm | 5896 | // InternalVampireLanguage.g:2321:7: lv_terms_4_0= ruleVLSFofTerm |
5897 | { | 5897 | { |
5898 | 5898 | ||
5899 | newCompositeNode(grammarAccess.getVLSFunctionFofAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); | 5899 | newCompositeNode(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); |
5900 | 5900 | ||
5901 | pushFollow(FOLLOW_14); | 5901 | pushFollow(FOLLOW_14); |
5902 | lv_terms_4_0=ruleVLSFofTerm(); | 5902 | lv_terms_4_0=ruleVLSFofTerm(); |
@@ -5905,7 +5905,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5905 | 5905 | ||
5906 | 5906 | ||
5907 | if (current==null) { | 5907 | if (current==null) { |
5908 | current = createModelElementForParent(grammarAccess.getVLSFunctionFofRule()); | 5908 | current = createModelElementForParent(grammarAccess.getVLSFunctionAsTermRule()); |
5909 | } | 5909 | } |
5910 | add( | 5910 | add( |
5911 | current, | 5911 | current, |
@@ -5931,7 +5931,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5931 | 5931 | ||
5932 | otherlv_5=(Token)match(input,35,FOLLOW_2); | 5932 | otherlv_5=(Token)match(input,35,FOLLOW_2); |
5933 | 5933 | ||
5934 | newLeafNode(otherlv_5, grammarAccess.getVLSFunctionFofAccess().getRightParenthesisKeyword_1_3()); | 5934 | newLeafNode(otherlv_5, grammarAccess.getVLSFunctionAsTermAccess().getRightParenthesisKeyword_1_3()); |
5935 | 5935 | ||
5936 | 5936 | ||
5937 | } | 5937 | } |
@@ -5958,7 +5958,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser { | |||
5958 | } | 5958 | } |
5959 | return current; | 5959 | return current; |
5960 | } | 5960 | } |
5961 | // $ANTLR end "ruleVLSFunctionFof" | 5961 | // $ANTLR end "ruleVLSFunctionAsTerm" |
5962 | 5962 | ||
5963 | 5963 | ||
5964 | // $ANTLR start "entryRuleVLSDefinedTerm" | 5964 | // $ANTLR start "entryRuleVLSDefinedTerm" |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/scoping/AbstractVampireLanguageScopeProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/scoping/AbstractVampireLanguageScopeProvider.java index 0f5a902d..28f2f810 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/scoping/AbstractVampireLanguageScopeProvider.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/scoping/AbstractVampireLanguageScopeProvider.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.scoping; | 4 | package ca.mcgill.ecse.dslreasoner.scoping; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSemanticSequencer.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSemanticSequencer.java index 890341db..bae51ef0 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSemanticSequencer.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSemanticSequencer.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.serializer; | 4 | package ca.mcgill.ecse.dslreasoner.serializer; |
5 | 5 | ||
@@ -16,7 +16,7 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier; | |||
16 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFalse; | 16 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFalse; |
17 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula; | 17 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula; |
18 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction; | 18 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction; |
19 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof; | 19 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm; |
20 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies; | 20 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies; |
21 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude; | 21 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude; |
22 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality; | 22 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality; |
@@ -107,8 +107,8 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic | |||
107 | case VampireLanguagePackage.VLS_FUNCTION: | 107 | case VampireLanguagePackage.VLS_FUNCTION: |
108 | sequence_VLSAtomicFunction(context, (VLSFunction) semanticObject); | 108 | sequence_VLSAtomicFunction(context, (VLSFunction) semanticObject); |
109 | return; | 109 | return; |
110 | case VampireLanguagePackage.VLS_FUNCTION_FOF: | 110 | case VampireLanguagePackage.VLS_FUNCTION_AS_TERM: |
111 | sequence_VLSFunctionFof(context, (VLSFunctionFof) semanticObject); | 111 | sequence_VLSFunctionAsTerm(context, (VLSFunctionAsTerm) semanticObject); |
112 | return; | 112 | return; |
113 | case VampireLanguagePackage.VLS_IMPLIES: | 113 | case VampireLanguagePackage.VLS_IMPLIES: |
114 | sequence_VLSBinary(context, (VLSImplies) semanticObject); | 114 | sequence_VLSBinary(context, (VLSImplies) semanticObject); |
@@ -786,13 +786,13 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic | |||
786 | 786 | ||
787 | /** | 787 | /** |
788 | * Contexts: | 788 | * Contexts: |
789 | * VLSFofTerm returns VLSFunctionFof | 789 | * VLSFofTerm returns VLSFunctionAsTerm |
790 | * VLSFunctionFof returns VLSFunctionFof | 790 | * VLSFunctionAsTerm returns VLSFunctionAsTerm |
791 | * | 791 | * |
792 | * Constraint: | 792 | * Constraint: |
793 | * ((functor=LOWER_WORD_ID | functor=SINGLE_QUOTE | functor=DOLLAR_ID | functor=DOUBLE_DOLLAR_ID) (terms+=VLSFofTerm terms+=VLSFofTerm*)?) | 793 | * ((functor=LOWER_WORD_ID | functor=SINGLE_QUOTE | functor=DOLLAR_ID | functor=DOUBLE_DOLLAR_ID) (terms+=VLSFofTerm terms+=VLSFofTerm*)?) |
794 | */ | 794 | */ |
795 | protected void sequence_VLSFunctionFof(ISerializationContext context, VLSFunctionFof semanticObject) { | 795 | protected void sequence_VLSFunctionAsTerm(ISerializationContext context, VLSFunctionAsTerm semanticObject) { |
796 | genericSequencer.createSequence(context, semanticObject); | 796 | genericSequencer.createSequence(context, semanticObject); |
797 | } | 797 | } |
798 | 798 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSyntacticSequencer.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSyntacticSequencer.java index 5c1a720e..922fca87 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSyntacticSequencer.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSyntacticSequencer.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.serializer; | 4 | package ca.mcgill.ecse.dslreasoner.serializer; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/services/VampireLanguageGrammarAccess.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/services/VampireLanguageGrammarAccess.java index c5bd8be2..e159834e 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/services/VampireLanguageGrammarAccess.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/services/VampireLanguageGrammarAccess.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.services; | 4 | package ca.mcgill.ecse.dslreasoner.services; |
5 | 5 | ||
@@ -1382,28 +1382,28 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder { | |||
1382 | private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSFofTerm"); | 1382 | private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSFofTerm"); |
1383 | private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); | 1383 | private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); |
1384 | private final RuleCall cVLSVariableParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0); | 1384 | private final RuleCall cVLSVariableParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0); |
1385 | private final RuleCall cVLSFunctionFofParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); | 1385 | private final RuleCall cVLSFunctionAsTermParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); |
1386 | private final RuleCall cVLSDefinedTermParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); | 1386 | private final RuleCall cVLSDefinedTermParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2); |
1387 | 1387 | ||
1388 | //VLSFofTerm VLSTerm: | 1388 | //VLSFofTerm VLSTerm: |
1389 | // VLSVariable | VLSFunctionFof | VLSDefinedTerm; | 1389 | // VLSVariable | VLSFunctionAsTerm | VLSDefinedTerm; |
1390 | @Override public ParserRule getRule() { return rule; } | 1390 | @Override public ParserRule getRule() { return rule; } |
1391 | 1391 | ||
1392 | ////(VLSVariable | VLSFunction | VLSTffConditional | VLSTffLet | VLSTffTuple) | 1392 | ////(VLSVariable | VLSFunction | VLSTffConditional | VLSTffLet | VLSTffTuple) |
1393 | //VLSVariable | VLSFunctionFof | VLSDefinedTerm | 1393 | //VLSVariable | VLSFunctionAsTerm | VLSDefinedTerm |
1394 | public Alternatives getAlternatives() { return cAlternatives; } | 1394 | public Alternatives getAlternatives() { return cAlternatives; } |
1395 | 1395 | ||
1396 | //VLSVariable | 1396 | //VLSVariable |
1397 | public RuleCall getVLSVariableParserRuleCall_0() { return cVLSVariableParserRuleCall_0; } | 1397 | public RuleCall getVLSVariableParserRuleCall_0() { return cVLSVariableParserRuleCall_0; } |
1398 | 1398 | ||
1399 | //VLSFunctionFof | 1399 | //VLSFunctionAsTerm |
1400 | public RuleCall getVLSFunctionFofParserRuleCall_1() { return cVLSFunctionFofParserRuleCall_1; } | 1400 | public RuleCall getVLSFunctionAsTermParserRuleCall_1() { return cVLSFunctionAsTermParserRuleCall_1; } |
1401 | 1401 | ||
1402 | //VLSDefinedTerm | 1402 | //VLSDefinedTerm |
1403 | public RuleCall getVLSDefinedTermParserRuleCall_2() { return cVLSDefinedTermParserRuleCall_2; } | 1403 | public RuleCall getVLSDefinedTermParserRuleCall_2() { return cVLSDefinedTermParserRuleCall_2; } |
1404 | } | 1404 | } |
1405 | public class VLSFunctionFofElements extends AbstractParserRuleElementFinder { | 1405 | public class VLSFunctionAsTermElements extends AbstractParserRuleElementFinder { |
1406 | private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSFunctionFof"); | 1406 | private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSFunctionAsTerm"); |
1407 | private final Group cGroup = (Group)rule.eContents().get(1); | 1407 | private final Group cGroup = (Group)rule.eContents().get(1); |
1408 | private final Assignment cFunctorAssignment_0 = (Assignment)cGroup.eContents().get(0); | 1408 | private final Assignment cFunctorAssignment_0 = (Assignment)cGroup.eContents().get(0); |
1409 | private final Alternatives cFunctorAlternatives_0_0 = (Alternatives)cFunctorAssignment_0.eContents().get(0); | 1409 | private final Alternatives cFunctorAlternatives_0_0 = (Alternatives)cFunctorAssignment_0.eContents().get(0); |
@@ -1421,7 +1421,7 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder { | |||
1421 | private final RuleCall cTermsVLSFofTermParserRuleCall_1_2_1_0 = (RuleCall)cTermsAssignment_1_2_1.eContents().get(0); | 1421 | private final RuleCall cTermsVLSFofTermParserRuleCall_1_2_1_0 = (RuleCall)cTermsAssignment_1_2_1.eContents().get(0); |
1422 | private final Keyword cRightParenthesisKeyword_1_3 = (Keyword)cGroup_1.eContents().get(3); | 1422 | private final Keyword cRightParenthesisKeyword_1_3 = (Keyword)cGroup_1.eContents().get(3); |
1423 | 1423 | ||
1424 | //VLSFunctionFof: | 1424 | //VLSFunctionAsTerm: |
1425 | // functor=(LOWER_WORD_ID | SINGLE_QUOTE | DOLLAR_ID | DOUBLE_DOLLAR_ID) ('(' terms+=VLSFofTerm (',' terms+=VLSFofTerm)* | 1425 | // functor=(LOWER_WORD_ID | SINGLE_QUOTE | DOLLAR_ID | DOUBLE_DOLLAR_ID) ('(' terms+=VLSFofTerm (',' terms+=VLSFofTerm)* |
1426 | // ')')?; | 1426 | // ')')?; |
1427 | @Override public ParserRule getRule() { return rule; } | 1427 | @Override public ParserRule getRule() { return rule; } |
@@ -1599,7 +1599,7 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder { | |||
1599 | private final VLSAtomicFunctionElements pVLSAtomicFunction; | 1599 | private final VLSAtomicFunctionElements pVLSAtomicFunction; |
1600 | private final VLSVariableElements pVLSVariable; | 1600 | private final VLSVariableElements pVLSVariable; |
1601 | private final VLSFofTermElements pVLSFofTerm; | 1601 | private final VLSFofTermElements pVLSFofTerm; |
1602 | private final VLSFunctionFofElements pVLSFunctionFof; | 1602 | private final VLSFunctionAsTermElements pVLSFunctionAsTerm; |
1603 | private final VLSDefinedTermElements pVLSDefinedTerm; | 1603 | private final VLSDefinedTermElements pVLSDefinedTerm; |
1604 | 1604 | ||
1605 | private final Grammar grammar; | 1605 | private final Grammar grammar; |
@@ -1652,7 +1652,7 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder { | |||
1652 | this.pVLSAtomicFunction = new VLSAtomicFunctionElements(); | 1652 | this.pVLSAtomicFunction = new VLSAtomicFunctionElements(); |
1653 | this.pVLSVariable = new VLSVariableElements(); | 1653 | this.pVLSVariable = new VLSVariableElements(); |
1654 | this.pVLSFofTerm = new VLSFofTermElements(); | 1654 | this.pVLSFofTerm = new VLSFofTermElements(); |
1655 | this.pVLSFunctionFof = new VLSFunctionFofElements(); | 1655 | this.pVLSFunctionAsTerm = new VLSFunctionAsTermElements(); |
1656 | this.pVLSDefinedTerm = new VLSDefinedTermElements(); | 1656 | this.pVLSDefinedTerm = new VLSDefinedTermElements(); |
1657 | } | 1657 | } |
1658 | 1658 | ||
@@ -2145,7 +2145,7 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder { | |||
2145 | } | 2145 | } |
2146 | 2146 | ||
2147 | //VLSFofTerm VLSTerm: | 2147 | //VLSFofTerm VLSTerm: |
2148 | // VLSVariable | VLSFunctionFof | VLSDefinedTerm; | 2148 | // VLSVariable | VLSFunctionAsTerm | VLSDefinedTerm; |
2149 | public VLSFofTermElements getVLSFofTermAccess() { | 2149 | public VLSFofTermElements getVLSFofTermAccess() { |
2150 | return pVLSFofTerm; | 2150 | return pVLSFofTerm; |
2151 | } | 2151 | } |
@@ -2154,15 +2154,15 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder { | |||
2154 | return getVLSFofTermAccess().getRule(); | 2154 | return getVLSFofTermAccess().getRule(); |
2155 | } | 2155 | } |
2156 | 2156 | ||
2157 | //VLSFunctionFof: | 2157 | //VLSFunctionAsTerm: |
2158 | // functor=(LOWER_WORD_ID | SINGLE_QUOTE | DOLLAR_ID | DOUBLE_DOLLAR_ID) ('(' terms+=VLSFofTerm (',' terms+=VLSFofTerm)* | 2158 | // functor=(LOWER_WORD_ID | SINGLE_QUOTE | DOLLAR_ID | DOUBLE_DOLLAR_ID) ('(' terms+=VLSFofTerm (',' terms+=VLSFofTerm)* |
2159 | // ')')?; | 2159 | // ')')?; |
2160 | public VLSFunctionFofElements getVLSFunctionFofAccess() { | 2160 | public VLSFunctionAsTermElements getVLSFunctionAsTermAccess() { |
2161 | return pVLSFunctionFof; | 2161 | return pVLSFunctionAsTerm; |
2162 | } | 2162 | } |
2163 | 2163 | ||
2164 | public ParserRule getVLSFunctionFofRule() { | 2164 | public ParserRule getVLSFunctionAsTermRule() { |
2165 | return getVLSFunctionFofAccess().getRule(); | 2165 | return getVLSFunctionAsTermAccess().getRule(); |
2166 | } | 2166 | } |
2167 | 2167 | ||
2168 | //VLSDefinedTerm: | 2168 | //VLSDefinedTerm: |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/AbstractVampireLanguageValidator.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/AbstractVampireLanguageValidator.java index 65104ffb..8c94ec86 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/AbstractVampireLanguageValidator.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/AbstractVampireLanguageValidator.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.validation; | 4 | package ca.mcgill.ecse.dslreasoner.validation; |
5 | 5 | ||
@@ -16,5 +16,4 @@ public abstract class AbstractVampireLanguageValidator extends AbstractDeclarati | |||
16 | result.add(ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage.eINSTANCE); | 16 | result.add(ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage.eINSTANCE); |
17 | return result; | 17 | return result; |
18 | } | 18 | } |
19 | |||
20 | } | 19 | } |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageConfigurableIssueCodesProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageConfigurableIssueCodesProvider.java new file mode 100644 index 00000000..1d504c4e --- /dev/null +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageConfigurableIssueCodesProvider.java | |||
@@ -0,0 +1,22 @@ | |||
1 | /* | ||
2 | * generated by Xtext 2.14.0 | ||
3 | */ | ||
4 | package ca.mcgill.ecse.dslreasoner.validation; | ||
5 | |||
6 | import org.eclipse.xtext.preferences.PreferenceKey; | ||
7 | import org.eclipse.xtext.util.IAcceptor; | ||
8 | import org.eclipse.xtext.validation.ConfigurableIssueCodesProvider; | ||
9 | import org.eclipse.xtext.validation.SeverityConverter; | ||
10 | |||
11 | @SuppressWarnings("restriction") | ||
12 | public class VampireLanguageConfigurableIssueCodesProvider extends ConfigurableIssueCodesProvider { | ||
13 | protected static final String ISSUE_CODE_PREFIX = "ca.mcgill.ecse.dslreasoner."; | ||
14 | |||
15 | public static final String DEPRECATED_MODEL_PART = ISSUE_CODE_PREFIX + "deprecatedModelPart"; | ||
16 | |||
17 | @Override | ||
18 | protected void initialize(IAcceptor<PreferenceKey> acceptor) { | ||
19 | super.initialize(acceptor); | ||
20 | acceptor.accept(create(DEPRECATED_MODEL_PART, SeverityConverter.SEVERITY_WARNING)); | ||
21 | } | ||
22 | } | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnd.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnd.java index de1ac885..f4b137c3 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnd.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnd.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnnotation.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnnotation.java index 94f9f966..10cba836 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnnotation.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAnnotation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAssignment.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAssignment.java index c73be6d1..24b65b51 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAssignment.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSAssignment.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSComment.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSComment.java index f317edbd..203859a9 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSComment.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSComment.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConfirmations.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConfirmations.java index 25e607f9..96ce4861 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConfirmations.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConfirmations.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConstant.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConstant.java index 3e9d1ff2..b252cced 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConstant.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSConstant.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDefinedTerm.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDefinedTerm.java index 12708167..4dc408e5 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDefinedTerm.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDefinedTerm.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDoubleQuote.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDoubleQuote.java index 501faf36..e5702848 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDoubleQuote.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDoubleQuote.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquality.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquality.java index aadf2ade..db02f2c2 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquality.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquality.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquivalent.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquivalent.java index 639a9f72..25e6fbe1 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquivalent.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSEquivalent.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java index 929385ac..d3a19016 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFalse.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFalse.java index e1bfd960..33a5fba8 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFalse.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFalse.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFofFormula.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFofFormula.java index 8de99107..41479be9 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFofFormula.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFofFormula.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunction.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunction.java index 7b4d0a30..e5bef1b5 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunction.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunction.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunctionAsTerm.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunctionAsTerm.java new file mode 100644 index 00000000..a3872bc6 --- /dev/null +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFunctionAsTerm.java | |||
@@ -0,0 +1,69 @@ | |||
1 | /** | ||
2 | * generated by Xtext 2.14.0 | ||
3 | */ | ||
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | ||
5 | |||
6 | import org.eclipse.emf.common.util.EList; | ||
7 | |||
8 | /** | ||
9 | * <!-- begin-user-doc --> | ||
10 | * A representation of the model object '<em><b>VLS Function As Term</b></em>'. | ||
11 | * <!-- end-user-doc --> | ||
12 | * | ||
13 | * <p> | ||
14 | * The following features are supported: | ||
15 | * </p> | ||
16 | * <ul> | ||
17 | * <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getFunctor <em>Functor</em>}</li> | ||
18 | * <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getTerms <em>Terms</em>}</li> | ||
19 | * </ul> | ||
20 | * | ||
21 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSFunctionAsTerm() | ||
22 | * @model | ||
23 | * @generated | ||
24 | */ | ||
25 | public interface VLSFunctionAsTerm extends VLSTerm | ||
26 | { | ||
27 | /** | ||
28 | * Returns the value of the '<em><b>Functor</b></em>' attribute. | ||
29 | * <!-- begin-user-doc --> | ||
30 | * <p> | ||
31 | * If the meaning of the '<em>Functor</em>' attribute isn't clear, | ||
32 | * there really should be more of a description here... | ||
33 | * </p> | ||
34 | * <!-- end-user-doc --> | ||
35 | * @return the value of the '<em>Functor</em>' attribute. | ||
36 | * @see #setFunctor(String) | ||
37 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSFunctionAsTerm_Functor() | ||
38 | * @model | ||
39 | * @generated | ||
40 | */ | ||
41 | String getFunctor(); | ||
42 | |||
43 | /** | ||
44 | * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getFunctor <em>Functor</em>}' attribute. | ||
45 | * <!-- begin-user-doc --> | ||
46 | * <!-- end-user-doc --> | ||
47 | * @param value the new value of the '<em>Functor</em>' attribute. | ||
48 | * @see #getFunctor() | ||
49 | * @generated | ||
50 | */ | ||
51 | void setFunctor(String value); | ||
52 | |||
53 | /** | ||
54 | * Returns the value of the '<em><b>Terms</b></em>' containment reference list. | ||
55 | * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm}. | ||
56 | * <!-- begin-user-doc --> | ||
57 | * <p> | ||
58 | * If the meaning of the '<em>Terms</em>' containment reference list isn't clear, | ||
59 | * there really should be more of a description here... | ||
60 | * </p> | ||
61 | * <!-- end-user-doc --> | ||
62 | * @return the value of the '<em>Terms</em>' containment reference list. | ||
63 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSFunctionAsTerm_Terms() | ||
64 | * @model containment="true" | ||
65 | * @generated | ||
66 | */ | ||
67 | EList<VLSTerm> getTerms(); | ||
68 | |||
69 | } // VLSFunctionAsTerm | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSImplies.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSImplies.java index 26e1f5f5..860ab242 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSImplies.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSImplies.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInclude.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInclude.java index 29e93ff2..e90fbe47 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInclude.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInclude.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInequality.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInequality.java index a5d4c815..e739e4e0 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInequality.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInequality.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInt.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInt.java index 41e0de04..7639fe55 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInt.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInt.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSLess.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSLess.java index accb525d..ae96339e 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSLess.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSLess.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSName.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSName.java index 79019bb5..32981a8b 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSName.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSName.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNand.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNand.java index 1735fd12..1b86f1bd 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNand.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNand.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNor.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNor.java index af57a7f4..d2f97d5c 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNor.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSNor.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOr.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOr.java index 4c1fb0ee..6bb521d6 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOr.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOr.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRational.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRational.java index 8ad40ca5..017f231c 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRational.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRational.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSReal.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSReal.java index f5686c88..3933fe6e 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSReal.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSReal.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRevImplies.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRevImplies.java index 7a8c96b7..348acc5b 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRevImplies.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRevImplies.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSSatisfiable.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSSatisfiable.java index 75006570..da645e63 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSSatisfiable.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSSatisfiable.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java index 4a3e51bb..57ce9098 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffFormula.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffFormula.java index 8b455f0a..a574b641 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffFormula.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffFormula.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTrue.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTrue.java index 865fae07..78aed874 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTrue.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTrue.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUnaryNegation.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUnaryNegation.java index cc81aad4..cec6ca6d 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUnaryNegation.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUnaryNegation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java index 8b7c913b..28ae1a33 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java index 90b3b95d..9750e4c5 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSXnor.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSXnor.java index ba433cec..64b1f584 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSXnor.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSXnor.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
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 84b65a59..0fb23c87 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 | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
@@ -123,13 +123,13 @@ public interface VampireLanguageFactory extends EFactory | |||
123 | VLSVariable createVLSVariable(); | 123 | VLSVariable createVLSVariable(); |
124 | 124 | ||
125 | /** | 125 | /** |
126 | * Returns a new object of class '<em>VLS Function Fof</em>'. | 126 | * Returns a new object of class '<em>VLS Function As Term</em>'. |
127 | * <!-- begin-user-doc --> | 127 | * <!-- begin-user-doc --> |
128 | * <!-- end-user-doc --> | 128 | * <!-- end-user-doc --> |
129 | * @return a new object of class '<em>VLS Function Fof</em>'. | 129 | * @return a new object of class '<em>VLS Function As Term</em>'. |
130 | * @generated | 130 | * @generated |
131 | */ | 131 | */ |
132 | VLSFunctionFof createVLSFunctionFof(); | 132 | VLSFunctionAsTerm createVLSFunctionAsTerm(); |
133 | 133 | ||
134 | /** | 134 | /** |
135 | * Returns a new object of class '<em>VLS Defined Term</em>'. | 135 | * Returns a new object of class '<em>VLS Defined Term</em>'. |
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 e7df5378..60061aee 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 | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
@@ -456,14 +456,14 @@ public interface VampireLanguagePackage extends EPackage | |||
456 | int VLS_VARIABLE_FEATURE_COUNT = VLS_TERM_FEATURE_COUNT + 1; | 456 | int VLS_VARIABLE_FEATURE_COUNT = VLS_TERM_FEATURE_COUNT + 1; |
457 | 457 | ||
458 | /** | 458 | /** |
459 | * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionFofImpl <em>VLS Function Fof</em>}' class. | 459 | * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl <em>VLS Function As Term</em>}' class. |
460 | * <!-- begin-user-doc --> | 460 | * <!-- begin-user-doc --> |
461 | * <!-- end-user-doc --> | 461 | * <!-- end-user-doc --> |
462 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionFofImpl | 462 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl |
463 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFunctionFof() | 463 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFunctionAsTerm() |
464 | * @generated | 464 | * @generated |
465 | */ | 465 | */ |
466 | int VLS_FUNCTION_FOF = 11; | 466 | int VLS_FUNCTION_AS_TERM = 11; |
467 | 467 | ||
468 | /** | 468 | /** |
469 | * The feature id for the '<em><b>Functor</b></em>' attribute. | 469 | * The feature id for the '<em><b>Functor</b></em>' attribute. |
@@ -472,7 +472,7 @@ public interface VampireLanguagePackage extends EPackage | |||
472 | * @generated | 472 | * @generated |
473 | * @ordered | 473 | * @ordered |
474 | */ | 474 | */ |
475 | int VLS_FUNCTION_FOF__FUNCTOR = VLS_TERM_FEATURE_COUNT + 0; | 475 | int VLS_FUNCTION_AS_TERM__FUNCTOR = VLS_TERM_FEATURE_COUNT + 0; |
476 | 476 | ||
477 | /** | 477 | /** |
478 | * The feature id for the '<em><b>Terms</b></em>' containment reference list. | 478 | * The feature id for the '<em><b>Terms</b></em>' containment reference list. |
@@ -481,16 +481,16 @@ public interface VampireLanguagePackage extends EPackage | |||
481 | * @generated | 481 | * @generated |
482 | * @ordered | 482 | * @ordered |
483 | */ | 483 | */ |
484 | int VLS_FUNCTION_FOF__TERMS = VLS_TERM_FEATURE_COUNT + 1; | 484 | int VLS_FUNCTION_AS_TERM__TERMS = VLS_TERM_FEATURE_COUNT + 1; |
485 | 485 | ||
486 | /** | 486 | /** |
487 | * The number of structural features of the '<em>VLS Function Fof</em>' class. | 487 | * The number of structural features of the '<em>VLS Function As Term</em>' class. |
488 | * <!-- begin-user-doc --> | 488 | * <!-- begin-user-doc --> |
489 | * <!-- end-user-doc --> | 489 | * <!-- end-user-doc --> |
490 | * @generated | 490 | * @generated |
491 | * @ordered | 491 | * @ordered |
492 | */ | 492 | */ |
493 | int VLS_FUNCTION_FOF_FEATURE_COUNT = VLS_TERM_FEATURE_COUNT + 2; | 493 | int VLS_FUNCTION_AS_TERM_FEATURE_COUNT = VLS_TERM_FEATURE_COUNT + 2; |
494 | 494 | ||
495 | /** | 495 | /** |
496 | * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDefinedTermImpl <em>VLS Defined Term</em>}' class. | 496 | * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDefinedTermImpl <em>VLS Defined Term</em>}' class. |
@@ -1624,36 +1624,36 @@ public interface VampireLanguagePackage extends EPackage | |||
1624 | EAttribute getVLSVariable_Name(); | 1624 | EAttribute getVLSVariable_Name(); |
1625 | 1625 | ||
1626 | /** | 1626 | /** |
1627 | * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof <em>VLS Function Fof</em>}'. | 1627 | * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm <em>VLS Function As Term</em>}'. |
1628 | * <!-- begin-user-doc --> | 1628 | * <!-- begin-user-doc --> |
1629 | * <!-- end-user-doc --> | 1629 | * <!-- end-user-doc --> |
1630 | * @return the meta object for class '<em>VLS Function Fof</em>'. | 1630 | * @return the meta object for class '<em>VLS Function As Term</em>'. |
1631 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof | 1631 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm |
1632 | * @generated | 1632 | * @generated |
1633 | */ | 1633 | */ |
1634 | EClass getVLSFunctionFof(); | 1634 | EClass getVLSFunctionAsTerm(); |
1635 | 1635 | ||
1636 | /** | 1636 | /** |
1637 | * Returns the meta object for the attribute '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof#getFunctor <em>Functor</em>}'. | 1637 | * Returns the meta object for the attribute '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getFunctor <em>Functor</em>}'. |
1638 | * <!-- begin-user-doc --> | 1638 | * <!-- begin-user-doc --> |
1639 | * <!-- end-user-doc --> | 1639 | * <!-- end-user-doc --> |
1640 | * @return the meta object for the attribute '<em>Functor</em>'. | 1640 | * @return the meta object for the attribute '<em>Functor</em>'. |
1641 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof#getFunctor() | 1641 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getFunctor() |
1642 | * @see #getVLSFunctionFof() | 1642 | * @see #getVLSFunctionAsTerm() |
1643 | * @generated | 1643 | * @generated |
1644 | */ | 1644 | */ |
1645 | EAttribute getVLSFunctionFof_Functor(); | 1645 | EAttribute getVLSFunctionAsTerm_Functor(); |
1646 | 1646 | ||
1647 | /** | 1647 | /** |
1648 | * Returns the meta object for the containment reference list '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof#getTerms <em>Terms</em>}'. | 1648 | * Returns the meta object for the containment reference list '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getTerms <em>Terms</em>}'. |
1649 | * <!-- begin-user-doc --> | 1649 | * <!-- begin-user-doc --> |
1650 | * <!-- end-user-doc --> | 1650 | * <!-- end-user-doc --> |
1651 | * @return the meta object for the containment reference list '<em>Terms</em>'. | 1651 | * @return the meta object for the containment reference list '<em>Terms</em>'. |
1652 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof#getTerms() | 1652 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm#getTerms() |
1653 | * @see #getVLSFunctionFof() | 1653 | * @see #getVLSFunctionAsTerm() |
1654 | * @generated | 1654 | * @generated |
1655 | */ | 1655 | */ |
1656 | EReference getVLSFunctionFof_Terms(); | 1656 | EReference getVLSFunctionAsTerm_Terms(); |
1657 | 1657 | ||
1658 | /** | 1658 | /** |
1659 | * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDefinedTerm <em>VLS Defined Term</em>}'. | 1659 | * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDefinedTerm <em>VLS Defined Term</em>}'. |
@@ -2560,14 +2560,14 @@ public interface VampireLanguagePackage extends EPackage | |||
2560 | EAttribute VLS_VARIABLE__NAME = eINSTANCE.getVLSVariable_Name(); | 2560 | EAttribute VLS_VARIABLE__NAME = eINSTANCE.getVLSVariable_Name(); |
2561 | 2561 | ||
2562 | /** | 2562 | /** |
2563 | * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionFofImpl <em>VLS Function Fof</em>}' class. | 2563 | * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl <em>VLS Function As Term</em>}' class. |
2564 | * <!-- begin-user-doc --> | 2564 | * <!-- begin-user-doc --> |
2565 | * <!-- end-user-doc --> | 2565 | * <!-- end-user-doc --> |
2566 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionFofImpl | 2566 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl |
2567 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFunctionFof() | 2567 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFunctionAsTerm() |
2568 | * @generated | 2568 | * @generated |
2569 | */ | 2569 | */ |
2570 | EClass VLS_FUNCTION_FOF = eINSTANCE.getVLSFunctionFof(); | 2570 | EClass VLS_FUNCTION_AS_TERM = eINSTANCE.getVLSFunctionAsTerm(); |
2571 | 2571 | ||
2572 | /** | 2572 | /** |
2573 | * The meta object literal for the '<em><b>Functor</b></em>' attribute feature. | 2573 | * The meta object literal for the '<em><b>Functor</b></em>' attribute feature. |
@@ -2575,7 +2575,7 @@ public interface VampireLanguagePackage extends EPackage | |||
2575 | * <!-- end-user-doc --> | 2575 | * <!-- end-user-doc --> |
2576 | * @generated | 2576 | * @generated |
2577 | */ | 2577 | */ |
2578 | EAttribute VLS_FUNCTION_FOF__FUNCTOR = eINSTANCE.getVLSFunctionFof_Functor(); | 2578 | EAttribute VLS_FUNCTION_AS_TERM__FUNCTOR = eINSTANCE.getVLSFunctionAsTerm_Functor(); |
2579 | 2579 | ||
2580 | /** | 2580 | /** |
2581 | * The meta object literal for the '<em><b>Terms</b></em>' containment reference list feature. | 2581 | * The meta object literal for the '<em><b>Terms</b></em>' containment reference list feature. |
@@ -2583,7 +2583,7 @@ public interface VampireLanguagePackage extends EPackage | |||
2583 | * <!-- end-user-doc --> | 2583 | * <!-- end-user-doc --> |
2584 | * @generated | 2584 | * @generated |
2585 | */ | 2585 | */ |
2586 | EReference VLS_FUNCTION_FOF__TERMS = eINSTANCE.getVLSFunctionFof_Terms(); | 2586 | EReference VLS_FUNCTION_AS_TERM__TERMS = eINSTANCE.getVLSFunctionAsTerm_Terms(); |
2587 | 2587 | ||
2588 | /** | 2588 | /** |
2589 | * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDefinedTermImpl <em>VLS Defined Term</em>}' class. | 2589 | * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDefinedTermImpl <em>VLS Defined Term</em>}' class. |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireModel.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireModel.java index be258228..be0e2f59 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireModel.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireModel.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAndImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAndImpl.java index 951de940..bd0df208 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAndImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAndImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAnnotationImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAnnotationImpl.java index 092dd4c9..b55f087b 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAnnotationImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAnnotationImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
@@ -301,7 +301,7 @@ public class VLSAnnotationImpl extends MinimalEObjectImpl.Container implements V | |||
301 | { | 301 | { |
302 | if (eIsProxy()) return super.toString(); | 302 | if (eIsProxy()) return super.toString(); |
303 | 303 | ||
304 | StringBuffer result = new StringBuffer(super.toString()); | 304 | StringBuilder result = new StringBuilder(super.toString()); |
305 | result.append(" (name: "); | 305 | result.append(" (name: "); |
306 | result.append(name); | 306 | result.append(name); |
307 | result.append(')'); | 307 | result.append(')'); |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAssignmentImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAssignmentImpl.java index e6dbb58d..76ea3ec9 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAssignmentImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSAssignmentImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSCommentImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSCommentImpl.java index 9599872d..6e9ab1ef 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSCommentImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSCommentImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
@@ -168,7 +168,7 @@ public class VLSCommentImpl extends MinimalEObjectImpl.Container implements VLSC | |||
168 | { | 168 | { |
169 | if (eIsProxy()) return super.toString(); | 169 | if (eIsProxy()) return super.toString(); |
170 | 170 | ||
171 | StringBuffer result = new StringBuffer(super.toString()); | 171 | StringBuilder result = new StringBuilder(super.toString()); |
172 | result.append(" (comment: "); | 172 | result.append(" (comment: "); |
173 | result.append(comment); | 173 | result.append(comment); |
174 | result.append(')'); | 174 | result.append(')'); |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConfirmationsImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConfirmationsImpl.java index fb4bbf82..bfa10db2 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConfirmationsImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConfirmationsImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConstantImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConstantImpl.java index b9bcf512..d552dc2b 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConstantImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSConstantImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
@@ -167,7 +167,7 @@ public class VLSConstantImpl extends VLSTermImpl implements VLSConstant | |||
167 | { | 167 | { |
168 | if (eIsProxy()) return super.toString(); | 168 | if (eIsProxy()) return super.toString(); |
169 | 169 | ||
170 | StringBuffer result = new StringBuffer(super.toString()); | 170 | StringBuilder result = new StringBuilder(super.toString()); |
171 | result.append(" (name: "); | 171 | result.append(" (name: "); |
172 | result.append(name); | 172 | result.append(name); |
173 | result.append(')'); | 173 | result.append(')'); |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDefinedTermImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDefinedTermImpl.java index 444e2b85..eced6b57 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDefinedTermImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDefinedTermImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
@@ -167,7 +167,7 @@ public class VLSDefinedTermImpl extends VLSTermImpl implements VLSDefinedTerm | |||
167 | { | 167 | { |
168 | if (eIsProxy()) return super.toString(); | 168 | if (eIsProxy()) return super.toString(); |
169 | 169 | ||
170 | StringBuffer result = new StringBuffer(super.toString()); | 170 | StringBuilder result = new StringBuilder(super.toString()); |
171 | result.append(" (value: "); | 171 | result.append(" (value: "); |
172 | result.append(value); | 172 | result.append(value); |
173 | result.append(')'); | 173 | result.append(')'); |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDoubleQuoteImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDoubleQuoteImpl.java index db99a631..4eeb1757 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDoubleQuoteImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDoubleQuoteImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEqualityImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEqualityImpl.java index ba729215..8ad728ad 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEqualityImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEqualityImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEquivalentImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEquivalentImpl.java index 2ab11117..e90d4359 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEquivalentImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSEquivalentImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java index 34670d8b..322e6710 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFalseImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFalseImpl.java index 1db5a6b4..43a4cc77 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFalseImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFalseImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFofFormulaImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFofFormulaImpl.java index beef8908..ac381744 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFofFormulaImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFofFormulaImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
@@ -382,7 +382,7 @@ public class VLSFofFormulaImpl extends MinimalEObjectImpl.Container implements V | |||
382 | { | 382 | { |
383 | if (eIsProxy()) return super.toString(); | 383 | if (eIsProxy()) return super.toString(); |
384 | 384 | ||
385 | StringBuffer result = new StringBuffer(super.toString()); | 385 | StringBuilder result = new StringBuilder(super.toString()); |
386 | result.append(" (name: "); | 386 | result.append(" (name: "); |
387 | result.append(name); | 387 | result.append(name); |
388 | result.append(", fofRole: "); | 388 | result.append(", fofRole: "); |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionAsTermImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionAsTermImpl.java new file mode 100644 index 00000000..1df29e68 --- /dev/null +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionAsTermImpl.java | |||
@@ -0,0 +1,240 @@ | |||
1 | /** | ||
2 | * generated by Xtext 2.14.0 | ||
3 | */ | ||
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | ||
5 | |||
6 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm; | ||
7 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm; | ||
8 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage; | ||
9 | |||
10 | import java.util.Collection; | ||
11 | |||
12 | import org.eclipse.emf.common.notify.Notification; | ||
13 | import org.eclipse.emf.common.notify.NotificationChain; | ||
14 | |||
15 | import org.eclipse.emf.common.util.EList; | ||
16 | |||
17 | import org.eclipse.emf.ecore.EClass; | ||
18 | import org.eclipse.emf.ecore.InternalEObject; | ||
19 | |||
20 | import org.eclipse.emf.ecore.impl.ENotificationImpl; | ||
21 | |||
22 | import org.eclipse.emf.ecore.util.EObjectContainmentEList; | ||
23 | import org.eclipse.emf.ecore.util.InternalEList; | ||
24 | |||
25 | /** | ||
26 | * <!-- begin-user-doc --> | ||
27 | * An implementation of the model object '<em><b>VLS Function As Term</b></em>'. | ||
28 | * <!-- end-user-doc --> | ||
29 | * <p> | ||
30 | * The following features are implemented: | ||
31 | * </p> | ||
32 | * <ul> | ||
33 | * <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl#getFunctor <em>Functor</em>}</li> | ||
34 | * <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl#getTerms <em>Terms</em>}</li> | ||
35 | * </ul> | ||
36 | * | ||
37 | * @generated | ||
38 | */ | ||
39 | public class VLSFunctionAsTermImpl extends VLSTermImpl implements VLSFunctionAsTerm | ||
40 | { | ||
41 | /** | ||
42 | * The default value of the '{@link #getFunctor() <em>Functor</em>}' attribute. | ||
43 | * <!-- begin-user-doc --> | ||
44 | * <!-- end-user-doc --> | ||
45 | * @see #getFunctor() | ||
46 | * @generated | ||
47 | * @ordered | ||
48 | */ | ||
49 | protected static final String FUNCTOR_EDEFAULT = null; | ||
50 | |||
51 | /** | ||
52 | * The cached value of the '{@link #getFunctor() <em>Functor</em>}' attribute. | ||
53 | * <!-- begin-user-doc --> | ||
54 | * <!-- end-user-doc --> | ||
55 | * @see #getFunctor() | ||
56 | * @generated | ||
57 | * @ordered | ||
58 | */ | ||
59 | protected String functor = FUNCTOR_EDEFAULT; | ||
60 | |||
61 | /** | ||
62 | * The cached value of the '{@link #getTerms() <em>Terms</em>}' containment reference list. | ||
63 | * <!-- begin-user-doc --> | ||
64 | * <!-- end-user-doc --> | ||
65 | * @see #getTerms() | ||
66 | * @generated | ||
67 | * @ordered | ||
68 | */ | ||
69 | protected EList<VLSTerm> terms; | ||
70 | |||
71 | /** | ||
72 | * <!-- begin-user-doc --> | ||
73 | * <!-- end-user-doc --> | ||
74 | * @generated | ||
75 | */ | ||
76 | protected VLSFunctionAsTermImpl() | ||
77 | { | ||
78 | super(); | ||
79 | } | ||
80 | |||
81 | /** | ||
82 | * <!-- begin-user-doc --> | ||
83 | * <!-- end-user-doc --> | ||
84 | * @generated | ||
85 | */ | ||
86 | @Override | ||
87 | protected EClass eStaticClass() | ||
88 | { | ||
89 | return VampireLanguagePackage.Literals.VLS_FUNCTION_AS_TERM; | ||
90 | } | ||
91 | |||
92 | /** | ||
93 | * <!-- begin-user-doc --> | ||
94 | * <!-- end-user-doc --> | ||
95 | * @generated | ||
96 | */ | ||
97 | public String getFunctor() | ||
98 | { | ||
99 | return functor; | ||
100 | } | ||
101 | |||
102 | /** | ||
103 | * <!-- begin-user-doc --> | ||
104 | * <!-- end-user-doc --> | ||
105 | * @generated | ||
106 | */ | ||
107 | public void setFunctor(String newFunctor) | ||
108 | { | ||
109 | String oldFunctor = functor; | ||
110 | functor = newFunctor; | ||
111 | if (eNotificationRequired()) | ||
112 | eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_FUNCTION_AS_TERM__FUNCTOR, oldFunctor, functor)); | ||
113 | } | ||
114 | |||
115 | /** | ||
116 | * <!-- begin-user-doc --> | ||
117 | * <!-- end-user-doc --> | ||
118 | * @generated | ||
119 | */ | ||
120 | public EList<VLSTerm> getTerms() | ||
121 | { | ||
122 | if (terms == null) | ||
123 | { | ||
124 | terms = new EObjectContainmentEList<VLSTerm>(VLSTerm.class, this, VampireLanguagePackage.VLS_FUNCTION_AS_TERM__TERMS); | ||
125 | } | ||
126 | return terms; | ||
127 | } | ||
128 | |||
129 | /** | ||
130 | * <!-- begin-user-doc --> | ||
131 | * <!-- end-user-doc --> | ||
132 | * @generated | ||
133 | */ | ||
134 | @Override | ||
135 | public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) | ||
136 | { | ||
137 | switch (featureID) | ||
138 | { | ||
139 | case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__TERMS: | ||
140 | return ((InternalEList<?>)getTerms()).basicRemove(otherEnd, msgs); | ||
141 | } | ||
142 | return super.eInverseRemove(otherEnd, featureID, msgs); | ||
143 | } | ||
144 | |||
145 | /** | ||
146 | * <!-- begin-user-doc --> | ||
147 | * <!-- end-user-doc --> | ||
148 | * @generated | ||
149 | */ | ||
150 | @Override | ||
151 | public Object eGet(int featureID, boolean resolve, boolean coreType) | ||
152 | { | ||
153 | switch (featureID) | ||
154 | { | ||
155 | case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__FUNCTOR: | ||
156 | return getFunctor(); | ||
157 | case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__TERMS: | ||
158 | return getTerms(); | ||
159 | } | ||
160 | return super.eGet(featureID, resolve, coreType); | ||
161 | } | ||
162 | |||
163 | /** | ||
164 | * <!-- begin-user-doc --> | ||
165 | * <!-- end-user-doc --> | ||
166 | * @generated | ||
167 | */ | ||
168 | @SuppressWarnings("unchecked") | ||
169 | @Override | ||
170 | public void eSet(int featureID, Object newValue) | ||
171 | { | ||
172 | switch (featureID) | ||
173 | { | ||
174 | case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__FUNCTOR: | ||
175 | setFunctor((String)newValue); | ||
176 | return; | ||
177 | case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__TERMS: | ||
178 | getTerms().clear(); | ||
179 | getTerms().addAll((Collection<? extends VLSTerm>)newValue); | ||
180 | return; | ||
181 | } | ||
182 | super.eSet(featureID, newValue); | ||
183 | } | ||
184 | |||
185 | /** | ||
186 | * <!-- begin-user-doc --> | ||
187 | * <!-- end-user-doc --> | ||
188 | * @generated | ||
189 | */ | ||
190 | @Override | ||
191 | public void eUnset(int featureID) | ||
192 | { | ||
193 | switch (featureID) | ||
194 | { | ||
195 | case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__FUNCTOR: | ||
196 | setFunctor(FUNCTOR_EDEFAULT); | ||
197 | return; | ||
198 | case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__TERMS: | ||
199 | getTerms().clear(); | ||
200 | return; | ||
201 | } | ||
202 | super.eUnset(featureID); | ||
203 | } | ||
204 | |||
205 | /** | ||
206 | * <!-- begin-user-doc --> | ||
207 | * <!-- end-user-doc --> | ||
208 | * @generated | ||
209 | */ | ||
210 | @Override | ||
211 | public boolean eIsSet(int featureID) | ||
212 | { | ||
213 | switch (featureID) | ||
214 | { | ||
215 | case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__FUNCTOR: | ||
216 | return FUNCTOR_EDEFAULT == null ? functor != null : !FUNCTOR_EDEFAULT.equals(functor); | ||
217 | case VampireLanguagePackage.VLS_FUNCTION_AS_TERM__TERMS: | ||
218 | return terms != null && !terms.isEmpty(); | ||
219 | } | ||
220 | return super.eIsSet(featureID); | ||
221 | } | ||
222 | |||
223 | /** | ||
224 | * <!-- begin-user-doc --> | ||
225 | * <!-- end-user-doc --> | ||
226 | * @generated | ||
227 | */ | ||
228 | @Override | ||
229 | public String toString() | ||
230 | { | ||
231 | if (eIsProxy()) return super.toString(); | ||
232 | |||
233 | StringBuilder result = new StringBuilder(super.toString()); | ||
234 | result.append(" (functor: "); | ||
235 | result.append(functor); | ||
236 | result.append(')'); | ||
237 | return result.toString(); | ||
238 | } | ||
239 | |||
240 | } //VLSFunctionAsTermImpl | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionImpl.java index 49da58d4..219c0258 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFunctionImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
@@ -230,7 +230,7 @@ public class VLSFunctionImpl extends VLSTermImpl implements VLSFunction | |||
230 | { | 230 | { |
231 | if (eIsProxy()) return super.toString(); | 231 | if (eIsProxy()) return super.toString(); |
232 | 232 | ||
233 | StringBuffer result = new StringBuffer(super.toString()); | 233 | StringBuilder result = new StringBuilder(super.toString()); |
234 | result.append(" (constant: "); | 234 | result.append(" (constant: "); |
235 | result.append(constant); | 235 | result.append(constant); |
236 | result.append(')'); | 236 | result.append(')'); |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSImpliesImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSImpliesImpl.java index 3c8d9193..aabf8533 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSImpliesImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSImpliesImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIncludeImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIncludeImpl.java index b37d97b4..47a9f4c6 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIncludeImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIncludeImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
@@ -231,7 +231,7 @@ public class VLSIncludeImpl extends MinimalEObjectImpl.Container implements VLSI | |||
231 | { | 231 | { |
232 | if (eIsProxy()) return super.toString(); | 232 | if (eIsProxy()) return super.toString(); |
233 | 233 | ||
234 | StringBuffer result = new StringBuffer(super.toString()); | 234 | StringBuilder result = new StringBuilder(super.toString()); |
235 | result.append(" (fileName: "); | 235 | result.append(" (fileName: "); |
236 | result.append(fileName); | 236 | result.append(fileName); |
237 | result.append(')'); | 237 | result.append(')'); |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSInequalityImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSInequalityImpl.java index ba409780..326b473b 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSInequalityImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSInequalityImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIntImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIntImpl.java index a513549a..44593a33 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIntImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIntImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSLessImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSLessImpl.java index 71f2b9c8..a3571d34 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSLessImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSLessImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
@@ -230,7 +230,7 @@ public class VLSLessImpl extends VLSTermImpl implements VLSLess | |||
230 | { | 230 | { |
231 | if (eIsProxy()) return super.toString(); | 231 | if (eIsProxy()) return super.toString(); |
232 | 232 | ||
233 | StringBuffer result = new StringBuffer(super.toString()); | 233 | StringBuilder result = new StringBuilder(super.toString()); |
234 | result.append(" (name: "); | 234 | result.append(" (name: "); |
235 | result.append(name); | 235 | result.append(name); |
236 | result.append(')'); | 236 | result.append(')'); |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNameImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNameImpl.java index 5217696e..6863c49c 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNameImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNameImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
@@ -168,7 +168,7 @@ public class VLSNameImpl extends MinimalEObjectImpl.Container implements VLSName | |||
168 | { | 168 | { |
169 | if (eIsProxy()) return super.toString(); | 169 | if (eIsProxy()) return super.toString(); |
170 | 170 | ||
171 | StringBuffer result = new StringBuffer(super.toString()); | 171 | StringBuilder result = new StringBuilder(super.toString()); |
172 | result.append(" (name: "); | 172 | result.append(" (name: "); |
173 | result.append(name); | 173 | result.append(name); |
174 | result.append(')'); | 174 | result.append(')'); |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNandImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNandImpl.java index ca157692..2e12ec98 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNandImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNandImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNorImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNorImpl.java index b9d8eea4..5bc1f7da 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNorImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNorImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOrImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOrImpl.java index dbe09020..80dbe94b 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOrImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOrImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRationalImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRationalImpl.java index 43f2b84b..c0960e3f 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRationalImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRationalImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRealImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRealImpl.java index 54789949..bedcde3e 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRealImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRealImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRevImpliesImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRevImpliesImpl.java index 2a0dbf03..97986a86 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRevImpliesImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRevImpliesImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSSatisfiableImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSSatisfiableImpl.java index 0c591e2f..49ef1e74 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSSatisfiableImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSSatisfiableImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java index 3766eae5..b556819f 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffFormulaImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffFormulaImpl.java index b20fa91c..b4ff1184 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffFormulaImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffFormulaImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
@@ -382,7 +382,7 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V | |||
382 | { | 382 | { |
383 | if (eIsProxy()) return super.toString(); | 383 | if (eIsProxy()) return super.toString(); |
384 | 384 | ||
385 | StringBuffer result = new StringBuffer(super.toString()); | 385 | StringBuilder result = new StringBuilder(super.toString()); |
386 | result.append(" (name: "); | 386 | result.append(" (name: "); |
387 | result.append(name); | 387 | result.append(name); |
388 | result.append(", fofRole: "); | 388 | result.append(", fofRole: "); |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTrueImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTrueImpl.java index 3153600a..85913139 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTrueImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTrueImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUnaryNegationImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUnaryNegationImpl.java index 85dc0b1b..c315f189 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUnaryNegationImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUnaryNegationImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java index 5627cc4c..696a4889 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java index 437bb72d..9ebed3eb 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
@@ -167,7 +167,7 @@ public class VLSVariableImpl extends VLSTermImpl implements VLSVariable | |||
167 | { | 167 | { |
168 | if (eIsProxy()) return super.toString(); | 168 | if (eIsProxy()) return super.toString(); |
169 | 169 | ||
170 | StringBuffer result = new StringBuffer(super.toString()); | 170 | StringBuilder result = new StringBuilder(super.toString()); |
171 | result.append(" (name: "); | 171 | result.append(" (name: "); |
172 | result.append(name); | 172 | result.append(name); |
173 | result.append(')'); | 173 | result.append(')'); |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSXnorImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSXnorImpl.java index 0f9e5f5a..06b6bd92 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSXnorImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSXnorImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
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 c3c74fe9..a6b1ac36 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 | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
@@ -76,7 +76,7 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL | |||
76 | case VampireLanguagePackage.VLS_ANNOTATION: return createVLSAnnotation(); | 76 | case VampireLanguagePackage.VLS_ANNOTATION: return createVLSAnnotation(); |
77 | case VampireLanguagePackage.VLS_TERM: return createVLSTerm(); | 77 | case VampireLanguagePackage.VLS_TERM: return createVLSTerm(); |
78 | case VampireLanguagePackage.VLS_VARIABLE: return createVLSVariable(); | 78 | case VampireLanguagePackage.VLS_VARIABLE: return createVLSVariable(); |
79 | case VampireLanguagePackage.VLS_FUNCTION_FOF: return createVLSFunctionFof(); | 79 | case VampireLanguagePackage.VLS_FUNCTION_AS_TERM: return createVLSFunctionAsTerm(); |
80 | case VampireLanguagePackage.VLS_DEFINED_TERM: return createVLSDefinedTerm(); | 80 | case VampireLanguagePackage.VLS_DEFINED_TERM: return createVLSDefinedTerm(); |
81 | case VampireLanguagePackage.VLS_EQUIVALENT: return createVLSEquivalent(); | 81 | case VampireLanguagePackage.VLS_EQUIVALENT: return createVLSEquivalent(); |
82 | case VampireLanguagePackage.VLS_IMPLIES: return createVLSImplies(); | 82 | case VampireLanguagePackage.VLS_IMPLIES: return createVLSImplies(); |
@@ -232,10 +232,10 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL | |||
232 | * <!-- end-user-doc --> | 232 | * <!-- end-user-doc --> |
233 | * @generated | 233 | * @generated |
234 | */ | 234 | */ |
235 | public VLSFunctionFof createVLSFunctionFof() | 235 | public VLSFunctionAsTerm createVLSFunctionAsTerm() |
236 | { | 236 | { |
237 | VLSFunctionFofImpl vlsFunctionFof = new VLSFunctionFofImpl(); | 237 | VLSFunctionAsTermImpl vlsFunctionAsTerm = new VLSFunctionAsTermImpl(); |
238 | return vlsFunctionFof; | 238 | return vlsFunctionAsTerm; |
239 | } | 239 | } |
240 | 240 | ||
241 | /** | 241 | /** |
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 2b131272..2907b35d 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 | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
@@ -17,7 +17,7 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier; | |||
17 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFalse; | 17 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFalse; |
18 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula; | 18 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula; |
19 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction; | 19 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction; |
20 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof; | 20 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm; |
21 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies; | 21 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies; |
22 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude; | 22 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude; |
23 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality; | 23 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality; |
@@ -139,7 +139,7 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL | |||
139 | * <!-- end-user-doc --> | 139 | * <!-- end-user-doc --> |
140 | * @generated | 140 | * @generated |
141 | */ | 141 | */ |
142 | private EClass vlsFunctionFofEClass = null; | 142 | private EClass vlsFunctionAsTermEClass = null; |
143 | 143 | ||
144 | /** | 144 | /** |
145 | * <!-- begin-user-doc --> | 145 | * <!-- begin-user-doc --> |
@@ -338,7 +338,7 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL | |||
338 | 338 | ||
339 | /** | 339 | /** |
340 | * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. | 340 | * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. |
341 | * | 341 | * |
342 | * <p>This method is used to initialize {@link VampireLanguagePackage#eINSTANCE} when that field is accessed. | 342 | * <p>This method is used to initialize {@link VampireLanguagePackage#eINSTANCE} when that field is accessed. |
343 | * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. | 343 | * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. |
344 | * <!-- begin-user-doc --> | 344 | * <!-- begin-user-doc --> |
@@ -353,7 +353,8 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL | |||
353 | if (isInited) return (VampireLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(VampireLanguagePackage.eNS_URI); | 353 | if (isInited) return (VampireLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(VampireLanguagePackage.eNS_URI); |
354 | 354 | ||
355 | // Obtain or create and register package | 355 | // Obtain or create and register package |
356 | VampireLanguagePackageImpl theVampireLanguagePackage = (VampireLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VampireLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new VampireLanguagePackageImpl()); | 356 | Object registeredVampireLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); |
357 | VampireLanguagePackageImpl theVampireLanguagePackage = registeredVampireLanguagePackage instanceof VampireLanguagePackageImpl ? (VampireLanguagePackageImpl)registeredVampireLanguagePackage : new VampireLanguagePackageImpl(); | ||
357 | 358 | ||
358 | isInited = true; | 359 | isInited = true; |
359 | 360 | ||
@@ -366,7 +367,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL | |||
366 | // Mark meta-data to indicate it can't be changed | 367 | // Mark meta-data to indicate it can't be changed |
367 | theVampireLanguagePackage.freeze(); | 368 | theVampireLanguagePackage.freeze(); |
368 | 369 | ||
369 | |||
370 | // Update the registry and return the package | 370 | // Update the registry and return the package |
371 | EPackage.Registry.INSTANCE.put(VampireLanguagePackage.eNS_URI, theVampireLanguagePackage); | 371 | EPackage.Registry.INSTANCE.put(VampireLanguagePackage.eNS_URI, theVampireLanguagePackage); |
372 | return theVampireLanguagePackage; | 372 | return theVampireLanguagePackage; |
@@ -697,9 +697,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL | |||
697 | * <!-- end-user-doc --> | 697 | * <!-- end-user-doc --> |
698 | * @generated | 698 | * @generated |
699 | */ | 699 | */ |
700 | public EClass getVLSFunctionFof() | 700 | public EClass getVLSFunctionAsTerm() |
701 | { | 701 | { |
702 | return vlsFunctionFofEClass; | 702 | return vlsFunctionAsTermEClass; |
703 | } | 703 | } |
704 | 704 | ||
705 | /** | 705 | /** |
@@ -707,9 +707,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL | |||
707 | * <!-- end-user-doc --> | 707 | * <!-- end-user-doc --> |
708 | * @generated | 708 | * @generated |
709 | */ | 709 | */ |
710 | public EAttribute getVLSFunctionFof_Functor() | 710 | public EAttribute getVLSFunctionAsTerm_Functor() |
711 | { | 711 | { |
712 | return (EAttribute)vlsFunctionFofEClass.getEStructuralFeatures().get(0); | 712 | return (EAttribute)vlsFunctionAsTermEClass.getEStructuralFeatures().get(0); |
713 | } | 713 | } |
714 | 714 | ||
715 | /** | 715 | /** |
@@ -717,9 +717,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL | |||
717 | * <!-- end-user-doc --> | 717 | * <!-- end-user-doc --> |
718 | * @generated | 718 | * @generated |
719 | */ | 719 | */ |
720 | public EReference getVLSFunctionFof_Terms() | 720 | public EReference getVLSFunctionAsTerm_Terms() |
721 | { | 721 | { |
722 | return (EReference)vlsFunctionFofEClass.getEStructuralFeatures().get(1); | 722 | return (EReference)vlsFunctionAsTermEClass.getEStructuralFeatures().get(1); |
723 | } | 723 | } |
724 | 724 | ||
725 | /** | 725 | /** |
@@ -1365,9 +1365,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL | |||
1365 | vlsVariableEClass = createEClass(VLS_VARIABLE); | 1365 | vlsVariableEClass = createEClass(VLS_VARIABLE); |
1366 | createEAttribute(vlsVariableEClass, VLS_VARIABLE__NAME); | 1366 | createEAttribute(vlsVariableEClass, VLS_VARIABLE__NAME); |
1367 | 1367 | ||
1368 | vlsFunctionFofEClass = createEClass(VLS_FUNCTION_FOF); | 1368 | vlsFunctionAsTermEClass = createEClass(VLS_FUNCTION_AS_TERM); |
1369 | createEAttribute(vlsFunctionFofEClass, VLS_FUNCTION_FOF__FUNCTOR); | 1369 | createEAttribute(vlsFunctionAsTermEClass, VLS_FUNCTION_AS_TERM__FUNCTOR); |
1370 | createEReference(vlsFunctionFofEClass, VLS_FUNCTION_FOF__TERMS); | 1370 | createEReference(vlsFunctionAsTermEClass, VLS_FUNCTION_AS_TERM__TERMS); |
1371 | 1371 | ||
1372 | vlsDefinedTermEClass = createEClass(VLS_DEFINED_TERM); | 1372 | vlsDefinedTermEClass = createEClass(VLS_DEFINED_TERM); |
1373 | createEAttribute(vlsDefinedTermEClass, VLS_DEFINED_TERM__VALUE); | 1373 | createEAttribute(vlsDefinedTermEClass, VLS_DEFINED_TERM__VALUE); |
@@ -1482,7 +1482,7 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL | |||
1482 | // Add supertypes to classes | 1482 | // Add supertypes to classes |
1483 | vlsSatisfiableEClass.getESuperTypes().add(this.getVLSConfirmations()); | 1483 | vlsSatisfiableEClass.getESuperTypes().add(this.getVLSConfirmations()); |
1484 | vlsVariableEClass.getESuperTypes().add(this.getVLSTerm()); | 1484 | vlsVariableEClass.getESuperTypes().add(this.getVLSTerm()); |
1485 | vlsFunctionFofEClass.getESuperTypes().add(this.getVLSTerm()); | 1485 | vlsFunctionAsTermEClass.getESuperTypes().add(this.getVLSTerm()); |
1486 | vlsDefinedTermEClass.getESuperTypes().add(this.getVLSTerm()); | 1486 | vlsDefinedTermEClass.getESuperTypes().add(this.getVLSTerm()); |
1487 | vlsEquivalentEClass.getESuperTypes().add(this.getVLSTerm()); | 1487 | vlsEquivalentEClass.getESuperTypes().add(this.getVLSTerm()); |
1488 | vlsImpliesEClass.getESuperTypes().add(this.getVLSTerm()); | 1488 | vlsImpliesEClass.getESuperTypes().add(this.getVLSTerm()); |
@@ -1552,9 +1552,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL | |||
1552 | initEClass(vlsVariableEClass, VLSVariable.class, "VLSVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); | 1552 | initEClass(vlsVariableEClass, VLSVariable.class, "VLSVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); |
1553 | initEAttribute(getVLSVariable_Name(), ecorePackage.getEString(), "name", null, 0, 1, VLSVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); | 1553 | initEAttribute(getVLSVariable_Name(), ecorePackage.getEString(), "name", null, 0, 1, VLSVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); |
1554 | 1554 | ||
1555 | initEClass(vlsFunctionFofEClass, VLSFunctionFof.class, "VLSFunctionFof", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); | 1555 | initEClass(vlsFunctionAsTermEClass, VLSFunctionAsTerm.class, "VLSFunctionAsTerm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); |
1556 | initEAttribute(getVLSFunctionFof_Functor(), ecorePackage.getEString(), "functor", null, 0, 1, VLSFunctionFof.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); | 1556 | initEAttribute(getVLSFunctionAsTerm_Functor(), ecorePackage.getEString(), "functor", null, 0, 1, VLSFunctionAsTerm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); |
1557 | initEReference(getVLSFunctionFof_Terms(), this.getVLSTerm(), null, "terms", null, 0, -1, VLSFunctionFof.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); | 1557 | initEReference(getVLSFunctionAsTerm_Terms(), this.getVLSTerm(), null, "terms", null, 0, -1, VLSFunctionAsTerm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); |
1558 | 1558 | ||
1559 | initEClass(vlsDefinedTermEClass, VLSDefinedTerm.class, "VLSDefinedTerm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); | 1559 | initEClass(vlsDefinedTermEClass, VLSDefinedTerm.class, "VLSDefinedTerm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); |
1560 | initEAttribute(getVLSDefinedTerm_Value(), ecorePackage.getEString(), "value", null, 0, 1, VLSDefinedTerm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); | 1560 | initEAttribute(getVLSDefinedTerm_Value(), ecorePackage.getEString(), "value", null, 0, 1, VLSDefinedTerm.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/impl/VampireModelImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireModelImpl.java index 05b3086c..e0dcd099 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireModelImpl.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireModelImpl.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl; |
5 | 5 | ||
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 41e073ca..1d9a6b22 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 | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.util; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.util; |
5 | 5 | ||
@@ -131,9 +131,9 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl | |||
131 | return createVLSVariableAdapter(); | 131 | return createVLSVariableAdapter(); |
132 | } | 132 | } |
133 | @Override | 133 | @Override |
134 | public Adapter caseVLSFunctionFof(VLSFunctionFof object) | 134 | public Adapter caseVLSFunctionAsTerm(VLSFunctionAsTerm object) |
135 | { | 135 | { |
136 | return createVLSFunctionFofAdapter(); | 136 | return createVLSFunctionAsTermAdapter(); |
137 | } | 137 | } |
138 | @Override | 138 | @Override |
139 | public Adapter caseVLSDefinedTerm(VLSDefinedTerm object) | 139 | public Adapter caseVLSDefinedTerm(VLSDefinedTerm object) |
@@ -443,16 +443,16 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl | |||
443 | } | 443 | } |
444 | 444 | ||
445 | /** | 445 | /** |
446 | * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof <em>VLS Function Fof</em>}'. | 446 | * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm <em>VLS Function As Term</em>}'. |
447 | * <!-- begin-user-doc --> | 447 | * <!-- begin-user-doc --> |
448 | * This default implementation returns null so that we can easily ignore cases; | 448 | * This default implementation returns null so that we can easily ignore cases; |
449 | * it's useful to ignore a case when inheritance will catch all the cases anyway. | 449 | * it's useful to ignore a case when inheritance will catch all the cases anyway. |
450 | * <!-- end-user-doc --> | 450 | * <!-- end-user-doc --> |
451 | * @return the new adapter. | 451 | * @return the new adapter. |
452 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof | 452 | * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm |
453 | * @generated | 453 | * @generated |
454 | */ | 454 | */ |
455 | public Adapter createVLSFunctionFofAdapter() | 455 | public Adapter createVLSFunctionAsTermAdapter() |
456 | { | 456 | { |
457 | return null; | 457 | return null; |
458 | } | 458 | } |
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 24ad4238..3b7106f8 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 | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.14.0 |
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.util; | 4 | package ca.mcgill.ecse.dslreasoner.vampireLanguage.util; |
5 | 5 | ||
@@ -152,11 +152,11 @@ public class VampireLanguageSwitch<T> extends Switch<T> | |||
152 | if (result == null) result = defaultCase(theEObject); | 152 | if (result == null) result = defaultCase(theEObject); |
153 | return result; | 153 | return result; |
154 | } | 154 | } |
155 | case VampireLanguagePackage.VLS_FUNCTION_FOF: | 155 | case VampireLanguagePackage.VLS_FUNCTION_AS_TERM: |
156 | { | 156 | { |
157 | VLSFunctionFof vlsFunctionFof = (VLSFunctionFof)theEObject; | 157 | VLSFunctionAsTerm vlsFunctionAsTerm = (VLSFunctionAsTerm)theEObject; |
158 | T result = caseVLSFunctionFof(vlsFunctionFof); | 158 | T result = caseVLSFunctionAsTerm(vlsFunctionAsTerm); |
159 | if (result == null) result = caseVLSTerm(vlsFunctionFof); | 159 | if (result == null) result = caseVLSTerm(vlsFunctionAsTerm); |
160 | if (result == null) result = defaultCase(theEObject); | 160 | if (result == null) result = defaultCase(theEObject); |
161 | return result; | 161 | return result; |
162 | } | 162 | } |
@@ -537,17 +537,17 @@ public class VampireLanguageSwitch<T> extends Switch<T> | |||
537 | } | 537 | } |
538 | 538 | ||
539 | /** | 539 | /** |
540 | * Returns the result of interpreting the object as an instance of '<em>VLS Function Fof</em>'. | 540 | * Returns the result of interpreting the object as an instance of '<em>VLS Function As Term</em>'. |
541 | * <!-- begin-user-doc --> | 541 | * <!-- begin-user-doc --> |
542 | * This implementation returns null; | 542 | * This implementation returns null; |
543 | * returning a non-null result will terminate the switch. | 543 | * returning a non-null result will terminate the switch. |
544 | * <!-- end-user-doc --> | 544 | * <!-- end-user-doc --> |
545 | * @param object the target of the switch. | 545 | * @param object the target of the switch. |
546 | * @return the result of interpreting the object as an instance of '<em>VLS Function Fof</em>'. | 546 | * @return the result of interpreting the object as an instance of '<em>VLS Function As Term</em>'. |
547 | * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) | 547 | * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) |
548 | * @generated | 548 | * @generated |
549 | */ | 549 | */ |
550 | public T caseVLSFunctionFof(VLSFunctionFof object) | 550 | public T caseVLSFunctionAsTerm(VLSFunctionAsTerm object) |
551 | { | 551 | { |
552 | return null; | 552 | return null; |
553 | } | 553 | } |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtext b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtext index 2b5958ca..7d20da72 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtext +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtext | |||
@@ -289,10 +289,10 @@ VLSVariable : | |||
289 | 289 | ||
290 | VLSFofTerm returns VLSTerm: | 290 | VLSFofTerm returns VLSTerm: |
291 | //(VLSVariable | VLSFunction | VLSTffConditional | VLSTffLet | VLSTffTuple) | 291 | //(VLSVariable | VLSFunction | VLSTffConditional | VLSTffLet | VLSTffTuple) |
292 | (VLSVariable | VLSFunctionFof | VLSDefinedTerm ) | 292 | (VLSVariable | VLSFunctionAsTerm | VLSDefinedTerm ) |
293 | ; | 293 | ; |
294 | 294 | ||
295 | VLSFunctionFof: | 295 | VLSFunctionAsTerm: |
296 | //? on next line causes warning | 296 | //? on next line causes warning |
297 | //TODO might need replace DOLLAR_ID with enum rule | 297 | //TODO might need replace DOLLAR_ID with enum rule |
298 | functor = (LOWER_WORD_ID | SINGLE_QUOTE | DOLLAR_ID | DOUBLE_DOLLAR_ID ) ( '(' terms += VLSFofTerm (',' terms += VLSFofTerm)* ')')? | 298 | functor = (LOWER_WORD_ID | SINGLE_QUOTE | DOLLAR_ID | DOUBLE_DOLLAR_ID ) ( '(' terms += VLSFofTerm (',' terms += VLSFofTerm)* ')')? |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin index 503b9b33..834a13c3 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin index bcff04c1..6895f687 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/.project b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/.project index 2221f39c..e73fac6d 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/.project +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/.project | |||
@@ -6,6 +6,11 @@ | |||
6 | </projects> | 6 | </projects> |
7 | <buildSpec> | 7 | <buildSpec> |
8 | <buildCommand> | 8 | <buildCommand> |
9 | <name>org.eclipse.viatra.query.tooling.ui.projectbuilder</name> | ||
10 | <arguments> | ||
11 | </arguments> | ||
12 | </buildCommand> | ||
13 | <buildCommand> | ||
9 | <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> | 14 | <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> |
10 | <arguments> | 15 | <arguments> |
11 | </arguments> | 16 | </arguments> |
@@ -30,5 +35,6 @@ | |||
30 | <nature>org.eclipse.pde.PluginNature</nature> | 35 | <nature>org.eclipse.pde.PluginNature</nature> |
31 | <nature>org.eclipse.jdt.core.javanature</nature> | 36 | <nature>org.eclipse.jdt.core.javanature</nature> |
32 | <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> | 37 | <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> |
38 | <nature>org.eclipse.viatra.query.projectnature</nature> | ||
33 | </natures> | 39 | </natures> |
34 | </projectDescription> | 40 | </projectDescription> |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/META-INF/MANIFEST.MF b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/META-INF/MANIFEST.MF index 63d39592..6ed29084 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/META-INF/MANIFEST.MF +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/META-INF/MANIFEST.MF | |||
@@ -6,12 +6,17 @@ Bundle-Version: 1.0.0.qualifier | |||
6 | Export-Package: ca.mcgill.ecse.dslreasoner.vampire.reasoner, | 6 | Export-Package: ca.mcgill.ecse.dslreasoner.vampire.reasoner, |
7 | ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder, | 7 | ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder, |
8 | ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries | 8 | ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries |
9 | Require-Bundle: org.eclipse.xtend.lib, | 9 | Require-Bundle: org.eclipse.emf.ecore, |
10 | org.eclipse.viatra.query.runtime.rete, | ||
11 | org.eclipse.viatra.query.runtime.localsearch, | ||
12 | org.eclipse.xtext.xbase.lib, | ||
13 | org.eclipse.xtend.lib, | ||
10 | hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0", | 14 | hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0", |
11 | hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0", | 15 | hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0", |
12 | ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0", | 16 | ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0", |
13 | org.eclipse.viatra.query.runtime;bundle-version="2.1.0", | 17 | org.eclipse.viatra.query.runtime;bundle-version="2.1.0", |
14 | org.eclipse.viatra.query.runtime.base.itc;bundle-version="2.1.0", | 18 | org.eclipse.viatra.query.runtime.base.itc;bundle-version="2.1.0", |
15 | org.apache.log4j;bundle-version="1.2.15" | 19 | org.apache.log4j;bundle-version="1.2.15" |
16 | Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.reasoner | ||
17 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | 20 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
21 | Import-Package: org.apache.log4j | ||
22 | Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.reasoner | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/build.properties b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/build.properties index aed85a48..efae4b07 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/build.properties +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/build.properties | |||
@@ -1,5 +1,6 @@ | |||
1 | bin.includes = META-INF/,\ | 1 | bin.includes = META-INF/,\ |
2 | . | 2 | . |
3 | source.. = src/,\ | 3 | source.. = src/,\ |
4 | src-gen/,\ | ||
4 | src-gen/ | 5 | src-gen/ |
5 | output.. = bin/ | 6 | output.. = bin/ |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/queries/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/vampireQueries.vql b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/queries/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/vampireQueries.vql index 2db380e4..be5a7c1f 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/queries/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/vampireQueries.vql +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/queries/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/vampireQueries.vql | |||
@@ -48,8 +48,8 @@ pattern VLSInequality(term: VLSInequality){ | |||
48 | VLSInequality(term); | 48 | VLSInequality(term); |
49 | } | 49 | } |
50 | 50 | ||
51 | pattern VLSFunctionFof(term: VLSFunctionFof){ | 51 | pattern VLSFunctionFof(term: VLSFunctionAsTerm){ |
52 | VLSFunctionFof(term); | 52 | VLSFunctionAsTerm(term); |
53 | } | 53 | } |
54 | 54 | ||
55 | //pattern VLSFofTerm(term: VLSFofTerm){ | 55 | //pattern VLSFofTerm(term: VLSFofTerm){ |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunctionFof.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunctionFof.java index 5a88b0b4..0e82d459 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunctionFof.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunctionFof.java | |||
@@ -3,6 +3,7 @@ | |||
3 | */ | 3 | */ |
4 | package ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries; | 4 | package ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries; |
5 | 5 | ||
6 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm; | ||
6 | import java.util.Arrays; | 7 | import java.util.Arrays; |
7 | import java.util.Collection; | 8 | import java.util.Collection; |
8 | import java.util.LinkedHashSet; | 9 | import java.util.LinkedHashSet; |
@@ -40,8 +41,8 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil; | |||
40 | * | 41 | * |
41 | * <p>Original source: | 42 | * <p>Original source: |
42 | * <code><pre> | 43 | * <code><pre> |
43 | * pattern VLSFunctionFof(term: VLSFunctionFof){ | 44 | * pattern VLSFunctionFof(term: VLSFunctionAsTerm){ |
44 | * VLSFunctionFof(term); | 45 | * VLSFunctionAsTerm(term); |
45 | * } | 46 | * } |
46 | * </pre></code> | 47 | * </pre></code> |
47 | * | 48 | * |
@@ -64,11 +65,11 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
64 | * | 65 | * |
65 | */ | 66 | */ |
66 | public static abstract class Match extends BasePatternMatch { | 67 | public static abstract class Match extends BasePatternMatch { |
67 | private ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof fTerm; | 68 | private VLSFunctionAsTerm fTerm; |
68 | 69 | ||
69 | private static List<String> parameterNames = makeImmutableList("term"); | 70 | private static List<String> parameterNames = makeImmutableList("term"); |
70 | 71 | ||
71 | private Match(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) { | 72 | private Match(final VLSFunctionAsTerm pTerm) { |
72 | this.fTerm = pTerm; | 73 | this.fTerm = pTerm; |
73 | } | 74 | } |
74 | 75 | ||
@@ -78,7 +79,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
78 | return null; | 79 | return null; |
79 | } | 80 | } |
80 | 81 | ||
81 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof getTerm() { | 82 | public VLSFunctionAsTerm getTerm() { |
82 | return this.fTerm; | 83 | return this.fTerm; |
83 | } | 84 | } |
84 | 85 | ||
@@ -86,13 +87,13 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
86 | public boolean set(final String parameterName, final Object newValue) { | 87 | public boolean set(final String parameterName, final Object newValue) { |
87 | if (!isMutable()) throw new java.lang.UnsupportedOperationException(); | 88 | if (!isMutable()) throw new java.lang.UnsupportedOperationException(); |
88 | if ("term".equals(parameterName) ) { | 89 | if ("term".equals(parameterName) ) { |
89 | this.fTerm = (ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) newValue; | 90 | this.fTerm = (VLSFunctionAsTerm) newValue; |
90 | return true; | 91 | return true; |
91 | } | 92 | } |
92 | return false; | 93 | return false; |
93 | } | 94 | } |
94 | 95 | ||
95 | public void setTerm(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) { | 96 | public void setTerm(final VLSFunctionAsTerm pTerm) { |
96 | if (!isMutable()) throw new java.lang.UnsupportedOperationException(); | 97 | if (!isMutable()) throw new java.lang.UnsupportedOperationException(); |
97 | this.fTerm = pTerm; | 98 | this.fTerm = pTerm; |
98 | } | 99 | } |
@@ -173,7 +174,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
173 | * @return the new, mutable (partial) match object. | 174 | * @return the new, mutable (partial) match object. |
174 | * | 175 | * |
175 | */ | 176 | */ |
176 | public static VLSFunctionFof.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) { | 177 | public static VLSFunctionFof.Match newMutableMatch(final VLSFunctionAsTerm pTerm) { |
177 | return new Mutable(pTerm); | 178 | return new Mutable(pTerm); |
178 | } | 179 | } |
179 | 180 | ||
@@ -185,12 +186,12 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
185 | * @return the (partial) match object. | 186 | * @return the (partial) match object. |
186 | * | 187 | * |
187 | */ | 188 | */ |
188 | public static VLSFunctionFof.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) { | 189 | public static VLSFunctionFof.Match newMatch(final VLSFunctionAsTerm pTerm) { |
189 | return new Immutable(pTerm); | 190 | return new Immutable(pTerm); |
190 | } | 191 | } |
191 | 192 | ||
192 | private static final class Mutable extends VLSFunctionFof.Match { | 193 | private static final class Mutable extends VLSFunctionFof.Match { |
193 | Mutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) { | 194 | Mutable(final VLSFunctionAsTerm pTerm) { |
194 | super(pTerm); | 195 | super(pTerm); |
195 | } | 196 | } |
196 | 197 | ||
@@ -201,7 +202,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
201 | } | 202 | } |
202 | 203 | ||
203 | private static final class Immutable extends VLSFunctionFof.Match { | 204 | private static final class Immutable extends VLSFunctionFof.Match { |
204 | Immutable(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) { | 205 | Immutable(final VLSFunctionAsTerm pTerm) { |
205 | super(pTerm); | 206 | super(pTerm); |
206 | } | 207 | } |
207 | 208 | ||
@@ -223,8 +224,8 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
223 | * | 224 | * |
224 | * <p>Original source: | 225 | * <p>Original source: |
225 | * <code><pre> | 226 | * <code><pre> |
226 | * pattern VLSFunctionFof(term: VLSFunctionFof){ | 227 | * pattern VLSFunctionFof(term: VLSFunctionAsTerm){ |
227 | * VLSFunctionFof(term); | 228 | * VLSFunctionAsTerm(term); |
228 | * } | 229 | * } |
229 | * </pre></code> | 230 | * </pre></code> |
230 | * | 231 | * |
@@ -282,7 +283,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
282 | * @return matches represented as a Match object. | 283 | * @return matches represented as a Match object. |
283 | * | 284 | * |
284 | */ | 285 | */ |
285 | public Collection<VLSFunctionFof.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) { | 286 | public Collection<VLSFunctionFof.Match> getAllMatches(final VLSFunctionAsTerm pTerm) { |
286 | return rawStreamAllMatches(new Object[]{pTerm}).collect(Collectors.toSet()); | 287 | return rawStreamAllMatches(new Object[]{pTerm}).collect(Collectors.toSet()); |
287 | } | 288 | } |
288 | 289 | ||
@@ -296,7 +297,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
296 | * @return a stream of matches represented as a Match object. | 297 | * @return a stream of matches represented as a Match object. |
297 | * | 298 | * |
298 | */ | 299 | */ |
299 | public Stream<VLSFunctionFof.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) { | 300 | public Stream<VLSFunctionFof.Match> streamAllMatches(final VLSFunctionAsTerm pTerm) { |
300 | return rawStreamAllMatches(new Object[]{pTerm}); | 301 | return rawStreamAllMatches(new Object[]{pTerm}); |
301 | } | 302 | } |
302 | 303 | ||
@@ -307,7 +308,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
307 | * @return a match represented as a Match object, or null if no match is found. | 308 | * @return a match represented as a Match object, or null if no match is found. |
308 | * | 309 | * |
309 | */ | 310 | */ |
310 | public Optional<VLSFunctionFof.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) { | 311 | public Optional<VLSFunctionFof.Match> getOneArbitraryMatch(final VLSFunctionAsTerm pTerm) { |
311 | return rawGetOneArbitraryMatch(new Object[]{pTerm}); | 312 | return rawGetOneArbitraryMatch(new Object[]{pTerm}); |
312 | } | 313 | } |
313 | 314 | ||
@@ -318,7 +319,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
318 | * @return true if the input is a valid (partial) match of the pattern. | 319 | * @return true if the input is a valid (partial) match of the pattern. |
319 | * | 320 | * |
320 | */ | 321 | */ |
321 | public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) { | 322 | public boolean hasMatch(final VLSFunctionAsTerm pTerm) { |
322 | return rawHasMatch(new Object[]{pTerm}); | 323 | return rawHasMatch(new Object[]{pTerm}); |
323 | } | 324 | } |
324 | 325 | ||
@@ -328,7 +329,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
328 | * @return the number of pattern matches found. | 329 | * @return the number of pattern matches found. |
329 | * | 330 | * |
330 | */ | 331 | */ |
331 | public int countMatches(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) { | 332 | public int countMatches(final VLSFunctionAsTerm pTerm) { |
332 | return rawCountMatches(new Object[]{pTerm}); | 333 | return rawCountMatches(new Object[]{pTerm}); |
333 | } | 334 | } |
334 | 335 | ||
@@ -340,7 +341,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
340 | * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked | 341 | * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked |
341 | * | 342 | * |
342 | */ | 343 | */ |
343 | public boolean forOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm, final Consumer<? super VLSFunctionFof.Match> processor) { | 344 | public boolean forOneArbitraryMatch(final VLSFunctionAsTerm pTerm, final Consumer<? super VLSFunctionFof.Match> processor) { |
344 | return rawForOneArbitraryMatch(new Object[]{pTerm}, processor); | 345 | return rawForOneArbitraryMatch(new Object[]{pTerm}, processor); |
345 | } | 346 | } |
346 | 347 | ||
@@ -352,7 +353,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
352 | * @return the (partial) match object. | 353 | * @return the (partial) match object. |
353 | * | 354 | * |
354 | */ | 355 | */ |
355 | public VLSFunctionFof.Match newMatch(final ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof pTerm) { | 356 | public VLSFunctionFof.Match newMatch(final VLSFunctionAsTerm pTerm) { |
356 | return VLSFunctionFof.Match.newMatch(pTerm); | 357 | return VLSFunctionFof.Match.newMatch(pTerm); |
357 | } | 358 | } |
358 | 359 | ||
@@ -361,8 +362,8 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
361 | * @return the Set of all values or empty set if there are no matches | 362 | * @return the Set of all values or empty set if there are no matches |
362 | * | 363 | * |
363 | */ | 364 | */ |
364 | protected Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof> rawStreamAllValuesOfterm(final Object[] parameters) { | 365 | protected Stream<VLSFunctionAsTerm> rawStreamAllValuesOfterm(final Object[] parameters) { |
365 | return rawStreamAllValues(POSITION_TERM, parameters).map(ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof.class::cast); | 366 | return rawStreamAllValues(POSITION_TERM, parameters).map(VLSFunctionAsTerm.class::cast); |
366 | } | 367 | } |
367 | 368 | ||
368 | /** | 369 | /** |
@@ -370,7 +371,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
370 | * @return the Set of all values or empty set if there are no matches | 371 | * @return the Set of all values or empty set if there are no matches |
371 | * | 372 | * |
372 | */ | 373 | */ |
373 | public Set<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof> getAllValuesOfterm() { | 374 | public Set<VLSFunctionAsTerm> getAllValuesOfterm() { |
374 | return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet()); | 375 | return rawStreamAllValuesOfterm(emptyArray()).collect(Collectors.toSet()); |
375 | } | 376 | } |
376 | 377 | ||
@@ -379,14 +380,14 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
379 | * @return the Set of all values or empty set if there are no matches | 380 | * @return the Set of all values or empty set if there are no matches |
380 | * | 381 | * |
381 | */ | 382 | */ |
382 | public Stream<ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof> streamAllValuesOfterm() { | 383 | public Stream<VLSFunctionAsTerm> streamAllValuesOfterm() { |
383 | return rawStreamAllValuesOfterm(emptyArray()); | 384 | return rawStreamAllValuesOfterm(emptyArray()); |
384 | } | 385 | } |
385 | 386 | ||
386 | @Override | 387 | @Override |
387 | protected VLSFunctionFof.Match tupleToMatch(final Tuple t) { | 388 | protected VLSFunctionFof.Match tupleToMatch(final Tuple t) { |
388 | try { | 389 | try { |
389 | return VLSFunctionFof.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) t.get(POSITION_TERM)); | 390 | return VLSFunctionFof.Match.newMatch((VLSFunctionAsTerm) t.get(POSITION_TERM)); |
390 | } catch(ClassCastException e) { | 391 | } catch(ClassCastException e) { |
391 | LOGGER.error("Element(s) in tuple not properly typed!",e); | 392 | LOGGER.error("Element(s) in tuple not properly typed!",e); |
392 | return null; | 393 | return null; |
@@ -396,7 +397,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
396 | @Override | 397 | @Override |
397 | protected VLSFunctionFof.Match arrayToMatch(final Object[] match) { | 398 | protected VLSFunctionFof.Match arrayToMatch(final Object[] match) { |
398 | try { | 399 | try { |
399 | return VLSFunctionFof.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) match[POSITION_TERM]); | 400 | return VLSFunctionFof.Match.newMatch((VLSFunctionAsTerm) match[POSITION_TERM]); |
400 | } catch(ClassCastException e) { | 401 | } catch(ClassCastException e) { |
401 | LOGGER.error("Element(s) in array not properly typed!",e); | 402 | LOGGER.error("Element(s) in array not properly typed!",e); |
402 | return null; | 403 | return null; |
@@ -406,7 +407,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
406 | @Override | 407 | @Override |
407 | protected VLSFunctionFof.Match arrayToMatchMutable(final Object[] match) { | 408 | protected VLSFunctionFof.Match arrayToMatchMutable(final Object[] match) { |
408 | try { | 409 | try { |
409 | return VLSFunctionFof.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) match[POSITION_TERM]); | 410 | return VLSFunctionFof.Match.newMutableMatch((VLSFunctionAsTerm) match[POSITION_TERM]); |
410 | } catch(ClassCastException e) { | 411 | } catch(ClassCastException e) { |
411 | LOGGER.error("Element(s) in array not properly typed!",e); | 412 | LOGGER.error("Element(s) in array not properly typed!",e); |
412 | return null; | 413 | return null; |
@@ -457,7 +458,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
457 | 458 | ||
458 | @Override | 459 | @Override |
459 | public VLSFunctionFof.Match newMatch(final Object... parameters) { | 460 | public VLSFunctionFof.Match newMatch(final Object... parameters) { |
460 | return VLSFunctionFof.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof) parameters[0]); | 461 | return VLSFunctionFof.Match.newMatch((ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm) parameters[0]); |
461 | } | 462 | } |
462 | 463 | ||
463 | /** | 464 | /** |
@@ -489,7 +490,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
489 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { | 490 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { |
490 | private final static VLSFunctionFof.GeneratedPQuery INSTANCE = new GeneratedPQuery(); | 491 | private final static VLSFunctionFof.GeneratedPQuery INSTANCE = new GeneratedPQuery(); |
491 | 492 | ||
492 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionFof")), PParameterDirection.INOUT); | 493 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionAsTerm")), PParameterDirection.INOUT); |
493 | 494 | ||
494 | private final List<PParameter> parameters = Arrays.asList(parameter_term); | 495 | private final List<PParameter> parameters = Arrays.asList(parameter_term); |
495 | 496 | ||
@@ -519,12 +520,12 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
519 | { | 520 | { |
520 | PBody body = new PBody(this); | 521 | PBody body = new PBody(this); |
521 | PVariable var_term = body.getOrCreateVariableByName("term"); | 522 | PVariable var_term = body.getOrCreateVariableByName("term"); |
522 | new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionFof"))); | 523 | new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionAsTerm"))); |
523 | body.setSymbolicParameters(Arrays.<ExportedParameter>asList( | 524 | body.setSymbolicParameters(Arrays.<ExportedParameter>asList( |
524 | new ExportedParameter(body, var_term, parameter_term) | 525 | new ExportedParameter(body, var_term, parameter_term) |
525 | )); | 526 | )); |
526 | // VLSFunctionFof(term) | 527 | // VLSFunctionAsTerm(term) |
527 | new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionFof"))); | 528 | new TypeConstraint(body, Tuples.flatTupleOf(var_term), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionAsTerm"))); |
528 | bodies.add(body); | 529 | bodies.add(body); |
529 | } | 530 | } |
530 | return bodies; | 531 | return bodies; |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.xtend index 3c672f4b..22bd4ab5 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.xtend +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.xtend | |||
@@ -1,5 +1,6 @@ | |||
1 | package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder | 1 | package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder |
2 | 2 | ||
3 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant | ||
3 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula | 4 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula |
4 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction | 5 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction |
5 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm | 6 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm |
@@ -13,6 +14,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition | |||
13 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type | 14 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type |
14 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable | 15 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable |
15 | import java.util.HashMap | 16 | import java.util.HashMap |
17 | import java.util.List | ||
16 | import java.util.Map | 18 | import java.util.Map |
17 | 19 | ||
18 | interface Logic2VampireLanguageMapper_TypeMapperTrace {} | 20 | interface Logic2VampireLanguageMapper_TypeMapperTrace {} |
@@ -32,6 +34,9 @@ class Logic2VampireLanguageMapperTrace { | |||
32 | public val Map<DefinedElement, VLSFunction> element2Predicate = new HashMap | 34 | public val Map<DefinedElement, VLSFunction> element2Predicate = new HashMap |
33 | public val Map<Type, VLSTerm> type2PossibleNot = new HashMap | 35 | public val Map<Type, VLSTerm> type2PossibleNot = new HashMap |
34 | public val Map<Type, VLSTerm> type2And = new HashMap | 36 | public val Map<Type, VLSTerm> type2And = new HashMap |
37 | //Uniqueness | ||
38 | public val List<VLSConstant> uniqueInstances = newArrayList | ||
39 | |||
35 | 40 | ||
36 | public var Map<ConstantDeclaration, ConstantDefinition> constantDefinitions | 41 | public var Map<ConstantDeclaration, ConstantDefinition> constantDefinitions |
37 | public var Map<RelationDeclaration, RelationDefinition> relationDefinitions | 42 | public var Map<RelationDeclaration, RelationDefinition> relationDefinitions |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend index 4b7ea3d0..e5dfbf08 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.xtend | |||
@@ -19,13 +19,14 @@ class Logic2VampireLanguageMapper_ScopeMapper { | |||
19 | val VLSVariable variable = createVLSVariable => [it.name = "A"] | 19 | val VLSVariable variable = createVLSVariable => [it.name = "A"] |
20 | 20 | ||
21 | // 1. make a list of constants equaling the min number of specified objects | 21 | // 1. make a list of constants equaling the min number of specified objects |
22 | val List<VLSConstant> instances = newArrayList | 22 | val localInstances = newArrayList |
23 | for (var i = 0; i < config.typeScopes.minNewElements; i++) { | 23 | for (var i = 0; i < config.typeScopes.minNewElements; i++) { |
24 | val num = i + 1 | 24 | val num = i + 1 |
25 | val cst = createVLSConstant => [ | 25 | val cst = createVLSConstant => [ |
26 | it.name = "o" + num | 26 | it.name = "o" + num |
27 | ] | 27 | ] |
28 | instances.add(cst) | 28 | trace.uniqueInstances.add(cst) |
29 | localInstances.add(cst) | ||
29 | } | 30 | } |
30 | 31 | ||
31 | // TODO: specify for the max | 32 | // TODO: specify for the max |
@@ -37,14 +38,14 @@ class Logic2VampireLanguageMapper_ScopeMapper { | |||
37 | it.fofFormula = createVLSUniversalQuantifier => [ | 38 | it.fofFormula = createVLSUniversalQuantifier => [ |
38 | it.variables += support.duplicate(variable) | 39 | it.variables += support.duplicate(variable) |
39 | // check below | 40 | // check below |
40 | it.operand = createVLSEquivalent => [ | 41 | it.operand = createVLSImplies => [ |
41 | it.left = support.topLevelTypeFunc | 42 | it.left = support.unfoldOr(localInstances.map [ i | |
42 | it.right = support.unfoldOr(instances.map [ i | | ||
43 | createVLSEquality => [ | 43 | createVLSEquality => [ |
44 | it.left = createVLSVariable => [it.name = variable.name] | 44 | it.left = createVLSVariable => [it.name = variable.name] |
45 | it.right = i | 45 | it.right = i |
46 | ] | 46 | ] |
47 | ]) | 47 | ]) |
48 | it.right = support.topLevelTypeFunc | ||
48 | ] | 49 | ] |
49 | ] | 50 | ] |
50 | ] | 51 | ] |
@@ -55,7 +56,7 @@ class Logic2VampireLanguageMapper_ScopeMapper { | |||
55 | val uniqueness = createVLSFofFormula => [ | 56 | val uniqueness = createVLSFofFormula => [ |
56 | it.name = "typeUniqueness" | 57 | it.name = "typeUniqueness" |
57 | it.fofRole = "axiom" | 58 | it.fofRole = "axiom" |
58 | it.fofFormula = support.establishUniqueness(instances) | 59 | it.fofFormula = support.establishUniqueness(trace.uniqueInstances) |
59 | ] | 60 | ] |
60 | trace.specification.formulas += uniqueness | 61 | trace.specification.formulas += uniqueness |
61 | } | 62 | } |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend index d3595a73..021cb0ea 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.xtend | |||
@@ -2,6 +2,7 @@ package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder | |||
2 | 2 | ||
3 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant | 3 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant |
4 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction | 4 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction |
5 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm | ||
5 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality | 6 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality |
6 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm | 7 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm |
7 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable | 8 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable |
@@ -36,6 +37,14 @@ class Logic2VampireLanguageMapper_Support { | |||
36 | def protected VLSVariable duplicate(VLSVariable term) { | 37 | def protected VLSVariable duplicate(VLSVariable term) { |
37 | return createVLSVariable => [it.name = term.name] | 38 | return createVLSVariable => [it.name = term.name] |
38 | } | 39 | } |
40 | |||
41 | def protected VLSFunctionAsTerm duplicate(VLSFunctionAsTerm term) { | ||
42 | return createVLSFunctionAsTerm => [it.functor = term.functor] | ||
43 | } | ||
44 | |||
45 | def protected VLSConstant duplicate(VLSConstant term) { | ||
46 | return createVLSConstant => [it.name = term.name] | ||
47 | } | ||
39 | 48 | ||
40 | def protected VLSFunction duplicate(VLSFunction term) { | 49 | def protected VLSFunction duplicate(VLSFunction term) { |
41 | return createVLSFunction => [ | 50 | return createVLSFunction => [ |
@@ -52,6 +61,19 @@ class Logic2VampireLanguageMapper_Support { | |||
52 | it.terms += duplicate(v) | 61 | it.terms += duplicate(v) |
53 | ] | 62 | ] |
54 | } | 63 | } |
64 | |||
65 | def protected VLSFunction duplicate(VLSFunction term, VLSFunctionAsTerm v) { | ||
66 | return createVLSFunction => [ | ||
67 | it.constant = term.constant | ||
68 | it.terms += duplicate(v) | ||
69 | ] | ||
70 | } | ||
71 | |||
72 | def protected VLSConstant toConstant(VLSFunctionAsTerm term) { | ||
73 | return createVLSConstant => [ | ||
74 | it.name = term.functor | ||
75 | ] | ||
76 | } | ||
55 | 77 | ||
56 | def protected VLSFunction topLevelTypeFunc() { | 78 | def protected VLSFunction topLevelTypeFunc() { |
57 | return createVLSFunction => [ | 79 | return createVLSFunction => [ |
@@ -61,6 +83,13 @@ class Logic2VampireLanguageMapper_Support { | |||
61 | ] | 83 | ] |
62 | ] | 84 | ] |
63 | } | 85 | } |
86 | |||
87 | def protected VLSFunction topLevelTypeFunc(VLSFunctionAsTerm v) { | ||
88 | return createVLSFunction => [ | ||
89 | it.constant = "object" | ||
90 | it.terms += duplicate(v) | ||
91 | ] | ||
92 | } | ||
64 | 93 | ||
65 | // TODO Make more general | 94 | // TODO Make more general |
66 | def establishUniqueness(List<VLSConstant> terms) { | 95 | def establishUniqueness(List<VLSConstant> terms) { |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend index bc0b3e23..f2a7b3f2 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend | |||
@@ -14,8 +14,9 @@ import java.util.Collection | |||
14 | import java.util.List | 14 | import java.util.List |
15 | 15 | ||
16 | import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* | 16 | import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* |
17 | import java.util.Collections | ||
17 | 18 | ||
18 | class Logic2VampireLanguageMapper_TypeMapper { | 19 | class Logic2VampireLanguageMapper_TypeMapper { |
19 | private val extension VampireLanguageFactory factory = VampireLanguageFactory.eINSTANCE | 20 | private val extension VampireLanguageFactory factory = VampireLanguageFactory.eINSTANCE |
20 | private val Logic2VampireLanguageMapper_Support support = new Logic2VampireLanguageMapper_Support | 21 | private val Logic2VampireLanguageMapper_Support support = new Logic2VampireLanguageMapper_Support |
21 | val Logic2VampireLanguageMapper base | 22 | val Logic2VampireLanguageMapper base |
@@ -25,8 +26,9 @@ class Logic2VampireLanguageMapper_TypeMapper { | |||
25 | this.base = base | 26 | this.base = base |
26 | } | 27 | } |
27 | 28 | ||
28 | def protected transformTypes(Collection<Type> types, Collection<DefinedElement> elements, Logic2VampireLanguageMapper mapper, Logic2VampireLanguageMapperTrace trace) { | 29 | def protected transformTypes(Collection<Type> types, Collection<DefinedElement> elements, |
29 | 30 | Logic2VampireLanguageMapper mapper, Logic2VampireLanguageMapperTrace trace) { | |
31 | |||
30 | // val typeTrace = new Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes | 32 | // val typeTrace = new Logic2VampireLanguageMapper_TypeMapperTrace_FilteredTypes |
31 | // trace.typeMapperTrace = typeTrace | 33 | // trace.typeMapperTrace = typeTrace |
32 | val VLSVariable variable = createVLSVariable => [it.name = "A"] | 34 | val VLSVariable variable = createVLSVariable => [it.name = "A"] |
@@ -86,14 +88,38 @@ class Logic2VampireLanguageMapper_TypeMapper { | |||
86 | 88 | ||
87 | ] | 89 | ] |
88 | trace.specification.formulas += res | 90 | trace.specification.formulas += res |
91 | |||
92 | // Create objects for the enum elements | ||
93 | val List<VLSFunction> enumScopeElems = newArrayList | ||
94 | for (var i = 0; i < type.elements.length; i++) { | ||
95 | val num = i + 1 | ||
96 | val cstTerm = createVLSFunctionAsTerm => [ | ||
97 | it.functor = "eo" + num | ||
98 | ] | ||
99 | val cst = support.toConstant(cstTerm) | ||
100 | trace.uniqueInstances.add(cst) | ||
101 | val fct = support.duplicate(type.elements.get(i).lookup(trace.element2Predicate), cstTerm) | ||
102 | enumScopeElems.add(fct) | ||
103 | // enumScopeElems.add(support.topLevelTypeFunc(cstTerm)) | ||
104 | } | ||
105 | |||
106 | |||
107 | |||
108 | val enumScope = createVLSFofFormula => [ | ||
109 | it.name = support.toIDMultiple("enumScope", type.name.split(" ").get(0)) | ||
110 | // below is temporary solution | ||
111 | it.fofRole = "axiom" | ||
112 | it.fofFormula = support.unfoldAnd(enumScopeElems) | ||
113 | ] | ||
114 | |||
115 | trace.specification.formulas += enumScope | ||
89 | } | 116 | } |
90 | 117 | ||
91 | //HIERARCHY HANDLER | 118 | // HIERARCHY HANDLER |
92 | |||
93 | |||
94 | // 3. For each non-abstract type, create an and sequence containing all typedeclaration predicates | 119 | // 3. For each non-abstract type, create an and sequence containing all typedeclaration predicates |
95 | // and store in a map | 120 | // and store in a map |
96 | for (t1 : types.filter[!isIsAbstract]) { | 121 | // println(types.filter[!isIsAbstract]) |
122 | for (t1 : types.filter[!isIsAbstract].filter(TypeDeclaration)) { | ||
97 | for (t2 : types) { | 123 | for (t2 : types) { |
98 | // possible improvement: check all supertypes and decide if negated or not based on negations/not negations of supertypes | 124 | // possible improvement: check all supertypes and decide if negated or not based on negations/not negations of supertypes |
99 | if (t1 == t2 || support.dfsSupertypeCheck(t1, t2)) { | 125 | if (t1 == t2 || support.dfsSupertypeCheck(t1, t2)) { |
@@ -121,7 +147,9 @@ class Logic2VampireLanguageMapper_TypeMapper { | |||
121 | it.operand = createVLSEquivalent => [ | 147 | it.operand = createVLSEquivalent => [ |
122 | it.left = support.topLevelTypeFunc | 148 | it.left = support.topLevelTypeFunc |
123 | // it.right = support.unfoldOr(new ArrayList<VLSTerm>(typeTrace.type2And.values)) | 149 | // it.right = support.unfoldOr(new ArrayList<VLSTerm>(typeTrace.type2And.values)) |
124 | it.right = support.unfoldOr(new ArrayList<VLSTerm>(trace.type2And.values)) | 150 | val reversedList = new ArrayList<VLSTerm>(trace.type2And.values) |
151 | // Collections.reverse(reversedList) | ||
152 | it.right = support.unfoldOr(reversedList) | ||
125 | ] | 153 | ] |
126 | ] | 154 | ] |
127 | ] | 155 | ] |
@@ -130,7 +158,7 @@ class Logic2VampireLanguageMapper_TypeMapper { | |||
130 | 158 | ||
131 | } | 159 | } |
132 | 160 | ||
133 | //below are from previous interface | 161 | // below are from previous interface |
134 | def protected transformTypeReference(Type referred, Logic2VampireLanguageMapper mapper, | 162 | def protected transformTypeReference(Type referred, Logic2VampireLanguageMapper mapper, |
135 | Logic2VampireLanguageMapperTrace trace) { | 163 | Logic2VampireLanguageMapperTrace trace) { |
136 | throw new UnsupportedOperationException("TODO: auto-generated method stub") | 164 | throw new UnsupportedOperationException("TODO: auto-generated method stub") |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin index e0766c08..3f204913 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin index c38c96ad..10983f27 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin index 2c091b47..00ebca4b 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin index b05fd2c1..9641858d 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin index 7f6519eb..2b51fe5d 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin index d30eebe5..75482abc 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin index 921b79bd..c394f878 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin index 6b8d1dc0..1ec5da80 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin index 83e57283..e85b5240 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin index 5a0087bc..c000d128 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin index 7d090297..5eb63977 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin index c8ab54c2..501dbfb4 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin index 3306fa73..621c888a 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.java index 2b491209..24df5fcd 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.java | |||
@@ -1,6 +1,7 @@ | |||
1 | package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder; | 1 | package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder; |
2 | 2 | ||
3 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper_TypeMapperTrace; | 3 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper_TypeMapperTrace; |
4 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant; | ||
4 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula; | 5 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula; |
5 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction; | 6 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction; |
6 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm; | 7 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm; |
@@ -14,7 +15,9 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition; | |||
14 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type; | 15 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type; |
15 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable; | 16 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable; |
16 | import java.util.HashMap; | 17 | import java.util.HashMap; |
18 | import java.util.List; | ||
17 | import java.util.Map; | 19 | import java.util.Map; |
20 | import org.eclipse.xtext.xbase.lib.CollectionLiterals; | ||
18 | 21 | ||
19 | @SuppressWarnings("all") | 22 | @SuppressWarnings("all") |
20 | public class Logic2VampireLanguageMapperTrace { | 23 | public class Logic2VampireLanguageMapperTrace { |
@@ -34,6 +37,8 @@ public class Logic2VampireLanguageMapperTrace { | |||
34 | 37 | ||
35 | public final Map<Type, VLSTerm> type2And = new HashMap<Type, VLSTerm>(); | 38 | public final Map<Type, VLSTerm> type2And = new HashMap<Type, VLSTerm>(); |
36 | 39 | ||
40 | public final List<VLSConstant> uniqueInstances = CollectionLiterals.<VLSConstant>newArrayList(); | ||
41 | |||
37 | public Map<ConstantDeclaration, ConstantDefinition> constantDefinitions; | 42 | public Map<ConstantDeclaration, ConstantDefinition> constantDefinitions; |
38 | 43 | ||
39 | public Map<RelationDeclaration, RelationDefinition> relationDefinitions; | 44 | public Map<RelationDeclaration, RelationDefinition> relationDefinitions; |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java index 8967839d..15ba78c9 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java | |||
@@ -5,13 +5,14 @@ import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguage | |||
5 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper_Support; | 5 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper_Support; |
6 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant; | 6 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant; |
7 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquality; | 7 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquality; |
8 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent; | ||
9 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula; | 8 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula; |
9 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies; | ||
10 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm; | ||
10 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier; | 11 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier; |
11 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable; | 12 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable; |
12 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory; | 13 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory; |
13 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration; | 14 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration; |
14 | import java.util.List; | 15 | import java.util.ArrayList; |
15 | import org.eclipse.emf.common.util.EList; | 16 | import org.eclipse.emf.common.util.EList; |
16 | import org.eclipse.xtext.xbase.lib.CollectionLiterals; | 17 | import org.eclipse.xtext.xbase.lib.CollectionLiterals; |
17 | import org.eclipse.xtext.xbase.lib.Extension; | 18 | import org.eclipse.xtext.xbase.lib.Extension; |
@@ -39,7 +40,7 @@ public class Logic2VampireLanguageMapper_ScopeMapper { | |||
39 | it.setName("A"); | 40 | it.setName("A"); |
40 | }; | 41 | }; |
41 | final VLSVariable variable = ObjectExtensions.<VLSVariable>operator_doubleArrow(_createVLSVariable, _function); | 42 | final VLSVariable variable = ObjectExtensions.<VLSVariable>operator_doubleArrow(_createVLSVariable, _function); |
42 | final List<VLSConstant> instances = CollectionLiterals.<VLSConstant>newArrayList(); | 43 | final ArrayList<VLSTerm> localInstances = CollectionLiterals.<VLSTerm>newArrayList(); |
43 | for (int i = 0; (i < config.typeScopes.minNewElements); i++) { | 44 | for (int i = 0; (i < config.typeScopes.minNewElements); i++) { |
44 | { | 45 | { |
45 | final int num = (i + 1); | 46 | final int num = (i + 1); |
@@ -48,7 +49,8 @@ public class Logic2VampireLanguageMapper_ScopeMapper { | |||
48 | it.setName(("o" + Integer.valueOf(num))); | 49 | it.setName(("o" + Integer.valueOf(num))); |
49 | }; | 50 | }; |
50 | final VLSConstant cst = ObjectExtensions.<VLSConstant>operator_doubleArrow(_createVLSConstant, _function_1); | 51 | final VLSConstant cst = ObjectExtensions.<VLSConstant>operator_doubleArrow(_createVLSConstant, _function_1); |
51 | instances.add(cst); | 52 | trace.uniqueInstances.add(cst); |
53 | localInstances.add(cst); | ||
52 | } | 54 | } |
53 | } | 55 | } |
54 | if ((config.typeScopes.minNewElements != 0)) { | 56 | if ((config.typeScopes.minNewElements != 0)) { |
@@ -61,10 +63,9 @@ public class Logic2VampireLanguageMapper_ScopeMapper { | |||
61 | EList<VLSVariable> _variables = it_1.getVariables(); | 63 | EList<VLSVariable> _variables = it_1.getVariables(); |
62 | VLSVariable _duplicate = this.support.duplicate(variable); | 64 | VLSVariable _duplicate = this.support.duplicate(variable); |
63 | _variables.add(_duplicate); | 65 | _variables.add(_duplicate); |
64 | VLSEquivalent _createVLSEquivalent = this.factory.createVLSEquivalent(); | 66 | VLSImplies _createVLSImplies = this.factory.createVLSImplies(); |
65 | final Procedure1<VLSEquivalent> _function_3 = (VLSEquivalent it_2) -> { | 67 | final Procedure1<VLSImplies> _function_3 = (VLSImplies it_2) -> { |
66 | it_2.setLeft(this.support.topLevelTypeFunc()); | 68 | final Function1<VLSTerm, VLSEquality> _function_4 = (VLSTerm i) -> { |
67 | final Function1<VLSConstant, VLSEquality> _function_4 = (VLSConstant i) -> { | ||
68 | VLSEquality _createVLSEquality = this.factory.createVLSEquality(); | 69 | VLSEquality _createVLSEquality = this.factory.createVLSEquality(); |
69 | final Procedure1<VLSEquality> _function_5 = (VLSEquality it_3) -> { | 70 | final Procedure1<VLSEquality> _function_5 = (VLSEquality it_3) -> { |
70 | VLSVariable _createVLSVariable_1 = this.factory.createVLSVariable(); | 71 | VLSVariable _createVLSVariable_1 = this.factory.createVLSVariable(); |
@@ -77,9 +78,10 @@ public class Logic2VampireLanguageMapper_ScopeMapper { | |||
77 | }; | 78 | }; |
78 | return ObjectExtensions.<VLSEquality>operator_doubleArrow(_createVLSEquality, _function_5); | 79 | return ObjectExtensions.<VLSEquality>operator_doubleArrow(_createVLSEquality, _function_5); |
79 | }; | 80 | }; |
80 | it_2.setRight(this.support.unfoldOr(ListExtensions.<VLSConstant, VLSEquality>map(instances, _function_4))); | 81 | it_2.setLeft(this.support.unfoldOr(ListExtensions.<VLSTerm, VLSEquality>map(localInstances, _function_4))); |
82 | it_2.setRight(this.support.topLevelTypeFunc()); | ||
81 | }; | 83 | }; |
82 | VLSEquivalent _doubleArrow = ObjectExtensions.<VLSEquivalent>operator_doubleArrow(_createVLSEquivalent, _function_3); | 84 | VLSImplies _doubleArrow = ObjectExtensions.<VLSImplies>operator_doubleArrow(_createVLSImplies, _function_3); |
83 | it_1.setOperand(_doubleArrow); | 85 | it_1.setOperand(_doubleArrow); |
84 | }; | 86 | }; |
85 | VLSUniversalQuantifier _doubleArrow = ObjectExtensions.<VLSUniversalQuantifier>operator_doubleArrow(_createVLSUniversalQuantifier, _function_2); | 87 | VLSUniversalQuantifier _doubleArrow = ObjectExtensions.<VLSUniversalQuantifier>operator_doubleArrow(_createVLSUniversalQuantifier, _function_2); |
@@ -92,7 +94,7 @@ public class Logic2VampireLanguageMapper_ScopeMapper { | |||
92 | final Procedure1<VLSFofFormula> _function_2 = (VLSFofFormula it) -> { | 94 | final Procedure1<VLSFofFormula> _function_2 = (VLSFofFormula it) -> { |
93 | it.setName("typeUniqueness"); | 95 | it.setName("typeUniqueness"); |
94 | it.setFofRole("axiom"); | 96 | it.setFofRole("axiom"); |
95 | it.setFofFormula(this.support.establishUniqueness(instances)); | 97 | it.setFofFormula(this.support.establishUniqueness(trace.uniqueInstances)); |
96 | }; | 98 | }; |
97 | final VLSFofFormula uniqueness = ObjectExtensions.<VLSFofFormula>operator_doubleArrow(_createVLSFofFormula_1, _function_2); | 99 | final VLSFofFormula uniqueness = ObjectExtensions.<VLSFofFormula>operator_doubleArrow(_createVLSFofFormula_1, _function_2); |
98 | EList<VLSFofFormula> _formulas_1 = trace.specification.getFormulas(); | 100 | EList<VLSFofFormula> _formulas_1 = trace.specification.getFormulas(); |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java index 72ca44e9..e2ff7a0e 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java | |||
@@ -6,6 +6,7 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd; | |||
6 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant; | 6 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant; |
7 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier; | 7 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier; |
8 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction; | 8 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction; |
9 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm; | ||
9 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies; | 10 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies; |
10 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality; | 11 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality; |
11 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr; | 12 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr; |
@@ -62,6 +63,22 @@ public class Logic2VampireLanguageMapper_Support { | |||
62 | return ObjectExtensions.<VLSVariable>operator_doubleArrow(_createVLSVariable, _function); | 63 | return ObjectExtensions.<VLSVariable>operator_doubleArrow(_createVLSVariable, _function); |
63 | } | 64 | } |
64 | 65 | ||
66 | protected VLSFunctionAsTerm duplicate(final VLSFunctionAsTerm term) { | ||
67 | VLSFunctionAsTerm _createVLSFunctionAsTerm = this.factory.createVLSFunctionAsTerm(); | ||
68 | final Procedure1<VLSFunctionAsTerm> _function = (VLSFunctionAsTerm it) -> { | ||
69 | it.setFunctor(term.getFunctor()); | ||
70 | }; | ||
71 | return ObjectExtensions.<VLSFunctionAsTerm>operator_doubleArrow(_createVLSFunctionAsTerm, _function); | ||
72 | } | ||
73 | |||
74 | protected VLSConstant duplicate(final VLSConstant term) { | ||
75 | VLSConstant _createVLSConstant = this.factory.createVLSConstant(); | ||
76 | final Procedure1<VLSConstant> _function = (VLSConstant it) -> { | ||
77 | it.setName(term.getName()); | ||
78 | }; | ||
79 | return ObjectExtensions.<VLSConstant>operator_doubleArrow(_createVLSConstant, _function); | ||
80 | } | ||
81 | |||
65 | protected VLSFunction duplicate(final VLSFunction term) { | 82 | protected VLSFunction duplicate(final VLSFunction term) { |
66 | VLSFunction _createVLSFunction = this.factory.createVLSFunction(); | 83 | VLSFunction _createVLSFunction = this.factory.createVLSFunction(); |
67 | final Procedure1<VLSFunction> _function = (VLSFunction it) -> { | 84 | final Procedure1<VLSFunction> _function = (VLSFunction it) -> { |
@@ -87,6 +104,25 @@ public class Logic2VampireLanguageMapper_Support { | |||
87 | return ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function); | 104 | return ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function); |
88 | } | 105 | } |
89 | 106 | ||
107 | protected VLSFunction duplicate(final VLSFunction term, final VLSFunctionAsTerm v) { | ||
108 | VLSFunction _createVLSFunction = this.factory.createVLSFunction(); | ||
109 | final Procedure1<VLSFunction> _function = (VLSFunction it) -> { | ||
110 | it.setConstant(term.getConstant()); | ||
111 | EList<VLSTerm> _terms = it.getTerms(); | ||
112 | VLSFunctionAsTerm _duplicate = this.duplicate(v); | ||
113 | _terms.add(_duplicate); | ||
114 | }; | ||
115 | return ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function); | ||
116 | } | ||
117 | |||
118 | protected VLSConstant toConstant(final VLSFunctionAsTerm term) { | ||
119 | VLSConstant _createVLSConstant = this.factory.createVLSConstant(); | ||
120 | final Procedure1<VLSConstant> _function = (VLSConstant it) -> { | ||
121 | it.setName(term.getFunctor()); | ||
122 | }; | ||
123 | return ObjectExtensions.<VLSConstant>operator_doubleArrow(_createVLSConstant, _function); | ||
124 | } | ||
125 | |||
90 | protected VLSFunction topLevelTypeFunc() { | 126 | protected VLSFunction topLevelTypeFunc() { |
91 | VLSFunction _createVLSFunction = this.factory.createVLSFunction(); | 127 | VLSFunction _createVLSFunction = this.factory.createVLSFunction(); |
92 | final Procedure1<VLSFunction> _function = (VLSFunction it) -> { | 128 | final Procedure1<VLSFunction> _function = (VLSFunction it) -> { |
@@ -102,6 +138,17 @@ public class Logic2VampireLanguageMapper_Support { | |||
102 | return ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function); | 138 | return ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function); |
103 | } | 139 | } |
104 | 140 | ||
141 | protected VLSFunction topLevelTypeFunc(final VLSFunctionAsTerm v) { | ||
142 | VLSFunction _createVLSFunction = this.factory.createVLSFunction(); | ||
143 | final Procedure1<VLSFunction> _function = (VLSFunction it) -> { | ||
144 | it.setConstant("object"); | ||
145 | EList<VLSTerm> _terms = it.getTerms(); | ||
146 | VLSFunctionAsTerm _duplicate = this.duplicate(v); | ||
147 | _terms.add(_duplicate); | ||
148 | }; | ||
149 | return ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function); | ||
150 | } | ||
151 | |||
105 | public VLSTerm establishUniqueness(final List<VLSConstant> terms) { | 152 | public VLSTerm establishUniqueness(final List<VLSConstant> terms) { |
106 | final List<VLSInequality> eqs = CollectionLiterals.<VLSInequality>newArrayList(); | 153 | final List<VLSInequality> eqs = CollectionLiterals.<VLSInequality>newArrayList(); |
107 | List<VLSConstant> _subList = terms.subList(1, ((Object[])Conversions.unwrapArray(terms, Object.class)).length); | 154 | List<VLSConstant> _subList = terms.subList(1, ((Object[])Conversions.unwrapArray(terms, Object.class)).length); |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java index d3dddcfc..f776371b 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java | |||
@@ -3,10 +3,12 @@ package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder; | |||
3 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper; | 3 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper; |
4 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapperTrace; | 4 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapperTrace; |
5 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper_Support; | 5 | import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.Logic2VampireLanguageMapper_Support; |
6 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant; | ||
6 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDoubleQuote; | 7 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDoubleQuote; |
7 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent; | 8 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent; |
8 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula; | 9 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula; |
9 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction; | 10 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction; |
11 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm; | ||
10 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm; | 12 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm; |
11 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation; | 13 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation; |
12 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier; | 14 | import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier; |
@@ -16,6 +18,7 @@ import com.google.common.base.Objects; | |||
16 | import com.google.common.collect.Iterables; | 18 | import com.google.common.collect.Iterables; |
17 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement; | 19 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement; |
18 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type; | 20 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type; |
21 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration; | ||
19 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition; | 22 | import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition; |
20 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage; | 23 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage; |
21 | import hu.bme.mit.inf.dslreasoner.util.CollectionsUtil; | 24 | import hu.bme.mit.inf.dslreasoner.util.CollectionsUtil; |
@@ -24,6 +27,7 @@ import java.util.Collection; | |||
24 | import java.util.List; | 27 | import java.util.List; |
25 | import org.eclipse.emf.common.util.EList; | 28 | import org.eclipse.emf.common.util.EList; |
26 | import org.eclipse.xtext.xbase.lib.CollectionLiterals; | 29 | import org.eclipse.xtext.xbase.lib.CollectionLiterals; |
30 | import org.eclipse.xtext.xbase.lib.Conversions; | ||
27 | import org.eclipse.xtext.xbase.lib.Extension; | 31 | import org.eclipse.xtext.xbase.lib.Extension; |
28 | import org.eclipse.xtext.xbase.lib.Functions.Function1; | 32 | import org.eclipse.xtext.xbase.lib.Functions.Function1; |
29 | import org.eclipse.xtext.xbase.lib.IterableExtensions; | 33 | import org.eclipse.xtext.xbase.lib.IterableExtensions; |
@@ -107,14 +111,38 @@ public class Logic2VampireLanguageMapper_TypeMapper { | |||
107 | final VLSFofFormula res = ObjectExtensions.<VLSFofFormula>operator_doubleArrow(_createVLSFofFormula, _function_1); | 111 | final VLSFofFormula res = ObjectExtensions.<VLSFofFormula>operator_doubleArrow(_createVLSFofFormula, _function_1); |
108 | EList<VLSFofFormula> _formulas = trace.specification.getFormulas(); | 112 | EList<VLSFofFormula> _formulas = trace.specification.getFormulas(); |
109 | _formulas.add(res); | 113 | _formulas.add(res); |
114 | final List<VLSFunction> enumScopeElems = CollectionLiterals.<VLSFunction>newArrayList(); | ||
115 | for (int i = 0; (i < ((Object[])Conversions.unwrapArray(type_1.getElements(), Object.class)).length); i++) { | ||
116 | { | ||
117 | final int num = (i + 1); | ||
118 | VLSFunctionAsTerm _createVLSFunctionAsTerm = this.factory.createVLSFunctionAsTerm(); | ||
119 | final Procedure1<VLSFunctionAsTerm> _function_2 = (VLSFunctionAsTerm it) -> { | ||
120 | it.setFunctor(("eo" + Integer.valueOf(num))); | ||
121 | }; | ||
122 | final VLSFunctionAsTerm cstTerm = ObjectExtensions.<VLSFunctionAsTerm>operator_doubleArrow(_createVLSFunctionAsTerm, _function_2); | ||
123 | final VLSConstant cst = this.support.toConstant(cstTerm); | ||
124 | trace.uniqueInstances.add(cst); | ||
125 | final VLSFunction fct = this.support.duplicate(CollectionsUtil.<DefinedElement, VLSFunction>lookup(type_1.getElements().get(i), trace.element2Predicate), cstTerm); | ||
126 | enumScopeElems.add(fct); | ||
127 | } | ||
128 | } | ||
129 | VLSFofFormula _createVLSFofFormula_1 = this.factory.createVLSFofFormula(); | ||
130 | final Procedure1<VLSFofFormula> _function_2 = (VLSFofFormula it) -> { | ||
131 | it.setName(this.support.toIDMultiple("enumScope", type_1.getName().split(" ")[0])); | ||
132 | it.setFofRole("axiom"); | ||
133 | it.setFofFormula(this.support.unfoldAnd(enumScopeElems)); | ||
134 | }; | ||
135 | final VLSFofFormula enumScope = ObjectExtensions.<VLSFofFormula>operator_doubleArrow(_createVLSFofFormula_1, _function_2); | ||
136 | EList<VLSFofFormula> _formulas_1 = trace.specification.getFormulas(); | ||
137 | _formulas_1.add(enumScope); | ||
110 | } | 138 | } |
111 | } | 139 | } |
112 | final Function1<Type, Boolean> _function_1 = (Type it) -> { | 140 | final Function1<Type, Boolean> _function_1 = (Type it) -> { |
113 | boolean _isIsAbstract = it.isIsAbstract(); | 141 | boolean _isIsAbstract = it.isIsAbstract(); |
114 | return Boolean.valueOf((!_isIsAbstract)); | 142 | return Boolean.valueOf((!_isIsAbstract)); |
115 | }; | 143 | }; |
116 | Iterable<Type> _filter_1 = IterableExtensions.<Type>filter(types, _function_1); | 144 | Iterable<TypeDeclaration> _filter_1 = Iterables.<TypeDeclaration>filter(IterableExtensions.<Type>filter(types, _function_1), TypeDeclaration.class); |
117 | for (final Type t1 : _filter_1) { | 145 | for (final TypeDeclaration t1 : _filter_1) { |
118 | { | 146 | { |
119 | for (final Type t2 : types) { | 147 | for (final Type t2 : types) { |
120 | if ((Objects.equal(t1, t2) || this.support.dfsSupertypeCheck(t1, t2))) { | 148 | if ((Objects.equal(t1, t2) || this.support.dfsSupertypeCheck(t1, t2))) { |
@@ -147,8 +175,8 @@ public class Logic2VampireLanguageMapper_TypeMapper { | |||
147 | final Procedure1<VLSEquivalent> _function_4 = (VLSEquivalent it_2) -> { | 175 | final Procedure1<VLSEquivalent> _function_4 = (VLSEquivalent it_2) -> { |
148 | it_2.setLeft(this.support.topLevelTypeFunc()); | 176 | it_2.setLeft(this.support.topLevelTypeFunc()); |
149 | Collection<VLSTerm> _values = trace.type2And.values(); | 177 | Collection<VLSTerm> _values = trace.type2And.values(); |
150 | ArrayList<VLSTerm> _arrayList = new ArrayList<VLSTerm>(_values); | 178 | final ArrayList<VLSTerm> reversedList = new ArrayList<VLSTerm>(_values); |
151 | it_2.setRight(this.support.unfoldOr(_arrayList)); | 179 | it_2.setRight(this.support.unfoldOr(reversedList)); |
152 | }; | 180 | }; |
153 | VLSEquivalent _doubleArrow = ObjectExtensions.<VLSEquivalent>operator_doubleArrow(_createVLSEquivalent, _function_4); | 181 | VLSEquivalent _doubleArrow = ObjectExtensions.<VLSEquivalent>operator_doubleArrow(_createVLSEquivalent, _function_4); |
154 | it_1.setOperand(_doubleArrow); | 182 | it_1.setOperand(_doubleArrow); |