Skip to content

Commit

Permalink
Enable LogicalAbstractMeasurement in grammar
Browse files Browse the repository at this point in the history
Problem isn't multiple inheritance since these are just interfaces. It's
inheritance diamonds - which we avoid here.
  • Loading branch information
steve-hickman-epistimis committed Jan 22, 2024
1 parent c5ff61c commit 4084754
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions com.epistimis.uddl/src/com/epistimis/uddl/Uddl.xtext
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 4084754

Please sign in to comment.