Skip to content

Commit 5e4f467

Browse files
authored
Merge pull request #441 from IETS3/bugfix/backport-units-migration
expr.units: do not migrate extensions units
2 parents e49ca16 + 30ac927 commit 5e4f467

File tree

1 file changed

+93
-7
lines changed

1 file changed

+93
-7
lines changed

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

Lines changed: 93 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@
113113
<concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
114114
<child id="1144230900587" name="variable" index="1Duv9x" />
115115
</concept>
116+
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
117+
<child id="8356039341262087992" name="line" index="1aUNEU" />
118+
</concept>
116119
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
117120
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
118121
</language>
@@ -164,6 +167,7 @@
164167
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
165168
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
166169
</concept>
170+
<concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
167171
<concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
168172
<concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
169173
<reference id="1145383142433" name="elementConcept" index="2I9WkF" />
@@ -177,6 +181,9 @@
177181
</concept>
178182
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
179183
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
184+
<concept id="1172326502327" name="jetbrains.mps.lang.smodel.structure.Concept_IsExactlyOperation" flags="nn" index="3O6GUB">
185+
<child id="1206733650006" name="conceptArgument" index="3QVz_e" />
186+
</concept>
180187
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
181188
<reference id="1138405853777" name="concept" index="ehGHo" />
182189
</concept>
@@ -222,6 +229,14 @@
222229
<property id="5820409521797704727" name="fromVersion" index="qMTe8" />
223230
</concept>
224231
</language>
232+
<language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
233+
<concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
234+
<property id="155656958578482949" name="value" index="3oM_SC" />
235+
</concept>
236+
<concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
237+
<child id="2535923850359271783" name="elements" index="1PaTwD" />
238+
</concept>
239+
</language>
225240
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
226241
<concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
227242
<child id="1204796294226" name="closure" index="23t8la" />
@@ -233,6 +248,7 @@
233248
<concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
234249
<child id="1151688676805" name="elementType" index="_ZDj9" />
235250
</concept>
251+
<concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
236252
<concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
237253
<child id="1237721435807" name="elementType" index="HW$YZ" />
238254
</concept>
@@ -2117,21 +2133,91 @@
21172133
<node concept="H_c77" id="1KUmgSFpJCD" role="1tU5fm" />
21182134
</node>
21192135
<node concept="3clFbS" id="1KUmgSFpJmF" role="2LFqv$">
2136+
<node concept="3SKdUt" id="3slXa_gMknW" role="3cqZAp">
2137+
<node concept="1PaTwC" id="3slXa_gMknX" role="1aUNEU">
2138+
<node concept="3oM_SD" id="3slXa_gMknY" role="1PaTwD">
2139+
<property role="3oM_SC" value="the" />
2140+
</node>
2141+
<node concept="3oM_SD" id="3slXa_gMktG" role="1PaTwD">
2142+
<property role="3oM_SC" value="extra" />
2143+
</node>
2144+
<node concept="3oM_SD" id="3slXa_gMkup" role="1PaTwD">
2145+
<property role="3oM_SC" value="isExactly" />
2146+
</node>
2147+
<node concept="3oM_SD" id="3slXa_gMkuN" role="1PaTwD">
2148+
<property role="3oM_SC" value="is" />
2149+
</node>
2150+
<node concept="3oM_SD" id="3slXa_gMkuU" role="1PaTwD">
2151+
<property role="3oM_SC" value="required" />
2152+
</node>
2153+
<node concept="3oM_SD" id="3slXa_gMkvm" role="1PaTwD">
2154+
<property role="3oM_SC" value="to" />
2155+
</node>
2156+
<node concept="3oM_SD" id="3slXa_gMkvD" role="1PaTwD">
2157+
<property role="3oM_SC" value="avoid" />
2158+
</node>
2159+
<node concept="3oM_SD" id="3slXa_gMkvX" role="1PaTwD">
2160+
<property role="3oM_SC" value="migrating" />
2161+
</node>
2162+
<node concept="3oM_SD" id="3slXa_gMkw8" role="1PaTwD">
2163+
<property role="3oM_SC" value="extensions" />
2164+
</node>
2165+
<node concept="3oM_SD" id="3slXa_gMkwW" role="1PaTwD">
2166+
<property role="3oM_SC" value="to" />
2167+
</node>
2168+
<node concept="3oM_SD" id="3slXa_gMkxj" role="1PaTwD">
2169+
<property role="3oM_SC" value="units" />
2170+
</node>
2171+
<node concept="3oM_SD" id="3slXa_gMm$r" role="1PaTwD">
2172+
<property role="3oM_SC" value="language" />
2173+
</node>
2174+
</node>
2175+
</node>
21202176
<node concept="3cpWs8" id="1KUmgSFpOE4" role="3cqZAp">
21212177
<node concept="3cpWsn" id="1KUmgSFpOE5" role="3cpWs9">
21222178
<property role="TrG5h" value="allUnits" />
21232179
<node concept="2I9FWS" id="1KUmgSFpODT" role="1tU5fm">
21242180
<ref role="2I9WkF" to="b0gq:7eOyx9r3jsZ" resolve="Unit" />
21252181
</node>
2126-
<node concept="2OqwBi" id="1KUmgSFpOE6" role="33vP2m">
2127-
<node concept="37vLTw" id="1KUmgSFpOE7" role="2Oq$k0">
2128-
<ref role="3cqZAo" node="1KUmgSFpJmD" resolve="mdl" />
2129-
</node>
2130-
<node concept="2SmgA7" id="1KUmgSFpOE8" role="2OqNvi">
2131-
<node concept="chp4Y" id="1KUmgSFpOE9" role="1dBWTz">
2132-
<ref role="cht4Q" to="b0gq:7eOyx9r3jsZ" resolve="Unit" />
2182+
<node concept="2OqwBi" id="3slXa_gMjfn" role="33vP2m">
2183+
<node concept="2OqwBi" id="3slXa_gM8ca" role="2Oq$k0">
2184+
<node concept="2OqwBi" id="1KUmgSFpOE6" role="2Oq$k0">
2185+
<node concept="37vLTw" id="1KUmgSFpOE7" role="2Oq$k0">
2186+
<ref role="3cqZAo" node="1KUmgSFpJmD" resolve="mdl" />
2187+
</node>
2188+
<node concept="2SmgA7" id="1KUmgSFpOE8" role="2OqNvi">
2189+
<node concept="chp4Y" id="1KUmgSFpOE9" role="1dBWTz">
2190+
<ref role="cht4Q" to="b0gq:7eOyx9r3jsZ" resolve="Unit" />
2191+
</node>
2192+
</node>
2193+
</node>
2194+
<node concept="3zZkjj" id="3slXa_gMcJa" role="2OqNvi">
2195+
<node concept="1bVj0M" id="3slXa_gMcJc" role="23t8la">
2196+
<node concept="3clFbS" id="3slXa_gMcJd" role="1bW5cS">
2197+
<node concept="3clFbF" id="3slXa_gMd5r" role="3cqZAp">
2198+
<node concept="2OqwBi" id="3slXa_gMfyB" role="3clFbG">
2199+
<node concept="2OqwBi" id="3slXa_gMdFc" role="2Oq$k0">
2200+
<node concept="37vLTw" id="3slXa_gMd5q" role="2Oq$k0">
2201+
<ref role="3cqZAo" node="3slXa_gMcJe" resolve="it" />
2202+
</node>
2203+
<node concept="2yIwOk" id="3slXa_gMeJR" role="2OqNvi" />
2204+
</node>
2205+
<node concept="3O6GUB" id="3slXa_gMgzd" role="2OqNvi">
2206+
<node concept="chp4Y" id="3slXa_gMish" role="3QVz_e">
2207+
<ref role="cht4Q" to="b0gq:7eOyx9r3jsZ" resolve="Unit" />
2208+
</node>
2209+
</node>
2210+
</node>
2211+
</node>
2212+
</node>
2213+
<node concept="Rh6nW" id="3slXa_gMcJe" role="1bW2Oz">
2214+
<property role="TrG5h" value="it" />
2215+
<node concept="2jxLKc" id="3slXa_gMcJf" role="1tU5fm" />
2216+
</node>
2217+
</node>
21332218
</node>
21342219
</node>
2220+
<node concept="ANE8D" id="3slXa_gMjOh" role="2OqNvi" />
21352221
</node>
21362222
</node>
21372223
</node>

0 commit comments

Comments
 (0)