From 8da9c6c65e0757cecc5d596d4c7d12743b0f1d47 Mon Sep 17 00:00:00 2001 From: Pierre De Belen Date: Wed, 15 Jan 2025 10:07:19 -0500 Subject: [PATCH] Revert "Clean up m3 metamodel (#917)" (#918) This reverts commit 2b94210dcd6de69855a9f2b85fde8c26188d29c5. --- .../antlr/AntlrContextToM3CoreInstance.java | 2 +- .../resources/platform/pure/grammar/m3.pure | 53 +++++++------------ .../TestBinaryModelRepositorySerializer.java | 2 +- .../TestBinaryModelSourceSerializer.java | 4 +- .../pure/m3/tests/lineinfo/TestLineInfo.java | 4 +- .../platform_dsl_mapping/grammar/mapping.pure | 2 +- .../TestReflectiveCoreInstance.java | 4 +- 7 files changed, 29 insertions(+), 42 deletions(-) diff --git a/legend-pure-core/legend-pure-m3-core/src/main/java/org/finos/legend/pure/m3/serialization/grammar/m3parser/antlr/AntlrContextToM3CoreInstance.java b/legend-pure-core/legend-pure-m3-core/src/main/java/org/finos/legend/pure/m3/serialization/grammar/m3parser/antlr/AntlrContextToM3CoreInstance.java index c16f897830..0d3923874c 100644 --- a/legend-pure-core/legend-pure-m3-core/src/main/java/org/finos/legend/pure/m3/serialization/grammar/m3parser/antlr/AntlrContextToM3CoreInstance.java +++ b/legend-pure-core/legend-pure-m3-core/src/main/java/org/finos/legend/pure/m3/serialization/grammar/m3parser/antlr/AntlrContextToM3CoreInstance.java @@ -2562,7 +2562,7 @@ private Constraint constraint(CoreInstance owner, ConstraintContext ctx, int pos Instance.setValueForProperty(constraintFunctionLambda, M3Properties.classifierGenericType, lambdaGenericType, this.processorSupport); Instance.setValueForProperty(functionType, M3Properties.function, constraintFunctionLambda, this.processorSupport); - Constraint constraint = ConstraintInstance.createPersistent(this.repository, null, null); + Constraint constraint = ConstraintInstance.createPersistent(this.repository, null, null, null); constraint.setSourceInformation(constraintSourceInformation); constraint._name(constraintName); if (constraintOwner != null) diff --git a/legend-pure-core/legend-pure-m3-core/src/main/resources/platform/pure/grammar/m3.pure b/legend-pure-core/legend-pure-m3-core/src/main/resources/platform/pure/grammar/m3.pure index 013973c1ff..d6e6c0a121 100644 --- a/legend-pure-core/legend-pure-m3-core/src/main/resources/platform/pure/grammar/m3.pure +++ b/legend-pure-core/legend-pure-m3-core/src/main/resources/platform/pure/grammar/m3.pure @@ -67,11 +67,11 @@ Root.children[meta].children[pure].children[metamodel].children[PackageableElement].properties[package] : Root.children[meta].children[pure] } -^Package testable @Root.children[meta].children[pure].children.children[metamodel].children +^Package test @Root.children[meta].children[pure].children { - Root.children[meta].children[pure].children[metamodel].children[ModelElement].properties[name] : 'testable', + Root.children[meta].children[pure].children[metamodel].children[ModelElement].properties[name] : 'test', Package.properties[children] : [], - Root.children[meta].children[pure].children[metamodel].children[PackageableElement].properties[package] : Root.children[meta].children[pure].children[metamodel] + Root.children[meta].children[pure].children[metamodel].children[PackageableElement].properties[package] : Root.children[meta].children[pure] } ^Package type @Root.children[meta].children[pure].children[metamodel].children @@ -357,7 +357,7 @@ }, ^Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization] { - Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[general] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[testable].children[Testable]}, + Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[general] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[test].children[Testable]}, Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[specific] : Root.children[meta].children[pure].children[metamodel].children[type].children[Class] } ] @@ -476,7 +476,6 @@ ^Root.children[meta].children[pure].children[metamodel].children[type].children[Class] InferredGenericType @Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children { - Root.children[meta].children[pure].children[metamodel].children[extension].children[ElementWithStereotypes].properties[stereotypes] : Root.children[meta].children[pure].children[metamodel].children[ProtocolInfo].p_stereotypes[excluded], Root.children[meta].children[pure].children[metamodel].children[type].children[Any].properties[classifierGenericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[type].children[Class], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[typeArguments]:[^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[InferredGenericType]}]}, Root.children[meta].children[pure].children[metamodel].children[PackageableElement].properties[package] : Root.children[meta].children[pure].children[metamodel].children[type].children[generics], Root.children[meta].children[pure].children[metamodel].children[ModelElement].properties[name] : 'InferredGenericType', @@ -520,7 +519,6 @@ ^Root.children[meta].children[pure].children[metamodel].children[type].children[Class] Referenceable @Root.children[meta].children[pure].children[metamodel].children { - Root.children[meta].children[pure].children[metamodel].children[extension].children[ElementWithStereotypes].properties[stereotypes] : Root.children[meta].children[pure].children[metamodel].children[ProtocolInfo].p_stereotypes[excluded], Root.children[meta].children[pure].children[metamodel].children[type].children[Any].properties[classifierGenericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[type].children[Class], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[typeArguments]:[^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[Referenceable]}]}, Root.children[meta].children[pure].children[metamodel].children[PackageableElement].properties[package] : Root.children[meta].children[pure].children[metamodel], Root.children[meta].children[pure].children[metamodel].children[ModelElement].properties[name] : 'Referenceable', @@ -746,7 +744,6 @@ , ^Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property] specializations { - Root.children[meta].children[pure].children[metamodel].children[extension].children[ElementWithStereotypes].properties[stereotypes] : Root.children[meta].children[pure].children[metamodel].children[ProtocolInfo].p_stereotypes[inferred], Root.children[meta].children[pure].children[metamodel].children[ModelElement].properties[name] : 'specializations', Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property].properties[aggregation] : Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AggregationKind].values[None], Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AbstractProperty].properties[genericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization]}, @@ -1086,7 +1083,6 @@ ^Root.children[meta].children[pure].children[metamodel].children[type].children[Class] Any @Root.children[meta].children[pure].children[metamodel].children[type].children { - Root.children[meta].children[pure].children[metamodel].children[extension].children[ElementWithStereotypes].properties[stereotypes] : Root.children[meta].children[pure].children[metamodel].children[ProtocolInfo].p_stereotypes[excluded], Root.children[meta].children[pure].children[metamodel].children[type].children[Any].properties[classifierGenericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[type].children[Class], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[typeArguments]:[^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[type].children[Any]}]}, Root.children[meta].children[pure].children[metamodel].children[PackageableElement].properties[package] : Root.children[meta].children[pure].children[metamodel].children[type], Root.children[meta].children[pure].children[metamodel].children[ModelElement].properties[name] : 'Any', @@ -1722,7 +1718,6 @@ ^Root.children[meta].children[pure].children[metamodel].children[type].children[Class] NonExecutableValueSpecification @Root.children[meta].children[pure].children[metamodel].children[valuespecification].children { - Root.children[meta].children[pure].children[metamodel].children[extension].children[ElementWithStereotypes].properties[stereotypes] : Root.children[meta].children[pure].children[metamodel].children[ProtocolInfo].p_stereotypes[excluded], Root.children[meta].children[pure].children[metamodel].children[type].children[Any].properties[classifierGenericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[type].children[Class], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[typeArguments]:^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[valuespecification].children[NonExecutableValueSpecification]}}, Root.children[meta].children[pure].children[metamodel].children[PackageableElement].properties[package] : Root.children[meta].children[pure].children[metamodel].children[valuespecification], Root.children[meta].children[pure].children[metamodel].children[type].children[Class].properties[properties]: @@ -2372,7 +2367,7 @@ }, ^Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization] { - Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[general] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType] {Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType] : Root.children[meta].children[pure].children[metamodel].children[testable].children[Testable]}, + Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[general] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType] {Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType] : Root.children[meta].children[pure].children[test].children[Testable]}, Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[specific] : Root.children[meta].children[pure].children[metamodel].children[function].children[ConcreteFunctionDefinition] } ] @@ -3134,14 +3129,6 @@ Root.children[meta].children[pure].children[metamodel].children[PackageableElement].properties[package] : Root.children[meta].children[pure].children[metamodel].children[constraint], Root.children[meta].children[pure].children[metamodel].children[type].children[Class].properties[properties]: [ - ^Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property] name - { - Root.children[meta].children[pure].children[metamodel].children[ModelElement].properties[name] : 'name', - Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property].properties[aggregation] : Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AggregationKind].values[None], - Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AbstractProperty].properties[genericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:String}, - Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AbstractProperty].properties[multiplicity] : Root.children[meta].children[pure].children[metamodel].children[multiplicity].children[PureOne], - Root.children[meta].children[pure].children[metamodel].children[type].children[Any].properties[classifierGenericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[typeArguments]:[^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[constraint].children[Constraint]}, ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:String}], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[multiplicityArguments]:Root.children[meta].children[pure].children[metamodel].children[multiplicity].children[PureOne]} - }, ^Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property] owner { Root.children[meta].children[pure].children[metamodel].children[ModelElement].properties[name] : 'owner', @@ -3188,7 +3175,7 @@ [ ^Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization] { - Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[general] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType] {Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType] : Root.children[meta].children[pure].children[metamodel].children[type].children[Any]}, + Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[general] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType] {Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType] : Root.children[meta].children[pure].children[metamodel].children[ModelElement]}, Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[specific] : Root.children[meta].children[pure].children[metamodel].children[constraint].children[Constraint] } ] @@ -3246,23 +3233,23 @@ [ ^Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization] { - Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[general] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType] {Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType] : Root.children[meta].children[pure].children[metamodel].children[type].children[Any]}, + Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[general] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType] {Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType] : Root.children[meta].children[pure].children[metamodel].children[ModelElement]}, Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[specific] : Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[DefaultValue] } ] } -^Root.children[meta].children[pure].children[metamodel].children[type].children[Class] Test @Root.children[meta].children[pure].children[metamodel].children[testable].children +^Root.children[meta].children[pure].children[metamodel].children[type].children[Class] Test @Root.children[meta].children[pure].children[test].children { Root.children[meta].children[pure].children[metamodel].children[type].children[Any].properties[classifierGenericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType] { Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[type].children[Class], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[typeArguments]:^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType] { - Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[testable].children[Test] + Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[test].children[Test] } }, - Root.children[meta].children[pure].children[metamodel].children[PackageableElement].properties[package] : Root.children[meta].children[pure].children[metamodel].children[testable], + Root.children[meta].children[pure].children[metamodel].children[PackageableElement].properties[package] : Root.children[meta].children[pure].children[test], Root.children[meta].children[pure].children[metamodel].children[type].children[Class].properties[properties]: [ ^Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property] id @@ -3271,15 +3258,15 @@ Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property].properties[aggregation] : Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AggregationKind].values[None], Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AbstractProperty].properties[genericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:String}, Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AbstractProperty].properties[multiplicity] : Root.children[meta].children[pure].children[metamodel].children[multiplicity].children[PureOne], - Root.children[meta].children[pure].children[metamodel].children[type].children[Any].properties[classifierGenericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[typeArguments]:[^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[testable].children[Test]}, ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:String}], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[multiplicityArguments]:Root.children[meta].children[pure].children[metamodel].children[multiplicity].children[PureOne]} + Root.children[meta].children[pure].children[metamodel].children[type].children[Any].properties[classifierGenericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[typeArguments]:[^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[test].children[Test]}, ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:String}], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[multiplicityArguments]:Root.children[meta].children[pure].children[metamodel].children[multiplicity].children[PureOne]} }, ^Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property] testable { Root.children[meta].children[pure].children[metamodel].children[ModelElement].properties[name] : 'testable', Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property].properties[aggregation] : Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AggregationKind].values[None], - Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AbstractProperty].properties[genericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[testable].children[Testable]}, + Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AbstractProperty].properties[genericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[test].children[Testable]}, Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AbstractProperty].properties[multiplicity] : Root.children[meta].children[pure].children[metamodel].children[multiplicity].children[PureOne], - Root.children[meta].children[pure].children[metamodel].children[type].children[Any].properties[classifierGenericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[typeArguments]:[^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[testable].children[Test]}, ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[testable].children[Testable]}], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[multiplicityArguments]:Root.children[meta].children[pure].children[metamodel].children[multiplicity].children[PureOne]} + Root.children[meta].children[pure].children[metamodel].children[type].children[Any].properties[classifierGenericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[typeArguments]:[^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[test].children[Test]}, ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[test].children[Testable]}], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[multiplicityArguments]:Root.children[meta].children[pure].children[metamodel].children[multiplicity].children[PureOne]} } ], Root.children[meta].children[pure].children[metamodel].children[ModelElement].properties[name] :'Test', @@ -3288,31 +3275,31 @@ ^Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization] { Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[general] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType] {Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType] : Root.children[meta].children[pure].children[metamodel].children[type].children[Any]}, - Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[specific] : Root.children[meta].children[pure].children[metamodel].children[testable].children[Test] + Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[specific] : Root.children[meta].children[pure].children[test].children[Test] } ] } -^Root.children[meta].children[pure].children[metamodel].children[type].children[Class] Testable @Root.children[meta].children[pure].children[metamodel].children[testable].children +^Root.children[meta].children[pure].children[metamodel].children[type].children[Class] Testable @Root.children[meta].children[pure].children[test].children { Root.children[meta].children[pure].children[metamodel].children[type].children[Any].properties[classifierGenericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType] { Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[type].children[Class], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[typeArguments]:^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType] { - Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[testable].children[Testable] + Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[test].children[Testable] } }, - Root.children[meta].children[pure].children[metamodel].children[PackageableElement].properties[package] : Root.children[meta].children[pure].children[metamodel].children[testable], + Root.children[meta].children[pure].children[metamodel].children[PackageableElement].properties[package] : Root.children[meta].children[pure].children[test], Root.children[meta].children[pure].children[metamodel].children[type].children[Class].properties[properties]: [ ^Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property] tests { Root.children[meta].children[pure].children[metamodel].children[ModelElement].properties[name] : 'tests', Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property].properties[aggregation] : Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AggregationKind].values[None], - Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AbstractProperty].properties[genericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[testable].children[Test]}, + Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AbstractProperty].properties[genericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[test].children[Test]}, Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[AbstractProperty].properties[multiplicity] : Root.children[meta].children[pure].children[metamodel].children[multiplicity].children[ZeroMany], - Root.children[meta].children[pure].children[metamodel].children[type].children[Any].properties[classifierGenericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[typeArguments]:[^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[testable].children[Testable]}, ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[testable].children[Test]}], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[multiplicityArguments]:Root.children[meta].children[pure].children[metamodel].children[multiplicity].children[ZeroMany]} + Root.children[meta].children[pure].children[metamodel].children[type].children[Any].properties[classifierGenericType] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[metamodel].children[function].children[property].children[Property], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[typeArguments]:[^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[test].children[Testable]}, ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType]{Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType]:Root.children[meta].children[pure].children[test].children[Test]}], Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[multiplicityArguments]:Root.children[meta].children[pure].children[metamodel].children[multiplicity].children[ZeroMany]} } ], Root.children[meta].children[pure].children[metamodel].children[ModelElement].properties[name] :'Testable', @@ -3321,7 +3308,7 @@ ^Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization] { Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[general] : ^Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType] {Root.children[meta].children[pure].children[metamodel].children[type].children[generics].children[GenericType].properties[rawType] : Root.children[meta].children[pure].children[metamodel].children[type].children[Any]}, - Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[specific] : Root.children[meta].children[pure].children[metamodel].children[testable].children[Testable] + Root.children[meta].children[pure].children[metamodel].children[relationship].children[Generalization].properties[specific] : Root.children[meta].children[pure].children[test].children[Testable] } ] } diff --git a/legend-pure-core/legend-pure-m3-core/src/test/java/org/finos/legend/pure/m3/serialization/runtime/binary/TestBinaryModelRepositorySerializer.java b/legend-pure-core/legend-pure-m3-core/src/test/java/org/finos/legend/pure/m3/serialization/runtime/binary/TestBinaryModelRepositorySerializer.java index d0e7dd02e8..32e6759875 100644 --- a/legend-pure-core/legend-pure-m3-core/src/test/java/org/finos/legend/pure/m3/serialization/runtime/binary/TestBinaryModelRepositorySerializer.java +++ b/legend-pure-core/legend-pure-m3-core/src/test/java/org/finos/legend/pure/m3/serialization/runtime/binary/TestBinaryModelRepositorySerializer.java @@ -85,7 +85,7 @@ public void testPlatformSerialization() throws IOException } } String m3BinaryPath = PureRepositoryJarTools.purePathToBinaryPath("/platform/pure/grammar/m3.pure"); - for (String instancePath : Lists.mutable.with("meta", "meta::pure", "meta::pure::metamodel::relation", "meta::pure::functions", "meta::pure::functions::lang", "meta::pure::metamodel", "meta::pure::metamodel::constraint", "meta::pure::metamodel::extension", "meta::pure::metamodel::function", "meta::pure::metamodel::function::property", "meta::pure::metamodel::import", "meta::pure::metamodel::multiplicity", "meta::pure::metamodel::relationship", "meta::pure::metamodel::treepath", "meta::pure::metamodel::type", "meta::pure::metamodel::type::generics", "meta::pure::metamodel::valuespecification", "meta::pure::router", "meta::pure::tools", "system", "system::imports", "meta::pure::metamodel::testable")) + for (String instancePath : Lists.mutable.with("meta", "meta::pure", "meta::pure::metamodel::relation", "meta::pure::functions", "meta::pure::functions::lang", "meta::pure::metamodel", "meta::pure::metamodel::constraint", "meta::pure::metamodel::extension", "meta::pure::metamodel::function", "meta::pure::metamodel::function::property", "meta::pure::metamodel::import", "meta::pure::metamodel::multiplicity", "meta::pure::metamodel::relationship", "meta::pure::metamodel::treepath", "meta::pure::metamodel::type", "meta::pure::metamodel::type::generics", "meta::pure::metamodel::valuespecification", "meta::pure::router", "meta::pure::tools", "system", "system::imports", "meta::pure::test")) { expectedDefinitionIndex.put(instancePath, m3BinaryPath); } diff --git a/legend-pure-core/legend-pure-m3-core/src/test/java/org/finos/legend/pure/m3/serialization/runtime/binary/TestBinaryModelSourceSerializer.java b/legend-pure-core/legend-pure-m3-core/src/test/java/org/finos/legend/pure/m3/serialization/runtime/binary/TestBinaryModelSourceSerializer.java index c95d5b0184..80b1be9f05 100644 --- a/legend-pure-core/legend-pure-m3-core/src/test/java/org/finos/legend/pure/m3/serialization/runtime/binary/TestBinaryModelSourceSerializer.java +++ b/legend-pure-core/legend-pure-m3-core/src/test/java/org/finos/legend/pure/m3/serialization/runtime/binary/TestBinaryModelSourceSerializer.java @@ -323,7 +323,7 @@ public void testTreePath() public void testM3Serialization() { Source source = runtime.getSourceById("/platform/pure/grammar/m3.pure"); - SetIterable expectedInstances = collectInstancePaths(source.getNewInstances(), Sets.mutable.with("meta", "meta::pure", "meta::pure::metamodel::relation", "meta::pure::functions", "meta::pure::functions::lang", "meta::pure::metamodel", "meta::pure::metamodel::extension", "meta::pure::metamodel::function", "meta::pure::metamodel::function::property", "meta::pure::metamodel::import", "meta::pure::metamodel::multiplicity", "meta::pure::metamodel::relationship", "meta::pure::metamodel::treepath", "meta::pure::metamodel::type", "meta::pure::metamodel::type::generics", "meta::pure::metamodel::constraint", "meta::pure::metamodel::valuespecification", "meta::pure::router", "meta::pure::tools", "system", "system::imports", "meta::pure::metamodel::testable")); + SetIterable expectedInstances = collectInstancePaths(source.getNewInstances(), Sets.mutable.with("meta", "meta::pure", "meta::pure::metamodel::relation", "meta::pure::functions", "meta::pure::functions::lang", "meta::pure::metamodel", "meta::pure::metamodel::extension", "meta::pure::metamodel::function", "meta::pure::metamodel::function::property", "meta::pure::metamodel::import", "meta::pure::metamodel::multiplicity", "meta::pure::metamodel::relationship", "meta::pure::metamodel::treepath", "meta::pure::metamodel::type", "meta::pure::metamodel::type::generics", "meta::pure::metamodel::constraint", "meta::pure::metamodel::valuespecification", "meta::pure::router", "meta::pure::tools", "system", "system::imports", "meta::pure::test")); SetIterable expectedReferences = Sets.mutable.with(); Pair serializationResult = serializeSource(source); @@ -359,7 +359,7 @@ public void testPlatformSerialization() expectedInstances.addAllIterable(importGroupsByBaseName.get(Source.formatForImportGroupId(source.getId()))); if ("/platform/pure/grammar/m3.pure".equals(source.getId())) { - expectedInstances.addAllIterable(Lists.mutable.with("meta", "meta::pure", "meta::pure::functions", "meta::pure::metamodel::relation", "meta::pure::functions::lang", "meta::pure::metamodel", "meta::pure::metamodel::constraint", "meta::pure::metamodel::extension", "meta::pure::metamodel::function", "meta::pure::metamodel::function::property", "meta::pure::metamodel::import", "meta::pure::metamodel::multiplicity", "meta::pure::metamodel::relationship", "meta::pure::metamodel::treepath", "meta::pure::metamodel::type", "meta::pure::metamodel::type::generics", "meta::pure::metamodel::valuespecification", "meta::pure::router", "meta::pure::tools", "system", "system::imports", "meta::pure::metamodel::testable")); + expectedInstances.addAllIterable(Lists.mutable.with("meta", "meta::pure", "meta::pure::functions", "meta::pure::metamodel::relation", "meta::pure::functions::lang", "meta::pure::metamodel", "meta::pure::metamodel::constraint", "meta::pure::metamodel::extension", "meta::pure::metamodel::function", "meta::pure::metamodel::function::property", "meta::pure::metamodel::import", "meta::pure::metamodel::multiplicity", "meta::pure::metamodel::relationship", "meta::pure::metamodel::treepath", "meta::pure::metamodel::type", "meta::pure::metamodel::type::generics", "meta::pure::metamodel::valuespecification", "meta::pure::router", "meta::pure::tools", "system", "system::imports", "meta::pure::test")); } Pair serializationResult = serializeSource(source); diff --git a/legend-pure-core/legend-pure-m3-core/src/test/java/org/finos/legend/pure/m3/tests/lineinfo/TestLineInfo.java b/legend-pure-core/legend-pure-m3-core/src/test/java/org/finos/legend/pure/m3/tests/lineinfo/TestLineInfo.java index a323e58f1c..3c02a118cb 100644 --- a/legend-pure-core/legend-pure-m3-core/src/test/java/org/finos/legend/pure/m3/tests/lineinfo/TestLineInfo.java +++ b/legend-pure-core/legend-pure-m3-core/src/test/java/org/finos/legend/pure/m3/tests/lineinfo/TestLineInfo.java @@ -116,7 +116,7 @@ public void testLineInfoForDynamicInstanceGeneratedM3() CoreInstance classifierGenericType = propertiesByName.get("classifierGenericType"); Assert.assertNotNull(classifierGenericType); // Note: these source coordinates may change if m3.pure changes - assertSourceInformation("/platform/pure/grammar/m3.pure", 1096, 13, 1096, 126, 1103, 17, classifierGenericType.getSourceInformation()); + assertSourceInformation("/platform/pure/grammar/m3.pure", 1092, 13, 1092, 126, 1099, 17, classifierGenericType.getSourceInformation()); // Test function CoreInstance func = runtime.getCoreInstance("pkg1::pkg2::printSomething__Any_1_"); @@ -136,7 +136,7 @@ public void testLineInfoForDynamicInstanceGeneratedM3() Assert.assertNotNull(funcType); Assert.assertEquals(M3Paths.ConcreteFunctionDefinition, PackageableElement.getUserPathForPackageableElement(funcType, "::")); // Note: these source coordinates may change if m3.pure changes - assertSourceInformation("/platform/pure/grammar/m3.pure", 2355, 1, 2355, 88, 2379, 1, funcType.getSourceInformation()); + assertSourceInformation("/platform/pure/grammar/m3.pure", 2350, 1, 2350, 88, 2374, 1, funcType.getSourceInformation()); } @Test diff --git a/legend-pure-dsl/legend-pure-dsl-mapping/legend-pure-m2-dsl-mapping-pure/src/main/resources/platform_dsl_mapping/grammar/mapping.pure b/legend-pure-dsl/legend-pure-dsl-mapping/legend-pure-m2-dsl-mapping-pure/src/main/resources/platform_dsl_mapping/grammar/mapping.pure index b1f635c508..389a9010fb 100644 --- a/legend-pure-dsl/legend-pure-dsl-mapping/legend-pure-m2-dsl-mapping-pure/src/main/resources/platform_dsl_mapping/grammar/mapping.pure +++ b/legend-pure-dsl/legend-pure-dsl-mapping/legend-pure-m2-dsl-mapping-pure/src/main/resources/platform_dsl_mapping/grammar/mapping.pure @@ -18,7 +18,7 @@ import meta::pure::store::*; import meta::pure::tools::*; import meta::pure::functions::collection::*; import meta::pure::mapping::aggregationAware::*; -import meta::pure::metamodel::testable::*; +import meta::pure::test::*; import meta::pure::metamodel::relation::*; // Mapping diff --git a/legend-pure-runtime/legend-pure-runtime-java-engine-compiled/src/test/java/org/finos/legend/pure/runtime/java/compiled/runtime/generation/processors/support/coreinstance/TestReflectiveCoreInstance.java b/legend-pure-runtime/legend-pure-runtime-java-engine-compiled/src/test/java/org/finos/legend/pure/runtime/java/compiled/runtime/generation/processors/support/coreinstance/TestReflectiveCoreInstance.java index 938c6aad7c..3cb3127bf3 100644 --- a/legend-pure-runtime/legend-pure-runtime-java-engine-compiled/src/test/java/org/finos/legend/pure/runtime/java/compiled/runtime/generation/processors/support/coreinstance/TestReflectiveCoreInstance.java +++ b/legend-pure-runtime/legend-pure-runtime-java-engine-compiled/src/test/java/org/finos/legend/pure/runtime/java/compiled/runtime/generation/processors/support/coreinstance/TestReflectiveCoreInstance.java @@ -38,7 +38,7 @@ public void testKeyIndex() .withKey("Root::meta::pure::metamodel::extension::ElementWithConstraints", "constraints") .withKey("Root::meta::pure::metamodel::extension::ElementWithStereotypes", "stereotypes") .withKey("Root::meta::pure::metamodel::extension::ElementWithTaggedValues", "taggedValues") - .withKey("Root::meta::pure::metamodel::testable::Testable", "tests") + .withKey("Root::meta::pure::test::Testable", "tests") .withKeys("Root::meta::pure::metamodel::type::Type", "generalizations", "name", "specializations") .withKeys("Root::meta::pure::metamodel::type::Class", "multiplicityParameters", "originalMilestonedProperties", "properties", "propertiesFromAssociations", "qualifiedProperties", "qualifiedPropertiesFromAssociations", "typeParameters") .withKeys("Root::meta::pure::metamodel::PackageableElement", "package", "referenceUsages") @@ -62,7 +62,7 @@ public void testKeyIndex() index.getRealKeyByName("taggedValues")); Assert.assertEquals( - Lists.immutable.with("Root", "children", "meta", "children", "pure", "children", "metamodel", "children", "testable", "children", "Testable", "properties", "tests"), + Lists.immutable.with("Root", "children", "meta", "children", "pure", "children", "test", "children", "Testable", "properties", "tests"), index.getRealKeyByName("tests")); Assert.assertEquals(