Commit c93c1100 authored by André Pacak's avatar André Pacak

working merging of context and lookup judgment (a lot stuff hard coded)

parent 7524c8ac
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
<dependency reexport="false">3a1c1f85-c745-4d04-a210-f97a7e31f9cc(org.inca.extensions)</dependency> <dependency reexport="false">3a1c1f85-c745-4d04-a210-f97a7e31f9cc(org.inca.extensions)</dependency>
<dependency reexport="false">d5a58d02-4ac7-4892-afde-65968670c300(org.inca.data#8607574815737030311)</dependency> <dependency reexport="false">d5a58d02-4ac7-4892-afde-65968670c300(org.inca.data#8607574815737030311)</dependency>
<dependency reexport="false">1bc49cec-41e6-417f-a12b-f0e0125494e9(org.inca.core#4530729936991344007)</dependency> <dependency reexport="false">1bc49cec-41e6-417f-a12b-f0e0125494e9(org.inca.core#4530729936991344007)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
</dependencies> </dependencies>
<languageVersions> <languageVersions>
<language slang="l:ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71:TypeLang" version="0" /> <language slang="l:ab9b5480-36a1-4fc2-9c9d-f0faa4fc1b71:TypeLang" version="0" />
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<import index="uu1k" ref="r:5d05a0a1-0178-4953-8047-22b44c66dcde(org.inca.data.structure)" /> <import index="uu1k" ref="r:5d05a0a1-0178-4953-8047-22b44c66dcde(org.inca.data.structure)" />
<import index="z9af" ref="r:92efe085-3295-42c0-bd7e-2ea049fae522(org.inca.extensions.structure)" /> <import index="z9af" ref="r:92efe085-3295-42c0-bd7e-2ea049fae522(org.inca.extensions.structure)" />
<import index="55iy" ref="r:6bb35df6-a651-4174-a533-ca7006eccec8(org.inca.gp.structure)" /> <import index="55iy" ref="r:6bb35df6-a651-4174-a533-ca7006eccec8(org.inca.gp.structure)" />
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" /> <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
</imports> </imports>
<registry> <registry>
...@@ -341,6 +342,9 @@ ...@@ -341,6 +342,9 @@
<concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" /> <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" /> <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
<concept id="1175845471038" name="jetbrains.mps.baseLanguage.collections.structure.ReverseOperation" flags="nn" index="35Qw8J" /> <concept id="1175845471038" name="jetbrains.mps.baseLanguage.collections.structure.ReverseOperation" flags="nn" index="35Qw8J" />
<concept id="5232196642625575054" name="jetbrains.mps.baseLanguage.collections.structure.TailListOperation" flags="nn" index="1eb2uI">
<child id="5232196642625575056" name="fromIndex" index="1eb2uK" />
</concept>
<concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt"> <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
<child id="1197683466920" name="keyType" index="3rvQeY" /> <child id="1197683466920" name="keyType" index="3rvQeY" />
<child id="1197683475734" name="valueType" index="3rvSg0" /> <child id="1197683475734" name="valueType" index="3rvSg0" />
...@@ -7240,6 +7244,7 @@ ...@@ -7240,6 +7244,7 @@
</node> </node>
</node> </node>
<node concept="2tJIrI" id="6XUlM2ozuzJ" role="jymVt" /> <node concept="2tJIrI" id="6XUlM2ozuzJ" role="jymVt" />
<node concept="2tJIrI" id="6XUlM2pHy7N" role="jymVt" />
<node concept="3clFb_" id="32CDcOyUlT4" role="jymVt"> <node concept="3clFb_" id="32CDcOyUlT4" role="jymVt">
<property role="TrG5h" value="hasLookupDeclaration" /> <property role="TrG5h" value="hasLookupDeclaration" />
<node concept="3clFbS" id="32CDcOyUlT7" role="3clF47"> <node concept="3clFbS" id="32CDcOyUlT7" role="3clF47">
...@@ -7788,6 +7793,22 @@ ...@@ -7788,6 +7793,22 @@
<property role="3SKdUp" value="TODO need to rename var (name)" /> <property role="3SKdUp" value="TODO need to rename var (name)" />
</node> </node>
</node> </node>
<node concept="3cpWs8" id="6XUlM2p8LhE" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2p8LhF" role="3cpWs9">
<property role="TrG5h" value="varName" />
<node concept="17QB3L" id="6XUlM2p8LhC" role="1tU5fm" />
<node concept="2OqwBi" id="6XUlM2p8LhG" role="33vP2m">
<node concept="37vLTw" id="6XUlM2p8LhH" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2oK$jC" resolve="genContext" />
</node>
<node concept="2piZGk" id="6XUlM2p8LhI" role="2OqNvi">
<node concept="Xl_RD" id="6XUlM2p8LhJ" role="2piZGb">
<property role="Xl_RC" value="name" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="6XUlM2oKmd9" role="3cqZAp"> <node concept="3cpWs8" id="6XUlM2oKmd9" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2oKmda" role="3cpWs9"> <node concept="3cpWsn" id="6XUlM2oKmda" role="3cpWs9">
<property role="TrG5h" value="varTerm" /> <property role="TrG5h" value="varTerm" />
...@@ -7799,6 +7820,41 @@ ...@@ -7799,6 +7820,41 @@
</node> </node>
</node> </node>
</node> </node>
<node concept="3cpWs8" id="6XUlM2p8SjJ" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2p8SjK" role="3cpWs9">
<property role="TrG5h" value="replacedVarTerm" />
<node concept="3Tqbb2" id="6XUlM2p8Sj_" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12g7Tn" resolve="IMetaTerm" />
</node>
<node concept="2OqwBi" id="6XUlM2p8SjL" role="33vP2m">
<node concept="37vLTw" id="6XUlM2p8SjM" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2oKmda" resolve="varTerm" />
</node>
<node concept="2qgKlT" id="6XUlM2p8SjN" role="2OqNvi">
<ref role="37wK5l" to="pgas:6XUlM2p8p1I" resolve="replaceMetaVar" />
<node concept="2OqwBi" id="6XUlM2paHEC" role="37wK5m">
<node concept="2OqwBi" id="6XUlM2paCLa" role="2Oq$k0">
<node concept="2OqwBi" id="6XUlM2p8SjO" role="2Oq$k0">
<node concept="37vLTw" id="6XUlM2p8SjP" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2oKmda" resolve="varTerm" />
</node>
<node concept="2qgKlT" id="6XUlM2paAz6" role="2OqNvi">
<ref role="37wK5l" to="pgas:2groWwXVpeb" resolve="getMetaVarNames" />
</node>
</node>
<node concept="1uHKPH" id="6XUlM2paFKM" role="2OqNvi" />
</node>
<node concept="3TrcHB" id="6XUlM2paI1j" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
<node concept="37vLTw" id="6XUlM2p8SjR" role="37wK5m">
<ref role="3cqZAo" node="6XUlM2p8LhF" resolve="varName" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="6XUlM2nYCkk" role="3cqZAp"> <node concept="3cpWs8" id="6XUlM2nYCkk" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2nYCkn" role="3cpWs9"> <node concept="3cpWsn" id="6XUlM2nYCkn" role="3cpWs9">
<property role="TrG5h" value="typeName" /> <property role="TrG5h" value="typeName" />
...@@ -7847,8 +7903,8 @@ ...@@ -7847,8 +7903,8 @@
<node concept="2pIpSj" id="6XUlM2oqLUM" role="2pJxcM"> <node concept="2pIpSj" id="6XUlM2oqLUM" role="2pJxcM">
<ref role="2pIpSl" to="b83y:2_58u12ePfd" resolve="arg1" /> <ref role="2pIpSl" to="b83y:2_58u12ePfd" resolve="arg1" />
<node concept="36biLy" id="6XUlM2oqLUN" role="2pJxcZ"> <node concept="36biLy" id="6XUlM2oqLUN" role="2pJxcZ">
<node concept="37vLTw" id="6XUlM2oKo6X" role="36biLW"> <node concept="37vLTw" id="6XUlM2p8WdM" role="36biLW">
<ref role="3cqZAo" node="6XUlM2oKmda" resolve="varTerm" /> <ref role="3cqZAo" node="6XUlM2p8SjK" resolve="replacedVarTerm" />
</node> </node>
</node> </node>
</node> </node>
...@@ -8125,16 +8181,128 @@ ...@@ -8125,16 +8181,128 @@
<node concept="3clFbH" id="6XUlM2p3zX_" role="3cqZAp" /> <node concept="3clFbH" id="6XUlM2p3zX_" role="3cqZAp" />
<node concept="3SKdUt" id="6XUlM2p3_6e" role="3cqZAp"> <node concept="3SKdUt" id="6XUlM2p3_6e" role="3cqZAp">
<node concept="3SKdUq" id="6XUlM2p3_6g" role="3SKWNk"> <node concept="3SKdUq" id="6XUlM2p3_6g" role="3SKWNk">
<property role="3SKdUp" value="TODO insert slice" /> <property role="3SKdUp" value="insert premises instead of the first one" />
</node> </node>
</node> </node>
<node concept="3clFbH" id="6XUlM2p3AbA" role="3cqZAp" /> <node concept="3clFbF" id="6XUlM2pi2p1" role="3cqZAp">
<node concept="3SKdUt" id="6XUlM2p3BNx" role="3cqZAp"> <node concept="2OqwBi" id="6XUlM2pi4ht" role="3clFbG">
<node concept="3SKdUq" id="6XUlM2p3BNz" role="3SKWNk"> <node concept="37vLTw" id="6XUlM2pi2oZ" role="2Oq$k0">
<property role="3SKdUp" value="TODO match output type of conclusion with output type of slice" /> <ref role="3cqZAo" node="6XUlM2p3qe1" resolve="premises" />
</node>
<node concept="X8dFx" id="6XUlM2pi8Be" role="2OqNvi">
<node concept="2OqwBi" id="6XUlM2pk7XT" role="25WWJ7">
<node concept="2OqwBi" id="6XUlM2piejK" role="2Oq$k0">
<node concept="2OqwBi" id="6XUlM2pib$9" role="2Oq$k0">
<node concept="37vLTw" id="6XUlM2pia16" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2p3pnE" resolve="rule" />
</node>
<node concept="3Tsc0h" id="6XUlM2pic8K" role="2OqNvi">
<ref role="3TtcxE" to="b83y:2_58u12eCWO" resolve="premises" />
</node>
</node>
<node concept="1eb2uI" id="6XUlM2pk4N1" role="2OqNvi">
<node concept="3cmrfG" id="6XUlM2pk5qO" role="1eb2uK">
<property role="3cmrfH" value="1" />
</node>
</node>
</node>
<node concept="3$u5V9" id="6XUlM2pkcaq" role="2OqNvi">
<node concept="1bVj0M" id="6XUlM2pkcas" role="23t8la">
<node concept="3clFbS" id="6XUlM2pkcat" role="1bW5cS">
<node concept="3clFbF" id="6XUlM2pkecv" role="3cqZAp">
<node concept="2OqwBi" id="6XUlM2pkg8Y" role="3clFbG">
<node concept="37vLTw" id="6XUlM2pkecu" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2pkcau" resolve="it" />
</node>
<node concept="1$rogu" id="6XUlM2pkiZu" role="2OqNvi" />
</node>
</node>
</node>
<node concept="Rh6nW" id="6XUlM2pkcau" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="6XUlM2pkcav" role="1tU5fm" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="6XUlM2pmASv" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2pmASw" role="3cpWs9">
<property role="TrG5h" value="binding" />
<node concept="3Tqbb2" id="6XUlM2pmASm" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12g7Tn" resolve="IMetaTerm" />
</node>
<node concept="2OqwBi" id="6XUlM2pmASx" role="33vP2m">
<node concept="2OqwBi" id="6XUlM2pmAS_" role="2Oq$k0">
<node concept="37vLTw" id="6XUlM2pmASA" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2p3pnE" resolve="rule" />
</node>
<node concept="3TrEf2" id="6XUlM2pst5J" role="2OqNvi">
<ref role="3Tt5mk" to="b83y:2_58u12eCXl" resolve="conclusion" />
</node>
</node>
<node concept="2qgKlT" id="6XUlM2pmASD" role="2OqNvi">
<ref role="37wK5l" to="pgas:1HuZxihg$ar" resolve="getArgumentBySortName" />
<node concept="Xl_RD" id="6XUlM2pmASE" role="37wK5m">
<property role="Xl_RC" value="Context" />
</node>
</node>
</node>
</node>
</node>
<node concept="3SKdUt" id="6XUlM2pn7ut" role="3cqZAp">
<node concept="3SKdUq" id="6XUlM2pn96h" role="3SKWNk">
<property role="3SKdUp" value="TODO hardcoded getting of type" />
</node>
</node>
<node concept="3cpWs8" id="6XUlM2pn1Cx" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2pn1Cy" role="3cpWs9">
<property role="TrG5h" value="boundType" />
<node concept="3Tqbb2" id="6XUlM2pn1Ct" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12eCXq" resolve="MetaVariable" />
</node>
<node concept="2OqwBi" id="6XUlM2pu8E7" role="33vP2m">
<node concept="2OqwBi" id="6XUlM2pn1Cz" role="2Oq$k0">
<node concept="2OqwBi" id="6XUlM2pn1C$" role="2Oq$k0">
<node concept="37vLTw" id="6XUlM2pn1C_" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2pmASw" resolve="binding" />
</node>
<node concept="2qgKlT" id="6XUlM2pn1CA" role="2OqNvi">
<ref role="37wK5l" to="pgas:2groWwXVpeb" resolve="getMetaVarNames" />
</node>
</node>
<node concept="34jXtK" id="6XUlM2pn1CB" role="2OqNvi">
<node concept="3cmrfG" id="6XUlM2pn1CC" role="25WWJ7">
<property role="3cmrfH" value="1" />
</node>
</node>
</node>
<node concept="1$rogu" id="6XUlM2pucbg" role="2OqNvi" />
</node>
</node>
</node>
<node concept="3clFbF" id="6XUlM2pnaax" role="3cqZAp">
<node concept="37vLTI" id="6XUlM2pnjOR" role="3clFbG">
<node concept="37vLTw" id="6XUlM2pnkiC" role="37vLTx">
<ref role="3cqZAo" node="6XUlM2pn1Cy" resolve="boundType" />
</node>
<node concept="2OqwBi" id="6XUlM2pnd$y" role="37vLTJ">
<node concept="1PxgMI" id="6XUlM2pnd0I" role="2Oq$k0">
<node concept="chp4Y" id="6XUlM2pndeo" role="3oSUPX">
<ref role="cht4Q" to="b83y:2_58u12ePfb" resolve="JudgmentInstance3" />
</node>
<node concept="37vLTw" id="6XUlM2pnaav" role="1m5AlR">
<ref role="3cqZAo" node="6XUlM2p3qdK" resolve="conclusion" />
</node>
</node>
<node concept="3TrEf2" id="6XUlM2pnecG" role="2OqNvi">
<ref role="3Tt5mk" to="b83y:2_58u12ePff" resolve="arg3" />
</node>
</node>
</node> </node>
</node> </node>
<node concept="3clFbH" id="6XUlM2p3qel" role="3cqZAp" />
<node concept="3cpWs8" id="6XUlM2p3qem" role="3cqZAp"> <node concept="3cpWs8" id="6XUlM2p3qem" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2p3qen" role="3cpWs9"> <node concept="3cpWsn" id="6XUlM2p3qen" role="3cpWs9">
<property role="TrG5h" value="lookupNoCtxRule" /> <property role="TrG5h" value="lookupNoCtxRule" />
...@@ -8148,7 +8316,7 @@ ...@@ -8148,7 +8316,7 @@
<ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" /> <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
<node concept="3cpWs3" id="6XUlM2p3qes" role="2pJxcZ"> <node concept="3cpWs3" id="6XUlM2p3qes" role="2pJxcZ">
<node concept="Xl_RD" id="6XUlM2p3qet" role="3uHU7w"> <node concept="Xl_RD" id="6XUlM2p3qet" role="3uHU7w">
<property role="Xl_RC" value="found" /> <property role="Xl_RC" value=" found" />
</node> </node>
<node concept="2OqwBi" id="6XUlM2p3qeu" role="3uHU7B"> <node concept="2OqwBi" id="6XUlM2p3qeu" role="3uHU7B">
<node concept="2OqwBi" id="6XUlM2p3qev" role="2Oq$k0"> <node concept="2OqwBi" id="6XUlM2p3qev" role="2Oq$k0">
...@@ -8308,7 +8476,7 @@ ...@@ -8308,7 +8476,7 @@
<ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" /> <ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
<node concept="3cpWs3" id="6XUlM2p2RzH" role="2pJxcZ"> <node concept="3cpWs3" id="6XUlM2p2RzH" role="2pJxcZ">
<node concept="Xl_RD" id="6XUlM2p2RLF" role="3uHU7w"> <node concept="Xl_RD" id="6XUlM2p2RLF" role="3uHU7w">
<property role="Xl_RC" value="next" /> <property role="Xl_RC" value=" next" />
</node> </node>
<node concept="2OqwBi" id="6XUlM2p2B6z" role="3uHU7B"> <node concept="2OqwBi" id="6XUlM2p2B6z" role="3uHU7B">
<node concept="2OqwBi" id="6XUlM2p2B6$" role="2Oq$k0"> <node concept="2OqwBi" id="6XUlM2p2B6$" role="2Oq$k0">
......
...@@ -191,6 +191,9 @@ ...@@ -191,6 +191,9 @@
<concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7"> <concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
<child id="1758937410080001570" name="conceptArgument" index="1dBWTz" /> <child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
</concept> </concept>
<concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
<child id="1145567471833" name="createdType" index="2T96Bj" />
</concept>
<concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt"> <concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
<reference id="1139877738879" name="concept" index="1A0vxQ" /> <reference id="1139877738879" name="concept" index="1A0vxQ" />
</concept> </concept>
...@@ -228,10 +231,14 @@ ...@@ -228,10 +231,14 @@
<concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4"> <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
<child id="540871147943773366" name="argument" index="25WWJ7" /> <child id="540871147943773366" name="argument" index="25WWJ7" />
</concept> </concept>
<concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
<child id="1151688676805" name="elementType" index="_ZDj9" />
</concept>
<concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" /> <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
<concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" /> <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" /> <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" /> <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" /> <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" /> <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
<concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" /> <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
...@@ -252,7 +259,7 @@ ...@@ -252,7 +259,7 @@
<node concept="1puMqW" id="4RJJaubPgua" role="1puA0r"> <node concept="1puMqW" id="4RJJaubPgua" role="1puA0r">
<ref role="1puQsG" node="7DdCaEODx6h" resolve="eliminateContextByProjection" /> <ref role="1puQsG" node="7DdCaEODx6h" resolve="eliminateContextByProjection" />
</node> </node>
<node concept="1puMqW" id="6XUlM2oHj7a" role="1puA0r"> <node concept="1puMqW" id="6XUlM2pBoFi" role="1puA0r">
<ref role="1puQsG" node="6XUlM2nKRm7" resolve="mergeContextProjectionLookup" /> <ref role="1puQsG" node="6XUlM2nKRm7" resolve="mergeContextProjectionLookup" />
</node> </node>
</node> </node>
...@@ -2015,11 +2022,6 @@ ...@@ -2015,11 +2022,6 @@
</node> </node>
<node concept="3clFbH" id="6XUlM2ojH3b" role="3cqZAp" /> <node concept="3clFbH" id="6XUlM2ojH3b" role="3cqZAp" />
<node concept="3clFbH" id="6XUlM2ofgIP" role="3cqZAp" /> <node concept="3clFbH" id="6XUlM2ofgIP" role="3cqZAp" />
<node concept="3SKdUt" id="6XUlM2nKXeG" role="3cqZAp">
<node concept="3SKdUq" id="6XUlM2nKXeI" role="3SKWNk">
<property role="3SKdUp" value="TODO generate lookup_noctx rule based on projection rule" />
</node>
</node>
<node concept="3SKdUt" id="6XUlM2nKXfO" role="3cqZAp"> <node concept="3SKdUt" id="6XUlM2nKXfO" role="3cqZAp">
<node concept="3SKdUq" id="6XUlM2nKXfQ" role="3SKWNk"> <node concept="3SKdUq" id="6XUlM2nKXfQ" role="3SKWNk">
<property role="3SKdUp" value="where conclusion returns bind we merge with both rules (==, !=)" /> <property role="3SKdUp" value="where conclusion returns bind we merge with both rules (==, !=)" />
...@@ -2088,7 +2090,7 @@ ...@@ -2088,7 +2090,7 @@
<ref role="3cqZAo" node="6XUlM2nU47c" resolve="rule" /> <ref role="3cqZAo" node="6XUlM2nU47c" resolve="rule" />
</node> </node>
<node concept="HtI8k" id="6XUlM2p3wO5" role="2OqNvi"> <node concept="HtI8k" id="6XUlM2p3wO5" role="2OqNvi">
<node concept="37vLTw" id="6XUlM2p3wOR" role="HtI8F"> <node concept="37vLTw" id="6XUlM2psrWZ" role="HtI8F">
<ref role="3cqZAo" node="6XUlM2p3vKE" resolve="equalRule" /> <ref role="3cqZAo" node="6XUlM2p3vKE" resolve="equalRule" />
</node> </node>
</node> </node>
...@@ -2232,10 +2234,200 @@ ...@@ -2232,10 +2234,200 @@
<node concept="3clFbH" id="6XUlM2nTful" role="3cqZAp" /> <node concept="3clFbH" id="6XUlM2nTful" role="3cqZAp" />
<node concept="3SKdUt" id="6XUlM2nKXoe" role="3cqZAp"> <node concept="3SKdUt" id="6XUlM2nKXoe" role="3cqZAp">
<node concept="3SKdUq" id="6XUlM2nKXog" role="3SKWNk"> <node concept="3SKdUq" id="6XUlM2nKXog" role="3SKWNk">
<property role="3SKdUp" value="TODO remove old lookup_noctx rule" /> <property role="3SKdUp" value="replace old lookup_noctx rule" />
</node>
</node>
<node concept="3cpWs8" id="6XUlM2pwe82" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2pwe83" role="3cpWs9">
<property role="TrG5h" value="intermediatelookupNoContex" />
<node concept="3Tqbb2" id="6XUlM2pwe7T" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
</node>
<node concept="2OqwBi" id="6XUlM2pwe84" role="33vP2m">
<node concept="37vLTw" id="6XUlM2pwe85" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2nKWP5" resolve="querier" />
</node>
<node concept="liA8E" id="6XUlM2pwe86" role="2OqNvi">
<ref role="37wK5l" to="5tos:6XUlM2o94Nv" resolve="getDeclarationByName" />
<node concept="Xl_RD" id="6XUlM2pwe87" role="37wK5m">
<property role="Xl_RC" value="lookup_noctx" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="6XUlM2pDbRL" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2pDbRM" role="3cpWs9">
<property role="TrG5h" value="instancesOfIntermediate" />
<node concept="2I9FWS" id="6XUlM2pDbRA" role="1tU5fm">
<ref role="2I9WkF" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
</node>
<node concept="2OqwBi" id="6XUlM2pDbRN" role="33vP2m">
<node concept="37vLTw" id="6XUlM2pDbRO" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2nKWP5" resolve="querier" />
</node>
<node concept="liA8E" id="6XUlM2pDbRP" role="2OqNvi">
<ref role="37wK5l" to="5tos:4RJJaub9DpF" resolve="getInstancesOfDeclaration" />
<node concept="37vLTw" id="6XUlM2pDbRQ" role="37wK5m">
<ref role="3cqZAo" node="6XUlM2pwe83" resolve="intermediatelookupNoContex" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="6XUlM2pHOdD" role="3cqZAp" />
<node concept="3clFbF" id="6XUlM2pvWDO" role="3cqZAp">
<node concept="2OqwBi" id="6XUlM2pvYgW" role="3clFbG">
<node concept="37vLTw" id="6XUlM2pvWDM" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2nKWP5" resolve="querier" />
</node>
<node concept="liA8E" id="6XUlM2pvZm3" role="2OqNvi">
<ref role="37wK5l" to="5tos:6XUlM2nTnbU" resolve="removeRulesOfDeclarationAndItself" />
<node concept="37vLTw" id="6XUlM2pwhPK" role="37wK5m">
<ref role="3cqZAo" node="6XUlM2pwe83" resolve="intermediatelookupNoContex" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="6XUlM2pFGQ3" role="3cqZAp" />
<node concept="1DcWWT" id="6XUlM2pDljy" role="3cqZAp">
<node concept="3clFbS" id="6XUlM2pDlj$" role="2LFqv$">
<node concept="3cpWs8" id="6XUlM2pDpwH" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2pDpwI" role="3cpWs9">
<property role="TrG5h" value="args" />
<node concept="_YKpA" id="6XUlM2pDpw_" role="1tU5fm">
<node concept="3Tqbb2" id="6XUlM2pDpwC" role="_ZDj9">
<ref role="ehGHo" to="b83y:2_58u12g7Tn" resolve="IMetaTerm" />
</node>
</node>
<node concept="2OqwBi" id="6XUlM2pDpwJ" role="33vP2m">
<node concept="37vLTw" id="6XUlM2pDpwK" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2pDlj_" resolve="instance" />
</node>
<node concept="2qgKlT" id="6XUlM2pDpwL" role="2OqNvi">
<ref role="37wK5l" to="pgas:5YqjVV7s$$Q" resolve="getArguments" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="6XUlM2pDqBL" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2pDqBM" role="3cpWs9">
<property role="TrG5h" value="argsForNew" />
<node concept="_YKpA" id="6XUlM2pDqBN" role="1tU5fm">
<node concept="3Tqbb2" id="6XUlM2pDqBO" role="_ZDj9">
<ref role="ehGHo" to="b83y:2_58u12g7Tn" resolve="IMetaTerm" />
</node>
</node>
<node concept="2ShNRf" id="6XUlM2pDrg2" role="33vP2m">
<node concept="2T8Vx0" id="6XUlM2pDrmZ" role="2ShVmc">
<node concept="2I9FWS" id="6XUlM2pDrn1" role="2T96Bj">
<ref role="2I9WkF" to="b83y:2_58u12g7Tn" resolve="IMetaTerm" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="6XUlM2pDrzD" role="3cqZAp">
<node concept="2OqwBi" id="6XUlM2pDsDz" role="3clFbG">
<node concept="37vLTw" id="6XUlM2pDBf3" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2pDqBM" resolve="argsForNew" />
</node>
<node concept="TSZUe" id="6XUlM2pDwXe" role="2OqNvi">
<node concept="2OqwBi" id="6XUlM2pDylx" role="25WWJ7">
<node concept="37vLTw" id="6XUlM2pDwZF" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2pDpwI" resolve="args" />
</node>
<node concept="34jXtK" id="6XUlM2pDAv1" role="2OqNvi">
<node concept="3cmrfG" id="6XUlM2pDAxT" role="25WWJ7">
<property role="3cmrfH" value="0" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="6XUlM2pDA$l" role="3cqZAp">
<node concept="2OqwBi" id="6XUlM2pDA$m" role="3clFbG">
<node concept="37vLTw" id="6XUlM2pDBVC" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2pDqBM" resolve="argsForNew" />
</node>
<node concept="TSZUe" id="6XUlM2pDA$o" role="2OqNvi">
<node concept="2OqwBi" id="6XUlM2pDA$p" role="25WWJ7">
<node concept="37vLTw" id="6XUlM2pDA$q" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2pDpwI" resolve="args" />
</node>
<node concept="34jXtK" id="6XUlM2pDA$r" role="2OqNvi">
<node concept="3cmrfG" id="6XUlM2pDA$s" role="25WWJ7">
<property role="3cmrfH" value="0" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="6XUlM2pDAP7" role="3cqZAp">
<node concept="2OqwBi" id="6XUlM2pDAP8" role="3clFbG">
<node concept="37vLTw" id="6XUlM2pDC1b" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2pDqBM" resolve="argsForNew" />
</node>
<node concept="TSZUe" id="6XUlM2pDAPa" role="2OqNvi">
<node concept="2OqwBi" id="6XUlM2pDAPb" role="25WWJ7">
<node concept="37vLTw" id="6XUlM2pDAPc" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2pDpwI" resolve="args" />
</node>
<node concept="34jXtK" id="6XUlM2pDAPd" role="2OqNvi">
<node concept="3cmrfG" id="6XUlM2pDB7G" role="25WWJ7">
<property role="3cmrfH" value="1" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="6XUlM2pDqud" role="3cqZAp" />
<node concept="3cpWs8" id="6XUlM2pDCiA" role="3cqZAp">
<node concept="3cpWsn" id="6XUlM2pDCiB" role="3cpWs9">
<property role="TrG5h" value="newInstance" />
<node concept="3Tqbb2" id="6XUlM2pDCix" role="1tU5fm">
<ref role="ehGHo" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
</node>
<node concept="2OqwBi" id="6XUlM2pDCiC" role="33vP2m">
<node concept="37vLTw" id="6XUlM2pDCiD" role="2Oq$k0">
<ref role="3cqZAo" node="6XUlM2oh_OS" resolve="inlinedLookupDeclaration" />