Skip to content

Commit 0759b0f

Browse files
committed
KERML_-107, SYSML2_-417 Updated production names in Xtext grammars.
1 parent 7f17d48 commit 0759b0f

18 files changed

Lines changed: 2022 additions & 2030 deletions

File tree

-27 Bytes
Binary file not shown.

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

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

org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/internal/InternalKerMLParser.java

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

org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/serializer/AbstractKerMLSemanticSequencer.java

Lines changed: 409 additions & 417 deletions
Large diffs are not rendered by default.

org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/serializer/AbstractKerMLSyntacticSequencer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1872,9 +1872,8 @@ protected void emit_TextualRepresentation_RepKeyword_0_0_q(EObject semanticObjec
18721872
* ownedRelationship+=Differencing (ambiguity) (rule end)
18731873
* ownedRelationship+=FeatureConjugation (ambiguity) (rule end)
18741874
* ownedRelationship+=FeatureValue (ambiguity) (rule end)
1875+
* ownedRelationship+=FlowEndMember (ambiguity) (rule end)
18751876
* ownedRelationship+=Intersecting (ambiguity) (rule end)
1876-
* ownedRelationship+=ItemFeatureMember (ambiguity) (rule end)
1877-
* ownedRelationship+=ItemFlowEndMember (ambiguity) (rule end)
18781877
* ownedRelationship+=MultiplicityExpressionMember ']' (ambiguity) (rule end)
18791878
* ownedRelationship+=OwnedConjugation (ambiguity) (rule end)
18801879
* ownedRelationship+=OwnedCrossSubsetting (ambiguity) (rule end)
@@ -1896,6 +1895,7 @@ protected void emit_TextualRepresentation_RepKeyword_0_0_q(EObject semanticObjec
18961895
* ownedRelationship+=OwnedSubsetting (ambiguity) (rule end)
18971896
* ownedRelationship+=OwnedTypeFeaturing (ambiguity) (rule end)
18981897
* ownedRelationship+=Ownedsubclassification (ambiguity) (rule end)
1898+
* ownedRelationship+=PayloadFeatureMember (ambiguity) (rule end)
18991899
* ownedRelationship+=PrefixMetadataMember 'assoc' 'struct' (ambiguity) (rule end)
19001900
* ownedRelationship+=PrefixMetadataMember 'assoc' (ambiguity) (rule end)
19011901
* ownedRelationship+=PrefixMetadataMember 'behavior' (ambiguity) (rule end)

org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/services/KerMLGrammarAccess.java

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

org.omg.kerml.xtext/src/org/omg/kerml/xtext/KerML.xtext

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ FeatureElement returns SysML::Feature :
271271
| Connector
272272
| BindingConnector
273273
| Succession
274-
| ItemFlow
275-
| SuccessionItemFlow
274+
| Flow
275+
| SuccessionFlow
276276
;
277277

278278
/* PACKAGES */
@@ -983,53 +983,53 @@ Interaction returns SysML::Interaction :
983983
ClassifierDeclaration TypeBody
984984
;
985985

986-
/* Item Flows */
986+
/* Flows */
987987

988-
ItemFlow returns SysML::Flow :
988+
Flow returns SysML::Flow :
989989
FeaturePrefix 'flow'
990-
ItemFlowDeclaration TypeBody
990+
FlowDeclaration TypeBody
991991
;
992992

993-
SuccessionItemFlow returns SysML::SuccessionFlow :
994-
FeaturePrefix 'succession' 'flow' ItemFlowDeclaration TypeBody
993+
SuccessionFlow returns SysML::SuccessionFlow :
994+
FeaturePrefix 'succession' 'flow' FlowDeclaration TypeBody
995995
;
996996

997-
fragment ItemFlowDeclaration returns SysML::Flow :
997+
fragment FlowDeclaration returns SysML::Flow :
998998
FeatureDeclaration? ValuePart?
999-
( 'of' ownedRelationship += ItemFeatureMember )?
1000-
( 'from' ownedRelationship += ItemFlowEndMember
1001-
'to' ownedRelationship += ItemFlowEndMember )?
999+
( 'of' ownedRelationship += PayloadFeatureMember )?
1000+
( 'from' ownedRelationship += FlowEndMember
1001+
'to' ownedRelationship += FlowEndMember )?
10021002
| ( isSufficient ?= 'all' )?
1003-
ownedRelationship += ItemFlowEndMember 'to'
1004-
ownedRelationship += ItemFlowEndMember
1003+
ownedRelationship += FlowEndMember 'to'
1004+
ownedRelationship += FlowEndMember
10051005
;
10061006

1007-
ItemFeatureMember returns SysML::FeatureMembership :
1008-
ownedRelatedElement += ItemFeature
1007+
PayloadFeatureMember returns SysML::FeatureMembership :
1008+
ownedRelatedElement += PayloadFeature
10091009
;
10101010

1011-
ItemFeature returns SysML::PayloadFeature :
1012-
Identification? ItemFeatureSpecializationPart ValuePart?
1011+
PayloadFeature returns SysML::PayloadFeature :
1012+
Identification? PayloadFeatureSpecializationPart ValuePart?
10131013
| Identification? ValuePart
10141014
| ownedRelationship += OwnedFeatureTyping ( ownedRelationship += OwnedMultiplicity )?
10151015
| ownedRelationship += OwnedMultiplicity ownedRelationship += OwnedFeatureTyping
10161016
;
10171017

1018-
fragment ItemFeatureSpecializationPart returns SysML::Feature :
1018+
fragment PayloadFeatureSpecializationPart returns SysML::Feature :
10191019
( -> FeatureSpecialization )+ MultiplicityPart? FeatureSpecialization*
10201020
| MultiplicityPart FeatureSpecialization+
10211021
;
10221022

1023-
ItemFlowEndMember returns SysML::EndFeatureMembership :
1024-
ownedRelatedElement += ItemFlowEnd
1023+
FlowEndMember returns SysML::EndFeatureMembership :
1024+
ownedRelatedElement += FlowEnd
10251025
;
10261026

1027-
ItemFlowEnd returns SysML::FlowEnd :
1028-
( ownedRelationship += ItemFlowEndSubsetting )?
1029-
ownedRelationship += ItemFlowFeatureMember
1027+
FlowEnd returns SysML::FlowEnd :
1028+
( ownedRelationship += FlowEndSubsetting )?
1029+
ownedRelationship += FlowFeatureMember
10301030
;
10311031

1032-
ItemFlowEndSubsetting returns SysML::ReferenceSubsetting :
1032+
FlowEndSubsetting returns SysML::ReferenceSubsetting :
10331033
referencedFeature = [SysML::Feature | QualifiedName] '.'
10341034
| ownedRelatedElement += FeatureChainPrefix
10351035
;
@@ -1039,15 +1039,15 @@ FeatureChainPrefix returns SysML::Feature :
10391039
ownedRelationship += OwnedFeatureChaining '.'
10401040
;
10411041

1042-
ItemFlowFeatureMember returns SysML::FeatureMembership :
1043-
ownedRelatedElement += ItemFlowFeature
1042+
FlowFeatureMember returns SysML::FeatureMembership :
1043+
ownedRelatedElement += FlowFeature
10441044
;
10451045

1046-
ItemFlowFeature returns SysML::Feature :
1047-
ownedRelationship += ItemFlowRedefinition
1046+
FlowFeature returns SysML::Feature :
1047+
ownedRelationship += FlowRedefinition
10481048
;
10491049

1050-
ItemFlowRedefinition returns SysML::Redefinition :
1050+
FlowRedefinition returns SysML::Redefinition :
10511051
redefinedFeature = [SysML::Feature|QualifiedName]
10521052
;
10531053

-71 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)