Skip to content

Commit 3df8c7e

Browse files
HeikoBeckerHeikoBecker
authored
Merge pull request #673 from IETS3/bugfix/numbertype_isSameAs_672
Use precision function in isSameAs on NumberType (#672)
2 parents 7d57b35 + 198f0d6 commit 3df8c7e

File tree

2 files changed

+106
-19
lines changed
  • code/languages/org.iets3.opensource

2 files changed

+106
-19
lines changed

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

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4601,28 +4601,18 @@
46014601
<node concept="1Wc70l" id="3Up1DZuQK0b" role="3cqZAk">
46024602
<node concept="1Wc70l" id="3Up1DZuQFw4" role="3uHU7B">
46034603
<node concept="17R0WA" id="3Up1DZuQEsG" role="3uHU7B">
4604-
<node concept="2OqwBi" id="3Up1DZuRtUi" role="3uHU7B">
4605-
<node concept="2OqwBi" id="3Up1DZuQDd2" role="2Oq$k0">
4606-
<node concept="13iPFW" id="3Up1DZuQD2$" role="2Oq$k0" />
4607-
<node concept="3TrEf2" id="3Up1DZuQDlW" role="2OqNvi">
4608-
<ref role="3Tt5mk" to="5qo5:19PglA20qY9" resolve="prec" />
4609-
</node>
4610-
</node>
4611-
<node concept="3TrcHB" id="3Up1DZuRuie" role="2OqNvi">
4612-
<ref role="3TsBF5" to="5qo5:19PglA20qY6" resolve="prec" />
4604+
<node concept="2OqwBi" id="3Up1DZuQDd2" role="3uHU7B">
4605+
<node concept="13iPFW" id="3Up1DZuQD2$" role="2Oq$k0" />
4606+
<node concept="2qgKlT" id="7mtXr8h9t9J" role="2OqNvi">
4607+
<ref role="37wK5l" node="19PglA20ASE" resolve="precision" />
46134608
</node>
46144609
</node>
4615-
<node concept="2OqwBi" id="3Up1DZuRuM3" role="3uHU7w">
4616-
<node concept="2OqwBi" id="3Up1DZuQEHI" role="2Oq$k0">
4617-
<node concept="37vLTw" id="3Up1DZuQEvt" role="2Oq$k0">
4618-
<ref role="3cqZAo" node="5L2mTKm_vHh" resolve="casted" />
4619-
</node>
4620-
<node concept="3TrEf2" id="3Up1DZuQF0V" role="2OqNvi">
4621-
<ref role="3Tt5mk" to="5qo5:19PglA20qY9" resolve="prec" />
4622-
</node>
4610+
<node concept="2OqwBi" id="3Up1DZuQEHI" role="3uHU7w">
4611+
<node concept="37vLTw" id="3Up1DZuQEvt" role="2Oq$k0">
4612+
<ref role="3cqZAo" node="5L2mTKm_vHh" resolve="casted" />
46234613
</node>
4624-
<node concept="3TrcHB" id="3Up1DZuRva3" role="2OqNvi">
4625-
<ref role="3TsBF5" to="5qo5:19PglA20qY6" resolve="prec" />
4614+
<node concept="2qgKlT" id="7mtXr8h9uot" role="2OqNvi">
4615+
<ref role="37wK5l" node="19PglA20ASE" resolve="precision" />
46264616
</node>
46274617
</node>
46284618
</node>

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

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17002,6 +17002,103 @@
1700217002
<node concept="1qefOq" id="1IiUOyIooOY" role="1SKRRt">
1700317003
<node concept="_iOnV" id="1IiUOyIooP2" role="1qenE9">
1700417004
<property role="TrG5h" value="equalityTypes" />
17005+
<node concept="2zPypq" id="7mtXr8h9IGx" role="_iOnC">
17006+
<property role="TrG5h" value="x1" />
17007+
<node concept="30bXRB" id="7mtXr8h9Jrk" role="2zPyp_">
17008+
<property role="30bXRw" value="1" />
17009+
</node>
17010+
<node concept="mLuIC" id="7mtXr8h9Jr6" role="2zM23F" />
17011+
</node>
17012+
<node concept="2zPypq" id="7mtXr8h9JwN" role="_iOnC">
17013+
<property role="TrG5h" value="y1" />
17014+
<node concept="30bXRB" id="7mtXr8h9JAL" role="2zPyp_">
17015+
<property role="30bXRw" value="2" />
17016+
</node>
17017+
<node concept="mLuIC" id="7mtXr8h9JA6" role="2zM23F">
17018+
<node concept="2gteS_" id="7mtXr8h9JAi" role="2gteVg">
17019+
<property role="2gteVv" value="0" />
17020+
</node>
17021+
</node>
17022+
</node>
17023+
<node concept="2zPypq" id="7mtXr8h9JLw" role="_iOnC">
17024+
<property role="TrG5h" value="number1" />
17025+
<node concept="30cPrO" id="7mtXr8h9JQZ" role="2zPyp_">
17026+
<node concept="_emDc" id="7mtXr8h9JRL" role="30dEs_">
17027+
<ref role="_emDf" node="7mtXr8h9JwN" resolve="y1" />
17028+
</node>
17029+
<node concept="_emDc" id="7mtXr8h9JQM" role="30dEsF">
17030+
<ref role="_emDf" node="7mtXr8h9IGx" resolve="x1" />
17031+
</node>
17032+
<node concept="7CXmI" id="7mtXr8h9KgS" role="lGtFl">
17033+
<node concept="7OXhh" id="7mtXr8h9KiL" role="7EUXB">
17034+
<property role="GvXf4" value="true" />
17035+
</node>
17036+
</node>
17037+
</node>
17038+
<node concept="1z9TsT" id="7mtXr8h9JYb" role="lGtFl">
17039+
<node concept="OjmMv" id="7mtXr8h9JYc" role="1w35rA">
17040+
<node concept="19SGf9" id="7mtXr8h9JYd" role="OjmMu">
17041+
<node concept="19SUe$" id="7mtXr8h9JYe" role="19SJt6">
17042+
<property role="19SUeA" value="Should not return error since x1 is default precision 0" />
17043+
</node>
17044+
</node>
17045+
</node>
17046+
</node>
17047+
</node>
17048+
<node concept="_ixoA" id="7mtXr8h9JGt" role="_iOnC" />
17049+
<node concept="2zPypq" id="7mtXr8h9HY2" role="_iOnC">
17050+
<property role="TrG5h" value="x2" />
17051+
<node concept="30bXRB" id="7mtXr8h9I3S" role="2zPyp_">
17052+
<property role="30bXRw" value="15" />
17053+
</node>
17054+
<node concept="mLuIC" id="7mtXr8h9I31" role="2zM23F">
17055+
<node concept="2gteSX" id="7mtXr8h9I3d" role="2gteSx">
17056+
<property role="2gteSR" value="10" />
17057+
<property role="2gteSE" value="20" />
17058+
</node>
17059+
</node>
17060+
</node>
17061+
<node concept="2zPypq" id="7mtXr8h9I9i" role="_iOnC">
17062+
<property role="TrG5h" value="y2" />
17063+
<node concept="30bXRB" id="7mtXr8h9IfP" role="2zPyp_">
17064+
<property role="30bXRw" value="12" />
17065+
</node>
17066+
<node concept="mLuIC" id="7mtXr8h9Iel" role="2zM23F">
17067+
<node concept="2gteSX" id="7mtXr8h9Iex" role="2gteSx">
17068+
<property role="2gteSR" value="10" />
17069+
<property role="2gteSE" value="20" />
17070+
</node>
17071+
<node concept="2gteS_" id="7mtXr8h9Ifa" role="2gteVg">
17072+
<property role="2gteVv" value="0" />
17073+
</node>
17074+
</node>
17075+
</node>
17076+
<node concept="2zPypq" id="7mtXr8h9HOy" role="_iOnC">
17077+
<property role="TrG5h" value="number2" />
17078+
<node concept="30cPrO" id="7mtXr8h9Ih0" role="2zPyp_">
17079+
<node concept="_emDc" id="7mtXr8h9IhV" role="30dEs_">
17080+
<ref role="_emDf" node="7mtXr8h9I9i" resolve="y2" />
17081+
</node>
17082+
<node concept="_emDc" id="7mtXr8h9IgE" role="30dEsF">
17083+
<ref role="_emDf" node="7mtXr8h9HY2" resolve="x2" />
17084+
</node>
17085+
<node concept="7CXmI" id="7mtXr8h9Kby" role="lGtFl">
17086+
<node concept="7OXhh" id="7mtXr8h9KeN" role="7EUXB">
17087+
<property role="GvXf4" value="true" />
17088+
</node>
17089+
</node>
17090+
</node>
17091+
<node concept="1z9TsT" id="7mtXr8h9Ipk" role="lGtFl">
17092+
<node concept="OjmMv" id="7mtXr8h9Ipl" role="1w35rA">
17093+
<node concept="19SGf9" id="7mtXr8h9Ipm" role="OjmMu">
17094+
<node concept="19SUe$" id="7mtXr8h9Ipn" role="19SJt6">
17095+
<property role="19SUeA" value="Should not return error since x2 is default precision 0" />
17096+
</node>
17097+
</node>
17098+
</node>
17099+
</node>
17100+
</node>
17101+
<node concept="_ixoA" id="7mtXr8h9HFf" role="_iOnC" />
1700517102
<node concept="2zPypq" id="1IiUOyIoseT" role="_iOnC">
1700617103
<property role="TrG5h" value="success1" />
1700717104
<node concept="30cPrO" id="1IiUOyIosgS" role="2zPyp_">

0 commit comments

Comments
 (0)