Skip to content

Commit 9c555c3

Browse files
seidewitzseidewitz
committed
SYSML2_-44 Updated SysML textual notation grammar for terminate actions.
1 parent 1771458 commit 9c555c3

9 files changed

Lines changed: 11804 additions & 10965 deletions

File tree

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

198 Bytes
Binary file not shown.

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

Lines changed: 106 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13185,11 +13185,20 @@ ruleActionNode returns [EObject current=null]
1318513185
}
1318613186
|
1318713187
{
13188-
newCompositeNode(grammarAccess.getActionNodeAccess().getControlNodeParserRuleCall_6());
13188+
newCompositeNode(grammarAccess.getActionNodeAccess().getTerminateNodeParserRuleCall_6());
1318913189
}
13190-
this_ControlNode_6=ruleControlNode
13190+
this_TerminateNode_6=ruleTerminateNode
1319113191
{
13192-
$current = $this_ControlNode_6.current;
13192+
$current = $this_TerminateNode_6.current;
13193+
afterParserOrEnumRuleCall();
13194+
}
13195+
|
13196+
{
13197+
newCompositeNode(grammarAccess.getActionNodeAccess().getControlNodeParserRuleCall_7());
13198+
}
13199+
this_ControlNode_7=ruleControlNode
13200+
{
13201+
$current = $this_ControlNode_7.current;
1319313202
afterParserOrEnumRuleCall();
1319413203
}
1319513204
)
@@ -15406,6 +15415,100 @@ ruleForVariableDeclaration returns [EObject current=null]
1540615415
}
1540715416
;
1540815417

15418+
// Entry rule entryRuleTerminateNode
15419+
entryRuleTerminateNode returns [EObject current=null]:
15420+
{ newCompositeNode(grammarAccess.getTerminateNodeRule()); }
15421+
iv_ruleTerminateNode=ruleTerminateNode
15422+
{ $current=$iv_ruleTerminateNode.current; }
15423+
EOF;
15424+
15425+
// Rule TerminateNode
15426+
ruleTerminateNode returns [EObject current=null]
15427+
@init {
15428+
enterRule();
15429+
}
15430+
@after {
15431+
leaveRule();
15432+
}:
15433+
(
15434+
{
15435+
if ($current==null) {
15436+
$current = createModelElement(grammarAccess.getTerminateNodeRule());
15437+
}
15438+
newCompositeNode(grammarAccess.getTerminateNodeAccess().getOccurrenceUsagePrefixParserRuleCall_0());
15439+
}
15440+
this_OccurrenceUsagePrefix_0=ruleOccurrenceUsagePrefix[$current]
15441+
{
15442+
$current = $this_OccurrenceUsagePrefix_0.current;
15443+
afterParserOrEnumRuleCall();
15444+
}
15445+
(
15446+
{
15447+
if ($current==null) {
15448+
$current = createModelElement(grammarAccess.getTerminateNodeRule());
15449+
}
15450+
newCompositeNode(grammarAccess.getTerminateNodeAccess().getActionNodeUsageDeclarationParserRuleCall_1());
15451+
}
15452+
this_ActionNodeUsageDeclaration_1=ruleActionNodeUsageDeclaration[$current]
15453+
{
15454+
$current = $this_ActionNodeUsageDeclaration_1.current;
15455+
afterParserOrEnumRuleCall();
15456+
}
15457+
)?
15458+
otherlv_2='terminate'
15459+
{
15460+
newLeafNode(otherlv_2, grammarAccess.getTerminateNodeAccess().getTerminateKeyword_2());
15461+
}
15462+
(
15463+
{
15464+
if ($current==null) {
15465+
$current = createModelElement(grammarAccess.getTerminateNodeRule());
15466+
}
15467+
newCompositeNode(grammarAccess.getTerminateNodeAccess().getActionBodyParserRuleCall_3_0());
15468+
}
15469+
this_ActionBody_3=ruleActionBody[$current]
15470+
{
15471+
$current = $this_ActionBody_3.current;
15472+
afterParserOrEnumRuleCall();
15473+
}
15474+
|
15475+
(
15476+
(
15477+
('+' | '-' | '~' | 'not' | 'all' | 'null' | '(' | 'true' | 'false' | '.' | '*' | ';' | '{' | 'if' | RULE_STRING_VALUE | RULE_DECIMAL_VALUE | RULE_EXP_VALUE | RULE_ID | RULE_UNRESTRICTED_NAME)=>
15478+
(
15479+
{
15480+
newCompositeNode(grammarAccess.getTerminateNodeAccess().getOwnedRelationshipNodeParameterMemberParserRuleCall_3_1_0_0());
15481+
}
15482+
lv_ownedRelationship_4_0=ruleNodeParameterMember
15483+
{
15484+
if ($current==null) {
15485+
$current = createModelElementForParent(grammarAccess.getTerminateNodeRule());
15486+
}
15487+
add(
15488+
$current,
15489+
"ownedRelationship",
15490+
lv_ownedRelationship_4_0,
15491+
"org.omg.sysml.xtext.SysML.NodeParameterMember");
15492+
afterParserOrEnumRuleCall();
15493+
}
15494+
)
15495+
)
15496+
{
15497+
if ($current==null) {
15498+
$current = createModelElement(grammarAccess.getTerminateNodeRule());
15499+
}
15500+
newCompositeNode(grammarAccess.getTerminateNodeAccess().getActionBodyParserRuleCall_3_1_1());
15501+
}
15502+
this_ActionBody_5=ruleActionBody[$current]
15503+
{
15504+
$current = $this_ActionBody_5.current;
15505+
afterParserOrEnumRuleCall();
15506+
}
15507+
)
15508+
)
15509+
)
15510+
;
15511+
1540915512
// Entry rule entryRuleControlNode
1541015513
entryRuleControlNode returns [EObject current=null]:
1541115514
{ newCompositeNode(grammarAccess.getControlNodeRule()); }

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

