Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext.ide;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext.ide.contentassist.antlr;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext.ui;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext.ui;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext.ui.internal;

import com.google.common.collect.Maps;
import com.google.inject.Guice;
import com.google.inject.Injector;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.apache.log4j.Logger;
import org.eclipse.ui.plugin.AbstractUIPlugin;
Expand All @@ -29,7 +29,7 @@ public class XtextActivator extends AbstractUIPlugin {

private static XtextActivator INSTANCE;

private Map<String, Injector> injectors = Collections.synchronizedMap(Maps.<String, Injector> newHashMapWithExpectedSize(1));
private Map<String, Injector> injectors = Collections.synchronizedMap(new HashMap<>(2));

@Override
public void start(BundleContext context) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext;

Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext.parser.antlr;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext.parser.antlr;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
grammar InternalKerMLExpressions;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext.scoping;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext.serializer;

Expand Down Expand Up @@ -684,8 +684,8 @@ protected void sequence_BodyParameterMember(ISerializationContext context, Param
*/
protected void sequence_BodyParameter(ISerializationContext context, Feature semanticObject) {
if (errorAcceptor != null) {
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.ELEMENT__DECLARED_NAME) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.ELEMENT__DECLARED_NAME));
if (transientValues.isValueTransient(semanticObject, SysMLPackage.eINSTANCE.getElement_DeclaredName()) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.eINSTANCE.getElement_DeclaredName()));
}
SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
feeder.accept(grammarAccess.getBodyParameterAccess().getDeclaredNameNameParserRuleCall_0(), semanticObject.getDeclaredName());
Expand Down Expand Up @@ -771,11 +771,11 @@ protected void sequence_ConstructorResultMember(ISerializationContext context, R
*/
protected void sequence_ElementReferenceMember(ISerializationContext context, Membership semanticObject) {
if (errorAcceptor != null) {
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.MEMBERSHIP__MEMBER_ELEMENT) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.MEMBERSHIP__MEMBER_ELEMENT));
if (transientValues.isValueTransient(semanticObject, SysMLPackage.eINSTANCE.getMembership_MemberElement()) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.eINSTANCE.getMembership_MemberElement()));
}
SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
feeder.accept(grammarAccess.getElementReferenceMemberAccess().getMemberElementElementQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(SysMLPackage.Literals.MEMBERSHIP__MEMBER_ELEMENT, false));
feeder.accept(grammarAccess.getElementReferenceMemberAccess().getMemberElementElementQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(SysMLPackage.eINSTANCE.getMembership_MemberElement(), false));
feeder.finish();
}

Expand Down Expand Up @@ -861,11 +861,11 @@ protected void sequence_ExpressionBody(ISerializationContext context, Expression
*/
protected void sequence_FeatureChainMember(ISerializationContext context, Membership semanticObject) {
if (errorAcceptor != null) {
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.MEMBERSHIP__MEMBER_ELEMENT) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.MEMBERSHIP__MEMBER_ELEMENT));
if (transientValues.isValueTransient(semanticObject, SysMLPackage.eINSTANCE.getMembership_MemberElement()) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.eINSTANCE.getMembership_MemberElement()));
}
SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
feeder.accept(grammarAccess.getFeatureChainMemberAccess().getMemberElementFeatureQualifiedNameParserRuleCall_0_0_1(), semanticObject.eGet(SysMLPackage.Literals.MEMBERSHIP__MEMBER_ELEMENT, false));
feeder.accept(grammarAccess.getFeatureChainMemberAccess().getMemberElementFeatureQualifiedNameParserRuleCall_0_0_1(), semanticObject.eGet(SysMLPackage.eINSTANCE.getMembership_MemberElement(), false));
feeder.finish();
}

Expand Down Expand Up @@ -923,11 +923,11 @@ protected void sequence_FeatureReferenceExpression(ISerializationContext context
*/
protected void sequence_FeatureReferenceMember(ISerializationContext context, Membership semanticObject) {
if (errorAcceptor != null) {
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.MEMBERSHIP__MEMBER_ELEMENT) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.MEMBERSHIP__MEMBER_ELEMENT));
if (transientValues.isValueTransient(semanticObject, SysMLPackage.eINSTANCE.getMembership_MemberElement()) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.eINSTANCE.getMembership_MemberElement()));
}
SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
feeder.accept(grammarAccess.getFeatureReferenceMemberAccess().getMemberElementFeatureQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(SysMLPackage.Literals.MEMBERSHIP__MEMBER_ELEMENT, false));
feeder.accept(grammarAccess.getFeatureReferenceMemberAccess().getMemberElementFeatureQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(SysMLPackage.eINSTANCE.getMembership_MemberElement(), false));
feeder.finish();
}

