Skip to content

Commit 8b54cc3

Browse files
arimerarimer
authored
Merge pull request #877 from IETS3/bugfix/numberType_containsZero
expr.simpleTypes: support infinite values in NumberType#containsZero
2 parents f5c6156 + cf3b5c9 commit 8b54cc3

File tree

3 files changed

+2087
-145
lines changed

3 files changed

+2087
-145
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1515
### Fixed
1616

1717
- The type calculation of field setters now works.
18+
- `NumberType#containsZero` now correctly deals with infinite values.
1819

1920
## February 2024
2021

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

Lines changed: 20 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -4761,157 +4761,32 @@
47614761
<node concept="3Tm1VV" id="60Qa1k_v7XM" role="1B3o_S" />
47624762
<node concept="10P_77" id="60Qa1k_vacK" role="3clF45" />
47634763
<node concept="3clFbS" id="60Qa1k_v7XO" role="3clF47">
4764-
<node concept="3clFbJ" id="60Qa1k_vaS1" role="3cqZAp">
4765-
<node concept="BsUDl" id="60Qa1k_vaSl" role="3clFbw">
4766-
<ref role="37wK5l" node="3p6$WoEh1ch" resolve="isInt" />
4767-
</node>
4768-
<node concept="3clFbS" id="60Qa1k_vaS3" role="3clFbx">
4769-
<node concept="3cpWs8" id="60Qa1k_vi83" role="3cqZAp">
4770-
<node concept="3cpWsn" id="60Qa1k_vi84" role="3cpWs9">
4771-
<property role="TrG5h" value="r" />
4772-
<node concept="1LlUBW" id="60Qa1k_vi85" role="1tU5fm">
4773-
<node concept="3cpWsb" id="60Qa1k_vi86" role="1Lm7xW" />
4774-
<node concept="3cpWsb" id="60Qa1k_vi87" role="1Lm7xW" />
4775-
</node>
4776-
<node concept="2OqwBi" id="60Qa1k_vi88" role="33vP2m">
4777-
<node concept="13iPFW" id="60Qa1k_vi89" role="2Oq$k0" />
4778-
<node concept="2qgKlT" id="60Qa1k_vi8a" role="2OqNvi">
4779-
<ref role="37wK5l" node="3p6$WoEzHkL" resolve="intRange" />
4780-
</node>
4764+
<node concept="3clFbF" id="OALx3k1O38" role="3cqZAp">
4765+
<node concept="1Wc70l" id="OALx3k2w$C" role="3clFbG">
4766+
<node concept="2YIFZM" id="OALx3k2z6a" role="3uHU7w">
4767+
<ref role="37wK5l" to="oq0c:2NHHcg2F9Vw" resolve="greaterOrEqual" />
4768+
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
4769+
<node concept="2OqwBi" id="OALx3k2$SW" role="37wK5m">
4770+
<node concept="13iPFW" id="OALx3k2$la" role="2Oq$k0" />
4771+
<node concept="2qgKlT" id="OALx3k2_UT" role="2OqNvi">
4772+
<ref role="37wK5l" node="19PglA20_Su" resolve="upperBound" />
47814773
</node>
47824774
</node>
4783-
</node>
4784-
<node concept="3cpWs6" id="60Qa1k_vi7R" role="3cqZAp">
4785-
<node concept="22lmx$" id="60Qa1k_HmFF" role="3cqZAk">
4786-
<node concept="22lmx$" id="7r95$k9CXdB" role="3uHU7B">
4787-
<node concept="3clFbC" id="7r95$k9CZbw" role="3uHU7B">
4788-
<node concept="10Nm6u" id="7r95$k9CZLu" role="3uHU7w" />
4789-
<node concept="37vLTw" id="7r95$k9CYfL" role="3uHU7B">
4790-
<ref role="3cqZAo" node="60Qa1k_vi84" resolve="r" />
4791-
</node>
4792-
</node>
4793-
<node concept="1eOMI4" id="7r95$k9CJWx" role="3uHU7w">
4794-
<node concept="1Wc70l" id="60Qa1k_Hlop" role="1eOMHV">
4795-
<node concept="3eOVzh" id="60Qa1k_HkUW" role="3uHU7B">
4796-
<node concept="1LFfDK" id="60Qa1k_vi7Z" role="3uHU7B">
4797-
<node concept="3cmrfG" id="60Qa1k_vi80" role="1LF_Uc">
4798-
<property role="3cmrfH" value="0" />
4799-
</node>
4800-
<node concept="37vLTw" id="60Qa1k_vi81" role="1LFl5Q">
4801-
<ref role="3cqZAo" node="60Qa1k_vi84" resolve="r" />
4802-
</node>
4803-
</node>
4804-
<node concept="3cmrfG" id="60Qa1k_vi82" role="3uHU7w">
4805-
<property role="3cmrfH" value="0" />
4806-
</node>
4807-
</node>
4808-
<node concept="2d3UOw" id="60Qa1k_vi7T" role="3uHU7w">
4809-
<node concept="3cmrfG" id="60Qa1k_vi7U" role="3uHU7w">
4810-
<property role="3cmrfH" value="0" />
4811-
</node>
4812-
<node concept="1LFfDK" id="60Qa1k_vi7V" role="3uHU7B">
4813-
<node concept="3cmrfG" id="60Qa1k_vi7W" role="1LF_Uc">
4814-
<property role="3cmrfH" value="1" />
4815-
</node>
4816-
<node concept="37vLTw" id="60Qa1k_vi7X" role="1LFl5Q">
4817-
<ref role="3cqZAo" node="60Qa1k_vi84" resolve="r" />
4818-
</node>
4819-
</node>
4820-
</node>
4821-
</node>
4822-
</node>
4823-
</node>
4824-
<node concept="1eOMI4" id="60Qa1k_Hn9z" role="3uHU7w">
4825-
<node concept="3clFbC" id="60Qa1k_HnC$" role="1eOMHV">
4826-
<node concept="1LFfDK" id="60Qa1k_Hn9A" role="3uHU7B">
4827-
<node concept="3cmrfG" id="60Qa1k_Hn9B" role="1LF_Uc">
4828-
<property role="3cmrfH" value="0" />
4829-
</node>
4830-
<node concept="37vLTw" id="60Qa1k_Hn9C" role="1LFl5Q">
4831-
<ref role="3cqZAo" node="60Qa1k_vi84" resolve="r" />
4832-
</node>
4833-
</node>
4834-
<node concept="3cmrfG" id="60Qa1k_Hn9D" role="3uHU7w">
4835-
<property role="3cmrfH" value="0" />
4836-
</node>
4837-
</node>
4838-
</node>
4775+
<node concept="Xl_RD" id="OALx3k2CbM" role="37wK5m">
4776+
<property role="Xl_RC" value="0" />
48394777
</node>
48404778
</node>
4841-
</node>
4842-
<node concept="9aQIb" id="60Qa1k_vhR6" role="9aQIa">
4843-
<node concept="3clFbS" id="60Qa1k_vhR7" role="9aQI4">
4844-
<node concept="3cpWs8" id="60Qa1k_vhj_" role="3cqZAp">
4845-
<node concept="3cpWsn" id="60Qa1k_vhjA" role="3cpWs9">
4846-
<property role="TrG5h" value="r" />
4847-
<node concept="1LlUBW" id="60Qa1k_vhjn" role="1tU5fm">
4848-
<node concept="10P55v" id="60Qa1k_vjpu" role="1Lm7xW" />
4849-
<node concept="10P55v" id="60Qa1k_vjUN" role="1Lm7xW" />
4850-
</node>
4851-
<node concept="2OqwBi" id="60Qa1k_vhjB" role="33vP2m">
4852-
<node concept="13iPFW" id="60Qa1k_vhjC" role="2Oq$k0" />
4853-
<node concept="2qgKlT" id="60Qa1k_vj0j" role="2OqNvi">
4854-
<ref role="37wK5l" node="3p6$WoEzKI5" resolve="doubleRange" />
4855-
</node>
4856-
</node>
4779+
<node concept="2YIFZM" id="OALx3k2pkE" role="3uHU7B">
4780+
<ref role="37wK5l" to="oq0c:2NHHcg2F41V" resolve="lessOrEq" />
4781+
<ref role="1Pybhc" to="oq0c:2NHHcg2EXna" resolve="InfHelper" />
4782+
<node concept="2OqwBi" id="OALx3k2sJV" role="37wK5m">
4783+
<node concept="13iPFW" id="OALx3k2sa7" role="2Oq$k0" />
4784+
<node concept="2qgKlT" id="OALx3k2u84" role="2OqNvi">
4785+
<ref role="37wK5l" node="19PglA20zCc" resolve="lowerBound" />
48574786
</node>
48584787
</node>
4859-
<node concept="3cpWs6" id="60Qa1k_vaT0" role="3cqZAp">
4860-
<node concept="22lmx$" id="60Qa1k_HpIh" role="3cqZAk">
4861-
<node concept="22lmx$" id="7r95$k9D1P3" role="3uHU7B">
4862-
<node concept="3clFbC" id="7r95$k9D3xE" role="3uHU7B">
4863-
<node concept="10Nm6u" id="7r95$k9D4zt" role="3uHU7w" />
4864-
<node concept="37vLTw" id="7r95$k9D2IL" role="3uHU7B">
4865-
<ref role="3cqZAo" node="60Qa1k_vhjA" resolve="r" />
4866-
</node>
4867-
</node>
4868-
<node concept="1eOMI4" id="7r95$k9CtfS" role="3uHU7w">
4869-
<node concept="1Wc70l" id="60Qa1k_HpIj" role="1eOMHV">
4870-
<node concept="3eOVzh" id="60Qa1k_HpIk" role="3uHU7B">
4871-
<node concept="1LFfDK" id="60Qa1k_HpIl" role="3uHU7B">
4872-
<node concept="3cmrfG" id="60Qa1k_HpIm" role="1LF_Uc">
4873-
<property role="3cmrfH" value="0" />
4874-
</node>
4875-
<node concept="37vLTw" id="60Qa1k_HpIn" role="1LFl5Q">
4876-
<ref role="3cqZAo" node="60Qa1k_vhjA" resolve="r" />
4877-
</node>
4878-
</node>
4879-
<node concept="3cmrfG" id="60Qa1k_HpIo" role="3uHU7w">
4880-
<property role="3cmrfH" value="0" />
4881-
</node>
4882-
</node>
4883-
<node concept="2d3UOw" id="60Qa1k_HpIp" role="3uHU7w">
4884-
<node concept="3cmrfG" id="60Qa1k_HpIq" role="3uHU7w">
4885-
<property role="3cmrfH" value="0" />
4886-
</node>
4887-
<node concept="1LFfDK" id="60Qa1k_HpIr" role="3uHU7B">
4888-
<node concept="3cmrfG" id="60Qa1k_HpIs" role="1LF_Uc">
4889-
<property role="3cmrfH" value="1" />
4890-
</node>
4891-
<node concept="37vLTw" id="60Qa1k_HpIt" role="1LFl5Q">
4892-
<ref role="3cqZAo" node="60Qa1k_vhjA" resolve="r" />
4893-
</node>
4894-
</node>
4895-
</node>
4896-
</node>
4897-
</node>
4898-
</node>
4899-
<node concept="1eOMI4" id="60Qa1k_HpIu" role="3uHU7w">
4900-
<node concept="3clFbC" id="60Qa1k_HpIv" role="1eOMHV">
4901-
<node concept="1LFfDK" id="60Qa1k_HpIw" role="3uHU7B">
4902-
<node concept="3cmrfG" id="60Qa1k_HpIx" role="1LF_Uc">
4903-
<property role="3cmrfH" value="0" />
4904-
</node>
4905-
<node concept="37vLTw" id="60Qa1k_HpIy" role="1LFl5Q">
4906-
<ref role="3cqZAo" node="60Qa1k_vhjA" resolve="r" />
4907-
</node>
4908-
</node>
4909-
<node concept="3cmrfG" id="60Qa1k_HpIz" role="3uHU7w">
4910-
<property role="3cmrfH" value="0" />
4911-
</node>
4912-
</node>
4913-
</node>
4914-
</node>
4788+
<node concept="Xl_RD" id="OALx3k2wmv" role="37wK5m">
4789+
<property role="Xl_RC" value="0" />
49154790
</node>
49164791
</node>
49174792
</node>

0 commit comments

Comments
 (0)