Skip to content

Commit

Permalink
ST6RI-602 Updated grammars to allow item flow payload binding w/o typing
Browse files Browse the repository at this point in the history
  • Loading branch information
@seidewitz
seidewitz committed Nov 10, 2022
1 parent 604154f commit 05b5205
Show file tree
Hide file tree
Showing 15 changed files with 14,279 additions and 14,162 deletions.
Binary file modified org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerML.xtextbin
View file
Binary file not shown.
51 changes: 39 additions & 12 deletions org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/internal/InternalKerML.g
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10135,21 +10135,48 @@ ruleItemFeature returns [EObject current=null]
)?
)
|
(
(
{
if ($current==null) {
$current = createModelElement(grammarAccess.getItemFeatureRule());
}
newCompositeNode(grammarAccess.getItemFeatureAccess().getIdentificationParserRuleCall_1_0());
}
this_Identification_3=ruleIdentification[$current]
{
$current = $this_Identification_3.current;
afterParserOrEnumRuleCall();
}
)?
{
if ($current==null) {
$current = createModelElement(grammarAccess.getItemFeatureRule());
}
newCompositeNode(grammarAccess.getItemFeatureAccess().getValuePartParserRuleCall_1_1());
}
this_ValuePart_4=ruleValuePart[$current]
{
$current = $this_ValuePart_4.current;
afterParserOrEnumRuleCall();
}
)
|
(
(
(
{
newCompositeNode(grammarAccess.getItemFeatureAccess().getOwnedRelationshipOwnedFeatureTypingParserRuleCall_1_0_0());
newCompositeNode(grammarAccess.getItemFeatureAccess().getOwnedRelationshipOwnedFeatureTypingParserRuleCall_2_0_0());
}
lv_ownedRelationship_3_0=ruleOwnedFeatureTyping
lv_ownedRelationship_5_0=ruleOwnedFeatureTyping
{
if ($current==null) {
$current = createModelElementForParent(grammarAccess.getItemFeatureRule());
}
add(
$current,
"ownedRelationship",
lv_ownedRelationship_3_0,
lv_ownedRelationship_5_0,
"org.omg.kerml.xtext.KerML.OwnedFeatureTyping");
afterParserOrEnumRuleCall();
}
Expand All @@ -10158,17 +10185,17 @@ ruleItemFeature returns [EObject current=null]
(
(
{
newCompositeNode(grammarAccess.getItemFeatureAccess().getOwnedRelationshipOwnedMultiplicityParserRuleCall_1_1_0());
newCompositeNode(grammarAccess.getItemFeatureAccess().getOwnedRelationshipOwnedMultiplicityParserRuleCall_2_1_0());
}
lv_ownedRelationship_4_0=ruleOwnedMultiplicity
lv_ownedRelationship_6_0=ruleOwnedMultiplicity
{
if ($current==null) {
$current = createModelElementForParent(grammarAccess.getItemFeatureRule());
}
add(
$current,
"ownedRelationship",
lv_ownedRelationship_4_0,
lv_ownedRelationship_6_0,
"org.omg.kerml.xtext.KerML.OwnedMultiplicity");
afterParserOrEnumRuleCall();
}
Expand All @@ -10180,17 +10207,17 @@ ruleItemFeature returns [EObject current=null]
(
(
{
newCompositeNode(grammarAccess.getItemFeatureAccess().getOwnedRelationshipOwnedMultiplicityParserRuleCall_2_0_0());
newCompositeNode(grammarAccess.getItemFeatureAccess().getOwnedRelationshipOwnedMultiplicityParserRuleCall_3_0_0());
}
lv_ownedRelationship_5_0=ruleOwnedMultiplicity
lv_ownedRelationship_7_0=ruleOwnedMultiplicity
{
if ($current==null) {
$current = createModelElementForParent(grammarAccess.getItemFeatureRule());
}
add(
$current,
"ownedRelationship",
lv_ownedRelationship_5_0,
lv_ownedRelationship_7_0,
"org.omg.kerml.xtext.KerML.OwnedMultiplicity");
afterParserOrEnumRuleCall();
}
Expand All @@ -10199,17 +10226,17 @@ ruleItemFeature returns [EObject current=null]
(
(
{
newCompositeNode(grammarAccess.getItemFeatureAccess().getOwnedRelationshipOwnedFeatureTypingParserRuleCall_2_1_0());
newCompositeNode(grammarAccess.getItemFeatureAccess().getOwnedRelationshipOwnedFeatureTypingParserRuleCall_3_1_0());
}
lv_ownedRelationship_6_0=ruleOwnedFeatureTyping
lv_ownedRelationship_8_0=ruleOwnedFeatureTyping
{
if ($current==null) {
$current = createModelElementForParent(grammarAccess.getItemFeatureRule());
}
add(
$current,
"ownedRelationship",
lv_ownedRelationship_6_0,
lv_ownedRelationship_8_0,
"org.omg.kerml.xtext.KerML.OwnedFeatureTyping");
afterParserOrEnumRuleCall();
}
Expand Down
82 changes: 41 additions & 41 deletions ...omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/internal/InternalKerMLLexer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3118,11 +3118,11 @@ public final void mRULE_DECIMAL_VALUE() throws RecognitionException {
try {
int _type = RULE_DECIMAL_VALUE;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalKerML.g:15973:20: ( '0' .. '9' ( '0' .. '9' )* )
// InternalKerML.g:15973:22: '0' .. '9' ( '0' .. '9' )*
// InternalKerML.g:16000:20: ( '0' .. '9' ( '0' .. '9' )* )
// InternalKerML.g:16000:22: '0' .. '9' ( '0' .. '9' )*
{
matchRange('0','9');
// InternalKerML.g:15973:31: ( '0' .. '9' )*
// InternalKerML.g:16000:31: ( '0' .. '9' )*
loop1:
do {
int alt1=2;
Expand All @@ -3135,7 +3135,7 @@ public final void mRULE_DECIMAL_VALUE() throws RecognitionException {

switch (alt1) {
case 1 :
// InternalKerML.g:15973:32: '0' .. '9'
// InternalKerML.g:16000:32: '0' .. '9'
{
matchRange('0','9');

Expand Down Expand Up @@ -3163,8 +3163,8 @@ public final void mRULE_EXP_VALUE() throws RecognitionException {
try {
int _type = RULE_EXP_VALUE;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalKerML.g:15975:16: ( RULE_DECIMAL_VALUE ( 'e' | 'E' ) ( '+' | '-' )? RULE_DECIMAL_VALUE )
// InternalKerML.g:15975:18: RULE_DECIMAL_VALUE ( 'e' | 'E' ) ( '+' | '-' )? RULE_DECIMAL_VALUE
// InternalKerML.g:16002:16: ( RULE_DECIMAL_VALUE ( 'e' | 'E' ) ( '+' | '-' )? RULE_DECIMAL_VALUE )
// InternalKerML.g:16002:18: RULE_DECIMAL_VALUE ( 'e' | 'E' ) ( '+' | '-' )? RULE_DECIMAL_VALUE
{
mRULE_DECIMAL_VALUE();
if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
Expand All @@ -3176,7 +3176,7 @@ public final void mRULE_EXP_VALUE() throws RecognitionException {
recover(mse);
throw mse;}

// InternalKerML.g:15975:47: ( '+' | '-' )?
// InternalKerML.g:16002:47: ( '+' | '-' )?
int alt2=2;
int LA2_0 = input.LA(1);

Expand Down Expand Up @@ -3219,8 +3219,8 @@ public final void mRULE_ID() throws RecognitionException {
try {
int _type = RULE_ID;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalKerML.g:15977:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
// InternalKerML.g:15977:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
// InternalKerML.g:16004:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
// InternalKerML.g:16004:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
input.consume();
Expand All @@ -3231,7 +3231,7 @@ public final void mRULE_ID() throws RecognitionException {
recover(mse);
throw mse;}

// InternalKerML.g:15977:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
// InternalKerML.g:16004:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop3:
do {
int alt3=2;
Expand Down Expand Up @@ -3280,11 +3280,11 @@ public final void mRULE_UNRESTRICTED_NAME() throws RecognitionException {
try {
int _type = RULE_UNRESTRICTED_NAME;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalKerML.g:15979:24: ( '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
// InternalKerML.g:15979:26: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
// InternalKerML.g:16006:24: ( '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
// InternalKerML.g:16006:26: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
// InternalKerML.g:15979:31: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
// InternalKerML.g:16006:31: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )*
loop4:
do {
int alt4=3;
Expand All @@ -3300,7 +3300,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='&')||(LA4_0>='(' && LA4_0<='[')||(LA4_0>=

switch (alt4) {
case 1 :
// InternalKerML.g:15979:32: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
// InternalKerML.g:16006:32: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
{
match('\\');
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' ) {
Expand All @@ -3316,7 +3316,7 @@ else if ( ((LA4_0>='\u0000' && LA4_0<='&')||(LA4_0>='(' && LA4_0<='[')||(LA4_0>=
}
break;
case 2 :
// InternalKerML.g:15979:73: ~ ( ( '\\\\' | '\\'' ) )
// InternalKerML.g:16006:73: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
Expand Down Expand Up @@ -3353,11 +3353,11 @@ public final void mRULE_STRING_VALUE() throws RecognitionException {
try {
int _type = RULE_STRING_VALUE;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalKerML.g:15981:19: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
// InternalKerML.g:15981:21: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
// InternalKerML.g:16008:19: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
// InternalKerML.g:16008:21: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
// InternalKerML.g:15981:25: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
// InternalKerML.g:16008:25: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*
loop5:
do {
int alt5=3;
Expand All @@ -3373,7 +3373,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=

switch (alt5) {
case 1 :
// InternalKerML.g:15981:26: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
// InternalKerML.g:16008:26: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\"' | '\\'' | '\\\\' )
{
match('\\');
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' ) {
Expand All @@ -3389,7 +3389,7 @@ else if ( ((LA5_0>='\u0000' && LA5_0<='!')||(LA5_0>='#' && LA5_0<='[')||(LA5_0>=
}
break;
case 2 :
// InternalKerML.g:15981:67: ~ ( ( '\\\\' | '\"' ) )
// InternalKerML.g:16008:67: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
Expand Down Expand Up @@ -3426,12 +3426,12 @@ public final void mRULE_REGULAR_COMMENT() throws RecognitionException {
try {
int _type = RULE_REGULAR_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalKerML.g:15983:22: ( '/*' ( options {greedy=false; } : . )* '*/' )
// InternalKerML.g:15983:24: '/*' ( options {greedy=false; } : . )* '*/'
// InternalKerML.g:16010:22: ( '/*' ( options {greedy=false; } : . )* '*/' )
// InternalKerML.g:16010:24: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");

// InternalKerML.g:15983:29: ( options {greedy=false; } : . )*
// InternalKerML.g:16010:29: ( options {greedy=false; } : . )*
loop6:
do {
int alt6=2;
Expand All @@ -3456,7 +3456,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<=')')||(LA6_0>='+' && LA6_0<='\uFFFF')) ) {

switch (alt6) {
case 1 :
// InternalKerML.g:15983:57: .
// InternalKerML.g:16010:57: .
{
matchAny();

Expand Down Expand Up @@ -3486,12 +3486,12 @@ public final void mRULE_ML_NOTE() throws RecognitionException {
try {
int _type = RULE_ML_NOTE;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalKerML.g:15985:14: ( '//*' ( options {greedy=false; } : . )* '*/' )
// InternalKerML.g:15985:16: '//*' ( options {greedy=false; } : . )* '*/'
// InternalKerML.g:16012:14: ( '//*' ( options {greedy=false; } : . )* '*/' )
// InternalKerML.g:16012:16: '//*' ( options {greedy=false; } : . )* '*/'
{
match("//*");

// InternalKerML.g:15985:22: ( options {greedy=false; } : . )*
// InternalKerML.g:16012:22: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
Expand All @@ -3516,7 +3516,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {

switch (alt7) {
case 1 :
// InternalKerML.g:15985:50: .
// InternalKerML.g:16012:50: .
{
matchAny();

Expand Down Expand Up @@ -3546,12 +3546,12 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
try {
int _type = RULE_SL_NOTE;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalKerML.g:15987:14: ( '//' (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )? ( ( '\\r' )? '\\n' )? )
// InternalKerML.g:15987:16: '//' (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )? ( ( '\\r' )? '\\n' )?
// InternalKerML.g:16014:14: ( '//' (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )? ( ( '\\r' )? '\\n' )? )
// InternalKerML.g:16014:16: '//' (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )? ( ( '\\r' )? '\\n' )?
{
match("//");

// InternalKerML.g:15987:21: (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )?
// InternalKerML.g:16014:21: (~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )* )?
int alt9=2;
int LA9_0 = input.LA(1);

Expand All @@ -3560,7 +3560,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
}
switch (alt9) {
case 1 :
// InternalKerML.g:15987:22: ~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )*
// InternalKerML.g:16014:22: ~ ( ( '\\n' | '\\r' ) ) (~ ( ( '\\n' | '\\r' ) ) )*
{
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') ) {
input.consume();
Expand All @@ -3571,7 +3571,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
recover(mse);
throw mse;}

// InternalKerML.g:15987:37: (~ ( ( '\\n' | '\\r' ) ) )*
// InternalKerML.g:16014:37: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
Expand All @@ -3584,7 +3584,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {

switch (alt8) {
case 1 :
// InternalKerML.g:15987:37: ~ ( ( '\\n' | '\\r' ) )
// InternalKerML.g:16014:37: ~ ( ( '\\n' | '\\r' ) )
{
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') ) {
input.consume();
Expand All @@ -3610,7 +3610,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {

}

// InternalKerML.g:15987:55: ( ( '\\r' )? '\\n' )?
// InternalKerML.g:16014:55: ( ( '\\r' )? '\\n' )?
int alt11=2;
int LA11_0 = input.LA(1);

Expand All @@ -3619,9 +3619,9 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
}
switch (alt11) {
case 1 :
// InternalKerML.g:15987:56: ( '\\r' )? '\\n'
// InternalKerML.g:16014:56: ( '\\r' )? '\\n'
{
// InternalKerML.g:15987:56: ( '\\r' )?
// InternalKerML.g:16014:56: ( '\\r' )?
int alt10=2;
int LA10_0 = input.LA(1);

Expand All @@ -3630,7 +3630,7 @@ public final void mRULE_SL_NOTE() throws RecognitionException {
}
switch (alt10) {
case 1 :
// InternalKerML.g:15987:56: '\\r'
// InternalKerML.g:16014:56: '\\r'
{
match('\r');

Expand Down Expand Up @@ -3662,10 +3662,10 @@ public final void mRULE_WS() throws RecognitionException {
try {
int _type = RULE_WS;
int _channel = DEFAULT_TOKEN_CHANNEL;
// InternalKerML.g:15989:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
// InternalKerML.g:15989:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
// InternalKerML.g:16016:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
// InternalKerML.g:16016:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
// InternalKerML.g:15989:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
// InternalKerML.g:16016:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt12=0;
loop12:
do {
Expand Down
Loading

0 comments on commit 05b5205

Please sign in to comment.