Skip to content

Commit 2ba0a1b

Browse files
wsafonovwsafonov
committed
executed pending migrations
1 parent 11549f5 commit 2ba0a1b

File tree

5 files changed

+5
-66
lines changed

5 files changed

+5
-66
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/behavior.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7243,7 +7243,7 @@
72437243
<property role="13i0iv" value="false" />
72447244
<property role="13i0it" value="false" />
72457245
<property role="TrG5h" value="addGenericDependecy" />
7246-
<ref role="13i0hy" to="hwgx:94IdDK$n_l" resolve="addGenericDependecy" />
7246+
<ref role="13i0hy" to="hwgx:94IdDK$n_l" resolve="addGenericChunkDependency" />
72477247
<node concept="3Tm1VV" id="5VEHrQcW_Gd" role="1B3o_S" />
72487248
<node concept="3clFbS" id="5VEHrQcW_Gi" role="3clF47">
72497249
<node concept="3clFbF" id="5VEHrQcWCJp" role="3cqZAp">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<language slang="l:7fa12e9c-b949-4976-b4fa-19accbc320b4:jetbrains.mps.lang.dataFlow" version="1" />
6565
<language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
6666
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
67+
<language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
6768
<language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
6869
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
6970
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.units.si/models/units.mps‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
</concept>
1515
<concept id="5185104661801317038" name="org.iets3.core.expr.typetags.units.structure.ValExpression" flags="ng" index="2m5Cep" />
1616
<concept id="8337440621611267903" name="org.iets3.core.expr.typetags.units.structure.Unit" flags="ng" index="CIrOH">
17-
<property id="8337440621611269512" name="description" index="CIruq" />
1817
<reference id="2034036099103723290" name="dimension" index="Rn5ok" />
1918
<child id="8337440621611270427" name="specification" index="CIsG9" />
2019
</concept>
@@ -120,42 +119,34 @@
120119
</node>
121120
<node concept="CIrOH" id="5XaocLWHSS4" role="_iOnB">
122121
<property role="TrG5h" value="m" />
123-
<property role="CIruq" value="distance" />
124122
<ref role="Rn5ok" node="1KUmgSFvJUm" resolve="metre" />
125123
</node>
126124
<node concept="CIrOH" id="5XaocLWHSS5" role="_iOnB">
127125
<property role="TrG5h" value="s" />
128-
<property role="CIruq" value="time" />
129126
<ref role="Rn5ok" node="1KUmgSFvJUr" resolve="time" />
130127
</node>
131128
<node concept="CIrOH" id="5XaocLWHSS6" role="_iOnB">
132129
<property role="TrG5h" value="kg" />
133-
<property role="CIruq" value="weight" />
134130
<ref role="Rn5ok" node="1KUmgSFvJUq" resolve="weight" />
135131
</node>
136132
<node concept="CIrOH" id="5XaocLWHSS7" role="_iOnB">
137133
<property role="TrG5h" value="mol" />
138-
<property role="CIruq" value="amount of chemical substance" />
139134
<ref role="Rn5ok" node="1KUmgSFvJUn" resolve="amount of chemical substance" />
140135
</node>
141136
<node concept="CIrOH" id="5XaocLWHSS8" role="_iOnB">
142137
<property role="TrG5h" value="K" />
143-
<property role="CIruq" value="temperature" />
144138
<ref role="Rn5ok" node="1KUmgSFvJUp" resolve="temperature" />
145139
</node>
146140
<node concept="CIrOH" id="5XaocLWHSS9" role="_iOnB">
147141
<property role="TrG5h" value="A" />
148-
<property role="CIruq" value="current" />
149142
<ref role="Rn5ok" node="1KUmgSFvJUk" resolve="current" />
150143
</node>
151144
<node concept="CIrOH" id="5XaocLWHSSa" role="_iOnB">
152145
<property role="TrG5h" value="cd" />
153-
<property role="CIruq" value="luminous intensity" />
154146
<ref role="Rn5ok" node="1KUmgSFvJUo" resolve="luminous intensity" />
155147
</node>
156148
<node concept="CIrOH" id="5XaocLWHSSb" role="_iOnB">
157149
<property role="TrG5h" value="nounit" />
158-
<property role="CIruq" value="undefined unit (helper)" />
159150
<ref role="Rn5ok" node="1KUmgSFvJUl" resolve="undefined unit (helper)" />
160151
<node concept="CIsGf" id="5XaocLWHSSc" role="CIsG9">
161152
<node concept="CIsvn" id="5XaocLWHSSd" role="CIi4h">
@@ -245,7 +236,6 @@
245236
</node>
246237
<node concept="CIrOH" id="69HsIy5F$rs" role="_iOnB">
247238
<property role="TrG5h" value="Hz" />
248-
<property role="CIruq" value="frequency" />
249239
<ref role="Rn5ok" node="1KUmgSFvJUB" resolve="frequency" />
250240
<node concept="CIsGf" id="69HsIy5F$vp" role="CIsG9">
251241
<node concept="CIsvn" id="69HsIy5F$vq" role="CIi4h">
@@ -258,7 +248,6 @@
258248
</node>
259249
<node concept="CIrOH" id="69HsIy5F$DR" role="_iOnB">
260250
<property role="TrG5h" value="rad" />
261-
<property role="CIruq" value="angle" />
262251
<ref role="Rn5ok" node="1KUmgSFvJUI" resolve="angle" />
263252
<node concept="CIsGf" id="69HsIy5F$FX" role="CIsG9">
264253
<node concept="CIsvn" id="69HsIy5F$FY" role="CIi4h">
@@ -274,7 +263,6 @@
274263
</node>
275264
<node concept="CIrOH" id="69HsIy5F$Io" role="_iOnB">
276265
<property role="TrG5h" value="sr" />
277-
<property role="CIruq" value="angle" />
278266
<ref role="Rn5ok" node="1KUmgSFvJUI" resolve="angle" />
279267
<node concept="CIsGf" id="69HsIy5F$K$" role="CIsG9">
280268
<node concept="CIsvn" id="69HsIy5F$KI" role="CIi4h">
@@ -293,7 +281,6 @@
293281
</node>
294282
<node concept="CIrOH" id="69HsIy5F$TY" role="_iOnB">
295283
<property role="TrG5h" value="N" />
296-
<property role="CIruq" value="force" />
297284
<ref role="Rn5ok" node="1KUmgSFvJUJ" resolve="force" />
298285
<node concept="CIsGf" id="69HsIy5F$Wh" role="CIsG9">
299286
<node concept="CIsvn" id="69HsIy5F$Wi" role="CIi4h">
@@ -312,7 +299,6 @@
312299
</node>
313300
<node concept="CIrOH" id="69HsIy5F_3N" role="_iOnB">
314301
<property role="TrG5h" value="Pa" />
315-
<property role="CIruq" value="pressure" />
316302
<ref role="Rn5ok" node="1KUmgSFvJUA" resolve="pressure" />
317303
<node concept="CIsGf" id="69HsIy5F_6e" role="CIsG9">
318304
<node concept="CIsvn" id="69HsIy5F_6d" role="CIi4h">
@@ -328,7 +314,6 @@
328314
</node>
329315
<node concept="CIrOH" id="69HsIy5F_gq" role="_iOnB">
330316
<property role="TrG5h" value="J" />
331-
<property role="CIruq" value="energy" />
332317
<ref role="Rn5ok" node="1KUmgSFvJUM" resolve="energy" />
333318
<node concept="CIsGf" id="69HsIy5F_iW" role="CIsG9">
334319
<node concept="CIsvn" id="69HsIy5F_iV" role="CIi4h">
@@ -341,7 +326,6 @@
341326
</node>
342327
<node concept="CIrOH" id="69HsIy5F_JE" role="_iOnB">
343328
<property role="TrG5h" value="W" />
344-
<property role="CIruq" value="power" />
345329
<ref role="Rn5ok" node="1KUmgSFvJUK" resolve="power" />
346330
<node concept="CIsGf" id="69HsIy5F_Mq" role="CIsG9">
347331
<node concept="CIsvn" id="69HsIy5F_Mp" role="CIi4h">
@@ -357,7 +341,6 @@
357341
</node>
358342
<node concept="CIrOH" id="69HsIy5F_XK" role="_iOnB">
359343
<property role="TrG5h" value="C" />
360-
<property role="CIruq" value="electric charge" />
361344
<ref role="Rn5ok" node="1KUmgSFvJUG" resolve="electric charge" />
362345
<node concept="CIsGf" id="69HsIy5FA0A" role="CIsG9">
363346
<node concept="CIsvn" id="69HsIy5FA0_" role="CIi4h">
@@ -370,7 +353,6 @@
370353
</node>
371354
<node concept="CIrOH" id="69HsIy5FANF" role="_iOnB">
372355
<property role="TrG5h" value="V" />
373-
<property role="CIruq" value="voltage" />
374356
<ref role="Rn5ok" node="1KUmgSFvJUC" resolve="voltage" />
375357
<node concept="CIsGf" id="69HsIy5FAQG" role="CIsG9">
376358
<node concept="CIsvn" id="69HsIy5FAQF" role="CIi4h">
@@ -386,7 +368,6 @@
386368
</node>
387369
<node concept="CIrOH" id="69HsIy5FDQP" role="_iOnB">
388370
<property role="TrG5h" value="F" />
389-
<property role="CIruq" value="capacitance" />
390371
<ref role="Rn5ok" node="1KUmgSFvJUw" resolve="capacitance" />
391372
<node concept="CIsGf" id="69HsIy5FDU3" role="CIsG9">
392373
<node concept="CIsvn" id="69HsIy5FDU2" role="CIi4h">
@@ -402,7 +383,6 @@
402383
</node>
403384
<node concept="CIrOH" id="69HsIy5FE7r" role="_iOnB">
404385
<property role="TrG5h" value="ohm" />
405-
<property role="CIruq" value="electrical resistance" />
406386
<ref role="Rn5ok" node="1KUmgSFvJU$" resolve="electrical resistance" />
407387
<node concept="CIsGf" id="69HsIy5FEuO" role="CIsG9">
408388
<node concept="CIsvn" id="69HsIy5FEuN" role="CIi4h">
@@ -418,7 +398,6 @@
418398
</node>
419399
<node concept="CIrOH" id="69HsIy5FErr" role="_iOnB">
420400
<property role="TrG5h" value="S" />
421-
<property role="CIruq" value="electrical conductance" />
422401
<ref role="Rn5ok" node="1KUmgSFvJUu" resolve="electrical conductance" />
423402
<node concept="CIsGf" id="69HsIy5FEvr" role="CIsG9">
424403
<node concept="CIsvn" id="69HsIy5FEvs" role="CIi4h">
@@ -434,7 +413,6 @@
434413
</node>
435414
<node concept="CIrOH" id="69HsIy5FEE9" role="_iOnB">
436415
<property role="TrG5h" value="Wb" />
437-
<property role="CIruq" value="magnetic flux" />
438416
<ref role="Rn5ok" node="1KUmgSFvJUs" resolve="magnetic flux" />
439417
<node concept="CIsGf" id="69HsIy5FEHG" role="CIsG9">
440418
<node concept="CIsvn" id="69HsIy5FEHF" role="CIi4h">
@@ -450,7 +428,6 @@
450428
</node>
451429
<node concept="CIrOH" id="69HsIy5FF00" role="_iOnB">
452430
<property role="TrG5h" value="T" />
453-
<property role="CIruq" value="magnetic induction" />
454431
<ref role="Rn5ok" node="1KUmgSFvJUy" resolve="magnetic induction" />
455432
<node concept="CIsGf" id="69HsIy5FF3F" role="CIsG9">
456433
<node concept="CIsvn" id="69HsIy5FF3E" role="CIi4h">
@@ -469,7 +446,6 @@
469446
</node>
470447
<node concept="CIrOH" id="69HsIy5FFfg" role="_iOnB">
471448
<property role="TrG5h" value="H" />
472-
<property role="CIruq" value="inductance" />
473449
<ref role="Rn5ok" node="1KUmgSFvJUx" resolve="inductance" />
474450
<node concept="CIsGf" id="69HsIy5FFj2" role="CIsG9">
475451
<node concept="CIsvn" id="69HsIy5FFj1" role="CIi4h">
@@ -488,7 +464,6 @@
488464
</node>
489465
<node concept="CIrOH" id="69HsIy5FFAH" role="_iOnB">
490466
<property role="TrG5h" value="lm" />
491-
<property role="CIruq" value="luminous flux" />
492467
<ref role="Rn5ok" node="1KUmgSFvJUD" resolve="luminous flux" />
493468
<node concept="CIsGf" id="69HsIy5FFEC" role="CIsG9">
494469
<node concept="CIsvn" id="69HsIy5FFEB" role="CIi4h">
@@ -501,7 +476,6 @@
501476
</node>
502477
<node concept="CIrOH" id="69HsIy5FFQF" role="_iOnB">
503478
<property role="TrG5h" value="lx" />
504-
<property role="CIruq" value="illuminance" />
505479
<ref role="Rn5ok" node="1KUmgSFvJUE" resolve="illuminance" />
506480
<node concept="CIsGf" id="69HsIy5FFUF" role="CIsG9">
507481
<node concept="CIsvn" id="69HsIy5FFUE" role="CIi4h">
@@ -517,7 +491,6 @@
517491
</node>
518492
<node concept="CIrOH" id="69HsIy5FGfl" role="_iOnB">
519493
<property role="TrG5h" value="Bq" />
520-
<property role="CIruq" value="radioactivity" />
521494
<ref role="Rn5ok" node="1KUmgSFvJUN" resolve="radioactivity" />
522495
<node concept="CIsGf" id="69HsIy5FGjt" role="CIsG9">
523496
<node concept="CIsvn" id="69HsIy5FGjs" role="CIi4h">
@@ -530,7 +503,6 @@
530503
</node>
531504
<node concept="CIrOH" id="69HsIy5FGw8" role="_iOnB">
532505
<property role="TrG5h" value="Gy" />
533-
<property role="CIruq" value="absorbed dose" />
534506
<ref role="Rn5ok" node="1KUmgSFvJUv" resolve="absorbed dose" />
535507
<node concept="CIsGf" id="69HsIy5FG$l" role="CIsG9">
536508
<node concept="CIsvn" id="69HsIy5FG$k" role="CIi4h">
@@ -546,7 +518,6 @@
546518
</node>
547519
<node concept="CIrOH" id="69HsIy5FGPD" role="_iOnB">
548520
<property role="TrG5h" value="Sv" />
549-
<property role="CIruq" value="equivalent dose" />
550521
<ref role="Rn5ok" node="1KUmgSFvJUz" resolve="equivalent dose" />
551522
<node concept="CIsGf" id="69HsIy5FGTX" role="CIsG9">
552523
<node concept="CIsvn" id="69HsIy5FGTW" role="CIi4h">
@@ -561,7 +532,6 @@
561532
</node>
562533
</node>
563534
<node concept="CIrOH" id="69HsIy5FH2V" role="_iOnB">
564-
<property role="CIruq" value="catalytic activity" />
565535
<property role="TrG5h" value="kat" />
566536
<ref role="Rn5ok" node="1KUmgSFvJUF" resolve="catalytic activity" />
567537
<node concept="CIsGf" id="69HsIy5FHg8" role="CIsG9">
@@ -582,7 +552,6 @@
582552
</node>
583553
<node concept="CIrOH" id="69HsIy5FyRU" role="_iOnB">
584554
<property role="TrG5h" value="degC" />
585-
<property role="CIruq" value="temperature" />
586555
<ref role="Rn5ok" node="1KUmgSFvJUp" resolve="temperature" />
587556
</node>
588557
<node concept="TRoc0" id="69HsIy5FyVs" role="_iOnB">
@@ -602,7 +571,6 @@
602571
<property role="1WsWdv" value="metre scaled" />
603572
</node>
604573
<node concept="CIrOH" id="69HsIy5FvYH" role="_iOnB">
605-
<property role="CIruq" value="metre" />
606574
<property role="TrG5h" value="nm" />
607575
<ref role="Rn5ok" node="1KUmgSFvJUm" resolve="metre" />
608576
<node concept="1z9TsT" id="_I$tx9N8BM" role="lGtFl">
@@ -616,22 +584,18 @@
616584
</node>
617585
</node>
618586
<node concept="CIrOH" id="69HsIy5FvXj" role="_iOnB">
619-
<property role="CIruq" value="metre" />
620587
<property role="TrG5h" value="µm" />
621588
<ref role="Rn5ok" node="1KUmgSFvJUm" resolve="metre" />
622589
</node>
623590
<node concept="CIrOH" id="69HsIy5FvWm" role="_iOnB">
624-
<property role="CIruq" value="metre" />
625591
<property role="TrG5h" value="mm" />
626592
<ref role="Rn5ok" node="1KUmgSFvJUm" resolve="metre" />
627593
</node>
628594
<node concept="CIrOH" id="69HsIy5FvZe" role="_iOnB">
629-
<property role="CIruq" value="metre" />
630595
<property role="TrG5h" value="cm" />
631596
<ref role="Rn5ok" node="1KUmgSFvJUm" resolve="metre" />
632597
</node>
633598
<node concept="CIrOH" id="69HsIy5FvYB" role="_iOnB">
634-
<property role="CIruq" value="metre" />
635599
<property role="TrG5h" value="km" />
636600
<ref role="Rn5ok" node="1KUmgSFvJUm" resolve="metre" />
637601
</node>
@@ -701,32 +665,26 @@
701665
</node>
702666
<node concept="CIrOH" id="69HsIy5Fwrk" role="_iOnB">
703667
<property role="TrG5h" value="ns" />
704-
<property role="CIruq" value="time" />
705668
<ref role="Rn5ok" node="1KUmgSFvJUr" resolve="time" />
706669
</node>
707670
<node concept="CIrOH" id="69HsIy5Fwvr" role="_iOnB">
708671
<property role="TrG5h" value="µs" />
709-
<property role="CIruq" value="time" />
710672
<ref role="Rn5ok" node="1KUmgSFvJUr" resolve="time" />
711673
</node>
712674
<node concept="CIrOH" id="69HsIy5FwuN" role="_iOnB">
713675
<property role="TrG5h" value="ms" />
714-
<property role="CIruq" value="time" />
715676
<ref role="Rn5ok" node="1KUmgSFvJUr" resolve="time" />
716677
</node>
717678
<node concept="CIrOH" id="69HsIy5Fwuc" role="_iOnB">
718679
<property role="TrG5h" value="min" />
719-
<property role="CIruq" value="time" />
720680
<ref role="Rn5ok" node="1KUmgSFvJUr" resolve="time" />
721681
</node>
722682
<node concept="CIrOH" id="69HsIy5Fwt1" role="_iOnB">
723683
<property role="TrG5h" value="h" />
724-
<property role="CIruq" value="time" />
725684
<ref role="Rn5ok" node="1KUmgSFvJUr" resolve="time" />
726685
</node>
727686
<node concept="CIrOH" id="69HsIy5FwtA" role="_iOnB">
728687
<property role="TrG5h" value="day" />
729-
<property role="CIruq" value="time" />
730688
<ref role="Rn5ok" node="1KUmgSFvJUr" resolve="time" />
731689
</node>
732690
<node concept="TRoc0" id="69HsIy5FwwI" role="_iOnB">
@@ -933,27 +891,22 @@
933891
</node>
934892
<node concept="CIrOH" id="69HsIy5Fy7C" role="_iOnB">
935893
<property role="TrG5h" value="ngramm" />
936-
<property role="CIruq" value="weight" />
937894
<ref role="Rn5ok" node="1KUmgSFvJUq" resolve="weight" />
938895
</node>
939896
<node concept="CIrOH" id="69HsIy5Fye0" role="_iOnB">
940897
<property role="TrG5h" value="µgramm" />
941-
<property role="CIruq" value="weight" />
942898
<ref role="Rn5ok" node="1KUmgSFvJUq" resolve="weight" />
943899
</node>
944900
<node concept="CIrOH" id="69HsIy5Fy6n" role="_iOnB">
945901
<property role="TrG5h" value="mgramm" />
946-
<property role="CIruq" value="weight" />
947902
<ref role="Rn5ok" node="1KUmgSFvJUq" resolve="weight" />
948903
</node>
949904
<node concept="CIrOH" id="69HsIy5FxTe" role="_iOnB">
950905
<property role="TrG5h" value="gramm" />
951-
<property role="CIruq" value="weight" />
952906
<ref role="Rn5ok" node="1KUmgSFvJUq" resolve="weight" />
953907
</node>
954908
<node concept="CIrOH" id="69HsIy5FyhU" role="_iOnB">
955909
<property role="TrG5h" value="ton" />
956-
<property role="CIruq" value="weight" />
957910
<ref role="Rn5ok" node="1KUmgSFvJUq" resolve="weight" />
958911
</node>
959912
<node concept="TRoc0" id="69HsIy5Fyjf" role="_iOnB">

‎code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@
160160
<concept id="6891143932407155983" name="org.iets3.core.expr.datetime.structure.MonthValue" flags="ng" index="k_sZE" />
161161
<concept id="6891143932407162183" name="org.iets3.core.expr.datetime.structure.DayValue" flags="ng" index="k_uuy" />
162162
<concept id="8435714728543075342" name="org.iets3.core.expr.datetime.structure.MakeDate" flags="ng" index="2ohD7n">
163-
<child id="8435714728543075345" name="month" index="2ohD78" />
164-
<child id="8435714728543075348" name="day" index="2ohD7d" />
165-
<child id="8435714728543075343" name="year" index="2ohD7m" />
163+
<child id="8435714728543075345" name="monthExpr" index="2ohD78" />
164+
<child id="8435714728543075348" name="dayExpr" index="2ohD7d" />
165+
<child id="8435714728543075343" name="yearExpr" index="2ohD7m" />
166166
</concept>
167167
<concept id="8435714728547225444" name="org.iets3.core.expr.datetime.structure.UntilOp" flags="ng" index="2oxMaX">
168168
<child id="8435714728547225445" name="endDate" index="2oxMaW" />

0 commit comments

Comments
 (0)