Commit f45bceb6 authored by Arnaud Dieumegard's avatar Arnaud Dieumegard

Patterns grammar correction for links types.

parent 650ef7b5
...@@ -1446,9 +1446,9 @@ rule__PatternLink__Group__1__Impl ...@@ -1446,9 +1446,9 @@ rule__PatternLink__Group__1__Impl
} }
: :
( (
{ before(grammarAccess.getPatternLinkAccess().getHyphenMinusHyphenMinusLeftCurlyBracketKeyword_1()); } { before(grammarAccess.getPatternLinkAccess().getHyphenMinusLeftCurlyBracketKeyword_1()); }
'--{' '-{'
{ after(grammarAccess.getPatternLinkAccess().getHyphenMinusHyphenMinusLeftCurlyBracketKeyword_1()); } { after(grammarAccess.getPatternLinkAccess().getHyphenMinusLeftCurlyBracketKeyword_1()); }
) )
; ;
finally { finally {
......
'('=28 '('=28
')'=29 ')'=29
','=30 ','=30
'--{'=36 '-{'=36
'.'=38 '.'=38
'First'=17 'First'=17
'FlattenC'=21 'FlattenC'=21
......
...@@ -585,10 +585,10 @@ public class InternalPatternLexer extends Lexer { ...@@ -585,10 +585,10 @@ public class InternalPatternLexer extends Lexer {
try { try {
int _type = T__36; int _type = T__36;
int _channel = DEFAULT_TOKEN_CHANNEL; int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalPattern.g:36:7: ( '--{' ) // InternalPattern.g:36:7: ( '-{' )
// InternalPattern.g:36:9: '--{' // InternalPattern.g:36:9: '-{'
{ {
match("--{"); match("-{");
} }
...@@ -1402,13 +1402,13 @@ public class InternalPatternLexer extends Lexer { ...@@ -1402,13 +1402,13 @@ public class InternalPatternLexer extends Lexer {
static final String DFA12_eofS = static final String DFA12_eofS =
"\u008b\uffff"; "\u008b\uffff";
static final String DFA12_minS = static final String DFA12_minS =
"\1\0\2\156\1\165\1\162\1\144\1\151\1\157\1\150\1\157\2\141\4\uffff\1\55\1\157\2\uffff\1\55\1\uffff\1\101\2\uffff\2\0\1\52\2\uffff\1\163\1\uffff\1\60\1\164\1\141\1\145\1\162\1\141\1\162\1\164\2\151\1\163\1\164\6\uffff\1\155\11\uffff\1\160\1\165\1\uffff\1\60\2\156\1\163\1\164\1\153\1\141\1\146\1\156\2\164\1\160\1\145\1\164\1\uffff\1\163\3\164\1\103\2\164\1\103\1\60\1\145\1\157\1\143\1\60\1\160\1\151\1\60\1\145\2\60\1\145\1\103\2\60\1\uffff\1\162\1\156\1\60\1\uffff\1\157\1\164\1\uffff\1\156\2\uffff\3\60\2\uffff\1\156\1\145\1\uffff\1\163\1\171\1\103\3\uffff\1\60\1\156\1\145\2\60\1\uffff\1\164\1\60\2\uffff\1\60\2\uffff"; "\1\0\2\156\1\165\1\162\1\144\1\151\1\157\1\150\1\157\2\141\4\uffff\1\55\1\157\2\uffff\1\173\1\uffff\1\101\2\uffff\2\0\1\52\2\uffff\1\163\1\uffff\1\60\1\164\1\141\1\145\1\162\1\141\1\162\1\164\2\151\1\163\1\164\6\uffff\1\155\11\uffff\1\160\1\165\1\uffff\1\60\2\156\1\163\1\164\1\153\1\141\1\146\1\156\2\164\1\160\1\145\1\164\1\uffff\1\163\3\164\1\103\2\164\1\103\1\60\1\145\1\157\1\143\1\60\1\160\1\151\1\60\1\145\2\60\1\145\1\103\2\60\1\uffff\1\162\1\156\1\60\1\uffff\1\157\1\164\1\uffff\1\156\2\uffff\3\60\2\uffff\1\156\1\145\1\uffff\1\163\1\171\1\103\3\uffff\1\60\1\156\1\145\2\60\1\uffff\1\164\1\60\2\uffff\1\60\2\uffff";
static final String DFA12_maxS = static final String DFA12_maxS =
"\1\uffff\2\156\1\165\1\162\1\144\2\157\1\150\1\157\2\141\4\uffff\1\55\1\157\2\uffff\1\55\1\uffff\1\172\2\uffff\2\uffff\1\57\2\uffff\1\163\1\uffff\1\172\1\164\1\141\1\145\1\162\1\141\1\162\1\164\2\151\1\163\1\164\6\uffff\1\155\11\uffff\1\160\1\165\1\uffff\1\172\2\156\1\163\1\164\1\153\1\141\1\146\1\156\2\164\1\160\1\145\1\164\1\uffff\1\163\3\164\1\120\2\164\1\120\1\172\1\145\1\157\1\143\1\172\1\160\1\151\1\172\1\145\2\172\1\145\1\120\2\172\1\uffff\1\162\1\156\1\172\1\uffff\1\157\1\164\1\uffff\1\156\2\uffff\3\172\2\uffff\1\156\1\145\1\uffff\1\163\1\171\1\103\3\uffff\1\172\1\156\1\145\2\172\1\uffff\1\164\1\172\2\uffff\1\172\2\uffff"; "\1\uffff\2\156\1\165\1\162\1\144\2\157\1\150\1\157\2\141\4\uffff\1\55\1\157\2\uffff\1\173\1\uffff\1\172\2\uffff\2\uffff\1\57\2\uffff\1\163\1\uffff\1\172\1\164\1\141\1\145\1\162\1\141\1\162\1\164\2\151\1\163\1\164\6\uffff\1\155\11\uffff\1\160\1\165\1\uffff\1\172\2\156\1\163\1\164\1\153\1\141\1\146\1\156\2\164\1\160\1\145\1\164\1\uffff\1\163\3\164\1\120\2\164\1\120\1\172\1\145\1\157\1\143\1\172\1\160\1\151\1\172\1\145\2\172\1\145\1\120\2\172\1\uffff\1\162\1\156\1\172\1\uffff\1\157\1\164\1\uffff\1\156\2\uffff\3\172\2\uffff\1\156\1\145\1\uffff\1\163\1\171\1\103\3\uffff\1\172\1\156\1\145\2\172\1\uffff\1\164\1\172\2\uffff\1\172\2\uffff";
static final String DFA12_acceptS = static final String DFA12_acceptS =
"\14\uffff\1\22\1\23\1\24\1\25\2\uffff\1\30\1\31\1\uffff\1\34\1\uffff\1\35\1\36\3\uffff\1\42\1\43\1\uffff\1\35\14\uffff\1\22\1\23\1\24\1\25\1\33\1\26\1\uffff\1\30\1\31\1\32\1\34\1\36\1\37\1\40\1\41\1\42\2\uffff\1\2\16\uffff\1\3\27\uffff\1\20\3\uffff\1\4\2\uffff\1\7\1\uffff\1\14\1\15\3\uffff\1\16\1\17\2\uffff\1\1\3\uffff\1\10\1\11\1\12\5\uffff\1\21\2\uffff\1\6\1\13\1\uffff\1\5\1\27"; "\14\uffff\1\22\1\23\1\24\1\25\2\uffff\1\30\1\31\1\uffff\1\34\1\uffff\1\35\1\36\3\uffff\1\42\1\43\1\uffff\1\35\14\uffff\1\22\1\23\1\24\1\25\1\33\1\26\1\uffff\1\30\1\31\1\32\1\34\1\36\1\37\1\40\1\41\1\42\2\uffff\1\2\16\uffff\1\3\27\uffff\1\20\3\uffff\1\4\2\uffff\1\7\1\uffff\1\14\1\15\3\uffff\1\16\1\17\2\uffff\1\1\3\uffff\1\10\1\11\1\12\5\uffff\1\21\2\uffff\1\6\1\13\1\uffff\1\5\1\27";
static final String DFA12_specialS = static final String DFA12_specialS =
"\1\0\30\uffff\1\2\1\1\160\uffff}>"; "\1\2\30\uffff\1\1\1\0\160\uffff}>";
static final String[] DFA12_transitionS = { static final String[] DFA12_transitionS = {
"\11\35\2\34\2\35\1\34\22\35\1\34\1\35\1\31\4\35\1\32\1\14\1\15\2\35\1\16\1\24\1\25\1\33\12\30\7\35\5\27\1\6\2\27\1\5\1\11\1\27\1\12\5\27\1\7\1\10\1\4\6\27\1\22\1\35\1\23\1\26\1\27\1\35\2\27\1\21\5\27\1\2\5\27\1\3\1\13\4\27\1\1\5\27\1\17\1\35\1\20\uff82\35", "\11\35\2\34\2\35\1\34\22\35\1\34\1\35\1\31\4\35\1\32\1\14\1\15\2\35\1\16\1\24\1\25\1\33\12\30\7\35\5\27\1\6\2\27\1\5\1\11\1\27\1\12\5\27\1\7\1\10\1\4\6\27\1\22\1\35\1\23\1\26\1\27\1\35\2\27\1\21\5\27\1\2\5\27\1\3\1\13\4\27\1\1\5\27\1\17\1\35\1\20\uff82\35",
"\1\36", "\1\36",
...@@ -1588,6 +1588,26 @@ public class InternalPatternLexer extends Lexer { ...@@ -1588,6 +1588,26 @@ public class InternalPatternLexer extends Lexer {
int _s = s; int _s = s;
switch ( s ) { switch ( s ) {
case 0 : case 0 :
int LA12_26 = input.LA(1);
s = -1;
if ( ((LA12_26>='\u0000' && LA12_26<='\uFFFF')) ) {s = 56;}
else s = 29;
if ( s>=0 ) return s;
break;
case 1 :
int LA12_25 = input.LA(1);
s = -1;
if ( ((LA12_25>='\u0000' && LA12_25<='\uFFFF')) ) {s = 56;}
else s = 29;
if ( s>=0 ) return s;
break;
case 2 :
int LA12_0 = input.LA(1); int LA12_0 = input.LA(1);
s = -1; s = -1;
...@@ -1649,26 +1669,6 @@ public class InternalPatternLexer extends Lexer { ...@@ -1649,26 +1669,6 @@ public class InternalPatternLexer 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<='\uFFFF')) ) {s = 29;} 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<='\uFFFF')) ) {s = 29;}
if ( s>=0 ) return s;
break;
case 1 :
int LA12_26 = input.LA(1);
s = -1;
if ( ((LA12_26>='\u0000' && LA12_26<='\uFFFF')) ) {s = 56;}
else s = 29;
if ( s>=0 ) return s;
break;
case 2 :
int LA12_25 = input.LA(1);
s = -1;
if ( ((LA12_25>='\u0000' && LA12_25<='\uFFFF')) ) {s = 56;}
else s = 29;
if ( s>=0 ) return s; if ( s>=0 ) return s;
break; break;
} }
......
...@@ -22,7 +22,7 @@ import java.util.ArrayList; ...@@ -22,7 +22,7 @@ import java.util.ArrayList;
@SuppressWarnings("all") @SuppressWarnings("all")
public class InternalPatternParser extends AbstractInternalContentAssistParser { public class InternalPatternParser extends AbstractInternalContentAssistParser {
public static final String[] tokenNames = new String[] { public static final String[] tokenNames = new String[] {
"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'unspec'", "'in'", "'out'", "'inout'", "'Transpose'", "'Identity'", "'First'", "'Rotate'", "'ShiftC'", "'ShiftP'", "'FlattenC'", "'ForkC'", "'ForkP'", "'JoinC'", "'JoinP'", "'Last'", "'pattern'", "'('", "')'", "','", "'{'", "'}'", "'component'", "'['", "']'", "'--{'", "'}->'", "'.'" "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'unspec'", "'in'", "'out'", "'inout'", "'Transpose'", "'Identity'", "'First'", "'Rotate'", "'ShiftC'", "'ShiftP'", "'FlattenC'", "'ForkC'", "'ForkP'", "'JoinC'", "'JoinP'", "'Last'", "'pattern'", "'('", "')'", "','", "'{'", "'}'", "'component'", "'['", "']'", "'-{'", "'}->'", "'.'"
}; };
public static final int RULE_STRING=6; public static final int RULE_STRING=6;
public static final int RULE_SL_COMMENT=8; public static final int RULE_SL_COMMENT=8;
...@@ -4609,21 +4609,21 @@ public class InternalPatternParser extends AbstractInternalContentAssistParser { ...@@ -4609,21 +4609,21 @@ public class InternalPatternParser extends AbstractInternalContentAssistParser {
// $ANTLR start "rule__PatternLink__Group__1__Impl" // $ANTLR start "rule__PatternLink__Group__1__Impl"
// InternalPattern.g:1443:1: rule__PatternLink__Group__1__Impl : ( '--{' ) ; // InternalPattern.g:1443:1: rule__PatternLink__Group__1__Impl : ( '-{' ) ;
public final void rule__PatternLink__Group__1__Impl() throws RecognitionException { public final void rule__PatternLink__Group__1__Impl() throws RecognitionException {
int stackSize = keepStackSize(); int stackSize = keepStackSize();
try { try {
// InternalPattern.g:1447:1: ( ( '--{' ) ) // InternalPattern.g:1447:1: ( ( '-{' ) )
// InternalPattern.g:1448:1: ( '--{' ) // InternalPattern.g:1448:1: ( '-{' )
{ {
// InternalPattern.g:1448:1: ( '--{' ) // InternalPattern.g:1448:1: ( '-{' )
// InternalPattern.g:1449:2: '--{' // InternalPattern.g:1449:2: '-{'
{ {
before(grammarAccess.getPatternLinkAccess().getHyphenMinusHyphenMinusLeftCurlyBracketKeyword_1()); before(grammarAccess.getPatternLinkAccess().getHyphenMinusLeftCurlyBracketKeyword_1());
match(input,36,FOLLOW_2); match(input,36,FOLLOW_2);
after(grammarAccess.getPatternLinkAccess().getHyphenMinusHyphenMinusLeftCurlyBracketKeyword_1()); after(grammarAccess.getPatternLinkAccess().getHyphenMinusLeftCurlyBracketKeyword_1());
} }
......
...@@ -564,9 +564,9 @@ rulePatternLink returns [EObject current=null] ...@@ -564,9 +564,9 @@ rulePatternLink returns [EObject current=null]
} }
) )
) )
otherlv_1='--{' otherlv_1='-{'
{ {
newLeafNode(otherlv_1, grammarAccess.getPatternLinkAccess().getHyphenMinusHyphenMinusLeftCurlyBracketKeyword_1()); newLeafNode(otherlv_1, grammarAccess.getPatternLinkAccess().getHyphenMinusLeftCurlyBracketKeyword_1());
} }
( (
( (
......
'('=12 '('=12
')'=14 ')'=14
','=13 ','=13
'--{'=20 '-{'=20
'.'=22 '.'=22
'First'=29 'First'=29
'FlattenC'=33 'FlattenC'=33
......
...@@ -249,10 +249,10 @@ public class InternalPatternLexer extends Lexer { ...@@ -249,10 +249,10 @@ public class InternalPatternLexer extends Lexer {
try { try {
int _type = T__20; int _type = T__20;
int _channel = DEFAULT_TOKEN_CHANNEL; int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalPattern.g:20:7: ( '--{' ) // InternalPattern.g:20:7: ( '-{' )
// InternalPattern.g:20:9: '--{' // InternalPattern.g:20:9: '-{'
{ {
match("--{"); match("-{");
} }
...@@ -1402,13 +1402,13 @@ public class InternalPatternLexer extends Lexer { ...@@ -1402,13 +1402,13 @@ public class InternalPatternLexer extends Lexer {
static final String DFA12_eofS = static final String DFA12_eofS =
"\u008b\uffff"; "\u008b\uffff";
static final String DFA12_minS = static final String DFA12_minS =
"\1\0\1\141\4\uffff\1\55\1\157\2\uffff\1\55\1\uffff\2\156\1\165\1\162\1\144\1\151\1\157\1\150\1\157\1\141\1\101\2\uffff\2\0\1\52\2\uffff\1\164\7\uffff\1\155\4\uffff\1\163\1\60\1\164\1\141\1\145\1\162\1\141\1\162\1\164\2\151\1\163\5\uffff\1\164\2\160\1\165\1\uffff\1\60\2\156\1\163\1\164\1\153\1\141\1\146\1\156\1\164\1\145\1\157\1\145\1\164\1\uffff\1\163\3\164\1\103\2\164\1\103\1\60\1\162\1\156\1\143\1\60\1\160\1\151\1\60\1\145\2\60\1\145\1\103\2\60\1\uffff\1\156\1\145\1\60\1\uffff\1\157\1\164\1\uffff\1\156\2\uffff\3\60\2\uffff\1\60\1\156\1\uffff\1\163\1\171\1\103\4\uffff\1\164\1\145\4\60\4\uffff"; "\1\0\1\141\4\uffff\1\55\1\157\2\uffff\1\173\1\uffff\2\156\1\165\1\162\1\144\1\151\1\157\1\150\1\157\1\141\1\101\2\uffff\2\0\1\52\2\uffff\1\164\7\uffff\1\155\4\uffff\1\163\1\60\1\164\1\141\1\145\1\162\1\141\1\162\1\164\2\151\1\163\5\uffff\1\164\2\160\1\165\1\uffff\1\60\2\156\1\163\1\164\1\153\1\141\1\146\1\156\1\164\1\145\1\157\1\145\1\164\1\uffff\1\163\3\164\1\103\2\164\1\103\1\60\1\162\1\156\1\143\1\60\1\160\1\151\1\60\1\145\2\60\1\145\1\103\2\60\1\uffff\1\156\1\145\1\60\1\uffff\1\157\1\164\1\uffff\1\156\2\uffff\3\60\2\uffff\1\60\1\156\1\uffff\1\163\1\171\1\103\4\uffff\1\164\1\145\4\60\4\uffff";
static final String DFA12_maxS = static final String DFA12_maxS =
"\1\uffff\1\141\4\uffff\1\55\1\157\2\uffff\1\55\1\uffff\2\156\1\165\1\162\1\144\2\157\1\150\1\157\1\141\1\172\2\uffff\2\uffff\1\57\2\uffff\1\164\7\uffff\1\155\4\uffff\1\163\1\172\1\164\1\141\1\145\1\162\1\141\1\162\1\164\2\151\1\163\5\uffff\1\164\2\160\1\165\1\uffff\1\172\2\156\1\163\1\164\1\153\1\141\1\146\1\156\1\164\1\145\1\157\1\145\1\164\1\uffff\1\163\3\164\1\120\2\164\1\120\1\172\1\162\1\156\1\143\1\172\1\160\1\151\1\172\1\145\2\172\1\145\1\120\2\172\1\uffff\1\156\1\145\1\172\1\uffff\1\157\1\164\1\uffff\1\156\2\uffff\3\172\2\uffff\1\172\1\156\1\uffff\1\163\1\171\1\103\4\uffff\1\164\1\145\4\172\4\uffff"; "\1\uffff\1\141\4\uffff\1\55\1\157\2\uffff\1\173\1\uffff\2\156\1\165\1\162\1\144\2\157\1\150\1\157\1\141\1\172\2\uffff\2\uffff\1\57\2\uffff\1\164\7\uffff\1\155\4\uffff\1\163\1\172\1\164\1\141\1\145\1\162\1\141\1\162\1\164\2\151\1\163\5\uffff\1\164\2\160\1\165\1\uffff\1\172\2\156\1\163\1\164\1\153\1\141\1\146\1\156\1\164\1\145\1\157\1\145\1\164\1\uffff\1\163\3\164\1\120\2\164\1\120\1\172\1\162\1\156\1\143\1\172\1\160\1\151\1\172\1\145\2\172\1\145\1\120\2\172\1\uffff\1\156\1\145\1\172\1\uffff\1\157\1\164\1\uffff\1\156\2\uffff\3\172\2\uffff\1\172\1\156\1\uffff\1\163\1\171\1\103\4\uffff\1\164\1\145\4\172\4\uffff";
static final String DFA12_acceptS = static final String DFA12_acceptS =
"\2\uffff\1\2\1\3\1\4\1\5\2\uffff\1\10\1\11\1\uffff\1\14\13\uffff\1\35\1\36\3\uffff\1\42\1\43\1\uffff\1\35\1\2\1\3\1\4\1\5\1\13\1\6\1\uffff\1\10\1\11\1\12\1\14\14\uffff\1\36\1\37\1\40\1\41\1\42\4\uffff\1\16\16\uffff\1\17\27\uffff\1\34\3\uffff\1\20\2\uffff\1\23\1\uffff\1\30\1\31\3\uffff\1\32\1\33\2\uffff\1\15\3\uffff\1\24\1\25\1\26\1\1\6\uffff\1\22\1\27\1\7\1\21"; "\2\uffff\1\2\1\3\1\4\1\5\2\uffff\1\10\1\11\1\uffff\1\14\13\uffff\1\35\1\36\3\uffff\1\42\1\43\1\uffff\1\35\1\2\1\3\1\4\1\5\1\13\1\6\1\uffff\1\10\1\11\1\12\1\14\14\uffff\1\36\1\37\1\40\1\41\1\42\4\uffff\1\16\16\uffff\1\17\27\uffff\1\34\3\uffff\1\20\2\uffff\1\23\1\uffff\1\30\1\31\3\uffff\1\32\1\33\2\uffff\1\15\3\uffff\1\24\1\25\1\26\1\1\6\uffff\1\22\1\27\1\7\1\21";
static final String DFA12_specialS = static final String DFA12_specialS =
"\1\2\30\uffff\1\1\1\0\160\uffff}>"; "\1\1\30\uffff\1\2\1\0\160\uffff}>";
static final String[] DFA12_transitionS = { static final String[] DFA12_transitionS = {
"\11\35\2\34\2\35\1\34\22\35\1\34\1\35\1\31\4\35\1\32\1\2\1\4\2\35\1\3\1\12\1\13\1\33\12\30\7\35\5\27\1\21\2\27\1\20\1\24\1\27\1\25\5\27\1\22\1\23\1\17\6\27\1\10\1\35\1\11\1\26\1\27\1\35\2\27\1\7\5\27\1\15\5\27\1\16\1\1\4\27\1\14\5\27\1\5\1\35\1\6\uff82\35", "\11\35\2\34\2\35\1\34\22\35\1\34\1\35\1\31\4\35\1\32\1\2\1\4\2\35\1\3\1\12\1\13\1\33\12\30\7\35\5\27\1\21\2\27\1\20\1\24\1\27\1\25\5\27\1\22\1\23\1\17\6\27\1\10\1\35\1\11\1\26\1\27\1\35\2\27\1\7\5\27\1\15\5\27\1\16\1\1\4\27\1\14\5\27\1\5\1\35\1\6\uff82\35",
"\1\36", "\1\36",
...@@ -1598,16 +1598,6 @@ public class InternalPatternLexer extends Lexer { ...@@ -1598,16 +1598,6 @@ public class InternalPatternLexer extends Lexer {
if ( s>=0 ) return s; if ( s>=0 ) return s;
break; break;
case 1 : case 1 :
int LA12_25 = input.LA(1);
s = -1;
if ( ((LA12_25>='\u0000' && LA12_25<='\uFFFF')) ) {s = 56;}
else s = 29;
if ( s>=0 ) return s;
break;
case 2 :
int LA12_0 = input.LA(1); int LA12_0 = input.LA(1);
s = -1; s = -1;
...@@ -1669,6 +1659,16 @@ public class InternalPatternLexer extends Lexer { ...@@ -1669,6 +1659,16 @@ public class InternalPatternLexer 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<='\uFFFF')) ) {s = 29;} 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<='\uFFFF')) ) {s = 29;}
if ( s>=0 ) return s;
break;
case 2 :
int LA12_25 = input.LA(1);
s = -1;
if ( ((LA12_25>='\u0000' && LA12_25<='\uFFFF')) ) {s = 56;}
else s = 29;
if ( s>=0 ) return s; if ( s>=0 ) return s;
break; break;
} }
......
...@@ -22,7 +22,7 @@ import java.util.ArrayList; ...@@ -22,7 +22,7 @@ import java.util.ArrayList;
@SuppressWarnings("all") @SuppressWarnings("all")
public class InternalPatternParser extends AbstractInternalAntlrParser { public class InternalPatternParser extends AbstractInternalAntlrParser {
public static final String[] tokenNames = new String[] { public static final String[] tokenNames = new String[] {
"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'pattern'", "'('", "','", "')'", "'{'", "'}'", "'component'", "'['", "']'", "'--{'", "'}->'", "'.'", "'unspec'", "'in'", "'out'", "'inout'", "'Transpose'", "'Identity'", "'First'", "'Rotate'", "'ShiftC'", "'ShiftP'", "'FlattenC'", "'ForkC'", "'ForkP'", "'JoinC'", "'JoinP'", "'Last'" "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'pattern'", "'('", "','", "')'", "'{'", "'}'", "'component'", "'['", "']'", "'-{'", "'}->'", "'.'", "'unspec'", "'in'", "'out'", "'inout'", "'Transpose'", "'Identity'", "'First'", "'Rotate'", "'ShiftC'", "'ShiftP'", "'FlattenC'", "'ForkC'", "'ForkP'", "'JoinC'", "'JoinP'", "'Last'"
}; };
public static final int RULE_STRING=6; public static final int RULE_STRING=6;
public static final int RULE_SL_COMMENT=8; public static final int RULE_SL_COMMENT=8;
...@@ -1290,7 +1290,7 @@ public class InternalPatternParser extends AbstractInternalAntlrParser { ...@@ -1290,7 +1290,7 @@ public class InternalPatternParser extends AbstractInternalAntlrParser {
// $ANTLR start "rulePatternLink" // $ANTLR start "rulePatternLink"
// InternalPattern.g:543:1: rulePatternLink returns [EObject current=null] : ( ( ( ruleQualifiedID ) ) otherlv_1= '--{' ( (lv_linkType_2_0= ruleLinkType ) ) otherlv_3= '}->' ( ( ruleQualifiedID ) ) ) ; // InternalPattern.g:543:1: rulePatternLink returns [EObject current=null] : ( ( ( ruleQualifiedID ) ) otherlv_1= '-{' ( (lv_linkType_2_0= ruleLinkType ) ) otherlv_3= '}->' ( ( ruleQualifiedID ) ) ) ;
public final EObject rulePatternLink() throws RecognitionException { public final EObject rulePatternLink() throws RecognitionException {
EObject current = null; EObject current = null;
...@@ -1303,11 +1303,11 @@ public class InternalPatternParser extends AbstractInternalAntlrParser { ...@@ -1303,11 +1303,11 @@ public class InternalPatternParser extends AbstractInternalAntlrParser {
enterRule(); enterRule();
try { try {
// InternalPattern.g:549:2: ( ( ( ( ruleQualifiedID ) ) otherlv_1= '--{' ( (lv_linkType_2_0= ruleLinkType ) ) otherlv_3= '}->' ( ( ruleQualifiedID ) ) ) ) // InternalPattern.g:549:2: ( ( ( ( ruleQualifiedID ) ) otherlv_1= '-{' ( (lv_linkType_2_0= ruleLinkType ) ) otherlv_3= '}->' ( ( ruleQualifiedID ) ) ) )
// InternalPattern.g:550:2: ( ( ( ruleQualifiedID ) ) otherlv_1= '--{' ( (lv_linkType_2_0= ruleLinkType ) ) otherlv_3= '}->' ( ( ruleQualifiedID ) ) ) // InternalPattern.g:550:2: ( ( ( ruleQualifiedID ) ) otherlv_1= '-{' ( (lv_linkType_2_0= ruleLinkType ) ) otherlv_3= '}->' ( ( ruleQualifiedID ) ) )
{ {
// InternalPattern.g:550:2: ( ( ( ruleQualifiedID ) ) otherlv_1= '--{' ( (lv_linkType_2_0= ruleLinkType ) ) otherlv_3= '}->' ( ( ruleQualifiedID ) ) ) // InternalPattern.g:550:2: ( ( ( ruleQualifiedID ) ) otherlv_1= '-{' ( (lv_linkType_2_0= ruleLinkType ) ) otherlv_3= '}->' ( ( ruleQualifiedID ) ) )
// InternalPattern.g:551:3: ( ( ruleQualifiedID ) ) otherlv_1= '--{' ( (lv_linkType_2_0= ruleLinkType ) ) otherlv_3= '}->' ( ( ruleQualifiedID ) ) // InternalPattern.g:551:3: ( ( ruleQualifiedID ) ) otherlv_1= '-{' ( (lv_linkType_2_0= ruleLinkType ) ) otherlv_3= '}->' ( ( ruleQualifiedID ) )
{ {
// InternalPattern.g:551:3: ( ( ruleQualifiedID ) ) // InternalPattern.g:551:3: ( ( ruleQualifiedID ) )
// InternalPattern.g:552:4: ( ruleQualifiedID ) // InternalPattern.g:552:4: ( ruleQualifiedID )
...@@ -1339,7 +1339,7 @@ public class InternalPatternParser extends AbstractInternalAntlrParser { ...@@ -1339,7 +1339,7 @@ public class InternalPatternParser extends AbstractInternalAntlrParser {
otherlv_1=(Token)match(input,20,FOLLOW_16); otherlv_1=(Token)match(input,20,FOLLOW_16);
newLeafNode(otherlv_1, grammarAccess.getPatternLinkAccess().getHyphenMinusHyphenMinusLeftCurlyBracketKeyword_1()); newLeafNode(otherlv_1, grammarAccess.getPatternLinkAccess().getHyphenMinusLeftCurlyBracketKeyword_1());
// InternalPattern.g:571:3: ( (lv_linkType_2_0= ruleLinkType ) ) // InternalPattern.g:571:3: ( (lv_linkType_2_0= ruleLinkType ) )
// InternalPattern.g:572:4: (lv_linkType_2_0= ruleLinkType ) // InternalPattern.g:572:4: (lv_linkType_2_0= ruleLinkType )
......
...@@ -334,7 +334,7 @@ public class PatternGrammarAccess extends AbstractGrammarElementFinder { ...@@ -334,7 +334,7 @@ public class PatternGrammarAccess extends AbstractGrammarElementFinder {
private final Assignment cSrcAssignment_0 = (Assignment)cGroup.eContents().get(0); private final Assignment cSrcAssignment_0 = (Assignment)cGroup.eContents().get(0);
private final CrossReference cSrcPatternPortCrossReference_0_0 = (CrossReference)cSrcAssignment_0.eContents().get(0); private final CrossReference cSrcPatternPortCrossReference_0_0 = (CrossReference)cSrcAssignment_0.eContents().get(0);
private final RuleCall cSrcPatternPortQualifiedIDParserRuleCall_0_0_1 = (RuleCall)cSrcPatternPortCrossReference_0_0.eContents().get(1); private final RuleCall cSrcPatternPortQualifiedIDParserRuleCall_0_0_1 = (RuleCall)cSrcPatternPortCrossReference_0_0.eContents().get(1);
private final Keyword cHyphenMinusHyphenMinusLeftCurlyBracketKeyword_1 = (Keyword)cGroup.eContents().get(1); private final Keyword cHyphenMinusLeftCurlyBracketKeyword_1 = (Keyword)cGroup.eContents().get(1);
private final Assignment cLinkTypeAssignment_2 = (Assignment)cGroup.eContents().get(2); private final Assignment cLinkTypeAssignment_2 = (Assignment)cGroup.eContents().get(2);
private final RuleCall cLinkTypeLinkTypeEnumRuleCall_2_0 = (RuleCall)cLinkTypeAssignment_2.eContents().get(0); private final RuleCall cLinkTypeLinkTypeEnumRuleCall_2_0 = (RuleCall)cLinkTypeAssignment_2.eContents().get(0);
private final Keyword cRightCurlyBracketHyphenMinusGreaterThanSignKeyword_3 = (Keyword)cGroup.eContents().get(3); private final Keyword cRightCurlyBracketHyphenMinusGreaterThanSignKeyword_3 = (Keyword)cGroup.eContents().get(3);
...@@ -343,10 +343,10 @@ public class PatternGrammarAccess extends AbstractGrammarElementFinder { ...@@ -343,10 +343,10 @@ public class PatternGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cDstPatternPortQualifiedIDParserRuleCall_4_0_1 = (RuleCall)cDstPatternPortCrossReference_4_0.eContents().get(1); private final RuleCall cDstPatternPortQualifiedIDParserRuleCall_4_0_1 = (RuleCall)cDstPatternPortCrossReference_4_0.eContents().get(1);
//PatternLink: //PatternLink:
// src=[PatternPort|QualifiedID] '--{' linkType=LinkType '}->' dst=[PatternPort|QualifiedID]; // src=[PatternPort|QualifiedID] '-{' linkType=LinkType '}->' dst=[PatternPort|QualifiedID];
@Override public ParserRule getRule() { return rule; } @Override public ParserRule getRule() { return rule; }
//src=[PatternPort|QualifiedID] '--{' linkType=LinkType '}->' dst=[PatternPort|QualifiedID] //src=[PatternPort|QualifiedID] '-{' linkType=LinkType '}->' dst=[PatternPort|QualifiedID]
public Group getGroup() { return cGroup; } public Group getGroup() { return cGroup; }
//src=[PatternPort|QualifiedID] //src=[PatternPort|QualifiedID]
...@@ -358,8 +358,8 @@ public class PatternGrammarAccess extends AbstractGrammarElementFinder { ...@@ -358,8 +358,8 @@ public class PatternGrammarAccess extends AbstractGrammarElementFinder {
//QualifiedID //QualifiedID
public RuleCall getSrcPatternPortQualifiedIDParserRuleCall_0_0_1() { return cSrcPatternPortQualifiedIDParserRuleCall_0_0_1; } public RuleCall getSrcPatternPortQualifiedIDParserRuleCall_0_0_1() { return cSrcPatternPortQualifiedIDParserRuleCall_0_0_1; }
//'--{' //'-{'
public Keyword getHyphenMinusHyphenMinusLeftCurlyBracketKeyword_1() { return cHyphenMinusHyphenMinusLeftCurlyBracketKeyword_1; } public Keyword getHyphenMinusLeftCurlyBracketKeyword_1() { return cHyphenMinusLeftCurlyBracketKeyword_1; }
//linkType=LinkType //linkType=LinkType
public Assignment getLinkTypeAssignment_2() { return cLinkTypeAssignment_2; } public Assignment getLinkTypeAssignment_2() { return cLinkTypeAssignment_2; }
...@@ -716,7 +716,7 @@ public class PatternGrammarAccess extends AbstractGrammarElementFinder { ...@@ -716,7 +716,7 @@ public class PatternGrammarAccess extends AbstractGrammarElementFinder {
} }
//PatternLink: //PatternLink:
// src=[PatternPort|QualifiedID] '--{' linkType=LinkType '}->' dst=[PatternPort|QualifiedID]; // src=[PatternPort|QualifiedID] '-{' linkType=LinkType '}->' dst=[PatternPort|QualifiedID];
public PatternLinkElements getPatternLinkAccess() { public PatternLinkElements getPatternLinkAccess() {
return pPatternLink; return pPatternLink;
} }
......
...@@ -34,7 +34,7 @@ CardinalityElement returns CardinalityElement: ...@@ -34,7 +34,7 @@ CardinalityElement returns CardinalityElement:
; ;
PatternLink returns PatternLink: PatternLink returns PatternLink:
src=[PatternPort|QualifiedID] '--{' linkType=LinkType '}->' dst=[PatternPort|QualifiedID] src=[PatternPort|QualifiedID] '-{' linkType=LinkType '}->' dst=[PatternPort|QualifiedID]
; ;
enum LinkType returns LinkType: enum LinkType returns LinkType:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment