Skip to content

Commit 2f4b644

Browse files
HeikoBeckerHeikoBecker
committed
Use RealType instead of null on unary op rules
The operand needs to be of non-null in the latest MPS versions in operator rules and this was causing problems because we used default null for unary operations.
1 parent 76ee157 commit 2f4b644

File tree

2 files changed

+41
-46
lines changed
  • code/languages/org.iets3.opensource/languages

2 files changed

+41
-46
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/typesystem.mps‎

Lines changed: 31 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<import index="7xqi" ref="r:d2ff18ef-a6af-4ccc-bbe9-c907db320eae(org.iets3.core.expr.math.plugin)" />
1515
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
1616
<import index="zzzn" ref="r:af0af2e7-f7e1-4536-83b5-6bf010d4afd2(org.iets3.core.expr.lambda.structure)" />
17-
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
1817
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
1918
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
19+
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
2020
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
2121
<import index="b1h1" ref="r:ac5f749f-6179-4d4f-ad24-ad9edbd8077b(org.iets3.core.expr.simpleTypes.behavior)" implicit="true" />
2222
</imports>
@@ -25,9 +25,6 @@
2525
<concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
2626
<child id="1219921048460" name="componentType" index="8Xvag" />
2727
</concept>
28-
<concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
29-
<child id="1082485599096" name="statements" index="9aQI4" />
30-
</concept>
3128
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
3229
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
3330
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
@@ -84,7 +81,6 @@
8481
</concept>
8582
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
8683
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
87-
<child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
8884
<child id="1068580123160" name="condition" index="3clFbw" />
8985
<child id="1068580123161" name="ifTrue" index="3clFbx" />
9086
</concept>
@@ -326,47 +322,26 @@
326322
<node concept="3clFbS" id="4iu6t1eAWxA" role="18ibNy">
327323
<node concept="nvevp" id="6q$NxWeFCRg" role="3cqZAp">
328324
<node concept="3clFbS" id="6q$NxWeFCRi" role="nvhr_">
329-
<node concept="3clFbJ" id="27$4JRbPQe0" role="3cqZAp">
330-
<node concept="3clFbS" id="27$4JRbPQe2" role="3clFbx">
331-
<node concept="1Z5TYs" id="27$4JRbPSlH" role="3cqZAp">
332-
<node concept="mw_s8" id="27$4JRbPSDR" role="1ZfhKB">
333-
<node concept="2pJPEk" id="27$4JRbPSDN" role="mwGJk">
334-
<node concept="2pJPED" id="27$4JRbPSDP" role="2pJPEn">
335-
<ref role="2pJxaS" to="5qo5:4rZeNQ6Oetc" resolve="RealType" />
336-
</node>
337-
</node>
338-
</node>
339-
<node concept="mw_s8" id="27$4JRbPSlK" role="1ZfhK$">
340-
<node concept="1Z2H0r" id="27$4JRbPRV5" role="mwGJk">
341-
<node concept="1YBJjd" id="27$4JRbPRZ3" role="1Z2MuG">
342-
<ref role="1YBMHb" node="4iu6t1eAWxC" resolve="abs" />
343-
</node>
344-
</node>
325+
<node concept="1Z5TYs" id="62kIHN0Cdat" role="3cqZAp">
326+
<node concept="mw_s8" id="62kIHN0Cdh2" role="1ZfhKB">
327+
<node concept="3h4ouC" id="62kIHN0CdgU" role="mwGJk">
328+
<node concept="1YBJjd" id="62kIHN0Cdj9" role="3h4sjZ">
329+
<ref role="1YBMHb" node="4iu6t1eAWxC" resolve="abs" />
345330
</node>
346-
</node>
347-
</node>
348-
<node concept="2OqwBi" id="27$4JRbPRrb" role="3clFbw">
349-
<node concept="1PxgMI" id="27$4JRbPQZm" role="2Oq$k0">
350-
<node concept="chp4Y" id="27$4JRbPR6i" role="3oSUPX">
351-
<ref role="cht4Q" to="hm2y:6sdnDbSlaok" resolve="Type" />
352-
</node>
353-
<node concept="2X3wrD" id="27$4JRbPQjg" role="1m5AlR">
331+
<node concept="2X3wrD" id="62kIHN0CdAq" role="3h4u4a">
354332
<ref role="2X3Bk0" node="6q$NxWeFCRm" resolve="absExpressionType" />
355333
</node>
356-
</node>
357-
<node concept="2qgKlT" id="27$4JRbPRGN" role="2OqNvi">
358-
<ref role="37wK5l" to="pbu6:7McqtXG$h_u" resolve="notRequiresSpecialCapability" />
334+
<node concept="2pJPEk" id="62kIHN0CdNE" role="3h4u2h">
335+
<node concept="2pJPED" id="62kIHN0CdNF" role="2pJPEn">
336+
<ref role="2pJxaS" to="5qo5:4rZeNQ6Oetc" resolve="RealType" />
337+
</node>
338+
</node>
359339
</node>
360340
</node>
361-
<node concept="9aQIb" id="27$4JRbPSWA" role="9aQIa">
362-
<node concept="3clFbS" id="27$4JRbPSWB" role="9aQI4">
363-
<node concept="2MkqsV" id="27$4JRbPTfX" role="3cqZAp">
364-
<node concept="Xl_RD" id="27$4JRbPTgX" role="2MkJ7o">
365-
<property role="Xl_RC" value="Could not compute type" />
366-
</node>
367-
<node concept="1YBJjd" id="27$4JRbPTAq" role="1urrMF">
368-
<ref role="1YBMHb" node="4iu6t1eAWxC" resolve="abs" />
369-
</node>
341+
<node concept="mw_s8" id="62kIHN0Cdaw" role="1ZfhK$">
342+
<node concept="1Z2H0r" id="62kIHN0CcKj" role="mwGJk">
343+
<node concept="1YBJjd" id="62kIHN0CcOM" role="1Z2MuG">
344+
<ref role="1YBMHb" node="4iu6t1eAWxC" resolve="abs" />
370345
</node>
371346
</node>
372347
</node>
@@ -689,7 +664,11 @@
689664
<node concept="2X3wrD" id="6q$NxWgcC0N" role="3h4u4a">
690665
<ref role="2X3Bk0" node="3htFKtcd8wT" resolve="sqrtExpressionInnerType" />
691666
</node>
692-
<node concept="10Nm6u" id="6q$NxWgcC8H" role="3h4u2h" />
667+
<node concept="2pJPEk" id="62kIHN0CbRm" role="3h4u2h">
668+
<node concept="2pJPED" id="62kIHN0CbRn" role="2pJPEn">
669+
<ref role="2pJxaS" to="5qo5:4rZeNQ6Oetc" resolve="RealType" />
670+
</node>
671+
</node>
693672
</node>
694673
</node>
695674
<node concept="mw_s8" id="6q$NxWgcBYy" role="1ZfhK$">
@@ -1385,7 +1364,6 @@
13851364
<property role="TrG5h" value="MathExpressionsOpRules" />
13861365
<node concept="3ciAk0" id="6q$NxWgbHE_" role="3he0YX">
13871366
<property role="3PlbSO" value="true" />
1388-
<node concept="10Nm6u" id="6q$NxWgbIzW" role="3ciSnv" />
13891367
<node concept="3gn64h" id="6q$NxWgbHHg" role="32tDTA">
13901368
<ref role="3gnhBz" to="1qv1:4iu6t1eB8RC" resolve="SqrtExpression" />
13911369
</node>
@@ -1424,6 +1402,11 @@
14241402
</node>
14251403
</node>
14261404
</node>
1405+
<node concept="2pJPEk" id="62kIHN0CbE4" role="3ciSnv">
1406+
<node concept="2pJPED" id="62kIHN0CbE5" role="2pJPEn">
1407+
<ref role="2pJxaS" to="5qo5:4rZeNQ6Oetc" resolve="RealType" />
1408+
</node>
1409+
</node>
14271410
</node>
14281411
<node concept="3ciAk0" id="6q$NxWgdrf1" role="3he0YX">
14291412
<property role="3PlbSO" value="true" />
@@ -1432,7 +1415,6 @@
14321415
<ref role="2pJxaS" to="5qo5:4rZeNQ6Oetc" resolve="RealType" />
14331416
</node>
14341417
</node>
1435-
<node concept="10Nm6u" id="6q$NxWgdrln" role="3ciSnv" />
14361418
<node concept="3gn64h" id="6q$NxWgdrkP" role="32tDTA">
14371419
<ref role="3gnhBz" to="1qv1:4iu6t1eAWup" resolve="AbsExpression" />
14381420
</node>
@@ -1466,6 +1448,11 @@
14661448
</node>
14671449
</node>
14681450
</node>
1451+
<node concept="2pJPEk" id="62kIHN0CbJD" role="3ciSnv">
1452+
<node concept="2pJPED" id="62kIHN0CbJE" role="2pJPEn">
1453+
<ref role="2pJxaS" to="5qo5:4rZeNQ6Oetc" resolve="RealType" />
1454+
</node>
1455+
</node>
14691456
</node>
14701457
<node concept="3ciAk0" id="4pvRh1NcPw1" role="3he0YX">
14711458
<node concept="3gn64h" id="4pvRh1NcPG6" role="32tDTA">

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2207,7 +2207,6 @@
22072207
<ref role="2pJxaS" to="w1hl:4HxogODTnzM" resolve="AbstractTaggedType" />
22082208
</node>
22092209
</node>
2210-
<node concept="10Nm6u" id="3htFKtcdXEL" role="3ciSnv" />
22112210
<node concept="3gn64h" id="3htFKtcdXD$" role="32tDTA">
22122211
<ref role="3gnhBz" to="1qv1:4iu6t1eB8RC" resolve="SqrtExpression" />
22132212
</node>
@@ -2324,10 +2323,14 @@
23242323
</node>
23252324
</node>
23262325
</node>
2326+
<node concept="2pJPEk" id="6q$NxWgcK91" role="3ciSnv">
2327+
<node concept="2pJPED" id="6q$NxWgcK9Y" role="2pJPEn">
2328+
<ref role="2pJxaS" to="5qo5:4rZeNQ6Oetc" resolve="RealType" />
2329+
</node>
2330+
</node>
23272331
</node>
23282332
<node concept="3ciAk0" id="1JTgXSYRFe0" role="3he0YX">
23292333
<property role="3PlbSO" value="true" />
2330-
<node concept="10Nm6u" id="1JTgXSYRFmi" role="3ciSnv" />
23312334
<node concept="3gn64h" id="1JTgXSYRFky" role="32tDTA">
23322335
<ref role="3gnhBz" to="1qv1:4iu6t1eAWup" resolve="AbsExpression" />
23332336
</node>
@@ -2357,6 +2360,11 @@
23572360
</node>
23582361
</node>
23592362
</node>
2363+
<node concept="2pJPEk" id="62kIHN0CmeE" role="3ciSnv">
2364+
<node concept="2pJPED" id="62kIHN0CmeF" role="2pJPEn">
2365+
<ref role="2pJxaS" to="5qo5:4rZeNQ6Oetc" resolve="RealType" />
2366+
</node>
2367+
</node>
23602368
</node>
23612369
<node concept="32tXgB" id="6q$NxWeCz0Y" role="3he0YX">
23622370
<node concept="3gn64h" id="6q$NxWeCz7X" role="32tDTA">

0 commit comments

Comments
 (0)