Skip to content

Commit d251c9a

Browse files
authored
Merge pull request #709 from IETS3/feature/mismatched_unit_error
Remove MetaUnit and refactor unit comparisons
2 parents 7fb76a6 + 10b468a commit d251c9a

File tree

7 files changed

+872
-1459
lines changed

7 files changed

+872
-1459
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@ All notable changes to this project are documented in this file.
55
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
77

8+
## September 2023
89

10+
### Fixed
11+
12+
- Unit comparisons for the **same** unit defined in **different** packages now lead to an error message for compatibility
13+
14+
### Removed
15+
16+
- the MetaUnit node was removed since it was not actively used
917

1018
## July 2023
1119

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/behavior.mps

Lines changed: 527 additions & 1357 deletions
Large diffs are not rendered by default.

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/structure.mps

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@
1919
<concept id="1224240836180" name="jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation" flags="ig" index="asaX9">
2020
<property id="1225118933224" name="comment" index="YLQ7P" />
2121
</concept>
22-
<concept id="6054523464627964745" name="jetbrains.mps.lang.structure.structure.AttributeInfo_AttributedConcept" flags="ng" index="trNpa">
23-
<reference id="6054523464627965081" name="concept" index="trN6q" />
24-
</concept>
25-
<concept id="2992811758677295509" name="jetbrains.mps.lang.structure.structure.AttributeInfo" flags="ng" index="M6xJ_">
26-
<property id="7588428831955550663" name="role" index="Hh88m" />
27-
<child id="7588428831947959310" name="attributed" index="EQaZv" />
28-
</concept>
2922
<concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
3023
<property id="6714410169261853888" name="conceptId" index="EcuMT" />
3124
<property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
@@ -201,55 +194,6 @@
201194
<ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
202195
</node>
203196
</node>
204-
<node concept="1TIwiD" id="lqDNwvnvZv">
205-
<property role="TrG5h" value="InferredAttribute" />
206-
<property role="3GE5qa" value="definition.meta" />
207-
<property role="EcuMT" value="385804577579859935" />
208-
<property role="R4oN_" value="an inferred node attribute" />
209-
<ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
210-
<node concept="1TJgyj" id="lqDNwvnvZG" role="1TKVEi">
211-
<property role="20lmBu" value="fLJjDmT/aggregation" />
212-
<property role="20kJfa" value="substitutions" />
213-
<property role="20lbJX" value="fLJekj6/_1__n" />
214-
<property role="IQ2ns" value="385804577579859948" />
215-
<ref role="20lvS9" node="lqDNwvnvYQ" resolve="InferredSubstitution" />
216-
</node>
217-
<node concept="M6xJ_" id="lqDNwvnvZw" role="lGtFl">
218-
<property role="Hh88m" value="inferred" />
219-
<node concept="trNpa" id="5pSqQr$RAFq" role="EQaZv">
220-
<ref role="trN6q" to="w1hl:1xEzHAktP2Q" resolve="TaggedType" />
221-
</node>
222-
</node>
223-
</node>
224-
<node concept="1TIwiD" id="lqDNwvnvYQ">
225-
<property role="TrG5h" value="InferredSubstitution" />
226-
<property role="3GE5qa" value="definition.meta" />
227-
<property role="EcuMT" value="385804577579859894" />
228-
<property role="R4oN_" value="an inferred substituion" />
229-
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
230-
<node concept="1TJgyj" id="lqDNwvnvZo" role="1TKVEi">
231-
<property role="20kJfa" value="metaUnit" />
232-
<property role="20lbJX" value="fLJekj4/_1" />
233-
<property role="IQ2ns" value="385804577579859928" />
234-
<ref role="20lvS9" node="7eOyx9raabt" resolve="MetaUnit" />
235-
</node>
236-
<node concept="1TJgyj" id="lqDNwvnvZk" role="1TKVEi">
237-
<property role="20lmBu" value="fLJjDmT/aggregation" />
238-
<property role="20kJfa" value="realUnit" />
239-
<property role="IQ2ns" value="385804577579859924" />
240-
<ref role="20lvS9" node="7eOyx9r3k4t" resolve="UnitSpecification" />
241-
</node>
242-
</node>
243-
<node concept="1TIwiD" id="7eOyx9raabt">
244-
<property role="TrG5h" value="MetaUnit" />
245-
<property role="3GE5qa" value="definition.meta" />
246-
<property role="EcuMT" value="8337440621613064925" />
247-
<property role="R4oN_" value="a meta unit" />
248-
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
249-
<node concept="PrWs8" id="2Ux6GHgTOwT" role="PzmwI">
250-
<ref role="PrY4T" node="7eOyx9r3k3e" resolve="IUnit" />
251-
</node>
252-
</node>
253197
<node concept="1TIwiD" id="yGiRIEU5vF">
254198
<property role="3GE5qa" value="conversion" />
255199
<property role="TrG5h" value="StripUnitExpression" />

0 commit comments

Comments
 (0)