Skip to content

Commit 9b1216c

Browse files
seidewitzseidewitz
committed
ST6RI-628 Updated metamodel for 2022-12 baseline.
Including: - Implemented combined computation of effective name and effective short name. - Updated KerMLQualifiedNameProvider to use declaredName for global scope name resolution.
1 parent 0c91e52 commit 9b1216c

166 files changed

Lines changed: 71068 additions & 56864 deletions

File tree

Some content is hidden

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

‎kerml/src/examples/Simple Tests/Elements.kerml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎kerml/src/examples/Simple Tests/Relationships.kerml‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

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

8 Bytes
Binary file not shown.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3569,17 +3569,17 @@ ruleBodyParameter returns [EObject current=null]
35693569
(
35703570
(
35713571
{
3572-
newCompositeNode(grammarAccess.getBodyParameterAccess().getNameNameParserRuleCall_0());
3572+
newCompositeNode(grammarAccess.getBodyParameterAccess().getDeclaredNameNameParserRuleCall_0());
35733573
}
3574-
lv_name_0_0=ruleName
3574+
lv_declaredName_0_0=ruleName
35753575
{
35763576
if ($current==null) {
35773577
$current = createModelElementForParent(grammarAccess.getBodyParameterRule());
35783578
}
35793579
set(
35803580
$current,
3581-
"name",
3582-
lv_name_0_0,
3581+
"declaredName",
3582+
lv_declaredName_0_0,
35833583
"org.omg.kerml.expressions.xtext.KerMLExpressions.Name");
35843584
afterParserOrEnumRuleCall();
35853585
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9459,31 +9459,31 @@ public final EObject entryRuleBodyParameter() throws RecognitionException {
94599459

94609460

94619461
// $ANTLR start "ruleBodyParameter"
9462-
// InternalKerMLExpressions.g:3562:1: ruleBodyParameter returns [EObject current=null] : ( (lv_name_0_0= ruleName ) ) ;
9462+
// InternalKerMLExpressions.g:3562:1: ruleBodyParameter returns [EObject current=null] : ( (lv_declaredName_0_0= ruleName ) ) ;
94639463
public final EObject ruleBodyParameter() throws RecognitionException {
94649464
EObject current = null;
94659465

9466-
AntlrDatatypeRuleToken lv_name_0_0 = null;
9466+
AntlrDatatypeRuleToken lv_declaredName_0_0 = null;
94679467

94689468

94699469

94709470
enterRule();
94719471

94729472
try {
9473-
// InternalKerMLExpressions.g:3568:2: ( ( (lv_name_0_0= ruleName ) ) )
9474-
// InternalKerMLExpressions.g:3569:2: ( (lv_name_0_0= ruleName ) )
9473+
// InternalKerMLExpressions.g:3568:2: ( ( (lv_declaredName_0_0= ruleName ) ) )
9474+
// InternalKerMLExpressions.g:3569:2: ( (lv_declaredName_0_0= ruleName ) )
94759475
{
9476-
// InternalKerMLExpressions.g:3569:2: ( (lv_name_0_0= ruleName ) )
9477-
// InternalKerMLExpressions.g:3570:3: (lv_name_0_0= ruleName )
9476+
// InternalKerMLExpressions.g:3569:2: ( (lv_declaredName_0_0= ruleName ) )
9477+
// InternalKerMLExpressions.g:3570:3: (lv_declaredName_0_0= ruleName )
94789478
{
9479-
// InternalKerMLExpressions.g:3570:3: (lv_name_0_0= ruleName )
9480-
// InternalKerMLExpressions.g:3571:4: lv_name_0_0= ruleName
9479+
// InternalKerMLExpressions.g:3570:3: (lv_declaredName_0_0= ruleName )
9480+
// InternalKerMLExpressions.g:3571:4: lv_declaredName_0_0= ruleName
94819481
{
94829482

9483-
newCompositeNode(grammarAccess.getBodyParameterAccess().getNameNameParserRuleCall_0());
9483+
newCompositeNode(grammarAccess.getBodyParameterAccess().getDeclaredNameNameParserRuleCall_0());
94849484

94859485
pushFollow(FOLLOW_2);
9486-
lv_name_0_0=ruleName();
9486+
lv_declaredName_0_0=ruleName();
94879487

94889488
state._fsp--;
94899489

@@ -9493,8 +9493,8 @@ public final EObject ruleBodyParameter() throws RecognitionException {
94939493
}
94949494
set(
94959495
current,
9496-
"name",
9497-
lv_name_0_0,
9496+
"declaredName",
9497+
lv_declaredName_0_0,
94989498
"org.omg.kerml.expressions.xtext.KerMLExpressions.Name");
94999499
afterParserOrEnumRuleCall();
95009500

‎org.omg.kerml.expressions.xtext/src-gen/org/omg/kerml/expressions/xtext/serializer/AbstractKerMLExpressionsSemanticSequencer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -611,16 +611,16 @@ protected void sequence_BodyParameterMember(ISerializationContext context, Param
611611
* BodyParameter returns Feature
612612
*
613613
* Constraint:
614-
* name=Name
614+
* declaredName=Name
615615
* </pre>
616616
*/
617617
protected void sequence_BodyParameter(ISerializationContext context, Feature semanticObject) {
618618
if (errorAcceptor != null) {
619-
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.ELEMENT__NAME) == ValueTransient.YES)
620-
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.ELEMENT__NAME));
619+
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.ELEMENT__DECLARED_NAME) == ValueTransient.YES)
620+
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.ELEMENT__DECLARED_NAME));
621621
}
622622
SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
623-
feeder.accept(grammarAccess.getBodyParameterAccess().getNameNameParserRuleCall_0(), semanticObject.getName());
623+
feeder.accept(grammarAccess.getBodyParameterAccess().getDeclaredNameNameParserRuleCall_0(), semanticObject.getDeclaredName());
624624
feeder.finish();
625625
}
626626

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2111,19 +2111,19 @@ public class BodyParameterMemberElements extends AbstractParserRuleElementFinder
21112111
}
21122112
public class BodyParameterElements extends AbstractParserRuleElementFinder {
21132113
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.omg.kerml.expressions.xtext.KerMLExpressions.BodyParameter");
2114-
private final Assignment cNameAssignment = (Assignment)rule.eContents().get(1);
2115-
private final RuleCall cNameNameParserRuleCall_0 = (RuleCall)cNameAssignment.eContents().get(0);
2114+
private final Assignment cDeclaredNameAssignment = (Assignment)rule.eContents().get(1);
2115+
private final RuleCall cDeclaredNameNameParserRuleCall_0 = (RuleCall)cDeclaredNameAssignment.eContents().get(0);
21162116

21172117
//BodyParameter returns SysML::Feature :
2118-
// name = Name
2118+
// declaredName = Name
21192119
//;
21202120
@Override public ParserRule getRule() { return rule; }
21212121

2122-
//name = Name
2123-
public Assignment getNameAssignment() { return cNameAssignment; }
2122+
//declaredName = Name
2123+
public Assignment getDeclaredNameAssignment() { return cDeclaredNameAssignment; }
21242124

21252125
//Name
2126-
public RuleCall getNameNameParserRuleCall_0() { return cNameNameParserRuleCall_0; }
2126+
public RuleCall getDeclaredNameNameParserRuleCall_0() { return cDeclaredNameNameParserRuleCall_0; }
21272127
}
21282128
public class SequenceExpressionElements extends AbstractParserRuleElementFinder {
21292129
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.omg.kerml.expressions.xtext.KerMLExpressions.SequenceExpression");
@@ -3900,7 +3900,7 @@ public ParserRule getBodyParameterMemberRule() {
39003900
}
39013901

39023902
//BodyParameter returns SysML::Feature :
3903-
// name = Name
3903+
// declaredName = Name
39043904
//;
39053905
public BodyParameterElements getBodyParameterAccess() {
39063906
return pBodyParameter;

‎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
@@ -376,7 +376,7 @@ BodyParameterMember returns SysML::ParameterMembership :
376376
;
377377

378378
BodyParameter returns SysML::Feature :
379-
name = Name
379+
declaredName = Name
380380
;
381381

382382
// Sequence Expressions

‎org.omg.kerml.xtext.ui/src/org/omg/kerml/xtext/ui/outline/KerMLOutlineTreeProvider.xtend‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ class KerMLOutlineTreeProvider extends DefaultOutlineTreeProvider {
6464

6565
def String idText(Element element) {
6666
var text = ""
67-
if (element?.shortName !== null) {
68-
text += ' <' + element.shortName + '>'
67+
if (element?.declaredShortName !== null) {
68+
text += ' <' + element.declaredShortName + '>'
6969
}
70-
val name = element?.getEffectiveName
70+
val name = element?.getName
7171
if (name !== null) {
7272
text += ' ' + name
7373
}
@@ -154,8 +154,8 @@ class KerMLOutlineTreeProvider extends DefaultOutlineTreeProvider {
154154
text = text + ' filter'
155155
}
156156
}
157-
if (imp.importedNamespace?.name !== null) {
158-
text += ' ' + imp.importedNamespace.name
157+
if (imp.importedNamespace?.declaredName !== null) {
158+
text += ' ' + imp.importedNamespace.declaredName
159159
}
160160
text += "::*"
161161
if (imp.isRecursive) {

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

-1004 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)