Skip to content

Commit d807f93

Browse files
TheKorposTheKorpos
committed
ST6RI-830 Re-generated xtext infrastructure for kerml and kerml
expressions
1 parent 2ecea07 commit d807f93

12 files changed

Lines changed: 8438 additions & 6177 deletions

File tree

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

72 Bytes
Binary file not shown.

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

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4877,6 +4877,35 @@ ruleName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
48774877
)
48784878
;
48794879

4880+
// Entry rule entryRuleGlobalQualification
4881+
entryRuleGlobalQualification returns [String current=null]:
4882+
{ newCompositeNode(grammarAccess.getGlobalQualificationRule()); }
4883+
iv_ruleGlobalQualification=ruleGlobalQualification
4884+
{ $current=$iv_ruleGlobalQualification.current.getText(); }
4885+
EOF;
4886+
4887+
// Rule GlobalQualification
4888+
ruleGlobalQualification returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
4889+
@init {
4890+
enterRule();
4891+
}
4892+
@after {
4893+
leaveRule();
4894+
}:
4895+
(
4896+
kw='$'
4897+
{
4898+
$current.merge(kw);
4899+
newLeafNode(kw, grammarAccess.getGlobalQualificationAccess().getDollarSignKeyword_0());
4900+
}
4901+
kw='::'
4902+
{
4903+
$current.merge(kw);
4904+
newLeafNode(kw, grammarAccess.getGlobalQualificationAccess().getColonColonKeyword_1());
4905+
}
4906+
)
4907+
;
4908+
48804909
// Entry rule entryRuleQualification
48814910
entryRuleQualification returns [String current=null]:
48824911
{ newCompositeNode(grammarAccess.getQualificationRule()); }
@@ -4929,22 +4958,34 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
49294958
(
49304959
(
49314960
{
4932-
newCompositeNode(grammarAccess.getQualifiedNameAccess().getQualificationParserRuleCall_0());
4961+
newCompositeNode(grammarAccess.getQualifiedNameAccess().getGlobalQualificationParserRuleCall_0());
4962+
}
4963+
this_GlobalQualification_0=ruleGlobalQualification
4964+
{
4965+
$current.merge(this_GlobalQualification_0);
4966+
}
4967+
{
4968+
afterParserOrEnumRuleCall();
4969+
}
4970+
)?
4971+
(
4972+
{
4973+
newCompositeNode(grammarAccess.getQualifiedNameAccess().getQualificationParserRuleCall_1());
49334974
}
4934-
this_Qualification_0=ruleQualification
4975+
this_Qualification_1=ruleQualification
49354976
{
4936-
$current.merge(this_Qualification_0);
4977+
$current.merge(this_Qualification_1);
49374978
}
49384979
{
49394980
afterParserOrEnumRuleCall();
49404981
}
49414982
)?
49424983
{
4943-
newCompositeNode(grammarAccess.getQualifiedNameAccess().getNameParserRuleCall_1());
4984+
newCompositeNode(grammarAccess.getQualifiedNameAccess().getNameParserRuleCall_2());
49444985
}
4945-
this_Name_1=ruleName
4986+
this_Name_2=ruleName
49464987
{
4947-
$current.merge(this_Name_1);
4988+
$current.merge(this_Name_2);
49484989
}
49494990
{
49504991
afterParserOrEnumRuleCall();

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'!='=24
22
'!=='=26
33
'#'=49
4+
'$'=66
45
'%'=42
56
'&'=21
67
'('=50
@@ -15,7 +16,7 @@
1516
'..'=37
1617
'.?'=55
1718
'/'=41
18-
'::'=66
19+
'::'=67
1920
';'=57
2021
'<'=33
2122
'<='=35
@@ -115,3 +116,4 @@ T__63=63
115116
T__64=64
116117
T__65=65
117118
T__66=66
119+
T__67=67

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

Lines changed: 194 additions & 165 deletions
Large diffs are not rendered by default.

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

Lines changed: 273 additions & 138 deletions
Large diffs are not rendered by default.

‎org.omg.kerml.expressions.xtext/src-gen/org/omg/kerml/expressions/xtext/services/KerMLExpressionsGrammarAccess.java‎

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2902,6 +2902,26 @@ public class NameElements extends AbstractParserRuleElementFinder {
29022902
//UNRESTRICTED_NAME
29032903
public RuleCall getUNRESTRICTED_NAMETerminalRuleCall_1() { return cUNRESTRICTED_NAMETerminalRuleCall_1; }
29042904
}
2905+
public class GlobalQualificationElements extends AbstractParserRuleElementFinder {
2906+
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.omg.kerml.expressions.xtext.KerMLExpressions.GlobalQualification");
2907+
private final Group cGroup = (Group)rule.eContents().get(1);
2908+
private final Keyword cDollarSignKeyword_0 = (Keyword)cGroup.eContents().get(0);
2909+
private final Keyword cColonColonKeyword_1 = (Keyword)cGroup.eContents().get(1);
2910+
2911+
//GlobalQualification :
2912+
// '$' '::'
2913+
//;
2914+
@Override public ParserRule getRule() { return rule; }
2915+
2916+
//'$' '::'
2917+
public Group getGroup() { return cGroup; }
2918+
2919+
//'$'
2920+
public Keyword getDollarSignKeyword_0() { return cDollarSignKeyword_0; }
2921+
2922+
//'::'
2923+
public Keyword getColonColonKeyword_1() { return cColonColonKeyword_1; }
2924+
}
29052925
public class QualificationElements extends AbstractParserRuleElementFinder {
29062926
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.omg.kerml.expressions.xtext.KerMLExpressions.Qualification");
29072927
private final Group cGroup = (Group)rule.eContents().get(1);
@@ -2925,22 +2945,26 @@ public class QualificationElements extends AbstractParserRuleElementFinder {
29252945
public class QualifiedNameElements extends AbstractParserRuleElementFinder {
29262946
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.omg.kerml.expressions.xtext.KerMLExpressions.QualifiedName");
29272947
private final Group cGroup = (Group)rule.eContents().get(1);
2928-
private final RuleCall cQualificationParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
2929-
private final RuleCall cNameParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
2948+
private final RuleCall cGlobalQualificationParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
2949+
private final RuleCall cQualificationParserRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
2950+
private final RuleCall cNameParserRuleCall_2 = (RuleCall)cGroup.eContents().get(2);
29302951

29312952
//QualifiedName:
2932-
// Qualification? Name
2953+
// GlobalQualification? Qualification? Name
29332954
//;
29342955
@Override public ParserRule getRule() { return rule; }
29352956

2936-
//Qualification? Name
2957+
//GlobalQualification? Qualification? Name
29372958
public Group getGroup() { return cGroup; }
29382959

2960+
//GlobalQualification?
2961+
public RuleCall getGlobalQualificationParserRuleCall_0() { return cGlobalQualificationParserRuleCall_0; }
2962+
29392963
//Qualification?
2940-
public RuleCall getQualificationParserRuleCall_0() { return cQualificationParserRuleCall_0; }
2964+
public RuleCall getQualificationParserRuleCall_1() { return cQualificationParserRuleCall_1; }
29412965

29422966
//Name
2943-
public RuleCall getNameParserRuleCall_1() { return cNameParserRuleCall_1; }
2967+
public RuleCall getNameParserRuleCall_2() { return cNameParserRuleCall_2; }
29442968
}
29452969

29462970

@@ -3037,6 +3061,7 @@ public class QualifiedNameElements extends AbstractParserRuleElementFinder {
30373061
private final RealValueElements pRealValue;
30383062
private final LiteralInfinityElements pLiteralInfinity;
30393063
private final NameElements pName;
3064+
private final GlobalQualificationElements pGlobalQualification;
30403065
private final QualificationElements pQualification;
30413066
private final QualifiedNameElements pQualifiedName;
30423067
private final TerminalRule tDECIMAL_VALUE;
@@ -3147,6 +3172,7 @@ public KerMLExpressionsGrammarAccess(GrammarProvider grammarProvider) {
31473172
this.pRealValue = new RealValueElements();
31483173
this.pLiteralInfinity = new LiteralInfinityElements();
31493174
this.pName = new NameElements();
3175+
this.pGlobalQualification = new GlobalQualificationElements();
31503176
this.pQualification = new QualificationElements();
31513177
this.pQualifiedName = new QualifiedNameElements();
31523178
this.tDECIMAL_VALUE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.omg.kerml.expressions.xtext.KerMLExpressions.DECIMAL_VALUE");
@@ -4302,6 +4328,17 @@ public ParserRule getNameRule() {
43024328
return getNameAccess().getRule();
43034329
}
43044330

4331+
//GlobalQualification :
4332+
// '$' '::'
4333+
//;
4334+
public GlobalQualificationElements getGlobalQualificationAccess() {
4335+
return pGlobalQualification;
4336+
}
4337+
4338+
public ParserRule getGlobalQualificationRule() {
4339+
return getGlobalQualificationAccess().getRule();
4340+
}
4341+
43054342
//Qualification :
43064343
// ( Name '::' )+
43074344
//;
@@ -4314,7 +4351,7 @@ public ParserRule getQualificationRule() {
43144351
}
43154352

43164353
//QualifiedName:
4317-
// Qualification? Name
4354+
// GlobalQualification? Qualification? Name
43184355
//;
43194356
public QualifiedNameElements getQualifiedNameAccess() {
43204357
return pQualifiedName;

‎org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerML.xtextbin‎

72 Bytes
Binary file not shown.

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

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15785,6 +15785,35 @@ ruleName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
1578515785
)
1578615786
;
1578715787

15788+
// Entry rule entryRuleGlobalQualification
15789+
entryRuleGlobalQualification returns [String current=null]:
15790+
{ newCompositeNode(grammarAccess.getGlobalQualificationRule()); }
15791+
iv_ruleGlobalQualification=ruleGlobalQualification
15792+
{ $current=$iv_ruleGlobalQualification.current.getText(); }
15793+
EOF;
15794+
15795+
// Rule GlobalQualification
15796+
ruleGlobalQualification returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
15797+
@init {
15798+
enterRule();
15799+
}
15800+
@after {
15801+
leaveRule();
15802+
}:
15803+
(
15804+
kw='$'
15805+
{
15806+
$current.merge(kw);
15807+
newLeafNode(kw, grammarAccess.getGlobalQualificationAccess().getDollarSignKeyword_0());
15808+
}
15809+
kw='::'
15810+
{
15811+
$current.merge(kw);
15812+
newLeafNode(kw, grammarAccess.getGlobalQualificationAccess().getColonColonKeyword_1());
15813+
}
15814+
)
15815+
;
15816+
1578815817
// Entry rule entryRuleQualification
1578915818
entryRuleQualification returns [String current=null]:
1579015819
{ newCompositeNode(grammarAccess.getQualificationRule()); }
@@ -15837,22 +15866,34 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
1583715866
(
1583815867
(
1583915868
{
15840-
newCompositeNode(grammarAccess.getQualifiedNameAccess().getQualificationParserRuleCall_0());
15869+
newCompositeNode(grammarAccess.getQualifiedNameAccess().getGlobalQualificationParserRuleCall_0());
15870+
}
15871+
this_GlobalQualification_0=ruleGlobalQualification
15872+
{
15873+
$current.merge(this_GlobalQualification_0);
15874+
}
15875+
{
15876+
afterParserOrEnumRuleCall();
15877+
}
15878+
)?
15879+
(
15880+
{
15881+
newCompositeNode(grammarAccess.getQualifiedNameAccess().getQualificationParserRuleCall_1());
1584115882
}
15842-
this_Qualification_0=ruleQualification
15883+
this_Qualification_1=ruleQualification
1584315884
{
15844-
$current.merge(this_Qualification_0);
15885+
$current.merge(this_Qualification_1);
1584515886
}
1584615887
{
1584715888
afterParserOrEnumRuleCall();
1584815889
}
1584915890
)?
1585015891
{
15851-
newCompositeNode(grammarAccess.getQualifiedNameAccess().getNameParserRuleCall_1());
15892+
newCompositeNode(grammarAccess.getQualifiedNameAccess().getNameParserRuleCall_2());
1585215893
}
15853-
this_Name_1=ruleName
15894+
this_Name_2=ruleName
1585415895
{
15855-
$current.merge(this_Name_1);
15896+
$current.merge(this_Name_2);
1585615897
}
1585715898
{
1585815899
afterParserOrEnumRuleCall();

‎org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/internal/InternalKerML.tokens‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'!='=131
22
'!=='=133
33
'#'=117
4+
'$'=150
45
'%'=144
56
'&'=128
67
'('=97
@@ -83,8 +84,8 @@
8384
'if'=122
8485
'implies'=124
8586
'import'=31
86-
'in'=153
87-
'inout'=155
87+
'in'=154
88+
'inout'=156
8889
'interaction'=113
8990
'intersects'=49
9091
'inv'=110
@@ -106,13 +107,13 @@
106107
'of'=67
107108
'or'=126
108109
'ordered'=70
109-
'out'=154
110+
'out'=155
110111
'package'=39
111112
'portion'=60
112113
'predicate'=108
113-
'private'=151
114-
'protected'=152
115-
'public'=150
114+
'private'=152
115+
'protected'=153
116+
'public'=151
116117
'readonly'=61
117118
'redefines'=80
118119
'redefinition'=85
@@ -208,6 +209,7 @@ T__152=152
208209
T__153=153
209210
T__154=154
210211
T__155=155
212+
T__156=156
211213
T__15=15
212214
T__16=16
213215
T__17=17

0 commit comments

Comments
 (0)