Lines changed: 73 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
'!='=151
2-
'!=='=153
1+
'!='=152
2+
'!=='=154
33
'#'=32
4-
'%'=164
5-
'&'=148
4+
'%'=165
5+
'&'=149
66
'('=84
77
')'=85
88
'*'=46
99
'**'=45
10-
'+'=161
10+
'+'=162
1111
','=20
12-
'-'=162
12+
'-'=163
1313
'->'=102
1414
'.'=89
1515
'..'=59
1616
'.?'=103
17-
'/'=163
17+
'/'=164
1818
':'=52
1919
'::'=44
2020
'::>'=56
@@ -23,147 +23,148 @@
2323
':>>'=34
2424
';'=15
2525
'<'=13
26-
'<='=159
26+
'<='=160
2727
'='=65
28-
'=='=150
29-
'==='=152
28+
'=='=151
29+
'==='=153
3030
'>'=14
31-
'>='=160
32-
'?'=142
33-
'??'=143
31+
'>='=161
32+
'?'=143
33+
'??'=144
3434
'@'=30
35-
'@@'=156
35+
'@@'=157
3636
'['=58
3737
']'=47
38-
'^'=165
38+
'^'=166
3939
'about'=23
4040
'abstract'=31
4141
'accept'=95
4242
'action'=93
43-
'actor'=128
43+
'actor'=129
4444
'after'=98
4545
'alias'=40
4646
'all'=43
4747
'allocate'=92
4848
'allocation'=91
49-
'analysis'=134
50-
'and'=149
51-
'as'=157
52-
'assert'=124
49+
'analysis'=135
50+
'and'=150
51+
'as'=158
52+
'assert'=125
5353
'assign'=101
54-
'assume'=176
54+
'assume'=177
5555
'at'=97
5656
'attribute'=68
5757
'bind'=79
5858
'binding'=78
5959
'by'=54
60-
'calc'=121
61-
'case'=132
60+
'calc'=122
61+
'case'=133
6262
'comment'=22
63-
'concern'=131
63+
'concern'=132
6464
'connect'=83
6565
'connection'=82
66-
'constraint'=123
67-
'decide'=111
66+
'constraint'=124
67+
'decide'=112
6868
'def'=29
6969
'default'=67
7070
'defined'=53
7171
'dependency'=18
7272
'derived'=63
73-
'do'=117
73+
'do'=118
7474
'doc'=25
7575
'else'=105
7676
'end'=64
77-
'entry'=116
77+
'entry'=117
7878
'enum'=69
7979
'event'=72
80-
'exhibit'=119
81-
'exit'=118
82-
'expose'=180
83-
'false'=168
80+
'exhibit'=120
81+
'exit'=119
82+
'expose'=181
83+
'false'=169
8484
'filter'=39
8585
'first'=81
8686
'flow'=86
8787
'for'=41
88-
'fork'=113
89-
'frame'=178
88+
'fork'=114
89+
'frame'=179
9090
'from'=19
91-
'hastype'=154
91+
'hastype'=155
9292
'if'=104
93-
'implies'=144
93+
'implies'=145
9494
'import'=42
9595
'in'=109
96-
'include'=137
96+
'include'=138
9797
'individual'=71
98-
'inout'=173
98+
'inout'=174
9999
'interface'=90
100-
'istype'=155
100+
'istype'=156
101101
'item'=74
102-
'join'=112
102+
'join'=113
103103
'language'=27
104104
'library'=37
105105
'locale'=24
106106
'loop'=107
107-
'merge'=110
107+
'merge'=111
108108
'message'=87
109-
'meta'=158
109+
'meta'=159
110110
'metadata'=28
111111
'nonunique'=51
112-
'not'=125
113-
'null'=166
114-
'objective'=133
112+
'not'=126
113+
'null'=167
114+
'objective'=134
115115
'occurrence'=70
116116
'of'=88
117-
'or'=146
117+
'or'=147
118118
'ordered'=50
119-
'out'=172
119+
'out'=173
120120
'package'=38
121-
'parallel'=115
121+
'parallel'=116
122122
'part'=75
123123
'perform'=94
124124
'port'=76
125-
'private'=170
126-
'protected'=171
127-
'public'=169
125+
'private'=171
126+
'protected'=172
127+
'public'=170
128128
'readonly'=62
129129
'redefines'=35
130130
'ref'=33
131131
'references'=57
132-
'render'=139
133-
'rendering'=140
132+
'render'=140
133+
'rendering'=141
134134
'rep'=26
135-
'require'=177
136-
'requirement'=126
137-
'return'=122
138-
'satisfy'=130
135+
'require'=178
136+
'requirement'=127
137+
'return'=123
138+
'satisfy'=131
139139
'send'=100
140-
'snapshot'=174
140+
'snapshot'=175
141141
'specializes'=49
142-
'stakeholder'=129
142+
'stakeholder'=130
143143
'standard'=36
144-
'state'=114
145-
'subject'=127
144+
'state'=115
145+
'subject'=128
146146
'subsets'=55
147147
'succession'=80
148+
'terminate'=110
148149
'then'=73
149-
'timeslice'=175
150+
'timeslice'=176
150151
'to'=21
151-
'transition'=120
152-
'true'=167
152+
'transition'=121
153+
'true'=168
153154
'until'=108
154-
'use'=136
155+
'use'=137
155156
'variant'=61
156157
'variation'=60
157-
'verification'=135
158-
'verify'=179
158+
'verification'=136
159+
'verify'=180
159160
'via'=96
160-
'view'=138
161-
'viewpoint'=141
161+
'view'=139
162+
'viewpoint'=142
162163
'when'=99
163164
'while'=106
164-
'xor'=147
165+
'xor'=148
165166
'{'=16
166-
'|'=145
167+
'|'=146
167168
'}'=17
168169
'~'=77
169170
RULE_DECIMAL_VALUE=6
@@ -261,6 +262,7 @@ T__178=178
261262
T__179=179
262263
T__17=17
263264
T__180=180
265+
T__181=181
264266
T__18=18
265267
T__19=19
266268
T__20=20

0 commit comments

Comments
 (0)