Skip to content

Commit 27402ba

Browse files
committed
ST6RI-827 Regenerated all .uml and .ecore metamodel files.
- Also generated sysml_clean.ecore file for SysML+KerML abstract syntax using standard UML2 Ecore generation. - Updated metamodel URI to 20250201. - Updated KerML and SysML grammars *only* for breaking changes in abstract syntax models. - Did *not* regenerate implementation classes or parsers.
1 parent a8434e1 commit 27402ba

16 files changed

Lines changed: 34361 additions & 26610 deletions

File tree

org.omg.kerml.expressions.xtext/src/org/omg/kerml/expressions/xtext/KerMLExpressions.xtext

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
grammar org.omg.kerml.expressions.xtext.KerMLExpressions hidden(WS, ML_NOTE, SL_NOTE)
3232

3333
import "http://www.eclipse.org/emf/2002/Ecore" as Ecore
34-
import "https://www.omg.org/spec/SysML/20240201" as SysML
34+
import "https://www.omg.org/spec/SysML/20250201" as SysML
3535

3636
/* EXPRESSIONS */
3737

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
grammar org.omg.kerml.xtext.KerML with org.omg.kerml.expressions.xtext.KerMLExpressions
3232

3333
import "http://www.eclipse.org/emf/2002/Ecore" as Ecore
34-
import "https://www.omg.org/spec/SysML/20240201" as SysML
34+
import "https://www.omg.org/spec/SysML/20250201" as SysML
3535

3636
/* ROOT NAMESPACE */
3737

@@ -513,7 +513,7 @@ fragment BasicFeaturePrefix returns SysML::Feature :
513513
( direction = FeatureDirection )?
514514
( isAbstract ?= 'abstract' )?
515515
( isComposite ?= 'composite' | isPortion ?= 'portion' )?
516-
( isReadOnly ?= 'readonly' )?
516+
( isConstant ?= 'readonly' )?
517517
( isDerived ?= 'derived' )?
518518
;
519519

@@ -986,16 +986,16 @@ Interaction returns SysML::Interaction :
986986

987987
/* Item Flows */
988988

989-
ItemFlow returns SysML::ItemFlow :
989+
ItemFlow returns SysML::Flow :
990990
FeaturePrefix 'flow'
991991
ItemFlowDeclaration TypeBody
992992
;
993993

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