Expand Down Expand Up @@ -1013,11 +1013,11 @@ protected void sequence_ImpliesExpressionReference(ISerializationContext context
*/
protected void sequence_InstantiatedTypeMember(ISerializationContext context, Membership semanticObject) {
if (errorAcceptor != null) {
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.MEMBERSHIP__MEMBER_ELEMENT) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.MEMBERSHIP__MEMBER_ELEMENT));
if (transientValues.isValueTransient(semanticObject, SysMLPackage.eINSTANCE.getMembership_MemberElement()) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.eINSTANCE.getMembership_MemberElement()));
}
SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
feeder.accept(grammarAccess.getInstantiatedTypeMemberAccess().getMemberElementTypeQualifiedNameParserRuleCall_0_0_1(), semanticObject.eGet(SysMLPackage.Literals.MEMBERSHIP__MEMBER_ELEMENT, false));
feeder.accept(grammarAccess.getInstantiatedTypeMemberAccess().getMemberElementTypeQualifiedNameParserRuleCall_0_0_1(), semanticObject.eGet(SysMLPackage.eINSTANCE.getMembership_MemberElement(), false));
feeder.finish();
}

Expand Down Expand Up @@ -1173,8 +1173,8 @@ protected void sequence_InvocationExpression_NamedArgumentList_PositionalArgumen
*/
protected void sequence_LiteralBoolean(ISerializationContext context, LiteralBoolean semanticObject) {
if (errorAcceptor != null) {
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.LITERAL_BOOLEAN__VALUE) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.LITERAL_BOOLEAN__VALUE));
if (transientValues.isValueTransient(semanticObject, SysMLPackage.eINSTANCE.getLiteralBoolean_Value()) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.eINSTANCE.getLiteralBoolean_Value()));
}
SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
feeder.accept(grammarAccess.getLiteralBooleanAccess().getValueBooleanValueParserRuleCall_0(), semanticObject.isValue());
Expand Down Expand Up @@ -1287,8 +1287,8 @@ protected void sequence_LiteralInfinity(ISerializationContext context, LiteralIn
*/
protected void sequence_LiteralInteger(ISerializationContext context, LiteralInteger semanticObject) {
if (errorAcceptor != null) {
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.LITERAL_INTEGER__VALUE) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.LITERAL_INTEGER__VALUE));
if (transientValues.isValueTransient(semanticObject, SysMLPackage.eINSTANCE.getLiteralInteger_Value()) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.eINSTANCE.getLiteralInteger_Value()));
}
SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
feeder.accept(grammarAccess.getLiteralIntegerAccess().getValueDECIMAL_VALUETerminalRuleCall_0(), semanticObject.getValue());
Expand Down Expand Up @@ -1347,8 +1347,8 @@ protected void sequence_LiteralInteger(ISerializationContext context, LiteralInt
*/
protected void sequence_LiteralReal(ISerializationContext context, LiteralRational semanticObject) {
if (errorAcceptor != null) {
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.LITERAL_RATIONAL__VALUE) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.LITERAL_RATIONAL__VALUE));
if (transientValues.isValueTransient(semanticObject, SysMLPackage.eINSTANCE.getLiteralRational_Value()) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.eINSTANCE.getLiteralRational_Value()));
}
SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
feeder.accept(grammarAccess.getLiteralRealAccess().getValueRealValueParserRuleCall_0(), semanticObject.getValue());
Expand Down Expand Up @@ -1407,8 +1407,8 @@ protected void sequence_LiteralReal(ISerializationContext context, LiteralRation
*/
protected void sequence_LiteralString(ISerializationContext context, LiteralString semanticObject) {
if (errorAcceptor != null) {
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.LITERAL_STRING__VALUE) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.LITERAL_STRING__VALUE));
if (transientValues.isValueTransient(semanticObject, SysMLPackage.eINSTANCE.getLiteralString_Value()) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.eINSTANCE.getLiteralString_Value()));
}
SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
feeder.accept(grammarAccess.getLiteralStringAccess().getValueSTRING_VALUETerminalRuleCall_0(), semanticObject.getValue());
Expand Down Expand Up @@ -1671,11 +1671,11 @@ protected void sequence_OwnedExpressionReference(ISerializationContext context,
*/
protected void sequence_OwnedFeatureChaining(ISerializationContext context, FeatureChaining semanticObject) {
if (errorAcceptor != null) {
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.FEATURE_CHAINING__CHAINING_FEATURE) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.FEATURE_CHAINING__CHAINING_FEATURE));
if (transientValues.isValueTransient(semanticObject, SysMLPackage.eINSTANCE.getFeatureChaining_ChainingFeature()) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.eINSTANCE.getFeatureChaining_ChainingFeature()));
}
SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
feeder.accept(grammarAccess.getOwnedFeatureChainingAccess().getChainingFeatureFeatureQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(SysMLPackage.Literals.FEATURE_CHAINING__CHAINING_FEATURE, false));
feeder.accept(grammarAccess.getOwnedFeatureChainingAccess().getChainingFeatureFeatureQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(SysMLPackage.eINSTANCE.getFeatureChaining_ChainingFeature(), false));
feeder.finish();
}

