Skip to content

Commit cd343a2

Browse files
seidewitzseidewitz
committed
Merge branch 'ST6RI-70' (pull request #36)
Conflicts: sysml/src/library/Base.alf sysml/src/library/BaseFunctions.alf sysml/src/library/ControlFunctions.alf sysml/src/library/Occurrences.alf sysml/src/library/Transfers.alf
2 parents 736c41e + 826070c commit cd343a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+48685
-30942
lines changed

‎org.omg.sysml.ide/src-gen/org/omg/sysml/ide/contentassist/antlr/AlfParser.java

+100-56
Large diffs are not rendered by default.

‎org.omg.sysml.ide/src-gen/org/omg/sysml/ide/contentassist/antlr/internal/InternalAlf.g

+4,814-2,520
Large diffs are not rendered by default.

‎org.omg.sysml.ide/src-gen/org/omg/sysml/ide/contentassist/antlr/internal/InternalAlf.tokens

+72-68
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,85 @@
1-
'!'=41
2-
'!='=29
1+
'!'=42
2+
'!='=30
33
'&&'=19
44
'&'=22
5-
'('=71
6-
')'=72
7-
'*'=38
8-
'**'=40
9-
'+'=36
10-
','=68
11-
'-'=37
12-
'->'=85
5+
'('=75
6+
')'=76
7+
'*'=39
8+
'**'=41
9+
'+'=37
10+
','=73
11+
'-'=38
12+
'->'=87
1313
'.'=24
14-
'..'=80
15-
'./'=87
16-
'/'=39
17-
':'=77
14+
'..'=82
15+
'./'=89
16+
'/'=40
17+
':'=79
1818
'::'=23
1919
';'=25
20-
'<'=32
21-
'<='=34
22-
'='=76
23-
'=='=28
24-
'=>'=83
25-
'>'=33
26-
'>='=35
20+
'<'=33
21+
'<='=35
22+
'='=78
23+
'=='=29
24+
'=>'=85
25+
'>'=34
26+
'>='=36
2727
'?'=16
2828
'??'=17
29-
'@'=94
30-
'Class'=56
31-
'['=78
32-
']'=79
29+
'@'=96
30+
'Class'=57
31+
'['=80
32+
']'=81
3333
'^'=21
34-
'abstract'=62
35-
'allInstances'=95
34+
'abstract'=63
35+
'allInstances'=97
3636
'any'=27
37-
'as'=51
38-
'assoc'=59
39-
'behavior'=60
40-
'class'=57
41-
'compose'=91
42-
'connector'=63
43-
'datatype'=58
44-
'end'=69
45-
'expr'=74
37+
'as'=52
38+
'assoc'=60
39+
'behavior'=61
40+
'binding'=67
41+
'class'=58
42+
'compose'=93
43+
'connector'=66
44+
'datatype'=59
45+
'end'=71
46+
'expr'=65
4647
'feature'=26
47-
'flow'=66
48-
'from'=84
49-
'function'=61
50-
'hastype'=31
51-
'import'=50
52-
'in'=47
53-
'inout'=49
54-
'instanceof'=30
55-
'interaction'=70
56-
'is'=55
57-
'nonunique'=93
58-
'null'=86
59-
'ordered'=92
60-
'out'=48
61-
'package'=52
62-
'packaged'=46
63-
'part'=88
64-
'port'=90
65-
'portion'=89
66-
'private'=44
67-
'protected'=45
68-
'public'=43
69-
'redefines'=75
70-
'specializes'=67
71-
'step'=73
72-
'stream'=65
73-
'subsets'=81
74-
'succession'=64
75-
'to'=82
76-
'{'=53
48+
'flow'=70
49+
'from'=86
50+
'function'=62
51+
'hastype'=32
52+
'import'=51
53+
'in'=48
54+
'inout'=50
55+
'instanceof'=31
56+
'interaction'=74
57+
'is'=56
58+
'nonunique'=95
59+
'null'=88
60+
'ordered'=94
61+
'out'=49
62+
'package'=53
63+
'packaged'=47
64+
'part'=90
65+
'port'=92
66+
'portion'=91
67+
'private'=45
68+
'protected'=46
69+
'public'=44
70+
'redefines'=77
71+
'specializes'=72
72+
'step'=64
73+
'stream'=28
74+
'subsets'=83
75+
'succession'=68
76+
'then'=69
77+
'to'=84
78+
'{'=54
7779
'|'=20
7880
'||'=18
79-
'}'=54
80-
'~'=42
81+
'}'=55
82+
'~'=43
8183
RULE_BOOLEAN_VALUE=9
8284
RULE_DOCUMENTATION_COMMENT=8
8385
RULE_EXP_VALUE=4
@@ -170,3 +172,5 @@ T__92=92
170172
T__93=93
171173
T__94=94
172174
T__95=95
175+
T__96=96
176+
T__97=97

0 commit comments

Comments
 (0)