998-
fragment ItemFlowDeclaration returns SysML::ItemFlow :
998+
fragment ItemFlowDeclaration returns SysML::Flow :
999999
FeatureDeclaration? ValuePart?
10001000
( 'of' ownedRelationship += ItemFeatureMember )?
10011001
( 'from' ownedRelationship += ItemFlowEndMember
@@ -1009,7 +1009,7 @@ ItemFeatureMember returns SysML::FeatureMembership :
10091009
ownedRelatedElement += ItemFeature
10101010
;
10111011

1012-
ItemFeature returns SysML::ItemFeature :
1012+
ItemFeature returns SysML::PayloadFeature :
10131013
Identification? ItemFeatureSpecializationPart ValuePart?
10141014
| Identification? ValuePart
10151015
| ownedRelationship += OwnedFeatureTyping ( ownedRelationship += OwnedMultiplicity )?
@@ -1025,7 +1025,7 @@ ItemFlowEndMember returns SysML::EndFeatureMembership :
10251025
ownedRelatedElement += ItemFlowEnd
10261026
;
10271027

1028-
ItemFlowEnd returns SysML::ItemFlowEnd :
1028+
ItemFlowEnd returns SysML::FlowEnd :
10291029
( ownedRelationship += ItemFlowEndSubsetting )?
10301030
ownedRelationship += ItemFlowFeatureMember
10311031
;

org.omg.sysml.xtext/src/org/omg/sysml/xtext/SysML.xtext

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
grammar org.omg.sysml.xtext.SysML with org.omg.kerml.expressions.xtext.KerMLExpressions
3232

3333
import "http://www.eclipse.org/emf/2002/Ecore" as Ecore
34-
import "https://www.omg.org/spec/SysML/20240201" as SysML
34+
import "https://www.omg.org/spec/SysML/20250201" as SysML
3535

3636
/* ROOT NAMESPACE */
3737

@@ -550,7 +550,7 @@ enum FeatureDirection returns SysML::FeatureDirectionKind:
550550
fragment RefPrefix returns SysML::Usage :
551551
( direction = FeatureDirection )?
552552
( isAbstract ?= 'abstract' | isVariation ?= 'variation')?
553-
( isReadOnly ?= 'readonly' )?
553+
( isConstant ?= 'readonly' )?
554554
( isDerived ?= 'derived' )?
555555
;
556556

@@ -815,8 +815,8 @@ LifeClassMembership returns SysML::OwningMembership :
815815
ownedRelatedElement += LifeClass
816816
;
817817

818-
LifeClass returns SysML::LifeClass :
819-
{SysML::LifeClass}
818+
LifeClass returns SysML::Class :
819+
{SysML::Class}
820820
;
821821

822822
/* Occurrence Usages */
@@ -1222,7 +1222,7 @@ FlowConnectionDefKeyword :
12221222
FlowConnectionKeyword 'def'
12231223
;
12241224

1225-
FlowConnectionDefinition returns SysML::FlowConnectionDefinition :
1225+
FlowConnectionDefinition returns SysML::FlowDefinition :
12261226
OccurrenceDefinitionPrefix FlowConnectionDefKeyword Definition
12271227
;
12281228

@@ -1232,11 +1232,11 @@ MessageKeyword :
12321232
'message'
12331233
;
12341234

1235-
Message returns SysML::FlowConnectionUsage :
1235+
Message returns SysML::FlowUsage :
12361236
OccurrenceUsagePrefix MessageKeyword MessageDeclaration DefinitionBody
12371237
;
12381238

1239-
fragment MessageDeclaration returns SysML::FlowConnectionUsage :
1239+
fragment MessageDeclaration returns SysML::FlowUsage :
12401240
UsageDeclaration? ValuePart?
12411241
( 'of' ownedRelationship += ItemFeatureMember )?
12421242
( 'from' ownedRelationship += MessageEventMember
@@ -1256,7 +1256,7 @@ MessageEvent returns SysML::EventOccurrenceUsage :
12561256

12571257
/* Flow Connection Usages */
12581258

1259-
FlowConnectionUsage returns SysML::FlowConnectionUsage :
1259+
FlowConnectionUsage returns SysML::FlowUsage :
12601260
OccurrenceUsagePrefix FlowConnectionKeyword
12611261
FlowConnectionDeclaration DefinitionBody
12621262
;
@@ -1265,12 +1265,12 @@ SuccessionFlowConnectionKeyword :
12651265
SuccessionKeyword FlowConnectionKeyword
12661266
;
12671267

1268-
SuccessionFlowConnectionUsage returns SysML::SuccessionFlowConnectionUsage :
1268+
SuccessionFlowConnectionUsage returns SysML::SuccessionFlowUsage :
12691269
OccurrenceUsagePrefix SuccessionFlowConnectionKeyword
12701270
FlowConnectionDeclaration DefinitionBody
12711271
;
12721272

1273-
fragment FlowConnectionDeclaration returns SysML::FlowConnectionUsage :
1273+
fragment FlowConnectionDeclaration returns SysML::FlowUsage :
12741274
UsageDeclaration? ValuePart?
12751275
( 'of' ownedRelationship += ItemFeatureMember )?
12761276
( 'from' ownedRelationship += FlowEndMember
@@ -1285,7 +1285,7 @@ ItemFeatureMember returns SysML::FeatureMembership :
12851285
ownedRelatedElement += ItemFeature
12861286
;
12871287

1288-
ItemFeature returns SysML::ItemFeature :
1288+
ItemFeature returns SysML::PayloadFeature :
12891289
PayloadFeature
12901290
;
12911291

@@ -1305,7 +1305,7 @@ FlowEndMember returns SysML::EndFeatureMembership :
13051305
ownedRelatedElement += FlowEnd
13061306
;
13071307

1308-
FlowEnd returns SysML::ItemFlowEnd :
1308+
FlowEnd returns SysML::FlowEnd :
13091309
( ownedRelationship += FlowEndSubsetting )?
13101310
ownedRelationship += FlowFeatureMember
13111311
;

0 commit comments

Comments
 (0)