diff options
author | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-02-01 14:29:16 +0100 |
---|---|---|
committer | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-02-01 14:29:16 +0100 |
commit | 94107f140402b3d63f17b3c4727b3cc8c3752082 (patch) | |
tree | 71f73dace064335609466f57566314cab433f295 /Application | |
parent | Type coloring (diff) | |
download | VIATRA-Generator-94107f140402b3d63f17b3c4727b3cc8c3752082.tar.gz VIATRA-Generator-94107f140402b3d63f17b3c4727b3cc8c3752082.tar.zst VIATRA-Generator-94107f140402b3d63f17b3c4727b3cc8c3752082.zip |
Eclass trace notation changed from "[X]" to "<X>".
Diffstat (limited to 'Application')
8 files changed, 60 insertions, 46 deletions
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtextbin b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtextbin index 73402e2a..a077deaa 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtextbin +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtextbin | |||
Binary files differ | |||
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.g b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.g index 695b7acf..438b8311 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.g +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.g | |||
@@ -2259,9 +2259,9 @@ ruleClassReference returns [EObject current=null] | |||
2259 | leaveRule(); | 2259 | leaveRule(); |
2260 | }: | 2260 | }: |
2261 | ( | 2261 | ( |
2262 | otherlv_0='[' | 2262 | otherlv_0='<' |
2263 | { | 2263 | { |
2264 | newLeafNode(otherlv_0, grammarAccess.getClassReferenceAccess().getLeftSquareBracketKeyword_0()); | 2264 | newLeafNode(otherlv_0, grammarAccess.getClassReferenceAccess().getLessThanSignKeyword_0()); |
2265 | } | 2265 | } |
2266 | ( | 2266 | ( |
2267 | ( | 2267 | ( |
@@ -2282,9 +2282,9 @@ ruleClassReference returns [EObject current=null] | |||
2282 | } | 2282 | } |
2283 | ) | 2283 | ) |
2284 | ) | 2284 | ) |
2285 | otherlv_2=']' | 2285 | otherlv_2='>' |
2286 | { | 2286 | { |
2287 | newLeafNode(otherlv_2, grammarAccess.getClassReferenceAccess().getRightSquareBracketKeyword_2()); | 2287 | newLeafNode(otherlv_2, grammarAccess.getClassReferenceAccess().getGreaterThanSignKeyword_2()); |
2288 | } | 2288 | } |
2289 | ) | 2289 | ) |
2290 | ; | 2290 | ; |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.tokens b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.tokens index 783a9243..ca7643ac 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.tokens +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.tokens | |||
@@ -5,12 +5,12 @@ | |||
5 | '.'=11 | 5 | '.'=11 |
6 | '..'=30 | 6 | '..'=30 |
7 | '::'=22 | 7 | '::'=22 |
8 | '<'=32 | ||
8 | '='=16 | 9 | '='=16 |
10 | '>'=33 | ||
9 | 'AlloySolver'=49 | 11 | 'AlloySolver'=49 |
10 | 'SMTSolver'=48 | 12 | 'SMTSolver'=48 |
11 | 'ViatraSolver'=50 | 13 | 'ViatraSolver'=50 |
12 | '['=32 | ||
13 | ']'=33 | ||
14 | 'config'=27 | 14 | 'config'=27 |
15 | 'debug'=45 | 15 | 'debug'=45 |
16 | 'epackage'=13 | 16 | 'epackage'=13 |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationLexer.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationLexer.java index d885919c..41858711 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationLexer.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationLexer.java | |||
@@ -513,10 +513,10 @@ public class InternalApplicationConfigurationLexer extends Lexer { | |||
513 | try { | 513 | try { |
514 | int _type = T__32; | 514 | int _type = T__32; |
515 | int _channel = DEFAULT_TOKEN_CHANNEL; | 515 | int _channel = DEFAULT_TOKEN_CHANNEL; |
516 | // InternalApplicationConfiguration.g:32:7: ( '[' ) | 516 | // InternalApplicationConfiguration.g:32:7: ( '<' ) |
517 | // InternalApplicationConfiguration.g:32:9: '[' | 517 | // InternalApplicationConfiguration.g:32:9: '<' |
518 | { | 518 | { |
519 | match('['); | 519 | match('<'); |
520 | 520 | ||
521 | } | 521 | } |
522 | 522 | ||
@@ -533,10 +533,10 @@ public class InternalApplicationConfigurationLexer extends Lexer { | |||
533 | try { | 533 | try { |
534 | int _type = T__33; | 534 | int _type = T__33; |
535 | int _channel = DEFAULT_TOKEN_CHANNEL; | 535 | int _channel = DEFAULT_TOKEN_CHANNEL; |
536 | // InternalApplicationConfiguration.g:33:7: ( ']' ) | 536 | // InternalApplicationConfiguration.g:33:7: ( '>' ) |
537 | // InternalApplicationConfiguration.g:33:9: ']' | 537 | // InternalApplicationConfiguration.g:33:9: '>' |
538 | { | 538 | { |
539 | match(']'); | 539 | match('>'); |
540 | 540 | ||
541 | } | 541 | } |
542 | 542 | ||
@@ -1757,7 +1757,7 @@ public class InternalApplicationConfigurationLexer extends Lexer { | |||
1757 | static final String DFA12_specialS = | 1757 | static final String DFA12_specialS = |
1758 | "\1\1\37\uffff\1\0\1\2\u00ca\uffff}>"; | 1758 | "\1\1\37\uffff\1\0\1\2\u00ca\uffff}>"; |
1759 | static final String[] DFA12_transitionS = { | 1759 | static final String[] DFA12_transitionS = { |
1760 | "\11\44\2\43\2\44\1\43\22\44\1\43\1\44\1\40\1\16\3\44\1\41\2\44\1\20\1\17\1\10\1\44\1\1\1\42\12\37\1\13\2\44\1\6\3\44\1\33\21\36\1\32\2\36\1\34\4\36\1\21\1\44\1\22\1\35\1\36\1\44\2\36\1\15\1\30\1\3\1\5\1\26\1\36\1\2\2\36\1\31\1\14\1\23\1\27\1\12\1\36\1\24\1\25\2\36\1\4\4\36\1\7\1\44\1\11\uff82\44", | 1760 | "\11\44\2\43\2\44\1\43\22\44\1\43\1\44\1\40\1\16\3\44\1\41\2\44\1\20\1\17\1\10\1\44\1\1\1\42\12\37\1\13\1\44\1\21\1\6\1\22\2\44\1\33\21\36\1\32\2\36\1\34\4\36\3\44\1\35\1\36\1\44\2\36\1\15\1\30\1\3\1\5\1\26\1\36\1\2\2\36\1\31\1\14\1\23\1\27\1\12\1\36\1\24\1\25\2\36\1\4\4\36\1\7\1\44\1\11\uff82\44", |
1761 | "\1\45", | 1761 | "\1\45", |
1762 | "\1\47\1\50", | 1762 | "\1\47\1\50", |
1763 | "\1\52\7\uffff\1\53", | 1763 | "\1\52\7\uffff\1\53", |
@@ -2077,9 +2077,9 @@ public class InternalApplicationConfigurationLexer extends Lexer { | |||
2077 | 2077 | ||
2078 | else if ( (LA12_0=='*') ) {s = 16;} | 2078 | else if ( (LA12_0=='*') ) {s = 16;} |
2079 | 2079 | ||
2080 | else if ( (LA12_0=='[') ) {s = 17;} | 2080 | else if ( (LA12_0=='<') ) {s = 17;} |
2081 | 2081 | ||
2082 | else if ( (LA12_0==']') ) {s = 18;} | 2082 | else if ( (LA12_0=='>') ) {s = 18;} |
2083 | 2083 | ||
2084 | else if ( (LA12_0=='n') ) {s = 19;} | 2084 | else if ( (LA12_0=='n') ) {s = 19;} |
2085 | 2085 | ||
@@ -2115,7 +2115,7 @@ public class InternalApplicationConfigurationLexer extends Lexer { | |||
2115 | 2115 | ||
2116 | else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 35;} | 2116 | else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 35;} |
2117 | 2117 | ||
2118 | 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;} | 2118 | 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;} |
2119 | 2119 | ||
2120 | if ( s>=0 ) return s; | 2120 | if ( s>=0 ) return s; |
2121 | break; | 2121 | break; |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationParser.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationParser.java index ce82fe1d..8bce7dfa 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationParser.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationParser.java | |||
@@ -22,7 +22,7 @@ import java.util.ArrayList; | |||
22 | @SuppressWarnings("all") | 22 | @SuppressWarnings("all") |
23 | public class InternalApplicationConfigurationParser extends AbstractInternalAntlrParser { | 23 | public class InternalApplicationConfigurationParser extends AbstractInternalAntlrParser { |
24 | public static final String[] tokenNames = new String[] { | 24 | public static final String[] tokenNames = new String[] { |
25 | "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'.'", "'import'", "'epackage'", "'viatra'", "'file'", "'='", "'{'", "','", "'}'", "'package'", "'excluding'", "'::'", "'metamodel'", "'folder'", "'models'", "'patterns'", "'config'", "'#'", "'+='", "'..'", "'*'", "'['", "']'", "'node'", "'int'", "'real'", "'string'", "'scope'", "'generate'", "'partial-model'", "'number'", "'runs'", "'solver'", "'output'", "'debug'", "'log'", "'statistics'", "'SMTSolver'", "'AlloySolver'", "'ViatraSolver'" | 25 | "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'.'", "'import'", "'epackage'", "'viatra'", "'file'", "'='", "'{'", "','", "'}'", "'package'", "'excluding'", "'::'", "'metamodel'", "'folder'", "'models'", "'patterns'", "'config'", "'#'", "'+='", "'..'", "'*'", "'<'", "'>'", "'node'", "'int'", "'real'", "'string'", "'scope'", "'generate'", "'partial-model'", "'number'", "'runs'", "'solver'", "'output'", "'debug'", "'log'", "'statistics'", "'SMTSolver'", "'AlloySolver'", "'ViatraSolver'" |
26 | }; | 26 | }; |
27 | public static final int T__50=50; | 27 | public static final int T__50=50; |
28 | public static final int T__19=19; | 28 | public static final int T__19=19; |
@@ -6192,7 +6192,7 @@ public class InternalApplicationConfigurationParser extends AbstractInternalAntl | |||
6192 | 6192 | ||
6193 | 6193 | ||
6194 | // $ANTLR start "ruleClassReference" | 6194 | // $ANTLR start "ruleClassReference" |
6195 | // InternalApplicationConfiguration.g:2254:1: ruleClassReference returns [EObject current=null] : (otherlv_0= '[' ( (lv_element_1_0= ruleMetamodelElement ) ) otherlv_2= ']' ) ; | 6195 | // InternalApplicationConfiguration.g:2254:1: ruleClassReference returns [EObject current=null] : (otherlv_0= '<' ( (lv_element_1_0= ruleMetamodelElement ) ) otherlv_2= '>' ) ; |
6196 | public final EObject ruleClassReference() throws RecognitionException { | 6196 | public final EObject ruleClassReference() throws RecognitionException { |
6197 | EObject current = null; | 6197 | EObject current = null; |
6198 | 6198 | ||
@@ -6205,15 +6205,15 @@ public class InternalApplicationConfigurationParser extends AbstractInternalAntl | |||
6205 | enterRule(); | 6205 | enterRule(); |
6206 | 6206 | ||
6207 | try { | 6207 | try { |
6208 | // InternalApplicationConfiguration.g:2260:2: ( (otherlv_0= '[' ( (lv_element_1_0= ruleMetamodelElement ) ) otherlv_2= ']' ) ) | 6208 | // InternalApplicationConfiguration.g:2260:2: ( (otherlv_0= '<' ( (lv_element_1_0= ruleMetamodelElement ) ) otherlv_2= '>' ) ) |
6209 | // InternalApplicationConfiguration.g:2261:2: (otherlv_0= '[' ( (lv_element_1_0= ruleMetamodelElement ) ) otherlv_2= ']' ) | 6209 | // InternalApplicationConfiguration.g:2261:2: (otherlv_0= '<' ( (lv_element_1_0= ruleMetamodelElement ) ) otherlv_2= '>' ) |
6210 | { | 6210 | { |
6211 | // InternalApplicationConfiguration.g:2261:2: (otherlv_0= '[' ( (lv_element_1_0= ruleMetamodelElement ) ) otherlv_2= ']' ) | 6211 | // InternalApplicationConfiguration.g:2261:2: (otherlv_0= '<' ( (lv_element_1_0= ruleMetamodelElement ) ) otherlv_2= '>' ) |
6212 | // InternalApplicationConfiguration.g:2262:3: otherlv_0= '[' ( (lv_element_1_0= ruleMetamodelElement ) ) otherlv_2= ']' | 6212 | // InternalApplicationConfiguration.g:2262:3: otherlv_0= '<' ( (lv_element_1_0= ruleMetamodelElement ) ) otherlv_2= '>' |
6213 | { | 6213 | { |
6214 | otherlv_0=(Token)match(input,32,FOLLOW_6); | 6214 | otherlv_0=(Token)match(input,32,FOLLOW_6); |
6215 | 6215 | ||
6216 | newLeafNode(otherlv_0, grammarAccess.getClassReferenceAccess().getLeftSquareBracketKeyword_0()); | 6216 | newLeafNode(otherlv_0, grammarAccess.getClassReferenceAccess().getLessThanSignKeyword_0()); |
6217 | 6217 | ||
6218 | // InternalApplicationConfiguration.g:2266:3: ( (lv_element_1_0= ruleMetamodelElement ) ) | 6218 | // InternalApplicationConfiguration.g:2266:3: ( (lv_element_1_0= ruleMetamodelElement ) ) |
6219 | // InternalApplicationConfiguration.g:2267:4: (lv_element_1_0= ruleMetamodelElement ) | 6219 | // InternalApplicationConfiguration.g:2267:4: (lv_element_1_0= ruleMetamodelElement ) |
@@ -6248,7 +6248,7 @@ public class InternalApplicationConfigurationParser extends AbstractInternalAntl | |||
6248 | 6248 | ||
6249 | otherlv_2=(Token)match(input,33,FOLLOW_2); | 6249 | otherlv_2=(Token)match(input,33,FOLLOW_2); |
6250 | 6250 | ||
6251 | newLeafNode(otherlv_2, grammarAccess.getClassReferenceAccess().getRightSquareBracketKeyword_2()); | 6251 | newLeafNode(otherlv_2, grammarAccess.getClassReferenceAccess().getGreaterThanSignKeyword_2()); |
6252 | 6252 | ||
6253 | 6253 | ||
6254 | } | 6254 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/services/ApplicationConfigurationGrammarAccess.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/services/ApplicationConfigurationGrammarAccess.java index a21d65e7..6541c19b 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/services/ApplicationConfigurationGrammarAccess.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/services/ApplicationConfigurationGrammarAccess.java | |||
@@ -1366,20 +1366,20 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen | |||
1366 | public class ClassReferenceElements extends AbstractParserRuleElementFinder { | 1366 | public class ClassReferenceElements extends AbstractParserRuleElementFinder { |
1367 | private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.ClassReference"); | 1367 | private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.ClassReference"); |
1368 | private final Group cGroup = (Group)rule.eContents().get(1); | 1368 | private final Group cGroup = (Group)rule.eContents().get(1); |
1369 | private final Keyword cLeftSquareBracketKeyword_0 = (Keyword)cGroup.eContents().get(0); | 1369 | private final Keyword cLessThanSignKeyword_0 = (Keyword)cGroup.eContents().get(0); |
1370 | private final Assignment cElementAssignment_1 = (Assignment)cGroup.eContents().get(1); | 1370 | private final Assignment cElementAssignment_1 = (Assignment)cGroup.eContents().get(1); |
1371 | private final RuleCall cElementMetamodelElementParserRuleCall_1_0 = (RuleCall)cElementAssignment_1.eContents().get(0); | 1371 | private final RuleCall cElementMetamodelElementParserRuleCall_1_0 = (RuleCall)cElementAssignment_1.eContents().get(0); |
1372 | private final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2); | 1372 | private final Keyword cGreaterThanSignKeyword_2 = (Keyword)cGroup.eContents().get(2); |
1373 | 1373 | ||
1374 | //ClassReference: | 1374 | //ClassReference: |
1375 | // '[' element=MetamodelElement ']'; | 1375 | // '<' element=MetamodelElement '>'; |
1376 | @Override public ParserRule getRule() { return rule; } | 1376 | @Override public ParserRule getRule() { return rule; } |
1377 | 1377 | ||
1378 | //'[' element=MetamodelElement ']' | 1378 | //'<' element=MetamodelElement '>' |
1379 | public Group getGroup() { return cGroup; } | 1379 | public Group getGroup() { return cGroup; } |
1380 | 1380 | ||
1381 | //'[' | 1381 | //'<' |
1382 | public Keyword getLeftSquareBracketKeyword_0() { return cLeftSquareBracketKeyword_0; } | 1382 | public Keyword getLessThanSignKeyword_0() { return cLessThanSignKeyword_0; } |
1383 | 1383 | ||
1384 | //element=MetamodelElement | 1384 | //element=MetamodelElement |
1385 | public Assignment getElementAssignment_1() { return cElementAssignment_1; } | 1385 | public Assignment getElementAssignment_1() { return cElementAssignment_1; } |
@@ -1387,8 +1387,8 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen | |||
1387 | //MetamodelElement | 1387 | //MetamodelElement |
1388 | public RuleCall getElementMetamodelElementParserRuleCall_1_0() { return cElementMetamodelElementParserRuleCall_1_0; } | 1388 | public RuleCall getElementMetamodelElementParserRuleCall_1_0() { return cElementMetamodelElementParserRuleCall_1_0; } |
1389 | 1389 | ||
1390 | //']' | 1390 | //'>' |
1391 | public Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; } | 1391 | public Keyword getGreaterThanSignKeyword_2() { return cGreaterThanSignKeyword_2; } |
1392 | } | 1392 | } |
1393 | public class ObjectReferenceElements extends AbstractParserRuleElementFinder { | 1393 | public class ObjectReferenceElements extends AbstractParserRuleElementFinder { |
1394 | private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.ObjectReference"); | 1394 | private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.ObjectReference"); |
@@ -2449,7 +2449,7 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen | |||
2449 | } | 2449 | } |
2450 | 2450 | ||
2451 | //ClassReference: | 2451 | //ClassReference: |
2452 | // '[' element=MetamodelElement ']'; | 2452 | // '<' element=MetamodelElement '>'; |
2453 | public ClassReferenceElements getClassReferenceAccess() { | 2453 | public ClassReferenceElements getClassReferenceAccess() { |
2454 | return pClassReference; | 2454 | return pClassReference; |
2455 | } | 2455 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext index 3efde6ec..1d12b3f7 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext | |||
@@ -112,7 +112,7 @@ TypeScope: '#' type = TypeReference | |||
112 | ('..' (maxUnlimited?='*' | max=INT))? | 112 | ('..' (maxUnlimited?='*' | max=INT))? |
113 | ; | 113 | ; |
114 | TypeReference: ClassReference | ObjectReference | IntegerReference | RealReference | StringReference; | 114 | TypeReference: ClassReference | ObjectReference | IntegerReference | RealReference | StringReference; |
115 | ClassReference: '[' element = MetamodelElement ']'; | 115 | ClassReference: '<' element = MetamodelElement '>'; |
116 | ObjectReference: {ObjectReference} 'node'; | 116 | ObjectReference: {ObjectReference} 'node'; |
117 | IntegerReference: {IntegerScope} 'int'; | 117 | IntegerReference: {IntegerScope} 'int'; |
118 | RealReference: {RealScope} 'real'; | 118 | RealReference: {RealScope} 'real'; |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend index ea0e8d1e..8973e7cf 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/scoping/ApplicationConfigurationScopeProvider.xtend | |||
@@ -3,25 +3,27 @@ | |||
3 | */ | 3 | */ |
4 | package hu.bme.mit.inf.dslreasoner.application.scoping | 4 | package hu.bme.mit.inf.dslreasoner.application.scoping |
5 | 5 | ||
6 | import org.eclipse.emf.ecore.EObject | 6 | import com.google.common.base.Function |
7 | import org.eclipse.emf.ecore.EReference | 7 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.AllPackageEntry |
8 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.MetamodelElement | 8 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.AllPatternEntry |
9 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage | 9 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage |
10 | import org.eclipse.xtext.EcoreUtil2 | 10 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ClassReference |
11 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript | 11 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript |
12 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.EPackageImport | 12 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.EPackageImport |
13 | import org.eclipse.xtext.scoping.Scopes | 13 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.MetamodelElement |
14 | import org.eclipse.emf.ecore.EClass | ||
15 | import org.eclipse.emf.ecore.EEnum | ||
16 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.MetamodelSpecification | 14 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.MetamodelSpecification |
17 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.AllPackageEntry | ||
18 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.PatternElement | 15 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.PatternElement |
19 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.AllPatternEntry | ||
20 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.PatternSpecification | 16 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.PatternSpecification |
21 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ViatraImport | 17 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ViatraImport |
22 | import com.google.common.base.Function | 18 | import org.eclipse.emf.ecore.EClass |
19 | import org.eclipse.emf.ecore.EEnum | ||
20 | import org.eclipse.emf.ecore.EObject | ||
21 | import org.eclipse.emf.ecore.EReference | ||
23 | import org.eclipse.viatra.query.patternlanguage.patternLanguage.PatternModel | 22 | import org.eclipse.viatra.query.patternlanguage.patternLanguage.PatternModel |
23 | import org.eclipse.xtext.EcoreUtil2 | ||
24 | import org.eclipse.xtext.naming.QualifiedName | 24 | import org.eclipse.xtext.naming.QualifiedName |
25 | import org.eclipse.xtext.scoping.IScope | ||
26 | import org.eclipse.xtext.scoping.Scopes | ||
25 | 27 | ||
26 | /** | 28 | /** |
27 | * This class contains custom scoping description. | 29 | * This class contains custom scoping description. |
@@ -55,7 +57,9 @@ class ApplicationConfigurationScopeProvider extends AbstractApplicationConfigura | |||
55 | return context.scopeForPatternSpecification(reference,document) | 57 | return context.scopeForPatternSpecification(reference,document) |
56 | } else if(context instanceof AllPatternEntry) { | 58 | } else if(context instanceof AllPatternEntry) { |
57 | return context.scopeForAllPatternEntry(reference,document) | 59 | return context.scopeForAllPatternEntry(reference,document) |
58 | } else { | 60 | } else if(context instanceof ClassReference) { |
61 | return context.scopeForClassReference(reference,document) | ||
62 | }else { | ||
59 | return super.getScope(context,reference) | 63 | return super.getScope(context,reference) |
60 | } | 64 | } |
61 | } | 65 | } |
@@ -122,7 +126,17 @@ class ApplicationConfigurationScopeProvider extends AbstractApplicationConfigura | |||
122 | } | 126 | } |
123 | } | 127 | } |
124 | 128 | ||
125 | // Todo [] scope | 129 | ////////// |
130 | |||
131 | def IScope scopeForClassReference(ClassReference classReference, EReference eReference, ConfigurationScript document) { | ||
132 | if(eReference === language.metamodelEntry_Package) { | ||
133 | return Scopes.scopeFor(document.allEPackages) | ||
134 | } else if(eReference === language.metamodelElement_Classifier) { | ||
135 | Scopes.scopeFor(document.allEClassifiers) | ||
136 | } else { | ||
137 | return super.getScope(classReference,eReference) | ||
138 | } | ||
139 | } | ||
126 | 140 | ||
127 | ////////// | 141 | ////////// |
128 | 142 | ||