Skip to content

Commit 9272fda

Browse files
seidewitzseidewitz
committed
KERML_-117 Updated Expressions grammar to use IndexExpression.
1 parent 4a96c23 commit 9272fda

29 files changed

Lines changed: 20766 additions & 20771 deletions

‎org.omg.kerml.expressions.xtext/src-gen/org/omg/kerml/expressions/xtext/KerMLExpressions.xtextbin‎

3 Bytes
Binary file not shown.

‎org.omg.kerml.expressions.xtext/src-gen/org/omg/kerml/expressions/xtext/parser/antlr/internal/InternalKerMLExpressions.g‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2836,24 +2836,14 @@ rulePrimaryExpression returns [EObject current=null]
28362836
(
28372837
{
28382838
$current = forceCreateModelElementAndAdd(
2839-
grammarAccess.getPrimaryExpressionAccess().getOperatorExpressionOperandAction_2_0_0_0(),
2839+
grammarAccess.getPrimaryExpressionAccess().getIndexExpressionOperandAction_2_0_0_0(),
28402840
$current);
28412841
}
28422842
)
2843-
(
2844-
(
2845-
lv_operator_5_0='#'
2846-
{
2847-
newLeafNode(lv_operator_5_0, grammarAccess.getPrimaryExpressionAccess().getOperatorNumberSignKeyword_2_0_0_1_0());
2848-
}
2849-
{
2850-
if ($current==null) {
2851-
$current = createModelElement(grammarAccess.getPrimaryExpressionRule());
2852-
}
2853-
setWithLastConsumed($current, "operator", lv_operator_5_0, "#");
2854-
}
2855-
)
2856-
)
2843+
otherlv_5='#'
2844+
{
2845+
newLeafNode(otherlv_5, grammarAccess.getPrimaryExpressionAccess().getNumberSignKeyword_2_0_0_1());
2846+
}
28572847
otherlv_6='('
28582848
{
28592849
newLeafNode(otherlv_6, grammarAccess.getPrimaryExpressionAccess().getLeftParenthesisKeyword_2_0_0_2());

‎org.omg.kerml.expressions.xtext/src-gen/org/omg/kerml/expressions/xtext/parser/antlr/internal/InternalKerMLExpressionsLexer.java‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,11 +1205,11 @@ public final void mRULE_DECIMAL_VALUE() throws RecognitionException {
12051205
try {
12061206
int _type = RULE_DECIMAL_VALUE;
12071207
int _channel = DEFAULT_TOKEN_CHANNEL;
1208-
// InternalKerMLExpressions.g:4926:20: ( '0' .. '9' ( '0' .. '9' )* )
1209-
// InternalKerMLExpressions.g:4926:22: '0' .. '9' ( '0' .. '9' )*
1208+
// InternalKerMLExpressions.g:4916:20: ( '0' .. '9' ( '0' .. '9' )* )
1209+
// InternalKerMLExpressions.g:4916:22: '0' .. '9' ( '0' .. '9' )*
12101210
{
12111211
matchRange('0','9');
1212-
// InternalKerMLExpressions.g:4926:31: ( '0' .. '9' )*
1212+
// InternalKerMLExpressions.g:4916:31: ( '0' .. '9' )*
12131213
loop1:
12141214
do {
12151215
int alt1=2;
@@ -1222,7 +1222,7 @@ public final void mRULE_DECIMAL_VALUE() throws RecognitionException {
12221222

12231223
switch (alt1) {
12241224
case 1 :
1225-
// InternalKerMLExpressions.g:4926:32: '0' .. '9'
1225+
// InternalKerMLExpressions.g:4916:32: '0' .. '9'
12261226
{
12271227
matchRange('0','9');
12281228

@@ -1250,8 +1250,8 @@ public final void mRULE_EXP_VALUE() throws RecognitionException {
12501250
try {
12511251
int _type = RULE_EXP_VALUE;
12521252
int _channel = DEFAULT_TOKEN_CHANNEL;
1253-
// InternalKerMLExpressions.g:4928:16: ( RULE_DECIMAL_VALUE ( 'e' | 'E' ) ( '+' | '-' )? RULE_DECIMAL_VALUE )
1254-
// InternalKerMLExpressions.g:4928:18: RULE_DECIMAL_VALUE ( 'e' | 'E' ) ( '+' | '-' )? RULE_DECIMAL_VALUE
1253+
// InternalKerMLExpressions.g:4918:16: ( RULE_DECIMAL_VALUE ( 'e' | 'E' ) ( '+' | '-' )? RULE_DECIMAL_VALUE )
1254+
// InternalKerMLExpressions.g:4918:18: RULE_DECIMAL_VALUE ( 'e' | 'E' ) ( '+' | '-' )? RULE_DECIMAL_VALUE
12551255
{
12561256
mRULE_DECIMAL_VALUE();
12571257
if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
@@ -1263,7 +1263,7 @@ public final void mRULE_EXP_VALUE() throws RecognitionException {
12631263
recover(mse);
12641264
throw mse;}
12651265

1266-
// InternalKerMLExpressions.g:4928:47: ( '+' | '-' )?
1266+
// InternalKerMLExpressions.g:4918:47: ( '+' | '-' )?
12671267
int alt2=2;
12681268
int LA2_0 = input.LA(1);
12691269

@@ -1306,8 +1306,8 @@ public final void mRULE_ID() throws RecognitionException {
13061306
try {
13071307
int _type = RULE_ID;
13081308
int _channel = DEFAULT_TOKEN_CHANNEL;
1309-
// InternalKerMLExpressions.g:4930:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
1310-
// InternalKerMLExpressions.g:4930:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
1309+
// InternalKerMLExpressions.g:4920:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
1310+
// InternalKerMLExpressions.g:4920:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
13111311
{
13121312
if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
13131313
input.consume();
@@ -1318,7 +1318,7 @@ public final void mRULE_ID() throws RecognitionException {
13181318
recover(mse);
13191319
throw mse;}
13201320

1321-
// InternalKerMLExpressions.g:4930:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
1321+
// InternalKerMLExpressions.g:4920:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
13221322
loop3:
13231323
do {
13241324
int alt3=2;
@@ -1367,11 +1367,11 @@ public final void mRULE_UNRESTRICTED_NAME() throws RecognitionException {
13671367
try {
13681368
int _type = RULE_UNRESTRICTED_NAME;
13691369
int _channel = DEFAULT_TOKEN_CHANNEL;
1370-
// InternalKerMLExpressions.g:4932:24: ( '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
1371-
// InternalKerMLExpressions.g:4932:26: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
1370+
// InternalKerMLExpressions.g:4922:24: ( '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
1371+
// InternalKerMLExpressions.g:4922:26: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
13721372
{
13731373
match('\'');
1374-
// InternalKerMLExpressions.g:4932:31: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
1374+
// InternalKerMLExpressions.g:4922:31: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
13751375
loop4:
13761376
do {
13771377
int alt4=3;
@@ -1387,7 +1387,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='&')||(LA4_0>='(' && LA4_0<='[')||(LA4_0>=
13871387

13881388
switch (alt4) {
13891389
case 1 :
1390-
// InternalKerMLExpressions.g:4932:32: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
1390+
// InternalKerMLExpressions.g:4922:32: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
13911391
{
13921392
match('\\');
13931393
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' ) {
@@ -1403,7 +1403,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='&')||(LA4_0>='(' && LA4_0<='[')||(LA4_0>=
14031403
}
14041404
break;
14051405
case 2 :
1406-
// InternalKerMLExpressions.g:4932:73: ~ ( ( '\\\\' | '\\'' ) )
1406+
// InternalKerMLExpressions.g:4922:73: ~ ( ( '\\\\' | '\\'' ) )
14071407
{
14081408
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
14091409
input.consume();
@@ -1440,11 +1440,11 @@ public final void mRULE_STRING_VALUE() throws RecognitionException {
14401440
try {
14411441
int _type = RULE_STRING_VALUE;
14421442
int _channel = DEFAULT_TOKEN_CHANNEL;
1443-
// InternalKerMLExpressions.g:4934:19: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
1444-
// InternalKerMLExpressions.g:4934:21: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
1443+
// InternalKerMLExpressions.g:4924:19: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
1444+
// InternalKerMLExpressions.g:4924:21: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
14451445
{
14461446
match('\"');
1447-
// InternalKerMLExpressions.g:4934:25: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
1447+
// InternalKerMLExpressions.g:4924:25: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
14481448
loop5:
14491449
do {
14501450
int alt5=3;
@@ -1460,7 +1460,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=
14601460

14611461
switch (alt5) {
14621462
case 1 :
1463-
// InternalKerMLExpressions.g:4934:26: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
1463+
// InternalKerMLExpressions.g:4924:26: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
14641464
{
14651465
match('\\');
14661466
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' ) {
@@ -1476,7 +1476,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=
14761476
}
14771477
break;
14781478
case 2 :
1479-
// InternalKerMLExpressions.g:4934:67: ~ ( ( '\\\\' | '\"' ) )
1479+
// InternalKerMLExpressions.g:4924:67: ~ ( ( '\\\\' | '\"' ) )
14801480
{
14811481
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
14821482
input.consume();
@@ -1513,12 +1513,12 @@ public final void mRULE_REGULAR_COMMENT() throws RecognitionException {
15131513
try {
15141514
int _type = RULE_REGULAR_COMMENT;
15151515
int _channel = DEFAULT_TOKEN_CHANNEL;
1516-
// InternalKerMLExpressions.g:4936:22: ( '/*' ( options {greedy=false; } : . )* '*/' )
1517-
// InternalKerMLExpressions.g:4936:24: '/*' ( options {greedy=false; } : . )* '*/'
1516+
// InternalKerMLExpressions.g:4926:22: ( '/*' ( options {greedy=false; } : . )* '*/' )
1517+
// InternalKerMLExpressions.g:4926:24: '/*' ( options {greedy=false; } : . )* '*/'
15181518
{
15191519
match("/*");
15201520

1521-
// InternalKerMLExpressions.g:4936:29: ( options {greedy=false; } : . )*
1521+
// InternalKerMLExpressions.g:4926:29: ( options {greedy=false; } : . )*
15221522
loop6:
15231523
do {
15241524
int alt6=2;
@@ -1543,7 +1543,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<=')')||(LA6_0>='+' && LA6_0<='\uFFFF')) ) {
15431543

15441544
switch (alt6) {
15451545
case 1 :
1546-
// InternalKerMLExpressions.g:4936:57: .
1546+
// InternalKerMLExpressions.g:4926:57: .
15471547
{
15481548
matchAny();
15491549

@@ -1573,12 +1573,12 @@ public final void mRULE_ML_NOTE() throws RecognitionException {
15731573
try {
15741574
int _type = RULE_ML_NOTE;
15751575
int _channel = DEFAULT_TOKEN_CHANNEL;
1576-
// InternalKerMLExpressions.g:4938:14: ( '//*' ( options {greedy=false; } : . )* '*/' )
1577-
// InternalKerMLExpressions.g:4938:16: '//*' ( options {greedy=false; } : . )* '*/'
1576+
// InternalKerMLExpressions.g:4928:14: ( '//*' ( options {greedy=false; } : . )* '*/' )
1577+
// InternalKerMLExpressions.g:4928:16: '//*' ( options {greedy=false; } : . )* '*/'
15781578
{
15791579
match("//*");
15801580

1581-
// InternalKerMLExpressions.g:4938:22: ( options {greedy=false; } : . )*
1581+
// InternalKerMLExpressions.g:4928:22: ( options {greedy=false; } : . )*
15821582
loop7:
15831583
do {
15841584
int alt7=2;
@@ -1603,7 +1603,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
16031603

16041604
switch (alt7) {
16051605
case 1 :
1606-
// InternalKerMLExpressions.g:4938:50: .
1606+
// InternalKerMLExpressions.g:4928:50: .
16071607
{
16081608
matchAny();
16091609

@@ -1633,12 +1633,12 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
16331633
try {
16341634
int _type = RULE_SL_NOTE;
16351635
int _channel = DEFAULT_TOKEN_CHANNEL;
1636-
// InternalKerMLExpressions.g:4940:14: ( '//' (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )? ( ( '\\r' )? '\\n' )? )
1637-
// InternalKerMLExpressions.g:4940:16: '//' (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )? ( ( '\\r' )? '\\n' )?
1636+
// InternalKerMLExpressions.g:4930:14: ( '//' (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )? ( ( '\\r' )? '\\n' )? )
1637+
// InternalKerMLExpressions.g:4930:16: '//' (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )? ( ( '\\r' )? '\\n' )?
16381638
{
16391639
match("//");
16401640

1641-
// InternalKerMLExpressions.g:4940:21: (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )?
1641+
// InternalKerMLExpressions.g:4930:21: (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )?
16421642
int alt9=2;
16431643
int LA9_0 = input.LA(1);
16441644

@@ -1647,7 +1647,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
16471647
}
16481648
switch (alt9) {
16491649
case 1 :
1650-
// InternalKerMLExpressions.g:4940:22: ~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )*
1650+
// InternalKerMLExpressions.g:4930:22: ~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )*
16511651
{
16521652
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') ) {
16531653
input.consume();
@@ -1658,7 +1658,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
16581658
recover(mse);
16591659
throw mse;}
16601660

1661-
// InternalKerMLExpressions.g:4940:37: (~ ( ( '\\n' | '\\r' ) ) )*
1661+
// InternalKerMLExpressions.g:4930:37: (~ ( ( '\\n' | '\\r' ) ) )*
16621662
loop8:
16631663
do {
16641664
int alt8=2;
@@ -1671,7 +1671,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
16711671

16721672
switch (alt8) {
16731673
case 1 :
1674-
// InternalKerMLExpressions.g:4940:37: ~ ( ( '\\n' | '\\r' ) )
1674+
// InternalKerMLExpressions.g:4930:37: ~ ( ( '\\n' | '\\r' ) )
16751675
{
16761676
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') ) {
16771677
input.consume();
@@ -1697,7 +1697,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
16971697

16981698
}
16991699

1700-
// InternalKerMLExpressions.g:4940:55: ( ( '\\r' )? '\\n' )?
1700+
// InternalKerMLExpressions.g:4930:55: ( ( '\\r' )? '\\n' )?
17011701
int alt11=2;
17021702
int LA11_0 = input.LA(1);
17031703

@@ -1706,9 +1706,9 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
17061706
}
17071707
switch (alt11) {
17081708
case 1 :
1709-
// InternalKerMLExpressions.g:4940:56: ( '\\r' )? '\\n'
1709+
// InternalKerMLExpressions.g:4930:56: ( '\\r' )? '\\n'
17101710
{
1711-
// InternalKerMLExpressions.g:4940:56: ( '\\r' )?
1711+
// InternalKerMLExpressions.g:4930:56: ( '\\r' )?
17121712
int alt10=2;
17131713
int LA10_0 = input.LA(1);
17141714

@@ -1717,7 +1717,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
17171717
}
17181718
switch (alt10) {
17191719
case 1 :
1720-
// InternalKerMLExpressions.g:4940:56: '\\r'
1720+
// InternalKerMLExpressions.g:4930:56: '\\r'
17211721
{
17221722
match('\r');
17231723

@@ -1749,10 +1749,10 @@ public final void mRULE_WS() throws RecognitionException {
17491749
try {
17501750
int _type = RULE_WS;
17511751
int _channel = DEFAULT_TOKEN_CHANNEL;
1752-
// InternalKerMLExpressions.g:4942:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
1753-
// InternalKerMLExpressions.g:4942:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
1752+
// InternalKerMLExpressions.g:4932:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
1753+
// InternalKerMLExpressions.g:4932:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
17541754
{
1755-
// InternalKerMLExpressions.g:4942:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
1755+
// InternalKerMLExpressions.g:4932:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
17561756
int cnt12=0;
17571757
loop12:
17581758
do {

0 commit comments

Comments
 (0)