Expand All @@ -1691,11 +1691,11 @@ protected void sequence_OwnedFeatureChaining(ISerializationContext context, Feat
*/
protected void sequence_ParameterRedefinition(ISerializationContext context, Redefinition semanticObject) {
if (errorAcceptor != null) {
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.REDEFINITION__REDEFINED_FEATURE) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.REDEFINITION__REDEFINED_FEATURE));
if (transientValues.isValueTransient(semanticObject, SysMLPackage.eINSTANCE.getRedefinition_RedefinedFeature()) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.eINSTANCE.getRedefinition_RedefinedFeature()));
}
SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
feeder.accept(grammarAccess.getParameterRedefinitionAccess().getRedefinedFeatureFeatureQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(SysMLPackage.Literals.REDEFINITION__REDEFINED_FEATURE, false));
feeder.accept(grammarAccess.getParameterRedefinitionAccess().getRedefinedFeatureFeatureQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(SysMLPackage.eINSTANCE.getRedefinition_RedefinedFeature(), false));
feeder.finish();
}

Expand Down Expand Up @@ -1939,11 +1939,11 @@ protected void sequence_PrimaryExpression(ISerializationContext context, SelectE
*/
protected void sequence_ReferenceTyping(ISerializationContext context, FeatureTyping semanticObject) {
if (errorAcceptor != null) {
if (transientValues.isValueTransient(semanticObject, SysMLPackage.Literals.FEATURE_TYPING__TYPE) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.Literals.FEATURE_TYPING__TYPE));
if (transientValues.isValueTransient(semanticObject, SysMLPackage.eINSTANCE.getFeatureTyping_Type()) == ValueTransient.YES)
errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, SysMLPackage.eINSTANCE.getFeatureTyping_Type()));
}
SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
feeder.accept(grammarAccess.getReferenceTypingAccess().getTypeTypeQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(SysMLPackage.Literals.FEATURE_TYPING__TYPE, false));
feeder.accept(grammarAccess.getReferenceTypingAccess().getTypeTypeQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(SysMLPackage.eINSTANCE.getFeatureTyping_Type(), false));
feeder.finish();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext.serializer;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext.services;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.34.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.expressions.xtext.validation;

Expand All @@ -13,7 +13,7 @@ public abstract class AbstractKerMLExpressionsValidator extends AbstractDeclarat
@Override
protected List<EPackage> getEPackages() {
List<EPackage> result = new ArrayList<EPackage>();
result.add(EPackage.Registry.INSTANCE.getEPackage("https://www.omg.org/spec/SysML/20250201"));
result.add(EPackage.Registry.INSTANCE.getEPackage("https://www.omg.org/spec/SysML/20260501"));
return result;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
grammar org.omg.kerml.expressions.xtext.KerMLExpressions hidden(WS, ML_NOTE, SL_NOTE)

import "http://www.eclipse.org/emf/2002/Ecore" as Ecore
import "https://www.omg.org/spec/SysML/20250201" as SysML
import "https://www.omg.org/spec/SysML/20260501" as SysML

/* EXPRESSIONS */

Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.owl/transforms/SysML2OWL.qvto
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*
*****************************************************************************/

modeltype SysML uses "https://www.omg.org/spec/SysML/20250201";
modeltype SysML uses "https://www.omg.org/spec/SysML/20260501";
modeltype OWL uses "http://www.omg.org/spec/SysML/2.0/OWL";
modeltype Ecore uses "http://www.eclipse.org/emf/2002/Ecore";

Expand Down
Binary file modified org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerML.xtextbin
Binary file not shown.
Loading
Loading