Skip to content

Commit 76ee157

Browse files
HeikoBeckerHeikoBecker
committed
Fix bug in abs expression type computation.
This disables the operation type rule for the absolute value operation.
1 parent f671d88 commit 76ee157

File tree

1 file changed

+41
-12
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models

1 file changed

+41
-12
lines changed

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

Lines changed: 41 additions & 12 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" />
1718
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
1819
<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,6 +25,9 @@
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>
2831
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
2932
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
3033
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
@@ -81,6 +84,7 @@
8184
</concept>
8285
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
8386
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
87+
<child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
8488
<child id="1068580123160" name="condition" index="3clFbw" />
8589
<child id="1068580123161" name="ifTrue" index="3clFbx" />
8690
</concept>
@@ -322,22 +326,47 @@
322326
<node concept="3clFbS" id="4iu6t1eAWxA" role="18ibNy">
323327
<node concept="nvevp" id="6q$NxWeFCRg" role="3cqZAp">
324328
<node concept="3clFbS" id="6q$NxWeFCRi" role="nvhr_">
325-
<node concept="1Z5TYs" id="6q$NxWgdp5I" role="3cqZAp">
326-
<node concept="mw_s8" id="6q$NxWgdp6d" role="1ZfhKB">
327-
<node concept="3h4ouC" id="6q$NxWgdp65" role="mwGJk">
328-
<node concept="1YBJjd" id="6q$NxWgdp6G" role="3h4sjZ">
329-
<ref role="1YBMHb" node="4iu6t1eAWxC" resolve="abs" />
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>
330345
</node>
331-
<node concept="2X3wrD" id="6q$NxWgdp7g" role="3h4u4a">
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">
332354
<ref role="2X3Bk0" node="6q$NxWeFCRm" resolve="absExpressionType" />
333355
</node>
334-
<node concept="10Nm6u" id="6q$NxWgdpbj" role="3h4u2h" />
356+
</node>
357+
<node concept="2qgKlT" id="27$4JRbPRGN" role="2OqNvi">
358+
<ref role="37wK5l" to="pbu6:7McqtXG$h_u" resolve="notRequiresSpecialCapability" />
335359
</node>
336360
</node>
337-
<node concept="mw_s8" id="6q$NxWgdp5L" role="1ZfhK$">
338-
<node concept="1Z2H0r" id="6q$NxWgdoRI" role="mwGJk">
339-
<node concept="1YBJjd" id="6q$NxWgdp1n" role="1Z2MuG">
340-
<ref role="1YBMHb" node="4iu6t1eAWxC" resolve="abs" />
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>
341370
</node>
342371
</node>
343372
</node>

0 commit comments

Comments
 (0)