Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[567448] Bug fixing #71

Merged
merged 1 commit into from
Nov 9, 2020
Merged

[567448] Bug fixing #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...g/polarsys/capella/scenario/editor/dsl/ide/contentassist/antlr/TextualScenarioParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,9 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
builder.put(grammarAccess.getLostMessageAccess().getNameAssignment_3(), "rule__LostMessage__NameAssignment_3");
builder.put(grammarAccess.getFoundMessageAccess().getArrowAssignment_0(), "rule__FoundMessage__ArrowAssignment_0");
builder.put(grammarAccess.getFoundMessageAccess().getTargetAssignment_1(), "rule__FoundMessage__TargetAssignment_1");
builder.put(grammarAccess.getFoundMessageAccess().getDoubleDotAssignment_2(), "rule__FoundMessage__DoubleDotAssignment_2");
builder.put(grammarAccess.getFoundMessageAccess().getNameAssignment_3(), "rule__FoundMessage__NameAssignment_3");
builder.put(grammarAccess.getFoundMessageAccess().getExecutionAssignment_2(), "rule__FoundMessage__ExecutionAssignment_2");
builder.put(grammarAccess.getFoundMessageAccess().getDoubleDotAssignment_3(), "rule__FoundMessage__DoubleDotAssignment_3");
builder.put(grammarAccess.getFoundMessageAccess().getNameAssignment_4(), "rule__FoundMessage__NameAssignment_4");
builder.put(grammarAccess.getParticipantDeactivationAccess().getKeywordAssignment_0(), "rule__ParticipantDeactivation__KeywordAssignment_0");
builder.put(grammarAccess.getParticipantDeactivationAccess().getNameAssignment_1(), "rule__ParticipantDeactivation__NameAssignment_1");
builder.put(grammarAccess.getCombinedFragmentAccess().getKeywordAssignment_0(), "rule__CombinedFragment__KeywordAssignment_0");
Expand Down
74 changes: 60 additions & 14 deletions ...ys/capella/scenario/editor/dsl/ide/contentassist/antlr/internal/InternalTextualScenario.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2308,9 +2308,9 @@ rule__FoundMessage__Group__2__Impl
}
:
(
{ before(grammarAccess.getFoundMessageAccess().getDoubleDotAssignment_2()); }
(rule__FoundMessage__DoubleDotAssignment_2)
{ after(grammarAccess.getFoundMessageAccess().getDoubleDotAssignment_2()); }
{ before(grammarAccess.getFoundMessageAccess().getExecutionAssignment_2()); }
(rule__FoundMessage__ExecutionAssignment_2)?
{ after(grammarAccess.getFoundMessageAccess().getExecutionAssignment_2()); }
)
;
finally {
Expand All @@ -2323,6 +2323,7 @@ rule__FoundMessage__Group__3
}
:
rule__FoundMessage__Group__3__Impl
rule__FoundMessage__Group__4
;
finally {
restoreStackSize(stackSize);
Expand All @@ -2334,9 +2335,35 @@ rule__FoundMessage__Group__3__Impl
}
:
(
{ before(grammarAccess.getFoundMessageAccess().getNameAssignment_3()); }
(rule__FoundMessage__NameAssignment_3)
{ after(grammarAccess.getFoundMessageAccess().getNameAssignment_3()); }
{ before(grammarAccess.getFoundMessageAccess().getDoubleDotAssignment_3()); }
(rule__FoundMessage__DoubleDotAssignment_3)
{ after(grammarAccess.getFoundMessageAccess().getDoubleDotAssignment_3()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__FoundMessage__Group__4
@init {
int stackSize = keepStackSize();
}
:
rule__FoundMessage__Group__4__Impl
;
finally {
restoreStackSize(stackSize);
}

rule__FoundMessage__Group__4__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getFoundMessageAccess().getNameAssignment_4()); }
(rule__FoundMessage__NameAssignment_4)
{ after(grammarAccess.getFoundMessageAccess().getNameAssignment_4()); }
)
;
finally {
Expand Down Expand Up @@ -3734,34 +3761,53 @@ finally {
restoreStackSize(stackSize);
}

rule__FoundMessage__DoubleDotAssignment_2
rule__FoundMessage__ExecutionAssignment_2
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getFoundMessageAccess().getExecutionWithExecutionKeyword_2_0()); }
(
{ before(grammarAccess.getFoundMessageAccess().getExecutionWithExecutionKeyword_2_0()); }
'withExecution'
{ after(grammarAccess.getFoundMessageAccess().getExecutionWithExecutionKeyword_2_0()); }
)
{ after(grammarAccess.getFoundMessageAccess().getExecutionWithExecutionKeyword_2_0()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__FoundMessage__DoubleDotAssignment_3
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getFoundMessageAccess().getDoubleDotColonKeyword_2_0()); }
{ before(grammarAccess.getFoundMessageAccess().getDoubleDotColonKeyword_3_0()); }
(
{ before(grammarAccess.getFoundMessageAccess().getDoubleDotColonKeyword_2_0()); }
{ before(grammarAccess.getFoundMessageAccess().getDoubleDotColonKeyword_3_0()); }
':'
{ after(grammarAccess.getFoundMessageAccess().getDoubleDotColonKeyword_2_0()); }
{ after(grammarAccess.getFoundMessageAccess().getDoubleDotColonKeyword_3_0()); }
)
{ after(grammarAccess.getFoundMessageAccess().getDoubleDotColonKeyword_2_0()); }
{ after(grammarAccess.getFoundMessageAccess().getDoubleDotColonKeyword_3_0()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__FoundMessage__NameAssignment_3
rule__FoundMessage__NameAssignment_4
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getFoundMessageAccess().getNameSTRINGTerminalRuleCall_3_0()); }
{ before(grammarAccess.getFoundMessageAccess().getNameSTRINGTerminalRuleCall_4_0()); }
RULE_STRING
{ after(grammarAccess.getFoundMessageAccess().getNameSTRINGTerminalRuleCall_3_0()); }
{ after(grammarAccess.getFoundMessageAccess().getNameSTRINGTerminalRuleCall_4_0()); }
)
;
finally {
Expand Down
74 changes: 37 additions & 37 deletions ...la/scenario/editor/dsl/ide/contentassist/antlr/internal/InternalTextualScenarioLexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,10 +862,10 @@ public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalTextualScenario.g:4133:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
// InternalTextualScenario.g:4133:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
// InternalTextualScenario.g:4179:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
// InternalTextualScenario.g:4179:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
// InternalTextualScenario.g:4133:11: ( '^' )?
// InternalTextualScenario.g:4179:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);

Expand All @@ -874,7 +874,7 @@ public final void mRULE_ID() throws RecognitionException {
}
switch (alt1) {
case 1 :
// InternalTextualScenario.g:4133:11: '^'
// InternalTextualScenario.g:4179:11: '^'
{
match('^');

Expand All @@ -892,7 +892,7 @@ public final void mRULE_ID() throws RecognitionException {
recover(mse);
throw mse;}

// InternalTextualScenario.g:4133:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
// InternalTextualScenario.g:4179:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
Expand Down Expand Up @@ -941,10 +941,10 @@ public final void mRULE_INT() throws RecognitionException {
try {
int _type = RULE_INT;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalTextualScenario.g:4135:10: ( ( '0' .. '9' )+ )
// InternalTextualScenario.g:4135:12: ( '0' .. '9' )+
// InternalTextualScenario.g:4181:10: ( ( '0' .. '9' )+ )
// InternalTextualScenario.g:4181:12: ( '0' .. '9' )+
{
// InternalTextualScenario.g:4135:12: ( '0' .. '9' )+
// InternalTextualScenario.g:4181:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
Expand All @@ -958,7 +958,7 @@ public final void mRULE_INT() throws RecognitionException {

switch (alt3) {
case 1 :
// InternalTextualScenario.g:4135:13: '0' .. '9'
// InternalTextualScenario.g:4181:13: '0' .. '9'
{
matchRange('0','9');

Expand Down Expand Up @@ -990,10 +990,10 @@ public final void mRULE_STRING() throws RecognitionException {
try {
int _type = RULE_STRING;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalTextualScenario.g:4137:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
// InternalTextualScenario.g:4137:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
// InternalTextualScenario.g:4183:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
// InternalTextualScenario.g:4183:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
// InternalTextualScenario.g:4137:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
// InternalTextualScenario.g:4183:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);

Expand All @@ -1011,10 +1011,10 @@ else if ( (LA6_0=='\'') ) {
}
switch (alt6) {
case 1 :
// InternalTextualScenario.g:4137:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
// InternalTextualScenario.g:4183:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
// InternalTextualScenario.g:4137:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
// InternalTextualScenario.g:4183:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
loop4:
do {
int alt4=3;
Expand All @@ -1030,15 +1030,15 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=

switch (alt4) {
case 1 :
// InternalTextualScenario.g:4137:21: '\\\\' .
// InternalTextualScenario.g:4183:21: '\\\\' .
{
match('\\');
matchAny();

}
break;
case 2 :
// InternalTextualScenario.g:4137:28: ~ ( ( '\\\\' | '\"' ) )
// InternalTextualScenario.g:4183:28: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
Expand All @@ -1063,10 +1063,10 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=
}
break;
case 2 :
// InternalTextualScenario.g:4137:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
// InternalTextualScenario.g:4183:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
// InternalTextualScenario.g:4137:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
// InternalTextualScenario.g:4183:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
Expand All @@ -1082,15 +1082,15 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=

switch (alt5) {
case 1 :
// InternalTextualScenario.g:4137:54: '\\\\' .
// InternalTextualScenario.g:4183:54: '\\\\' .
{
match('\\');
matchAny();

}
break;
case 2 :
// InternalTextualScenario.g:4137:61: ~ ( ( '\\\\' | '\\'' ) )
// InternalTextualScenario.g:4183:61: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
Expand Down Expand Up @@ -1133,12 +1133,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {
try {
int _type = RULE_ML_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalTextualScenario.g:4139:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
// InternalTextualScenario.g:4139:19: '/*' ( options {greedy=false; } : . )* '*/'
// InternalTextualScenario.g:4185:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
// InternalTextualScenario.g:4185:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");

// InternalTextualScenario.g:4139:24: ( options {greedy=false; } : . )*
// InternalTextualScenario.g:4185:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
Expand All @@ -1163,7 +1163,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {

switch (alt7) {
case 1 :
// InternalTextualScenario.g:4139:52: .
// InternalTextualScenario.g:4185:52: .
{
matchAny();

Expand Down Expand Up @@ -1193,12 +1193,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
try {
int _type = RULE_SL_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalTextualScenario.g:4141:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
// InternalTextualScenario.g:4141:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
// InternalTextualScenario.g:4187:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
// InternalTextualScenario.g:4187:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");

// InternalTextualScenario.g:4141:24: (~ ( ( '\\n' | '\\r' ) ) )*
// InternalTextualScenario.g:4187:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
Expand All @@ -1211,7 +1211,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {

switch (alt8) {
case 1 :
// InternalTextualScenario.g:4141:24: ~ ( ( '\\n' | '\\r' ) )
// InternalTextualScenario.g:4187:24: ~ ( ( '\\n' | '\\r' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
input.consume();
Expand All @@ -1231,7 +1231,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
}
} while (true);

// InternalTextualScenario.g:4141:40: ( ( '\\r' )? '\\n' )?
// InternalTextualScenario.g:4187:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);

Expand All @@ -1240,9 +1240,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
}
switch (alt10) {
case 1 :
// InternalTextualScenario.g:4141:41: ( '\\r' )? '\\n'
// InternalTextualScenario.g:4187:41: ( '\\r' )? '\\n'
{
// InternalTextualScenario.g:4141:41: ( '\\r' )?
// InternalTextualScenario.g:4187:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);

Expand All @@ -1251,7 +1251,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {
}
switch (alt9) {
case 1 :
// InternalTextualScenario.g:4141:41: '\\r'
// InternalTextualScenario.g:4187:41: '\\r'
{
match('\r');

Expand Down Expand Up @@ -1283,10 +1283,10 @@ public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalTextualScenario.g:4143:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
// InternalTextualScenario.g:4143:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
// InternalTextualScenario.g:4189:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
// InternalTextualScenario.g:4189:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
// InternalTextualScenario.g:4143:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
// InternalTextualScenario.g:4189:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
Expand Down Expand Up @@ -1340,8 +1340,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {
try {
int _type = RULE_ANY_OTHER;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalTextualScenario.g:4145:16: ( . )
// InternalTextualScenario.g:4145:18: .
// InternalTextualScenario.g:4191:16: ( . )
// InternalTextualScenario.g:4191:18: .
{
matchAny();

Expand Down
Loading