diff options
Diffstat (limited to 'Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse')
91 files changed, 583 insertions, 246 deletions
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 | } |