Commit 9db29577 authored by André Pacak's avatar André Pacak

transformation to cleanup unnecessary projection judgments + rules

parent 01591f10
......@@ -140,7 +140,7 @@
<greater-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7984092366528910010" />
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="3001671298539037239" />
</external-mapping>
</greater-priority-mapping>
<lesser-priority-mapping>
......@@ -164,6 +164,20 @@
</external-mapping>
</lesser-priority-mapping>
</mapping-priority-rule>
<mapping-priority-rule kind="strictly_before">
<greater-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="7984092366528910010" />
</external-mapping>
</greater-priority-mapping>
<lesser-priority-mapping>
<generator generatorUID="ce0e1895-596b-45a3-b9f2-37e83b452864(TypeLang#01)" />
<external-mapping>
<mapping-node modelUID="r:ba89f5db-6588-4ca4-b7a4-6f4bcdf92187(main@generator)" nodeID="3001671298539037239" />
</external-mapping>
</lesser-priority-mapping>
</mapping-priority-rule>
</mapping-priorities>
</generator>
</generators>
......
......@@ -6401,12 +6401,17 @@
</node>
</node>
<node concept="3cpWs3" id="7oauUzrUUZF" role="3uHU7B">
<node concept="2OqwBi" id="7oauUzrUSXY" role="3uHU7B">
<node concept="37vLTw" id="7oauUzrUSJR" role="2Oq$k0">
<ref role="3cqZAo" node="7oauUzrUAqi" resolve="projectionDeclaration" />
<node concept="3cpWs3" id="2AC52hTUiav" role="3uHU7B">
<node concept="Xl_RD" id="2AC52hTUig_" role="3uHU7B">
<property role="Xl_RC" value="projection_" />
</node>
<node concept="3TrcHB" id="7oauUzrUTUk" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
<node concept="2OqwBi" id="7oauUzrUSXY" role="3uHU7w">
<node concept="37vLTw" id="7oauUzrUSJR" role="2Oq$k0">
<ref role="3cqZAo" node="7oauUzrUAqi" resolve="projectionDeclaration" />
</node>
<node concept="3TrcHB" id="7oauUzrUTUk" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
<node concept="Xl_RD" id="7oauUzrUUZI" role="3uHU7w">
......@@ -8397,6 +8402,21 @@
</node>
</node>
</node>
<node concept="3clFbF" id="2AC52hUbCRe" role="3cqZAp">
<node concept="37vLTI" id="2AC52hUbEg1" role="3clFbG">
<node concept="3clFbT" id="2AC52hUbEkD" role="37vLTx">
<property role="3clFbU" value="true" />
</node>
<node concept="2OqwBi" id="2AC52hUbDdV" role="37vLTJ">
<node concept="37vLTw" id="2AC52hUbCRc" role="2Oq$k0">
<ref role="3cqZAo" node="7oauUzvNtT3" resolve="reconstructionPremise" />
</node>
<node concept="3TrcHB" id="2AC52hUbDIh" role="2OqNvi">
<ref role="3TsBF5" to="b83y:4QidbFwe$5C" resolve="ignoreStuck" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="7oauUzvNtT9" role="3cqZAp">
<node concept="2OqwBi" id="7oauUzvNtTa" role="3clFbG">
<node concept="37vLTw" id="7oauUzvO24C" role="2Oq$k0">
......@@ -28297,6 +28317,85 @@
</node>
</node>
</node>
<node concept="3cpWs8" id="13xoOqI3nRE" role="3cqZAp">
<node concept="3cpWsn" id="13xoOqI3nRF" role="3cpWs9">
<property role="TrG5h" value="renamedConclusion" />
<node concept="3Tqbb2" id="13xoOqI3nRk" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12fwJB" resolve="JudgmentInstance" />
</node>
<node concept="2OqwBi" id="13xoOqI3nRG" role="33vP2m">
<node concept="2OqwBi" id="13xoOqI3nRH" role="2Oq$k0">
<node concept="37vLTw" id="13xoOqI3nRI" role="2Oq$k0">
<ref role="3cqZAo" node="2LROe3D2CDZ" resolve="renamedInlineRule" />
</node>
<node concept="3TrEf2" id="13xoOqI3nRJ" role="2OqNvi">
<ref role="3Tt5mk" to="b83y:2_58u12eCXl" resolve="conclusion" />
</node>
</node>
<node concept="2qgKlT" id="13xoOqI3nRK" role="2OqNvi">
<ref role="37wK5l" to="pgas:6faGdFABR2I" resolve="createNew" />
<node concept="37vLTw" id="13xoOqI3nRL" role="37wK5m">
<ref role="3cqZAo" node="aTgr8WGG5N" resolve="conclusionArgs" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="13xoOqI3_al" role="3cqZAp">
<node concept="3cpWsn" id="13xoOqI3_am" role="3cpWs9">
<property role="TrG5h" value="conclusionJudgment" />
<node concept="3Tqbb2" id="13xoOqI3_9S" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
</node>
<node concept="2OqwBi" id="13xoOqI3_an" role="33vP2m">
<node concept="2OqwBi" id="13xoOqI3_ao" role="2Oq$k0">
<node concept="37vLTw" id="13xoOqI3_ap" role="2Oq$k0">
<ref role="3cqZAo" node="2LROe3D2CDZ" resolve="renamedInlineRule" />
</node>
<node concept="3TrEf2" id="13xoOqI3_aq" role="2OqNvi">
<ref role="3Tt5mk" to="b83y:2_58u12eCXl" resolve="conclusion" />
</node>
</node>
<node concept="2qgKlT" id="13xoOqI3_ar" role="2OqNvi">
<ref role="37wK5l" to="pgas:iMPJyMM1Nb" resolve="getJudgment" />
</node>
</node>
</node>
</node>
<node concept="3SKdUt" id="13xoOqI5WHN" role="3cqZAp">
<node concept="3SKdUq" id="13xoOqI5WHP" role="3SKWNk">
<property role="3SKdUp" value="inlineSourceDecls are projections, therefore are not stuck by construction" />
</node>
</node>
<node concept="3clFbJ" id="13xoOqI3vAC" role="3cqZAp">
<node concept="3clFbS" id="13xoOqI3vAE" role="3clFbx">
<node concept="3clFbF" id="13xoOqI3qtp" role="3cqZAp">
<node concept="37vLTI" id="13xoOqI3sdt" role="3clFbG">
<node concept="3clFbT" id="13xoOqI3sio" role="37vLTx">
<property role="3clFbU" value="true" />
</node>
<node concept="2OqwBi" id="13xoOqI3rjD" role="37vLTJ">
<node concept="37vLTw" id="13xoOqI3qtn" role="2Oq$k0">
<ref role="3cqZAo" node="13xoOqI3nRF" resolve="renamedConclusion" />
</node>
<node concept="3TrcHB" id="13xoOqI3rJ_" role="2OqNvi">
<ref role="3TsBF5" to="b83y:4QidbFwe$5C" resolve="ignoreStuck" />
</node>
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="13xoOqI3Eo$" role="3clFbw">
<node concept="37vLTw" id="13xoOqI3AwN" role="2Oq$k0">
<ref role="3cqZAo" node="6faGdF_IPZ$" resolve="inlineSourceDecls" />
</node>
<node concept="3JPx81" id="13xoOqI3I3b" role="2OqNvi">
<node concept="37vLTw" id="13xoOqI3IqG" role="25WWJ7">
<ref role="3cqZAo" node="13xoOqI3_am" resolve="conclusionJudgment" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="3CBGuvMwjXj" role="3cqZAp">
<node concept="2OqwBi" id="3CBGuvMwjXk" role="3clFbG">
<node concept="2OqwBi" id="3CBGuvMwjXl" role="2Oq$k0">
......@@ -28312,21 +28411,8 @@
<node concept="37vLTw" id="3CBGuvMwjXp" role="37wK5m">
<ref role="3cqZAo" node="3CBGuvMnV0j" resolve="indexOfLastDuplicate" />
</node>
<node concept="2OqwBi" id="3CBGuvMwjXq" role="37wK5m">
<node concept="2OqwBi" id="3CBGuvMwjXr" role="2Oq$k0">
<node concept="37vLTw" id="2LROe3D2NoI" role="2Oq$k0">
<ref role="3cqZAo" node="2LROe3D2CDZ" resolve="renamedInlineRule" />
</node>
<node concept="3TrEf2" id="3CBGuvMwjXt" role="2OqNvi">
<ref role="3Tt5mk" to="b83y:2_58u12eCXl" resolve="conclusion" />
</node>
</node>
<node concept="2qgKlT" id="3CBGuvMwjXu" role="2OqNvi">
<ref role="37wK5l" to="pgas:6faGdFABR2I" resolve="createNew" />
<node concept="37vLTw" id="3CBGuvMwjXv" role="37wK5m">
<ref role="3cqZAo" node="aTgr8WGG5N" resolve="conclusionArgs" />
</node>
</node>
<node concept="37vLTw" id="13xoOqI3nRM" role="37wK5m">
<ref role="3cqZAo" node="13xoOqI3nRF" resolve="renamedConclusion" />
</node>
</node>
</node>
......@@ -1079,6 +1079,47 @@
<ref role="2I9WkF" to="b83y:2U2uJPpd5x5" resolve="Sort" />
</node>
</node>
<node concept="13i0hz" id="2AC52hU4WDH" role="13h7CS">
<property role="13i0iv" value="false" />
<property role="13i0it" value="false" />
<property role="TrG5h" value="getOutputSorts" />
<node concept="3Tm1VV" id="2AC52hU4WDI" role="1B3o_S" />
<node concept="3clFbS" id="2AC52hU4WDJ" role="3clF47">
<node concept="3clFbF" id="2AC52hU4WDK" role="3cqZAp">
<node concept="2OqwBi" id="2AC52hU4WDL" role="3clFbG">
<node concept="2OqwBi" id="2AC52hU4WDM" role="2Oq$k0">
<node concept="BsUDl" id="2AC52hU4WDN" role="2Oq$k0">
<ref role="37wK5l" node="4XA4NEmGQRd" resolve="getSorts" />
</node>
<node concept="3zZkjj" id="2AC52hU4WDO" role="2OqNvi">
<node concept="1bVj0M" id="2AC52hU4WDP" role="23t8la">
<node concept="3clFbS" id="2AC52hU4WDQ" role="1bW5cS">
<node concept="3clFbF" id="2AC52hU4WDR" role="3cqZAp">
<node concept="2OqwBi" id="2AC52hU4WDS" role="3clFbG">
<node concept="37vLTw" id="2AC52hU4WDT" role="2Oq$k0">
<ref role="3cqZAo" node="2AC52hU4WDV" resolve="it" />
</node>
<node concept="2qgKlT" id="2AC52hU4Y5U" role="2OqNvi">
<ref role="37wK5l" node="6OMXo1Raokp" resolve="isOutput" />
</node>
</node>
</node>
</node>
<node concept="Rh6nW" id="2AC52hU4WDV" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="2AC52hU4WDW" role="1tU5fm" />
</node>
</node>
</node>
</node>
<node concept="ANE8D" id="2AC52hU4WDX" role="2OqNvi" />
</node>
</node>
</node>
<node concept="2I9FWS" id="2AC52hU4WDY" role="3clF45">
<ref role="2I9WkF" to="b83y:2U2uJPpd5x5" resolve="Sort" />
</node>
</node>
<node concept="13i0hz" id="4XA4NEmHFP0" role="13h7CS">
<property role="13i0iv" value="false" />
<property role="13i0it" value="false" />
......@@ -5741,22 +5782,51 @@
<ref role="13i0hy" node="6faGdFABR2I" resolve="createNew" />
<node concept="3Tm1VV" id="6faGdFABShH" role="1B3o_S" />
<node concept="3clFbS" id="6faGdFABShM" role="3clF47">
<node concept="3cpWs6" id="6faGdFABUpC" role="3cqZAp">
<node concept="2OqwBi" id="6faGdFABVeP" role="3cqZAk">
<node concept="2OqwBi" id="6faGdFABUyB" role="2Oq$k0">
<node concept="13iPFW" id="6faGdFABUpV" role="2Oq$k0" />
<node concept="2qgKlT" id="6faGdFABUYr" role="2OqNvi">
<ref role="37wK5l" node="iMPJyMM1Nb" resolve="getJudgment" />
<node concept="3cpWs8" id="2AC52hU7$IF" role="3cqZAp">
<node concept="3cpWsn" id="2AC52hU7$IG" role="3cpWs9">
<property role="TrG5h" value="newInstance" />
<node concept="3Tqbb2" id="2AC52hU7$IE" role="1tU5fm">
<ref role="ehGHo" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
</node>
<node concept="2OqwBi" id="2AC52hU7$IH" role="33vP2m">
<node concept="2OqwBi" id="2AC52hU7$II" role="2Oq$k0">
<node concept="13iPFW" id="2AC52hU7$IJ" role="2Oq$k0" />
<node concept="2qgKlT" id="2AC52hU7$IK" role="2OqNvi">
<ref role="37wK5l" node="iMPJyMM1Nb" resolve="getJudgment" />
</node>
</node>
<node concept="2qgKlT" id="2AC52hU7$IL" role="2OqNvi">
<ref role="37wK5l" node="5YqjVV7pW7l" resolve="createInstance" />
<node concept="37vLTw" id="2AC52hU7$IM" role="37wK5m">
<ref role="3cqZAo" node="6faGdFABShN" resolve="args" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="2AC52hU8iJx" role="3cqZAp">
<node concept="37vLTI" id="2AC52hU8kU9" role="3clFbG">
<node concept="2OqwBi" id="2AC52hU8taL" role="37vLTx">
<node concept="13iPFW" id="2AC52hU8sZg" role="2Oq$k0" />
<node concept="3TrcHB" id="2AC52hU8tso" role="2OqNvi">
<ref role="3TsBF5" to="b83y:4QidbFwe$5C" resolve="ignoreStuck" />
</node>
</node>
<node concept="2qgKlT" id="6faGdFABW4P" role="2OqNvi">
<ref role="37wK5l" node="5YqjVV7pW7l" resolve="createInstance" />
<node concept="37vLTw" id="6faGdFABWdS" role="37wK5m">
<ref role="3cqZAo" node="6faGdFABShN" resolve="args" />
<node concept="2OqwBi" id="2AC52hU8iTK" role="37vLTJ">
<node concept="37vLTw" id="2AC52hU8iJv" role="2Oq$k0">
<ref role="3cqZAo" node="2AC52hU7$IG" resolve="newInstance" />
</node>
<node concept="3TrcHB" id="2AC52hU8k5X" role="2OqNvi">
<ref role="3TsBF5" to="b83y:4QidbFwe$5C" resolve="ignoreStuck" />
</node>
</node>
</node>
</node>
<node concept="3cpWs6" id="6faGdFABUpC" role="3cqZAp">
<node concept="37vLTw" id="2AC52hU7$IN" role="3cqZAk">
<ref role="3cqZAo" node="2AC52hU7$IG" resolve="newInstance" />
</node>
</node>
</node>
<node concept="37vLTG" id="6faGdFABShN" role="3clF46">
<property role="TrG5h" value="args" />
......@@ -5914,6 +5984,15 @@
<node concept="2pJPEk" id="6faGdFAC4lx" role="3cqZAk">
<node concept="2pJPED" id="6faGdFAC4ly" role="2pJPEn">
<ref role="2pJxaS" to="b83y:2_58u12uQ7H" resolve="JudgmentInstanceNeq" />
<node concept="2pJxcG" id="2AC52hU8qQM" role="2pJxcM">
<ref role="2pJxcJ" to="b83y:4QidbFwe$5C" resolve="ignoreStuck" />
<node concept="2OqwBi" id="2AC52hU8tNc" role="2pJxcZ">
<node concept="13iPFW" id="2AC52hU8tCM" role="2Oq$k0" />
<node concept="3TrcHB" id="2AC52hU8u90" role="2OqNvi">
<ref role="3TsBF5" to="b83y:4QidbFwe$5C" resolve="ignoreStuck" />
</node>
</node>
</node>
<node concept="2pIpSj" id="6faGdFAC4lz" role="2pJxcM">
<ref role="2pIpSl" to="b83y:2_58u12uQ7I" resolve="arg1" />
<node concept="36biLy" id="6faGdFAC4l$" role="2pJxcZ">
......@@ -6083,6 +6162,15 @@
<node concept="2pJPEk" id="6faGdFABW$o" role="3cqZAk">
<node concept="2pJPED" id="6faGdFABWAl" role="2pJPEn">
<ref role="2pJxaS" to="b83y:2_58u12t6cc" resolve="JudgmentInstanceEq" />
<node concept="2pJxcG" id="2AC52hU8rf4" role="2pJxcM">
<ref role="2pJxcJ" to="b83y:4QidbFwe$5C" resolve="ignoreStuck" />
<node concept="2OqwBi" id="2AC52hU8uov" role="2pJxcZ">
<node concept="13iPFW" id="2AC52hU8ue5" role="2Oq$k0" />
<node concept="3TrcHB" id="2AC52hU8uIj" role="2OqNvi">
<ref role="3TsBF5" to="b83y:4QidbFwe$5C" resolve="ignoreStuck" />
</node>
</node>
</node>
<node concept="2pIpSj" id="6faGdFABWAW" role="2pJxcM">
<ref role="2pIpSl" to="b83y:2_58u12uP1Y" resolve="arg1" />
<node concept="36biLy" id="6faGdFABWBC" role="2pJxcZ">
......@@ -10779,6 +10867,15 @@
<node concept="2pJPEk" id="6faGdFAC4DV" role="3cqZAk">
<node concept="2pJPED" id="6faGdFAC4DW" role="2pJPEn">
<ref role="2pJxaS" to="b83y:2U2uJPpPnWW" resolve="JudgmentInstanceMatch" />
<node concept="2pJxcG" id="2AC52hU8rXg" role="2pJxcM">
<ref role="2pJxcJ" to="b83y:4QidbFwe$5C" resolve="ignoreStuck" />
<node concept="2OqwBi" id="2AC52hU8uXZ" role="2pJxcZ">
<node concept="13iPFW" id="2AC52hU8uN_" role="2Oq$k0" />
<node concept="3TrcHB" id="2AC52hU8vjN" role="2OqNvi">
<ref role="3TsBF5" to="b83y:4QidbFwe$5C" resolve="ignoreStuck" />
</node>
</node>
</node>
<node concept="2pIpSj" id="6faGdFAC4DX" role="2pJxcM">
<ref role="2pIpSl" to="b83y:2U2uJPpPnWX" resolve="term" />
<node concept="36biLy" id="6faGdFAC4DY" role="2pJxcZ">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment