From 4084754c3fe4a9d75ce7801f30f4a0e1b4f15f0f Mon Sep 17 00:00:00 2001 From: Steve Hickman Date: Mon, 22 Jan 2024 13:50:14 -0800 Subject: [PATCH] Enable LogicalAbstractMeasurement in grammar Problem isn't multiple inheritance since these are just interfaces. It's inheritance diamonds - which we avoid here. --- com.epistimis.uddl/src/com/epistimis/uddl/Uddl.xtext | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/com.epistimis.uddl/src/com/epistimis/uddl/Uddl.xtext b/com.epistimis.uddl/src/com/epistimis/uddl/Uddl.xtext index 52dca01..01296dc 100644 --- a/com.epistimis.uddl/src/com/epistimis/uddl/Uddl.xtext +++ b/com.epistimis.uddl/src/com/epistimis/uddl/Uddl.xtext @@ -468,11 +468,11 @@ LogicalMeasurementSystemConversion: // See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#scoping // Use a FilteringScope /** An AbstractMeasurement is a Measurement, MeasurementAxis, or a ValueTypeUnit. */ -//LogicalAbstractMeasurement: -// LogicalMeasurement | // Use LogicalComposableElement -// LogicalMeasurementAxis | // Use LogicalElement -// LogicalValueTypeUnit //Use LogicalElement -//; +LogicalAbstractMeasurement: + LogicalMeasurement | // Use LogicalComposableElement + LogicalMeasurementAxis | // Use LogicalElement + LogicalValueTypeUnit //Use LogicalElement +; /** A Measurement realizes an Observable as a set of quantities that can be recorded for each axis of a MeasurementSystem. A Measurement contains the specific implementation details optionally including an override of the default ValueType and Unit for each axis as well as the constraints over that space for which the MeasurementSystem is valid. */ LogicalMeasurement: