From b4586542870d0e27b3d6da9fbd3eb30fd36d1d7f Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Tue, 8 May 2018 17:27:14 +0200 Subject: Regenerated Application Configuration Language --- .../antlr/ApplicationConfigurationParser.java | 19 +--- ...pplicationConfigurationContentAssistParser.java | 2 +- .../internal/InternalApplicationConfiguration.g | 14 +-- .../InternalApplicationConfiguration.tokens | 2 +- .../InternalApplicationConfigurationLexer.java | 126 +++++++++++---------- .../InternalApplicationConfigurationParser.java | 30 ++--- 6 files changed, 90 insertions(+), 103 deletions(-) (limited to 'Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr') diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/ApplicationConfigurationParser.java b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/ApplicationConfigurationParser.java index bfacda3b..831fc6aa 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/ApplicationConfigurationParser.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/ApplicationConfigurationParser.java @@ -1,19 +1,15 @@ /* - * generated by Xtext 2.10.0 + * generated by Xtext 2.12.0 */ package hu.bme.mit.inf.dslreasoner.application.ide.contentassist.antlr; import com.google.inject.Inject; import hu.bme.mit.inf.dslreasoner.application.ide.contentassist.antlr.internal.InternalApplicationConfigurationParser; import hu.bme.mit.inf.dslreasoner.application.services.ApplicationConfigurationGrammarAccess; -import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.antlr.runtime.RecognitionException; import org.eclipse.xtext.AbstractElement; import org.eclipse.xtext.ide.editor.contentassist.antlr.AbstractContentAssistParser; -import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement; -import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser; public class ApplicationConfigurationParser extends AbstractContentAssistParser { @@ -252,18 +248,7 @@ public class ApplicationConfigurationParser extends AbstractContentAssistParser } return nameMappings.get(element); } - - @Override - protected Collection getFollowElements(AbstractInternalContentAssistParser parser) { - try { - InternalApplicationConfigurationParser typedParser = (InternalApplicationConfigurationParser) parser; - typedParser.entryRuleConfigurationScript(); - return typedParser.getFollowElements(); - } catch(RecognitionException ex) { - throw new RuntimeException(ex); - } - } - + @Override protected String[] getInitialHiddenTokens() { return new String[] { "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT" }; diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/PartialApplicationConfigurationContentAssistParser.java b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/PartialApplicationConfigurationContentAssistParser.java index a418e063..e6e84770 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/PartialApplicationConfigurationContentAssistParser.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/PartialApplicationConfigurationContentAssistParser.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.10.0 + * generated by Xtext 2.12.0 */ package hu.bme.mit.inf.dslreasoner.application.ide.contentassist.antlr; diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfiguration.g b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfiguration.g index 72884c26..e594ed0b 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfiguration.g +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfiguration.g @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.10.0 + * generated by Xtext 2.12.0 */ grammar InternalApplicationConfiguration; @@ -4533,9 +4533,9 @@ rule__GraphPatternDeclaration__Group__0__Impl } : ( - { before(grammarAccess.getGraphPatternDeclarationAccess().getPatternsKeyword_0()); } - 'patterns' - { after(grammarAccess.getGraphPatternDeclarationAccess().getPatternsKeyword_0()); } + { before(grammarAccess.getGraphPatternDeclarationAccess().getConstraintsKeyword_0()); } + 'constraints' + { after(grammarAccess.getGraphPatternDeclarationAccess().getConstraintsKeyword_0()); } ) ; finally { @@ -7395,9 +7395,9 @@ rule__GenerationTask__Group_3_2__0__Impl } : ( - { before(grammarAccess.getGenerationTaskAccess().getPatternsKeyword_3_2_0()); } - 'patterns' - { after(grammarAccess.getGenerationTaskAccess().getPatternsKeyword_3_2_0()); } + { before(grammarAccess.getGenerationTaskAccess().getConstraintsKeyword_3_2_0()); } + 'constraints' + { after(grammarAccess.getGenerationTaskAccess().getConstraintsKeyword_3_2_0()); } ) ; finally { diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfiguration.tokens b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfiguration.tokens index d97278eb..b775c1c2 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfiguration.tokens +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfiguration.tokens @@ -12,6 +12,7 @@ 'SMTSolver'=14 'ViatraSolver'=16 'config'=33 +'constraints'=32 'debug'=49 'epackage'=19 'excluding'=27 @@ -33,7 +34,6 @@ 'output'=52 'package'=26 'partial-model'=47 -'patterns'=32 'real'=42 'runs'=56 'runtime'=35 diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfigurationLexer.java b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfigurationLexer.java index 4dceaca3..29163b4d 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfigurationLexer.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfigurationLexer.java @@ -521,10 +521,10 @@ public class InternalApplicationConfigurationLexer extends Lexer { try { int _type = T__32; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalApplicationConfiguration.g:32:7: ( 'patterns' ) - // InternalApplicationConfiguration.g:32:9: 'patterns' + // InternalApplicationConfiguration.g:32:7: ( 'constraints' ) + // InternalApplicationConfiguration.g:32:9: 'constraints' { - match("patterns"); + match("constraints"); } @@ -1919,17 +1919,17 @@ public class InternalApplicationConfigurationLexer extends Lexer { protected DFA12 dfa12 = new DFA12(this); static final String DFA12_eotS = - "\1\uffff\5\47\1\57\3\47\4\uffff\1\47\1\44\4\47\3\uffff\4\47\1\44\1\uffff\1\44\2\uffff\3\44\2\uffff\2\47\1\uffff\6\47\2\uffff\5\47\4\uffff\1\47\1\uffff\6\47\3\uffff\6\47\7\uffff\13\47\1\174\12\47\1\u0088\11\47\1\u0093\1\47\1\u0095\1\47\1\u0097\1\u0098\5\47\1\uffff\12\47\2\uffff\1\47\1\u00a9\1\u00aa\7\47\1\uffff\1\47\1\uffff\1\47\2\uffff\20\47\2\uffff\2\47\1\u00c6\2\47\1\u00c9\1\47\1\u00cb\1\u00cc\1\u00cd\3\47\1\u00d1\2\47\1\u00d4\4\47\1\u00d9\1\u00da\1\u00db\1\47\1\u00dd\1\47\1\uffff\1\u00df\1\47\1\uffff\1\u00e1\3\uffff\3\47\1\uffff\2\47\1\uffff\1\u00e7\3\47\3\uffff\1\u00eb\1\uffff\1\47\1\uffff\1\47\1\uffff\3\47\1\u00f1\1\47\1\uffff\1\u00f3\1\uffff\1\47\1\uffff\1\47\1\u00f6\1\u00f7\2\47\1\uffff\1\u00fa\1\uffff\1\u00fb\1\47\2\uffff\2\47\2\uffff\1\u00ff\1\u0100\1\47\2\uffff\1\u0102\1\uffff"; + "\1\uffff\5\47\1\57\3\47\4\uffff\1\47\1\44\4\47\3\uffff\4\47\1\44\1\uffff\1\44\2\uffff\3\44\2\uffff\2\47\1\uffff\6\47\2\uffff\5\47\4\uffff\1\47\1\uffff\6\47\3\uffff\6\47\7\uffff\13\47\1\173\11\47\1\u0087\11\47\1\u0092\1\47\1\u0094\1\47\1\u0096\1\u0097\5\47\1\uffff\12\47\2\uffff\1\47\1\u00a8\1\u00a9\7\47\1\uffff\1\47\1\uffff\1\47\2\uffff\20\47\2\uffff\2\47\1\u00c5\2\47\1\u00c8\1\47\1\u00ca\1\u00cb\1\u00cc\3\47\1\u00d0\2\47\1\u00d3\3\47\1\u00d7\1\u00d8\1\47\1\u00da\1\47\1\u00dc\1\47\1\uffff\1\u00de\1\47\1\uffff\1\u00e0\3\uffff\3\47\1\uffff\2\47\1\uffff\1\u00e6\2\47\2\uffff\1\47\1\uffff\1\u00ea\1\uffff\1\47\1\uffff\1\47\1\uffff\3\47\1\u00f0\1\47\2\uffff\2\47\1\uffff\1\47\1\u00f5\1\u00f6\2\47\1\uffff\1\u00f9\1\u00fa\2\47\2\uffff\2\47\2\uffff\1\47\1\u0100\1\u0101\1\47\1\u0103\2\uffff\1\u0104\2\uffff"; static final String DFA12_eofS = - "\u0103\uffff"; + "\u0105\uffff"; static final String DFA12_minS = - "\1\0\1\157\1\151\1\115\1\154\1\151\1\56\1\155\1\160\1\151\4\uffff\1\141\1\72\1\145\2\157\1\145\3\uffff\1\143\2\145\1\165\1\75\1\uffff\1\101\2\uffff\2\0\1\52\2\uffff\1\144\1\155\1\uffff\3\154\1\124\1\154\1\141\2\uffff\1\160\1\164\1\141\1\143\1\141\4\uffff\1\143\1\uffff\1\155\1\144\1\156\1\147\1\156\1\141\3\uffff\1\141\1\157\1\154\1\156\1\142\1\164\7\uffff\1\145\1\155\1\145\1\142\1\154\1\145\1\144\1\123\1\157\1\164\1\157\1\60\1\143\1\154\1\164\1\153\2\164\1\141\1\157\1\145\1\146\1\55\1\163\1\154\1\151\1\164\1\160\1\166\1\145\1\165\1\160\1\60\1\141\1\60\1\145\2\60\1\145\1\157\1\171\2\162\1\uffff\1\153\1\165\1\162\1\141\1\145\1\151\1\155\1\162\1\154\1\151\2\uffff\1\151\2\60\1\156\1\151\2\145\1\162\1\147\1\165\1\uffff\1\154\1\uffff\1\162\2\uffff\1\162\1\154\1\123\1\141\1\164\1\141\1\144\1\141\1\147\1\162\1\141\1\157\1\171\1\163\1\147\1\155\2\uffff\1\147\1\163\1\60\1\162\1\141\1\60\1\164\3\60\1\166\1\157\1\123\1\60\1\147\1\151\1\60\1\145\1\156\1\154\1\144\3\60\1\145\1\60\1\164\1\uffff\1\60\1\164\1\uffff\1\60\3\uffff\1\145\1\154\1\157\1\uffff\1\145\1\156\1\uffff\1\60\1\163\1\55\1\145\3\uffff\1\60\1\uffff\1\151\1\uffff\1\145\1\uffff\1\162\1\166\1\154\1\60\1\147\1\uffff\1\60\1\uffff\1\154\1\uffff\1\143\2\60\1\145\1\166\1\uffff\1\60\1\uffff\1\60\1\163\2\uffff\1\162\1\145\2\uffff\2\60\1\162\2\uffff\1\60\1\uffff"; + "\1\0\1\157\1\151\1\115\1\154\1\151\1\56\1\155\1\160\1\151\4\uffff\1\141\1\72\1\145\2\157\1\145\3\uffff\1\143\2\145\1\165\1\75\1\uffff\1\101\2\uffff\2\0\1\52\2\uffff\1\144\1\155\1\uffff\3\154\1\124\1\154\1\141\2\uffff\1\160\1\164\1\141\1\143\1\141\4\uffff\1\143\1\uffff\1\155\1\144\1\156\1\147\1\156\1\141\3\uffff\1\141\1\157\1\154\1\156\1\142\1\164\7\uffff\1\145\1\155\1\145\1\142\1\154\1\145\1\144\1\123\1\157\1\164\1\157\1\60\1\143\1\154\1\164\1\153\1\164\1\141\1\157\1\145\1\146\1\55\1\163\1\154\1\151\1\164\1\160\1\166\1\145\1\165\1\160\1\60\1\141\1\60\1\145\2\60\1\145\1\157\1\171\2\162\1\uffff\1\153\1\165\1\162\1\141\1\151\1\155\1\162\1\154\1\164\1\151\2\uffff\1\151\2\60\1\156\1\151\2\145\1\162\1\147\1\165\1\uffff\1\154\1\uffff\1\162\2\uffff\1\162\1\154\1\123\1\141\1\164\1\141\1\144\1\141\1\147\1\141\1\157\1\171\1\163\1\162\1\147\1\155\2\uffff\1\147\1\163\1\60\1\162\1\141\1\60\1\164\3\60\1\166\1\157\1\123\1\60\1\147\1\151\1\60\1\145\1\154\1\144\2\60\1\141\1\60\1\145\1\60\1\164\1\uffff\1\60\1\164\1\uffff\1\60\3\uffff\1\145\1\154\1\157\1\uffff\1\145\1\156\1\uffff\1\60\1\55\1\145\2\uffff\1\151\1\uffff\1\60\1\uffff\1\151\1\uffff\1\145\1\uffff\1\162\1\166\1\154\1\60\1\147\2\uffff\1\154\1\156\1\uffff\1\143\2\60\1\145\1\166\1\uffff\2\60\1\164\1\163\2\uffff\1\162\1\145\2\uffff\1\163\2\60\1\162\1\60\2\uffff\1\60\2\uffff"; static final String DFA12_maxS = - "\1\uffff\2\165\1\115\1\154\1\151\1\56\1\156\1\170\1\151\4\uffff\1\141\1\72\3\157\1\165\3\uffff\1\164\2\145\1\165\1\75\1\uffff\1\172\2\uffff\2\uffff\1\57\2\uffff\1\162\1\155\1\uffff\3\154\1\124\1\154\1\141\2\uffff\1\160\1\164\1\141\1\143\1\141\4\uffff\1\164\1\uffff\1\164\1\144\1\156\1\147\1\156\1\141\3\uffff\1\162\1\157\1\154\1\156\1\142\1\164\7\uffff\1\145\1\155\1\145\1\142\1\154\1\145\1\144\1\123\1\157\1\164\1\157\1\172\1\143\1\154\1\164\1\153\2\164\1\141\1\157\1\145\1\146\1\172\1\164\1\154\1\151\1\164\1\160\1\166\1\145\1\165\1\160\1\172\1\141\1\172\1\145\2\172\1\145\1\157\1\171\2\162\1\uffff\1\153\1\165\1\162\1\141\1\145\1\151\1\155\1\162\1\154\1\151\2\uffff\1\151\2\172\1\156\1\151\2\145\1\162\1\147\1\165\1\uffff\1\154\1\uffff\1\162\2\uffff\1\162\1\154\1\123\1\141\1\164\1\141\1\144\1\141\1\147\1\162\1\141\1\157\1\171\1\163\1\147\1\155\2\uffff\1\147\1\163\1\172\1\162\1\141\1\172\1\164\3\172\1\166\1\157\1\123\1\172\1\147\1\151\1\172\1\145\1\156\1\154\1\144\3\172\1\145\1\172\1\164\1\uffff\1\172\1\164\1\uffff\1\172\3\uffff\1\145\1\154\1\157\1\uffff\1\145\1\156\1\uffff\1\172\1\163\1\55\1\145\3\uffff\1\172\1\uffff\1\151\1\uffff\1\145\1\uffff\1\162\1\166\1\154\1\172\1\147\1\uffff\1\172\1\uffff\1\154\1\uffff\1\143\2\172\1\145\1\166\1\uffff\1\172\1\uffff\1\172\1\163\2\uffff\1\162\1\145\2\uffff\2\172\1\162\2\uffff\1\172\1\uffff"; + "\1\uffff\2\165\1\115\1\154\1\151\1\56\1\156\1\170\1\151\4\uffff\1\141\1\72\3\157\1\165\3\uffff\1\164\2\145\1\165\1\75\1\uffff\1\172\2\uffff\2\uffff\1\57\2\uffff\1\162\1\155\1\uffff\3\154\1\124\1\154\1\141\2\uffff\1\160\1\164\1\141\1\143\1\141\4\uffff\1\162\1\uffff\1\164\1\144\1\156\1\147\1\156\1\141\3\uffff\1\162\1\157\1\154\1\156\1\142\1\164\7\uffff\1\145\1\155\1\145\1\142\1\154\1\145\1\144\1\123\1\157\1\164\1\157\1\172\1\143\1\154\1\164\1\153\1\164\1\141\1\157\1\145\1\163\1\172\1\164\1\154\1\151\1\164\1\160\1\166\1\145\1\165\1\160\1\172\1\141\1\172\1\145\2\172\1\145\1\157\1\171\2\162\1\uffff\1\153\1\165\1\162\1\141\1\151\1\155\1\162\1\154\1\164\1\151\2\uffff\1\151\2\172\1\156\1\151\2\145\1\162\1\147\1\165\1\uffff\1\154\1\uffff\1\162\2\uffff\1\162\1\154\1\123\1\141\1\164\1\141\1\144\1\141\1\147\1\141\1\157\1\171\1\163\1\162\1\147\1\155\2\uffff\1\147\1\163\1\172\1\162\1\141\1\172\1\164\3\172\1\166\1\157\1\123\1\172\1\147\1\151\1\172\1\145\1\154\1\144\2\172\1\141\1\172\1\145\1\172\1\164\1\uffff\1\172\1\164\1\uffff\1\172\3\uffff\1\145\1\154\1\157\1\uffff\1\145\1\156\1\uffff\1\172\1\55\1\145\2\uffff\1\151\1\uffff\1\172\1\uffff\1\151\1\uffff\1\145\1\uffff\1\162\1\166\1\154\1\172\1\147\2\uffff\1\154\1\156\1\uffff\1\143\2\172\1\145\1\166\1\uffff\2\172\1\164\1\163\2\uffff\1\162\1\145\2\uffff\1\163\2\172\1\162\1\172\2\uffff\1\172\2\uffff"; static final String DFA12_acceptS = - "\12\uffff\1\14\1\15\1\16\1\17\6\uffff\1\33\1\34\1\35\5\uffff\1\54\1\uffff\1\57\1\60\3\uffff\1\64\1\65\2\uffff\1\57\6\uffff\1\42\1\7\5\uffff\1\14\1\15\1\16\1\17\1\uffff\1\22\6\uffff\1\33\1\34\1\35\6\uffff\1\53\1\54\1\60\1\61\1\62\1\63\1\64\53\uffff\1\37\12\uffff\1\30\1\50\12\uffff\1\1\1\uffff\1\36\1\uffff\1\3\1\13\20\uffff\1\56\1\40\33\uffff\1\43\2\uffff\1\47\1\uffff\1\2\1\55\1\24\3\uffff\1\10\2\uffff\1\12\4\uffff\1\32\1\25\1\27\1\uffff\1\41\1\uffff\1\46\1\uffff\1\52\5\uffff\1\20\1\uffff\1\45\1\uffff\1\31\5\uffff\1\11\1\uffff\1\26\2\uffff\1\44\1\4\2\uffff\1\21\1\23\3\uffff\1\51\1\5\1\uffff\1\6"; + "\12\uffff\1\14\1\15\1\16\1\17\6\uffff\1\33\1\34\1\35\5\uffff\1\54\1\uffff\1\57\1\60\3\uffff\1\64\1\65\2\uffff\1\57\6\uffff\1\42\1\7\5\uffff\1\14\1\15\1\16\1\17\1\uffff\1\22\6\uffff\1\33\1\34\1\35\6\uffff\1\53\1\54\1\60\1\61\1\62\1\63\1\64\52\uffff\1\37\12\uffff\1\30\1\50\12\uffff\1\1\1\uffff\1\36\1\uffff\1\3\1\13\20\uffff\1\56\1\40\33\uffff\1\43\2\uffff\1\47\1\uffff\1\2\1\55\1\24\3\uffff\1\10\2\uffff\1\12\3\uffff\1\32\1\25\1\uffff\1\27\1\uffff\1\41\1\uffff\1\46\1\uffff\1\52\5\uffff\1\20\1\45\2\uffff\1\31\5\uffff\1\11\4\uffff\1\44\1\4\2\uffff\1\21\1\23\5\uffff\1\51\1\5\1\uffff\1\26\1\6"; static final String DFA12_specialS = - "\1\1\37\uffff\1\2\1\0\u00e1\uffff}>"; + "\1\2\37\uffff\1\1\1\0\u00e3\uffff}>"; static final String[] DFA12_transitionS = { "\11\44\2\43\2\44\1\43\22\44\1\43\1\44\1\40\1\24\3\44\1\41\2\44\1\34\1\33\1\15\1\44\1\6\1\42\12\37\1\17\1\44\1\25\1\12\1\26\2\44\1\4\21\36\1\3\2\36\1\5\4\36\3\44\1\35\1\36\1\44\2\36\1\21\1\31\1\10\1\2\1\30\1\36\1\7\2\36\1\22\1\20\1\1\1\32\1\16\1\36\1\23\1\27\2\36\1\11\4\36\1\13\1\44\1\14\uff82\44", "\1\45\5\uffff\1\46", @@ -1988,23 +1988,23 @@ public class InternalApplicationConfigurationLexer extends Lexer { "", "", "", - "\1\140\16\uffff\1\142\1\uffff\1\141", + "\1\140\16\uffff\1\141", "", - "\1\144\6\uffff\1\143", + "\1\143\6\uffff\1\142", + "\1\144", "\1\145", "\1\146", "\1\147", "\1\150", - "\1\151", "", "", "", - "\1\153\20\uffff\1\152", + "\1\152\20\uffff\1\151", + "\1\153", "\1\154", "\1\155", "\1\156", "\1\157", - "\1\160", "", "", "", @@ -2012,6 +2012,7 @@ public class InternalApplicationConfigurationLexer extends Lexer { "", "", "", + "\1\160", "\1\161", "\1\162", "\1\163", @@ -2022,8 +2023,8 @@ public class InternalApplicationConfigurationLexer extends Lexer { "\1\170", "\1\171", "\1\172", - "\1\173", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "\1\174", "\1\175", "\1\176", "\1\177", @@ -2031,11 +2032,10 @@ public class InternalApplicationConfigurationLexer extends Lexer { "\1\u0081", "\1\u0082", "\1\u0083", - "\1\u0084", - "\1\u0085", - "\1\u0086", - "\1\u0087\2\uffff\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", - "\1\u008a\1\u0089", + "\1\u0085\14\uffff\1\u0084", + "\1\u0086\2\uffff\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "\1\u0089\1\u0088", + "\1\u008a", "\1\u008b", "\1\u008c", "\1\u008d", @@ -2043,19 +2043,19 @@ public class InternalApplicationConfigurationLexer extends Lexer { "\1\u008f", "\1\u0090", "\1\u0091", - "\1\u0092", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", - "\1\u0094", + "\1\u0093", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", - "\1\u0096", + "\1\u0095", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "\1\u0098", "\1\u0099", "\1\u009a", "\1\u009b", "\1\u009c", - "\1\u009d", "", + "\1\u009d", "\1\u009e", "\1\u009f", "\1\u00a0", @@ -2065,25 +2065,25 @@ public class InternalApplicationConfigurationLexer extends Lexer { "\1\u00a4", "\1\u00a5", "\1\u00a6", - "\1\u00a7", "", "", - "\1\u00a8", + "\1\u00a7", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "\1\u00aa", "\1\u00ab", "\1\u00ac", "\1\u00ad", "\1\u00ae", "\1\u00af", "\1\u00b0", + "", "\1\u00b1", "", "\1\u00b2", "", - "\1\u00b3", - "", "", + "\1\u00b3", "\1\u00b4", "\1\u00b5", "\1\u00b6", @@ -2099,83 +2099,82 @@ public class InternalApplicationConfigurationLexer extends Lexer { "\1\u00c0", "\1\u00c1", "\1\u00c2", - "\1\u00c3", "", "", + "\1\u00c3", "\1\u00c4", - "\1\u00c5", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "\1\u00c6", "\1\u00c7", - "\1\u00c8", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", - "\1\u00ca", + "\1\u00c9", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "\1\u00cd", "\1\u00ce", "\1\u00cf", - "\1\u00d0", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "\1\u00d1", "\1\u00d2", - "\1\u00d3", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "\1\u00d4", "\1\u00d5", "\1\u00d6", - "\1\u00d7", - "\1\u00d8", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "\1\u00d9", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", - "\1\u00dc", + "\1\u00db", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", - "\1\u00de", + "\1\u00dd", "", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", - "\1\u00e0", + "\1\u00df", "", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", "", "", "", + "\1\u00e1", "\1\u00e2", "\1\u00e3", - "\1\u00e4", "", + "\1\u00e4", "\1\u00e5", - "\1\u00e6", "", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "\1\u00e7", "\1\u00e8", - "\1\u00e9", - "\1\u00ea", "", "", + "\1\u00e9", "", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", "", + "\1\u00eb", + "", "\1\u00ec", "", "\1\u00ed", - "", "\1\u00ee", "\1\u00ef", - "\1\u00f0", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", - "\1\u00f2", + "\1\u00f1", "", - "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", "", - "\1\u00f4", + "\1\u00f2", + "\1\u00f3", "", - "\1\u00f5", + "\1\u00f4", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "\1\u00f7", "\1\u00f8", - "\1\u00f9", "", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", - "", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "\1\u00fb", "\1\u00fc", "", "", @@ -2183,12 +2182,15 @@ public class InternalApplicationConfigurationLexer extends Lexer { "\1\u00fe", "", "", + "\1\u00ff", + "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "\1\u0102", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", - "\1\u0101", "", "", "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47", + "", "" }; @@ -2239,6 +2241,16 @@ public class InternalApplicationConfigurationLexer extends Lexer { if ( s>=0 ) return s; break; case 1 : + int LA12_32 = input.LA(1); + + s = -1; + if ( ((LA12_32>='\u0000' && LA12_32<='\uFFFF')) ) {s = 77;} + + else s = 36; + + if ( s>=0 ) return s; + break; + case 2 : int LA12_0 = input.LA(1); s = -1; @@ -2314,16 +2326,6 @@ public class InternalApplicationConfigurationLexer extends Lexer { else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='$' && LA12_0<='&')||(LA12_0>='(' && LA12_0<=')')||LA12_0=='-'||LA12_0==';'||(LA12_0>='?' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 36;} - if ( s>=0 ) return s; - break; - case 2 : - int LA12_32 = input.LA(1); - - s = -1; - if ( ((LA12_32>='\u0000' && LA12_32<='\uFFFF')) ) {s = 77;} - - else s = 36; - if ( s>=0 ) return s; break; } diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfigurationParser.java b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfigurationParser.java index 988ac36c..b9d690f5 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfigurationParser.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/src-gen/hu/bme/mit/inf/dslreasoner/application/ide/contentassist/antlr/internal/InternalApplicationConfigurationParser.java @@ -22,7 +22,7 @@ import java.util.ArrayList; @SuppressWarnings("all") public class InternalApplicationConfigurationParser extends AbstractInternalContentAssistParser { public static final String[] tokenNames = new String[] { - "", "", "", "", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'none'", "'normal'", "'full'", "'SMTSolver'", "'AlloySolver'", "'ViatraSolver'", "'.'", "'import'", "'epackage'", "'viatra'", "'file'", "'='", "'{'", "'}'", "','", "'package'", "'excluding'", "'::'", "'metamodel'", "'folder'", "'models'", "'patterns'", "'config'", "'log-level'", "'runtime'", "'memory'", "'#'", "'<'", "'>'", "'node'", "'int'", "'real'", "'string'", "'..'", "'scope'", "'generate'", "'partial-model'", "'solver'", "'debug'", "'log'", "'statistics'", "'output'", "'+='", "'*'", "'number'", "'runs'" + "", "", "", "", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'none'", "'normal'", "'full'", "'SMTSolver'", "'AlloySolver'", "'ViatraSolver'", "'.'", "'import'", "'epackage'", "'viatra'", "'file'", "'='", "'{'", "'}'", "','", "'package'", "'excluding'", "'::'", "'metamodel'", "'folder'", "'models'", "'constraints'", "'config'", "'log-level'", "'runtime'", "'memory'", "'#'", "'<'", "'>'", "'node'", "'int'", "'real'", "'string'", "'..'", "'scope'", "'generate'", "'partial-model'", "'solver'", "'debug'", "'log'", "'statistics'", "'output'", "'+='", "'*'", "'number'", "'runs'" }; public static final int T__50=50; public static final int T__19=19; @@ -14536,21 +14536,21 @@ public class InternalApplicationConfigurationParser extends AbstractInternalCont // $ANTLR start "rule__GraphPatternDeclaration__Group__0__Impl" - // InternalApplicationConfiguration.g:4530:1: rule__GraphPatternDeclaration__Group__0__Impl : ( 'patterns' ) ; + // InternalApplicationConfiguration.g:4530:1: rule__GraphPatternDeclaration__Group__0__Impl : ( 'constraints' ) ; public final void rule__GraphPatternDeclaration__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalApplicationConfiguration.g:4534:1: ( ( 'patterns' ) ) - // InternalApplicationConfiguration.g:4535:1: ( 'patterns' ) + // InternalApplicationConfiguration.g:4534:1: ( ( 'constraints' ) ) + // InternalApplicationConfiguration.g:4535:1: ( 'constraints' ) { - // InternalApplicationConfiguration.g:4535:1: ( 'patterns' ) - // InternalApplicationConfiguration.g:4536:2: 'patterns' + // InternalApplicationConfiguration.g:4535:1: ( 'constraints' ) + // InternalApplicationConfiguration.g:4536:2: 'constraints' { - before(grammarAccess.getGraphPatternDeclarationAccess().getPatternsKeyword_0()); + before(grammarAccess.getGraphPatternDeclarationAccess().getConstraintsKeyword_0()); match(input,32,FOLLOW_2); - after(grammarAccess.getGraphPatternDeclarationAccess().getPatternsKeyword_0()); + after(grammarAccess.getGraphPatternDeclarationAccess().getConstraintsKeyword_0()); } @@ -22971,21 +22971,21 @@ public class InternalApplicationConfigurationParser extends AbstractInternalCont // $ANTLR start "rule__GenerationTask__Group_3_2__0__Impl" - // InternalApplicationConfiguration.g:7392:1: rule__GenerationTask__Group_3_2__0__Impl : ( 'patterns' ) ; + // InternalApplicationConfiguration.g:7392:1: rule__GenerationTask__Group_3_2__0__Impl : ( 'constraints' ) ; public final void rule__GenerationTask__Group_3_2__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalApplicationConfiguration.g:7396:1: ( ( 'patterns' ) ) - // InternalApplicationConfiguration.g:7397:1: ( 'patterns' ) + // InternalApplicationConfiguration.g:7396:1: ( ( 'constraints' ) ) + // InternalApplicationConfiguration.g:7397:1: ( 'constraints' ) { - // InternalApplicationConfiguration.g:7397:1: ( 'patterns' ) - // InternalApplicationConfiguration.g:7398:2: 'patterns' + // InternalApplicationConfiguration.g:7397:1: ( 'constraints' ) + // InternalApplicationConfiguration.g:7398:2: 'constraints' { - before(grammarAccess.getGenerationTaskAccess().getPatternsKeyword_3_2_0()); + before(grammarAccess.getGenerationTaskAccess().getConstraintsKeyword_3_2_0()); match(input,32,FOLLOW_2); - after(grammarAccess.getGenerationTaskAccess().getPatternsKeyword_3_2_0()); + after(grammarAccess.getGenerationTaskAccess().getConstraintsKeyword_3_2_0()); } -- cgit v1.2.3-54-g00ecf