Skip to content

Commit ed5612d

Browse files
seidewitzseidewitz
authored
Merge pull request #775 from Systems-Modeling/ST6RI-945
ST6RI-945 SysML 2.1 Ballot #1 - Textual Notation
2 parents 6059ea8 + f3ba721 commit ed5612d

35 files changed

Lines changed: 52967 additions & 52476 deletions

‎org.omg.sysml.xtext/src-gen/org/omg/sysml/xtext/SysML.xtextbin‎

15 Bytes
Binary file not shown.

‎org.omg.sysml.xtext/src-gen/org/omg/sysml/xtext/parser/antlr/internal/InternalSysML.g‎

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -465,22 +465,35 @@ ruleAnnotatingMember returns [EObject current=null]
465465
leaveRule();
466466
}:
467467
(
468-
(
469-
{
470-
newCompositeNode(grammarAccess.getAnnotatingMemberAccess().getOwnedRelatedElementAnnotatingElementParserRuleCall_0());
468+
{
469+
if ($current==null) {
470+
$current = createModelElement(grammarAccess.getAnnotatingMemberRule());
471471
}
472-
lv_ownedRelatedElement_0_0=ruleAnnotatingElement
473-
{
474-
if ($current==null) {
475-
$current = createModelElementForParent(grammarAccess.getAnnotatingMemberRule());
472+
newCompositeNode(grammarAccess.getAnnotatingMemberAccess().getMemberPrefixParserRuleCall_0());
473+
}
474+
this_MemberPrefix_0=ruleMemberPrefix[$current]
475+
{
476+
$current = $this_MemberPrefix_0.current;
477+
afterParserOrEnumRuleCall();
478+
}
479+
(
480+
(
481+
{
482+
newCompositeNode(grammarAccess.getAnnotatingMemberAccess().getOwnedRelatedElementAnnotatingElementParserRuleCall_1_0());
476483
}
477-
add(
478-
$current,
479-
"ownedRelatedElement",
480-
lv_ownedRelatedElement_0_0,
481-
"org.omg.sysml.xtext.SysML.AnnotatingElement");
482-
afterParserOrEnumRuleCall();
483-
}
484+
lv_ownedRelatedElement_1_0=ruleAnnotatingElement
485+
{
486+
if ($current==null) {
487+
$current = createModelElementForParent(grammarAccess.getAnnotatingMemberRule());
488+
}
489+
add(
490+
$current,
491+
"ownedRelatedElement",
492+
lv_ownedRelatedElement_1_0,
493+
"org.omg.sysml.xtext.SysML.AnnotatingElement");
494+
afterParserOrEnumRuleCall();
495+
}
496+
)
484497
)
485498
)
486499
;
@@ -20788,11 +20801,11 @@ ruleFramedConcernUsage returns [EObject current=null]
2078820801
if ($current==null) {
2078920802
$current = createModelElement(grammarAccess.getFramedConcernUsageRule());
2079020803
}
20791-
newCompositeNode(grammarAccess.getFramedConcernUsageAccess().getCalculationBodyParserRuleCall_1_2());
20804+
newCompositeNode(grammarAccess.getFramedConcernUsageAccess().getRequirementBodyParserRuleCall_1_2());
2079220805
}
20793-
this_CalculationBody_7=ruleCalculationBody[$current]
20806+
this_RequirementBody_7=ruleRequirementBody[$current]
2079420807
{
20795-
$current = $this_CalculationBody_7.current;
20808+
$current = $this_RequirementBody_7.current;
2079620809
afterParserOrEnumRuleCall();
2079720810
}
2079820811
)

‎org.omg.sysml.xtext/src-gen/org/omg/sysml/xtext/parser/antlr/internal/InternalSysMLLexer.java‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3821,11 +3821,11 @@ public final void mRULE_DECIMAL_VALUE() throws RecognitionException {
38213821
try {
38223822
int _type = RULE_DECIMAL_VALUE;
38233823
int _channel = DEFAULT_TOKEN_CHANNEL;
3824-
// InternalSysML.g:29335:20: ( '0' .. '9' ( '0' .. '9' )* )
3825-
// InternalSysML.g:29335:22: '0' .. '9' ( '0' .. '9' )*
3824+
// InternalSysML.g:29348:20: ( '0' .. '9' ( '0' .. '9' )* )
3825+
// InternalSysML.g:29348:22: '0' .. '9' ( '0' .. '9' )*
38263826
{
38273827
matchRange('0','9');
3828-
// InternalSysML.g:29335:31: ( '0' .. '9' )*
3828+
// InternalSysML.g:29348:31: ( '0' .. '9' )*
38293829
loop1:
38303830
do {
38313831
int alt1=2;
@@ -3838,7 +3838,7 @@ public final void mRULE_DECIMAL_VALUE() throws RecognitionException {
38383838

38393839
switch (alt1) {
38403840
case 1 :
3841-
// InternalSysML.g:29335:32: '0' .. '9'
3841+
// InternalSysML.g:29348:32: '0' .. '9'
38423842
{
38433843
matchRange('0','9');
38443844

@@ -3866,8 +3866,8 @@ public final void mRULE_EXP_VALUE() throws RecognitionException {
38663866
try {
38673867
int _type = RULE_EXP_VALUE;
38683868
int _channel = DEFAULT_TOKEN_CHANNEL;
3869-
// InternalSysML.g:29337:16: ( RULE_DECIMAL_VALUE ( 'e' | 'E' ) ( '+' | '-' )? RULE_DECIMAL_VALUE )
3870-
// InternalSysML.g:29337:18: RULE_DECIMAL_VALUE ( 'e' | 'E' ) ( '+' | '-' )? RULE_DECIMAL_VALUE
3869+
// InternalSysML.g:29350:16: ( RULE_DECIMAL_VALUE ( 'e' | 'E' ) ( '+' | '-' )? RULE_DECIMAL_VALUE )
3870+
// InternalSysML.g:29350:18: RULE_DECIMAL_VALUE ( 'e' | 'E' ) ( '+' | '-' )? RULE_DECIMAL_VALUE
38713871
{
38723872
mRULE_DECIMAL_VALUE();
38733873
if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
@@ -3879,7 +3879,7 @@ public final void mRULE_EXP_VALUE() throws RecognitionException {
38793879
recover(mse);
38803880
throw mse;}
38813881

3882-
// InternalSysML.g:29337:47: ( '+' | '-' )?
3882+
// InternalSysML.g:29350:47: ( '+' | '-' )?
38833883
int alt2=2;
38843884
int LA2_0 = input.LA(1);
38853885

@@ -3922,8 +3922,8 @@ public final void mRULE_ID() throws RecognitionException {
39223922
try {
39233923
int _type = RULE_ID;
39243924
int _channel = DEFAULT_TOKEN_CHANNEL;
3925-
// InternalSysML.g:29339:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
3926-
// InternalSysML.g:29339:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
3925+
// InternalSysML.g:29352:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
3926+
// InternalSysML.g:29352:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
39273927
{
39283928
if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
39293929
input.consume();
@@ -3934,7 +3934,7 @@ public final void mRULE_ID() throws RecognitionException {
39343934
recover(mse);
39353935
throw mse;}
39363936

3937-
// InternalSysML.g:29339:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
3937+
// InternalSysML.g:29352:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
39383938
loop3:
39393939
do {
39403940
int alt3=2;
@@ -3983,11 +3983,11 @@ public final void mRULE_UNRESTRICTED_NAME() throws RecognitionException {
39833983
try {
39843984
int _type = RULE_UNRESTRICTED_NAME;
39853985
int _channel = DEFAULT_TOKEN_CHANNEL;
3986-
// InternalSysML.g:29341:24: ( '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
3987-
// InternalSysML.g:29341:26: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
3986+
// InternalSysML.g:29354:24: ( '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
3987+
// InternalSysML.g:29354:26: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
39883988
{
39893989
match('\'');
3990-
// InternalSysML.g:29341:31: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
3990+
// InternalSysML.g:29354:31: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
39913991
loop4:
39923992
do {
39933993
int alt4=3;
@@ -4003,7 +4003,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='&')||(LA4_0>='(' && LA4_0<='[')||(LA4_0>=
40034003

40044004
switch (alt4) {
40054005
case 1 :
4006-
// InternalSysML.g:29341:32: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
4006+
// InternalSysML.g:29354:32: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
40074007
{
40084008
match('\\');
40094009
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -4019,7 +4019,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='&')||(LA4_0>='(' && LA4_0<='[')||(LA4_0>=
40194019
}
40204020
break;
40214021
case 2 :
4022-
// InternalSysML.g:29341:73: ~ ( ( '\\\\' | '\\'' ) )
4022+
// InternalSysML.g:29354:73: ~ ( ( '\\\\' | '\\'' ) )
40234023
{
40244024
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
40254025
input.consume();
@@ -4056,11 +4056,11 @@ public final void mRULE_STRING_VALUE() throws RecognitionException {
40564056
try {
40574057
int _type = RULE_STRING_VALUE;
40584058
int _channel = DEFAULT_TOKEN_CHANNEL;
4059-
// InternalSysML.g:29343:19: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
4060-
// InternalSysML.g:29343:21: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
4059+
// InternalSysML.g:29356:19: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
4060+
// InternalSysML.g:29356:21: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
40614061
{
40624062
match('\"');
4063-
// InternalSysML.g:29343:25: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
4063+
// InternalSysML.g:29356:25: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
40644064
loop5:
40654065
do {
40664066
int alt5=3;
@@ -4076,7 +4076,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=
40764076

40774077
switch (alt5) {
40784078
case 1 :
4079-
// InternalSysML.g:29343:26: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
4079+
// InternalSysML.g:29356:26: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
40804080
{
40814081
match('\\');
40824082
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -4092,7 +4092,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=
40924092
}
40934093
break;
40944094
case 2 :
4095-
// InternalSysML.g:29343:67: ~ ( ( '\\\\' | '\"' ) )
4095+
// InternalSysML.g:29356:67: ~ ( ( '\\\\' | '\"' ) )
40964096
{
40974097
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
40984098
input.consume();
@@ -4129,12 +4129,12 @@ public final void mRULE_REGULAR_COMMENT() throws RecognitionException {
41294129
try {
41304130
int _type = RULE_REGULAR_COMMENT;
41314131
int _channel = DEFAULT_TOKEN_CHANNEL;
4132-
// InternalSysML.g:29345:22: ( '/*' ( options {greedy=false; } : . )* '*/' )
4133-
// InternalSysML.g:29345:24: '/*' ( options {greedy=false; } : . )* '*/'
4132+
// InternalSysML.g:29358:22: ( '/*' ( options {greedy=false; } : . )* '*/' )
4133+
// InternalSysML.g:29358:24: '/*' ( options {greedy=false; } : . )* '*/'
41344134
{
41354135
match("/*");
41364136

4137-
// InternalSysML.g:29345:29: ( options {greedy=false; } : . )*
4137+
// InternalSysML.g:29358:29: ( options {greedy=false; } : . )*
41384138
loop6:
41394139
do {
41404140
int alt6=2;
@@ -4159,7 +4159,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<=')')||(LA6_0>='+' && LA6_0<='\uFFFF')) ) {
41594159

41604160
switch (alt6) {
41614161
case 1 :
4162-
// InternalSysML.g:29345:57: .
4162+
// InternalSysML.g:29358:57: .
41634163
{
41644164
matchAny();
41654165

@@ -4189,12 +4189,12 @@ public final void mRULE_ML_NOTE() throws RecognitionException {
41894189
try {
41904190
int _type = RULE_ML_NOTE;
41914191
int _channel = DEFAULT_TOKEN_CHANNEL;
4192-
// InternalSysML.g:29347:14: ( '//*' ( options {greedy=false; } : . )* '*/' )
4193-
// InternalSysML.g:29347:16: '//*' ( options {greedy=false; } : . )* '*/'
4192+
// InternalSysML.g:29360:14: ( '//*' ( options {greedy=false; } : . )* '*/' )
4193+
// InternalSysML.g:29360:16: '//*' ( options {greedy=false; } : . )* '*/'
41944194
{
41954195
match("//*");
41964196

4197-
// InternalSysML.g:29347:22: ( options {greedy=false; } : . )*
4197+
// InternalSysML.g:29360:22: ( options {greedy=false; } : . )*
41984198
loop7:
41994199
do {
42004200
int alt7=2;
@@ -4219,7 +4219,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
42194219

42204220
switch (alt7) {
42214221
case 1 :
4222-
// InternalSysML.g:29347:50: .
4222+
// InternalSysML.g:29360:50: .
42234223
{
42244224
matchAny();
42254225

@@ -4249,12 +4249,12 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
42494249
try {
42504250
int _type = RULE_SL_NOTE;
42514251
int _channel = DEFAULT_TOKEN_CHANNEL;
4252-
// InternalSysML.g:29349:14: ( '//' (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )? ( ( '\\r' )? '\\n' )? )
4253-
// InternalSysML.g:29349:16: '//' (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )? ( ( '\\r' )? '\\n' )?
4252+
// InternalSysML.g:29362:14: ( '//' (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )? ( ( '\\r' )? '\\n' )? )
4253+
// InternalSysML.g:29362:16: '//' (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )? ( ( '\\r' )? '\\n' )?
42544254
{
42554255
match("//");
42564256

4257-
// InternalSysML.g:29349:21: (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )?
4257+
// InternalSysML.g:29362:21: (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )?
42584258
int alt9=2;
42594259
int LA9_0 = input.LA(1);
42604260

@@ -4263,7 +4263,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
42634263
}
42644264
switch (alt9) {
42654265
case 1 :
4266-
// InternalSysML.g:29349:22: ~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )*
4266+
// InternalSysML.g:29362:22: ~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )*
42674267
{
42684268
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') ) {
42694269
input.consume();
@@ -4274,7 +4274,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
42744274
recover(mse);
42754275
throw mse;}
42764276

4277-
// InternalSysML.g:29349:37: (~ ( ( '\\n' | '\\r' ) ) )*
4277+
// InternalSysML.g:29362:37: (~ ( ( '\\n' | '\\r' ) ) )*
42784278
loop8:
42794279
do {
42804280
int alt8=2;
@@ -4287,7 +4287,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
42874287

42884288
switch (alt8) {
42894289
case 1 :
4290-
// InternalSysML.g:29349:37: ~ ( ( '\\n' | '\\r' ) )
4290+
// InternalSysML.g:29362:37: ~ ( ( '\\n' | '\\r' ) )
42914291
{
42924292
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') ) {
42934293
input.consume();
@@ -4313,7 +4313,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
43134313

43144314
}
43154315

4316-
// InternalSysML.g:29349:55: ( ( '\\r' )? '\\n' )?
4316+
// InternalSysML.g:29362:55: ( ( '\\r' )? '\\n' )?
43174317
int alt11=2;
43184318
int LA11_0 = input.LA(1);
43194319

@@ -4322,9 +4322,9 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
43224322
}
43234323
switch (alt11) {
43244324
case 1 :
4325-
// InternalSysML.g:29349:56: ( '\\r' )? '\\n'
4325+
// InternalSysML.g:29362:56: ( '\\r' )? '\\n'
43264326
{
4327-
// InternalSysML.g:29349:56: ( '\\r' )?
4327+
// InternalSysML.g:29362:56: ( '\\r' )?
43284328
int alt10=2;
43294329
int LA10_0 = input.LA(1);
43304330

@@ -4333,7 +4333,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
43334333
}
43344334
switch (alt10) {
43354335
case 1 :
4336-
// InternalSysML.g:29349:56: '\\r'
4336+
// InternalSysML.g:29362:56: '\\r'
43374337
{
43384338
match('\r');
43394339

@@ -4365,10 +4365,10 @@ public final void mRULE_WS() throws RecognitionException {
43654365
try {
43664366
int _type = RULE_WS;
43674367
int _channel = DEFAULT_TOKEN_CHANNEL;
4368-
// InternalSysML.g:29351:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
4369-
// InternalSysML.g:29351:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
4368+
// InternalSysML.g:29364:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
4369+
// InternalSysML.g:29364:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
43704370
{
4371-
// InternalSysML.g:29351:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
4371+
// InternalSysML.g:29364:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
43724372
int cnt12=0;
43734373
loop12:
43744374
do {

0 commit comments

Comments
 (0)