Skip to content

Commit 92e1074

Browse files
author
Alexander Pann
authored
Merge pull request #1020 from IETS3/bugfix/tuples
expr.base: rewrite NCopies rule to avoid freezes for large numbers
2 parents a04fc0c + dba99d4 commit 92e1074

File tree

2 files changed

+399
-89
lines changed

2 files changed

+399
-89
lines changed

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

Lines changed: 109 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -10652,31 +10652,32 @@
1065210652
<property role="TrG5h" value="typeof_NCopies" />
1065310653
<property role="3GE5qa" value="tuples" />
1065410654
<node concept="3clFbS" id="25rRV02oFpt" role="18ibNy">
10655-
<node concept="nvevp" id="7GwCuf2y0wh" role="3cqZAp">
10656-
<node concept="3clFbS" id="7GwCuf2y0wj" role="nvhr_">
10657-
<node concept="3clFbJ" id="25rRV02vcXJ" role="3cqZAp">
10658-
<node concept="3clFbS" id="25rRV02vcXL" role="3clFbx">
10659-
<node concept="3cpWs6" id="25rRV02vn_a" role="3cqZAp" />
10660-
</node>
10661-
<node concept="2OqwBi" id="25rRV02vl47" role="3clFbw">
10662-
<node concept="2OqwBi" id="25rRV02vgTf" role="2Oq$k0">
10663-
<node concept="2OqwBi" id="25rRV02vdla" role="2Oq$k0">
10664-
<node concept="1YBJjd" id="25rRV02vd8t" role="2Oq$k0">
10665-
<ref role="1YBMHb" node="25rRV02oFpv" resolve="nCopies" />
10666-
</node>
10667-
<node concept="3TrEf2" id="25rRV02vgfA" role="2OqNvi">
10668-
<ref role="3Tt5mk" to="hm2y:25rRV02osES" resolve="times" />
10669-
</node>
10670-
</node>
10671-
<node concept="2yIwOk" id="25rRV02vkpi" role="2OqNvi" />
10655+
<node concept="3clFbJ" id="25rRV02vcXJ" role="3cqZAp">
10656+
<node concept="3clFbS" id="25rRV02vcXL" role="3clFbx">
10657+
<node concept="3cpWs6" id="25rRV02vn_a" role="3cqZAp" />
10658+
</node>
10659+
<node concept="2OqwBi" id="25rRV02vl47" role="3clFbw">
10660+
<node concept="2OqwBi" id="25rRV02vgTf" role="2Oq$k0">
10661+
<node concept="2OqwBi" id="25rRV02vdla" role="2Oq$k0">
10662+
<node concept="1YBJjd" id="25rRV02vd8t" role="2Oq$k0">
10663+
<ref role="1YBMHb" node="25rRV02oFpv" resolve="nCopies" />
1067210664
</node>
10673-
<node concept="liA8E" id="25rRV02vmtA" role="2OqNvi">
10674-
<ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
10665+
<node concept="3TrEf2" id="25rRV02vgfA" role="2OqNvi">
10666+
<ref role="3Tt5mk" to="hm2y:25rRV02osES" resolve="times" />
1067510667
</node>
1067610668
</node>
10669+
<node concept="2yIwOk" id="25rRV02vkpi" role="2OqNvi" />
10670+
</node>
10671+
<node concept="liA8E" id="25rRV02vmtA" role="2OqNvi">
10672+
<ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
1067710673
</node>
10678-
<node concept="nvevp" id="xNPLfvZ3U" role="3cqZAp">
10679-
<node concept="3clFbS" id="xNPLfvZ3W" role="nvhr_">
10674+
</node>
10675+
</node>
10676+
<node concept="3clFbH" id="3cDaBeIllKZ" role="3cqZAp" />
10677+
<node concept="nvevp" id="xNPLfvZ3U" role="3cqZAp">
10678+
<node concept="3clFbS" id="xNPLfvZ3W" role="nvhr_">
10679+
<node concept="nvevp" id="7GwCuf2y0wh" role="3cqZAp">
10680+
<node concept="3clFbS" id="7GwCuf2y0wj" role="nvhr_">
1068010681
<node concept="3cpWs8" id="25rRV02p6Kg" role="3cqZAp">
1068110682
<node concept="3cpWsn" id="25rRV02p6Kh" role="3cpWs9">
1068210683
<property role="TrG5h" value="timesValue" />
@@ -10791,50 +10792,49 @@
1079110792
</node>
1079210793
<node concept="1Dw8fO" id="25rRV02qswS" role="3cqZAp">
1079310794
<node concept="3clFbS" id="25rRV02qswU" role="2LFqv$">
10794-
<node concept="3cpWs8" id="ijyib_b31c" role="3cqZAp">
10795-
<node concept="3cpWsn" id="ijyib_b31d" role="3cpWs9">
10796-
<property role="TrG5h" value="newElements" />
10797-
<node concept="_YKpA" id="ijyib_b5XT" role="1tU5fm">
10798-
<node concept="3Tqbb2" id="ijyib_b5XV" role="_ZDj9">
10799-
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
10800-
</node>
10801-
</node>
10802-
<node concept="2OqwBi" id="ijyib_b57L" role="33vP2m">
10803-
<node concept="2OqwBi" id="ijyib_b31e" role="2Oq$k0">
10804-
<node concept="37vLTw" id="ijyib_b31f" role="2Oq$k0">
10795+
<node concept="2Gpval" id="3cDaBeIiI9U" role="3cqZAp">
10796+
<node concept="2GrKxI" id="3cDaBeIiI9W" role="2Gsz3X">
10797+
<property role="TrG5h" value="type" />
10798+
</node>
10799+
<node concept="3clFbS" id="3cDaBeIiIa0" role="2LFqv$">
10800+
<node concept="3clFbF" id="3cDaBeIiJbW" role="3cqZAp">
10801+
<node concept="2OqwBi" id="3cDaBeIiLbQ" role="3clFbG">
10802+
<node concept="37vLTw" id="3cDaBeIiJbV" role="2Oq$k0">
1080510803
<ref role="3cqZAo" node="25rRV02qVo7" resolve="newElementTypes" />
1080610804
</node>
10807-
<node concept="3$u5V9" id="ijyib_b31g" role="2OqNvi">
10808-
<node concept="1bVj0M" id="ijyib_b31h" role="23t8la">
10809-
<node concept="3clFbS" id="ijyib_b31i" role="1bW5cS">
10810-
<node concept="3clFbF" id="ijyib_b31j" role="3cqZAp">
10811-
<node concept="2OqwBi" id="ijyib_b31k" role="3clFbG">
10812-
<node concept="37vLTw" id="ijyib_b31l" role="2Oq$k0">
10813-
<ref role="3cqZAo" node="ijyib_b31n" resolve="it" />
10814-
</node>
10815-
<node concept="1$rogu" id="ijyib_b31m" role="2OqNvi" />
10816-
</node>
10817-
</node>
10818-
</node>
10819-
<node concept="Rh6nW" id="ijyib_b31n" role="1bW2Oz">
10820-
<property role="TrG5h" value="it" />
10821-
<node concept="2jxLKc" id="ijyib_b31o" role="1tU5fm" />
10822-
</node>
10805+
<node concept="TSZUe" id="3cDaBeIiMLY" role="2OqNvi">
10806+
<node concept="2GrUjf" id="3cDaBeIiMPU" role="25WWJ7">
10807+
<ref role="2Gs0qQ" node="3cDaBeIiI9W" resolve="type" />
1082310808
</node>
1082410809
</node>
1082510810
</node>
10826-
<node concept="ANE8D" id="ijyib_b5J6" role="2OqNvi" />
1082710811
</node>
1082810812
</node>
10829-
</node>
10830-
<node concept="3clFbF" id="25rRV02qC4x" role="3cqZAp">
10831-
<node concept="2OqwBi" id="25rRV02qHBl" role="3clFbG">
10832-
<node concept="37vLTw" id="25rRV02qVob" role="2Oq$k0">
10833-
<ref role="3cqZAo" node="25rRV02qVo7" resolve="newElementTypes" />
10813+
<node concept="2OqwBi" id="3cDaBeIiFIX" role="2GsD0m">
10814+
<node concept="2OqwBi" id="3cDaBeIiFIY" role="2Oq$k0">
10815+
<node concept="37vLTw" id="3cDaBeIiFIZ" role="2Oq$k0">
10816+
<ref role="3cqZAo" node="25rRV02pwab" resolve="tupleType" />
10817+
</node>
10818+
<node concept="3Tsc0h" id="3cDaBeIiFJ0" role="2OqNvi">
10819+
<ref role="3TtcxE" to="hm2y:S$tO8ocniV" resolve="elementTypes" />
10820+
</node>
1083410821
</node>
10835-
<node concept="X8dFx" id="25rRV02rEC_" role="2OqNvi">
10836-
<node concept="37vLTw" id="ijyib_b31p" role="25WWJ7">
10837-
<ref role="3cqZAo" node="ijyib_b31d" resolve="newElements" />
10822+
<node concept="3$u5V9" id="3cDaBeIiFJ1" role="2OqNvi">
10823+
<node concept="1bVj0M" id="3cDaBeIiFJ2" role="23t8la">
10824+
<node concept="3clFbS" id="3cDaBeIiFJ3" role="1bW5cS">
10825+
<node concept="3clFbF" id="3cDaBeIiFJ4" role="3cqZAp">
10826+
<node concept="2OqwBi" id="3cDaBeIiFJ5" role="3clFbG">
10827+
<node concept="37vLTw" id="3cDaBeIiFJ6" role="2Oq$k0">
10828+
<ref role="3cqZAo" node="3cDaBeIiFJ8" resolve="it" />
10829+
</node>
10830+
<node concept="1$rogu" id="3cDaBeIiFJ7" role="2OqNvi" />
10831+
</node>
10832+
</node>
10833+
</node>
10834+
<node concept="Rh6nW" id="3cDaBeIiFJ8" role="1bW2Oz">
10835+
<property role="TrG5h" value="it" />
10836+
<node concept="2jxLKc" id="3cDaBeIiFJ9" role="1tU5fm" />
10837+
</node>
1083810838
</node>
1083910839
</node>
1084010840
</node>
@@ -10861,29 +10861,51 @@
1086110861
</node>
1086210862
</node>
1086310863
</node>
10864-
<node concept="1Z5TYs" id="25rRV02plzI" role="3cqZAp">
10865-
<node concept="mw_s8" id="25rRV02pmS$" role="1ZfhKB">
10866-
<node concept="2pJPEk" id="25rRV02pmSw" role="mwGJk">
10867-
<node concept="2pJPED" id="25rRV02pmSy" role="2pJPEn">
10868-
<ref role="2pJxaS" to="hm2y:S$tO8ocniU" resolve="TupleType" />
10869-
<node concept="2pIpSj" id="25rRV02ps6H" role="2pJxcM">
10870-
<ref role="2pIpSl" to="hm2y:S$tO8ocniV" resolve="elementTypes" />
10871-
<node concept="36biLy" id="25rRV02rJ1e" role="28nt2d">
10872-
<node concept="37vLTw" id="25rRV02rPTB" role="36biLW">
10873-
<ref role="3cqZAo" node="25rRV02qVo7" resolve="newElementTypes" />
10874-
</node>
10875-
</node>
10864+
<node concept="3cpWs8" id="5gIHvJqm4oK" role="3cqZAp">
10865+
<node concept="3cpWsn" id="5gIHvJqm4oN" role="3cpWs9">
10866+
<property role="TrG5h" value="returnType" />
10867+
<node concept="3Tqbb2" id="5gIHvJqm4oI" role="1tU5fm">
10868+
<ref role="ehGHo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
10869+
</node>
10870+
<node concept="2ShNRf" id="5gIHvJqm4Bw" role="33vP2m">
10871+
<node concept="3zrR0B" id="5gIHvJqm6h0" role="2ShVmc">
10872+
<node concept="3Tqbb2" id="5gIHvJqm6h2" role="3zrR0E">
10873+
<ref role="ehGHo" to="hm2y:S$tO8ocniU" resolve="TupleType" />
1087610874
</node>
1087710875
</node>
1087810876
</node>
1087910877
</node>
10878+
</node>
10879+
<node concept="3clFbF" id="5gIHvJqm6PZ" role="3cqZAp">
10880+
<node concept="2OqwBi" id="5gIHvJqma3q" role="3clFbG">
10881+
<node concept="2OqwBi" id="5gIHvJqm7do" role="2Oq$k0">
10882+
<node concept="37vLTw" id="5gIHvJqm6PX" role="2Oq$k0">
10883+
<ref role="3cqZAo" node="5gIHvJqm4oN" resolve="returnType" />
10884+
</node>
10885+
<node concept="3Tsc0h" id="5gIHvJqm7xt" role="2OqNvi">
10886+
<ref role="3TtcxE" to="hm2y:S$tO8ocniV" resolve="elementTypes" />
10887+
</node>
10888+
</node>
10889+
<node concept="X8dFx" id="5gIHvJqmcBr" role="2OqNvi">
10890+
<node concept="37vLTw" id="5gIHvJqmfL1" role="25WWJ7">
10891+
<ref role="3cqZAo" node="25rRV02qVo7" resolve="newElementTypes" />
10892+
</node>
10893+
</node>
10894+
</node>
10895+
</node>
10896+
<node concept="1Z5TYs" id="25rRV02plzI" role="3cqZAp">
1088010897
<node concept="mw_s8" id="25rRV02plzL" role="1ZfhK$">
1088110898
<node concept="1Z2H0r" id="25rRV02oHO$" role="mwGJk">
1088210899
<node concept="1YBJjd" id="25rRV02oJGq" role="1Z2MuG">
1088310900
<ref role="1YBMHb" node="25rRV02oFpv" resolve="nCopies" />
1088410901
</node>
1088510902
</node>
1088610903
</node>
10904+
<node concept="mw_s8" id="5gIHvJqmgOI" role="1ZfhKB">
10905+
<node concept="37vLTw" id="5gIHvJqmgOG" role="mwGJk">
10906+
<ref role="3cqZAo" node="5gIHvJqm4oN" resolve="returnType" />
10907+
</node>
10908+
</node>
1088710909
</node>
1088810910
</node>
1088910911
<node concept="1Wc70l" id="25rRV02p$5N" role="3clFbw">
@@ -10904,36 +10926,36 @@
1090410926
</node>
1090510927
</node>
1090610928
</node>
10907-
<node concept="1Z2H0r" id="xNPLfvZee" role="nvjzm">
10908-
<node concept="2OqwBi" id="xNPLfvZtK" role="1Z2MuG">
10909-
<node concept="1YBJjd" id="xNPLfvZhw" role="2Oq$k0">
10929+
<node concept="2X1qdy" id="7GwCuf2y0wn" role="2X0Ygz">
10930+
<property role="TrG5h" value="ctxType" />
10931+
<node concept="2jxLKc" id="7GwCuf2y0wo" role="1tU5fm" />
10932+
</node>
10933+
<node concept="1Z2H0r" id="7GwCuf2y0tK" role="nvjzm">
10934+
<node concept="2OqwBi" id="7GwCuf2y0rS" role="1Z2MuG">
10935+
<node concept="1YBJjd" id="7GwCuf2y0rT" role="2Oq$k0">
1091010936
<ref role="1YBMHb" node="25rRV02oFpv" resolve="nCopies" />
1091110937
</node>
10912-
<node concept="3TrEf2" id="xNPLfw14$" role="2OqNvi">
10913-
<ref role="3Tt5mk" to="hm2y:25rRV02osES" resolve="times" />
10938+
<node concept="2qgKlT" id="7GwCuf2y0rU" role="2OqNvi">
10939+
<ref role="37wK5l" to="pbu6:6zmBjqUivyF" resolve="contextExpression" />
1091410940
</node>
1091510941
</node>
1091610942
</node>
10917-
<node concept="2X1qdy" id="xNPLfvZ40" role="2X0Ygz">
10918-
<property role="TrG5h" value="timesType" />
10919-
<node concept="2jxLKc" id="xNPLfvZ41" role="1tU5fm" />
10920-
</node>
1092110943
</node>
1092210944
</node>
10923-
<node concept="2X1qdy" id="7GwCuf2y0wn" role="2X0Ygz">
10924-
<property role="TrG5h" value="ctxType" />
10925-
<node concept="2jxLKc" id="7GwCuf2y0wo" role="1tU5fm" />
10926-
</node>
10927-
<node concept="1Z2H0r" id="7GwCuf2y0tK" role="nvjzm">
10928-
<node concept="2OqwBi" id="7GwCuf2y0rS" role="1Z2MuG">
10929-
<node concept="1YBJjd" id="7GwCuf2y0rT" role="2Oq$k0">
10945+
<node concept="1Z2H0r" id="xNPLfvZee" role="nvjzm">
10946+
<node concept="2OqwBi" id="xNPLfvZtK" role="1Z2MuG">
10947+
<node concept="1YBJjd" id="xNPLfvZhw" role="2Oq$k0">
1093010948
<ref role="1YBMHb" node="25rRV02oFpv" resolve="nCopies" />
1093110949
</node>
10932-
<node concept="2qgKlT" id="7GwCuf2y0rU" role="2OqNvi">
10933-
<ref role="37wK5l" to="pbu6:6zmBjqUivyF" resolve="contextExpression" />
10950+
<node concept="3TrEf2" id="xNPLfw14$" role="2OqNvi">
10951+
<ref role="3Tt5mk" to="hm2y:25rRV02osES" resolve="times" />
1093410952
</node>
1093510953
</node>
1093610954
</node>
10955+
<node concept="2X1qdy" id="xNPLfvZ40" role="2X0Ygz">
10956+
<property role="TrG5h" value="timesType" />
10957+
<node concept="2jxLKc" id="xNPLfvZ41" role="1tU5fm" />
10958+
</node>
1093710959
</node>
1093810960
</node>
1093910961
<node concept="1YaCAy" id="25rRV02oFpv" role="1YuTPh">

0 commit comments

Comments
 (0)