Commit 35496da6 authored by André Pacak's avatar André Pacak
Browse files

use lookup_noctx instead of lookup where needed

parent 8c654557
......@@ -6810,7 +6810,7 @@
</node>
<node concept="3Tm1VV" id="4RJJaubau2E" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="4RJJaubLcZQ" role="jymVt" />
<node concept="2tJIrI" id="4RJJaubXLYO" role="jymVt" />
<node concept="3clFb_" id="4RJJaubLgPa" role="jymVt">
<property role="TrG5h" value="getLastElement" />
<node concept="3clFbS" id="4RJJaubLgPd" role="3clF47">
......
......@@ -100,6 +100,7 @@
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
</concept>
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
<concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
<child id="1144226360166" name="iterable" index="1DdaDG" />
</concept>
......@@ -113,6 +114,7 @@
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
<child id="6329021646629175155" name="commentPart" index="3SKWNk" />
</concept>
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
</language>
<language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
<concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
......@@ -219,11 +221,13 @@
<concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
<child id="540871147943773366" name="argument" index="25WWJ7" />
</concept>
<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="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="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="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
<concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
<concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
<child id="1197932505799" name="map" index="3ElQJh" />
......@@ -236,7 +240,7 @@
<node concept="1puMqW" id="4XA4NEmIqyV" role="1puA0r">
<ref role="1puQsG" node="4XA4NEmGx5U" resolve="eliminateRecursiveInputFromJudgment" />
</node>
<node concept="1puMqW" id="4RJJaubqJNN" role="1puA0r">
<node concept="1puMqW" id="4RJJaubPgua" role="1puA0r">
<ref role="1puQsG" node="7DdCaEODx6h" resolve="eliminateContextByProjection" />
</node>
</node>
......@@ -1266,6 +1270,27 @@
</node>
<node concept="1DcWWT" id="4RJJaubx5V2" role="3cqZAp">
<node concept="3clFbS" id="4RJJaubx5V4" role="2LFqv$">
<node concept="3clFbJ" id="4RJJaubNFbf" role="3cqZAp">
<node concept="3clFbS" id="4RJJaubNFbh" role="3clFbx">
<node concept="3N13vt" id="4RJJaubPgaq" role="3cqZAp" />
</node>
<node concept="2OqwBi" id="4RJJaubNHLX" role="3clFbw">
<node concept="2OqwBi" id="4RJJaubNGJm" role="2Oq$k0">
<node concept="37vLTw" id="4RJJaubNGpW" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubx1Y0" resolve="declWithContext" />
</node>
<node concept="3TrcHB" id="4RJJaubNH4r" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
<node concept="liA8E" id="4RJJaubNIIE" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence):boolean" resolve="contains" />
<node concept="Xl_RD" id="4RJJaubNILx" role="37wK5m">
<property role="Xl_RC" value="Required" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="4RJJaubxenT" role="3cqZAp">
<node concept="3cpWsn" id="4RJJaubxenU" role="3cpWs9">
<property role="TrG5h" value="createdRule" />
......@@ -1311,6 +1336,58 @@
<ref role="3cqZAo" node="4RJJaubx5Q4" resolve="instancesOfDeclaration" />
</node>
</node>
<node concept="3cpWs8" id="4RJJaubT8g8" role="3cqZAp">
<node concept="3cpWsn" id="4RJJaubT8g9" role="3cpWs9">
<property role="TrG5h" value="contextIndex" />
<node concept="10Oyi0" id="4RJJaubT8g6" role="1tU5fm" />
<node concept="2OqwBi" id="4RJJaubT8ga" role="33vP2m">
<node concept="37vLTw" id="4RJJaubT8gb" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubx1Y0" resolve="declWithContext" />
</node>
<node concept="2qgKlT" id="4RJJaubT8gc" role="2OqNvi">
<ref role="37wK5l" to="pgas:32CDcOz44ei" resolve="getIndexOfSortByName" />
<node concept="Xl_RD" id="4RJJaubT8gd" role="37wK5m">
<property role="Xl_RC" value="Context" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="4RJJaubTbFU" role="3cqZAp">
<node concept="3cpWsn" id="4RJJaubTbFV" role="3cpWs9">
<property role="TrG5h" value="newDeclaration" />
<node concept="3Tqbb2" id="4RJJaubTbFM" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
</node>
<node concept="2OqwBi" id="4RJJaubTbFW" role="33vP2m">
<node concept="37vLTw" id="4RJJaubTbFX" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubx1Y0" resolve="declWithContext" />
</node>
<node concept="2qgKlT" id="4RJJaubTbFY" role="2OqNvi">
<ref role="37wK5l" to="pgas:4XA4NEmJ4Wv" resolve="removeSort" />
<node concept="37vLTw" id="4RJJaubTbFZ" role="37wK5m">
<ref role="3cqZAo" node="4RJJaubT8g9" resolve="contextIndex" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="4RJJaubSZlE" role="3cqZAp">
<node concept="2OqwBi" id="4RJJaubT0_g" role="3clFbG">
<node concept="37vLTw" id="4RJJaubSZlC" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubf6Wq" resolve="querier" />
</node>
<node concept="liA8E" id="4RJJaubT0MZ" role="2OqNvi">
<ref role="37wK5l" to="5tos:4RJJaubau1Z" resolve="replaceInstancesOfDeclaration" />
<node concept="37vLTw" id="4RJJaubT0Oh" role="37wK5m">
<ref role="3cqZAo" node="4RJJaubx1Y0" resolve="declWithContext" />
</node>
<node concept="37vLTw" id="4RJJaubTeJ1" role="37wK5m">
<ref role="3cqZAo" node="4RJJaubTbFV" resolve="newDeclaration" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWsn" id="4RJJaubx1Y0" role="1Duv9x">
<property role="TrG5h" value="declWithContext" />
......@@ -1372,52 +1449,7 @@
</node>
</node>
</node>
<node concept="1DcWWT" id="32CDcOyFqUz" role="3cqZAp">
<node concept="3clFbS" id="32CDcOyFqU_" role="2LFqv$">
<node concept="3cpWs8" id="32CDcOyFunL" role="3cqZAp">
<node concept="3cpWsn" id="32CDcOyFunM" role="3cpWs9">
<property role="TrG5h" value="newDeclaration" />
<node concept="3Tqbb2" id="32CDcOyFunI" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
</node>
<node concept="2OqwBi" id="32CDcOyFunN" role="33vP2m">
<node concept="37vLTw" id="32CDcOyFunO" role="2Oq$k0">
<ref role="3cqZAo" node="32CDcOyFphS" resolve="projectContext" />
</node>
<node concept="liA8E" id="32CDcOyFunP" role="2OqNvi">
<ref role="37wK5l" to="5tos:32CDcOz3Fzl" resolve="createLookupNoContextDeclaration" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="4RJJaubfbQX" role="3cqZAp">
<node concept="2OqwBi" id="4RJJaubfbWY" role="3clFbG">
<node concept="37vLTw" id="4RJJaubfbQV" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubf6Wq" resolve="querier" />
</node>
<node concept="liA8E" id="4RJJaubfc38" role="2OqNvi">
<ref role="37wK5l" to="5tos:4RJJaubau1Z" resolve="replaceInstancesOfDeclaration" />
<node concept="37vLTw" id="4RJJaubfc4a" role="37wK5m">
<ref role="3cqZAo" node="32CDcOyFqUA" resolve="decl" />
</node>
<node concept="37vLTw" id="4RJJaubfcf1" role="37wK5m">
<ref role="3cqZAo" node="32CDcOyFunM" resolve="newDeclaration" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWsn" id="32CDcOyFqUA" role="1Duv9x">
<property role="TrG5h" value="decl" />
<node concept="3Tqbb2" id="32CDcOyFr4w" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12eLDI" resolve="JudgmentDeclaration" />
</node>
</node>
<node concept="37vLTw" id="32CDcOyFr$z" role="1DdaDG">
<ref role="3cqZAo" node="32CDcOyFp_A" resolve="declsWithContext" />
</node>
</node>
<node concept="3clFbH" id="4RJJaubwC7i" role="3cqZAp" />
<node concept="3clFbH" id="4RJJaubSFpY" role="3cqZAp" />
<node concept="3SKdUt" id="4RJJaubwF2h" role="3cqZAp">
<node concept="3SKdUq" id="4RJJaubwF2j" role="3SKWNk">
<property role="3SKdUp" value="generate lookup no context rules" />
......@@ -1456,7 +1488,199 @@
</node>
</node>
</node>
<node concept="3clFbH" id="4RJJaubeT53" role="3cqZAp" />
<node concept="3clFbH" id="4RJJaubV0Mh" role="3cqZAp" />
<node concept="3SKdUt" id="4RJJaubV64g" role="3cqZAp">
<node concept="3SKdUq" id="4RJJaubV64i" role="3SKWNk">
<property role="3SKdUp" value="use lookup no context instances instead of lookup judgment" />
</node>
</node>
<node concept="3SKdUt" id="4RJJaubXwwu" role="3cqZAp">
<node concept="3SKdUq" id="4RJJaubXwww" role="3SKWNk">
<property role="3SKdUp" value="ignore instances in lookup rules (rules where lookup or lookup_noctx is in conclusion)" />
</node>
</node>
<node concept="3clFbH" id="4RJJaubY8qB" role="3cqZAp" />
<node concept="3cpWs8" id="4RJJaubYkVl" role="3cqZAp">
<node concept="3cpWsn" id="4RJJaubVFtk" role="3cpWs9">
<property role="TrG5h" value="instancesOfDeclaration" />
<node concept="2I9FWS" id="4RJJaubVFtl" role="1tU5fm">
<ref role="2I9WkF" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
</node>
<node concept="2OqwBi" id="4RJJaubYnZ2" role="33vP2m">
<node concept="37vLTw" id="4RJJaubYnSc" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubf6Wq" resolve="querier" />
</node>
<node concept="liA8E" id="4RJJaubYo5h" role="2OqNvi">
<ref role="37wK5l" to="5tos:4RJJaub9DpF" resolve="getInstancesOfDeclaration" />
<node concept="37vLTw" id="4RJJaubYo7d" role="37wK5m">
<ref role="3cqZAo" node="4RJJaubC1p4" resolve="lookupDeclaration" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="4RJJaubZ3UB" role="3cqZAp">
<node concept="3cpWsn" id="4RJJaubZ3UC" role="3cpWs9">
<property role="TrG5h" value="instancesToReplace" />
<node concept="2I9FWS" id="4RJJaubZ3Uo" role="1tU5fm">
<ref role="2I9WkF" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
</node>
<node concept="2OqwBi" id="4RJJauc0X4p" role="33vP2m">
<node concept="2OqwBi" id="4RJJaubYv0C" role="2Oq$k0">
<node concept="37vLTw" id="4RJJauc0VwS" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubVFtk" resolve="instancesOfDeclaration" />
</node>
<node concept="3zZkjj" id="4RJJaubY$xT" role="2OqNvi">
<node concept="1bVj0M" id="4RJJaubY$xV" role="23t8la">
<node concept="3clFbS" id="4RJJaubY$xW" role="1bW5cS">
<node concept="3clFbF" id="4RJJaubY$_K" role="3cqZAp">
<node concept="1Wc70l" id="4RJJauc6EJl" role="3clFbG">
<node concept="3y3z36" id="4RJJauc0N4Q" role="3uHU7B">
<node concept="2OqwBi" id="4RJJaubYWLm" role="3uHU7B">
<node concept="2OqwBi" id="4RJJaubYDcs" role="2Oq$k0">
<node concept="1PxgMI" id="4RJJaubYCTz" role="2Oq$k0">
<node concept="chp4Y" id="4RJJaubYCWf" role="3oSUPX">
<ref role="cht4Q" to="b83y:2_58u12eCWN" resolve="Rule" />
</node>
<node concept="2OqwBi" id="4RJJaubY$MT" role="1m5AlR">
<node concept="37vLTw" id="4RJJaubY$_J" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubY$xX" resolve="it" />
</node>
<node concept="1mfA1w" id="4RJJaubY$ZX" role="2OqNvi" />
</node>
</node>
<node concept="3TrEf2" id="4RJJaubYDtz" role="2OqNvi">
<ref role="3Tt5mk" to="b83y:2_58u12eCXl" resolve="conclusion" />
</node>
</node>
<node concept="2qgKlT" id="4RJJaubZ2Ye" role="2OqNvi">
<ref role="37wK5l" to="pgas:iMPJyMM1Nb" resolve="getJudgment" />
</node>
</node>
<node concept="37vLTw" id="4RJJaubZ3BH" role="3uHU7w">
<ref role="3cqZAo" node="4RJJaubC1p4" resolve="lookupDeclaration" />
</node>
</node>
<node concept="3y3z36" id="4RJJauc6BRC" role="3uHU7w">
<node concept="37vLTw" id="4RJJauc6DgO" role="3uHU7w">
<ref role="3cqZAo" node="32CDcOz4ljR" resolve="lookupNoContextDeclaration" />
</node>
<node concept="2OqwBi" id="4RJJauc6uOZ" role="3uHU7B">
<node concept="2OqwBi" id="4RJJauc6ga$" role="2Oq$k0">
<node concept="1PxgMI" id="4RJJauc6dbL" role="2Oq$k0">
<node concept="chp4Y" id="4RJJauc6eCc" role="3oSUPX">
<ref role="cht4Q" to="b83y:2_58u12eCWN" resolve="Rule" />
</node>
<node concept="2OqwBi" id="4RJJauc5Zxp" role="1m5AlR">
<node concept="37vLTw" id="4RJJauc5YeX" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubY$xX" resolve="it" />
</node>
<node concept="1mfA1w" id="4RJJauc64uG" role="2OqNvi" />
</node>
</node>
<node concept="3TrEf2" id="4RJJauc6nre" role="2OqNvi">
<ref role="3Tt5mk" to="b83y:2_58u12eCXl" resolve="conclusion" />
</node>
</node>
<node concept="2qgKlT" id="4RJJauc6AjZ" role="2OqNvi">
<ref role="37wK5l" to="pgas:iMPJyMM1Nb" resolve="getJudgment" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="Rh6nW" id="4RJJaubY$xX" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="4RJJaubY$xY" role="1tU5fm" />
</node>
</node>
</node>
</node>
<node concept="ANE8D" id="4RJJauc1cqX" role="2OqNvi" />
</node>
</node>
</node>
<node concept="1DcWWT" id="4RJJaubVFtt" role="3cqZAp">
<node concept="3clFbS" id="4RJJaubVFtu" role="2LFqv$">
<node concept="3cpWs8" id="4RJJaubVFtv" role="3cqZAp">
<node concept="3cpWsn" id="4RJJaubVFtw" role="3cpWs9">
<property role="TrG5h" value="index" />
<node concept="10Oyi0" id="4RJJaubVFtx" role="1tU5fm" />
<node concept="2OqwBi" id="4RJJaubVFty" role="33vP2m">
<node concept="2qgKlT" id="4RJJaubVFt$" role="2OqNvi">
<ref role="37wK5l" to="pgas:4RJJaubsjNH" resolve="getIndexOfDifferenceInSorts" />
<node concept="37vLTw" id="4RJJaubYpv2" role="37wK5m">
<ref role="3cqZAo" node="32CDcOz4ljR" resolve="lookupNoContextDeclaration" />
</node>
</node>
<node concept="37vLTw" id="4RJJaubYpMi" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubC1p4" resolve="lookupDeclaration" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="4RJJaubVFtA" role="3cqZAp">
<node concept="3cpWsn" id="4RJJaubVFtB" role="3cpWs9">
<property role="TrG5h" value="newInstance" />
<node concept="3Tqbb2" id="4RJJaubVFtC" role="1tU5fm">
<ref role="ehGHo" to="b83y:2_58u12fwJB" resolve="JudgmentInstance" />
</node>
<node concept="2OqwBi" id="4RJJaubVFtD" role="33vP2m">
<node concept="37vLTw" id="4RJJaubVFtE" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubVFtT" resolve="instanceWithDeclaration" />
</node>
<node concept="2qgKlT" id="4RJJaubVFtF" role="2OqNvi">
<ref role="37wK5l" to="pgas:2loaFuj7QjI" resolve="removeSort" />
<node concept="37vLTw" id="4RJJaubVFtG" role="37wK5m">
<ref role="3cqZAo" node="4RJJaubVFtw" resolve="index" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="4RJJaubVFtH" role="3cqZAp">
<node concept="2OqwBi" id="4RJJaubVFtI" role="3clFbG">
<node concept="37vLTw" id="4RJJaubVFtJ" role="2Oq$k0">
<ref role="3cqZAo" node="4RJJaubVFtT" resolve="instanceWithDeclaration" />
</node>
<node concept="1P9Npp" id="4RJJaubVFtK" role="2OqNvi">
<node concept="37vLTw" id="4RJJaubVFtL" role="1P9ThW">
<ref role="3cqZAo" node="4RJJaubVFtB" resolve="newInstance" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="4RJJaubVFtM" role="3cqZAp">
<node concept="2OqwBi" id="4RJJaubVFtN" role="3clFbG">
<node concept="1PxgMI" id="4RJJaubVFtO" role="2Oq$k0">
<node concept="chp4Y" id="4RJJaubVFtP" role="3oSUPX">
<ref role="cht4Q" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
</node>
<node concept="37vLTw" id="4RJJaubVFtQ" role="1m5AlR">
<ref role="3cqZAo" node="4RJJaubVFtB" resolve="newInstance" />
</node>
</node>
<node concept="2qgKlT" id="4RJJaubVFtR" role="2OqNvi">
<ref role="37wK5l" to="pgas:iMPJyMLTZV" resolve="setJudgment" />
<node concept="37vLTw" id="4RJJaubYq41" role="37wK5m">
<ref role="3cqZAo" node="32CDcOz4ljR" resolve="lookupNoContextDeclaration" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWsn" id="4RJJaubVFtT" role="1Duv9x">
<property role="TrG5h" value="instanceWithDeclaration" />
<node concept="3Tqbb2" id="4RJJaubVFtU" role="1tU5fm">
<ref role="ehGHo" to="b83y:677Mj2_ELav" resolve="JudgmentInstanceWithDeclaration" />
</node>
</node>
<node concept="37vLTw" id="4RJJaubZ3UF" role="1DdaDG">
<ref role="3cqZAo" node="4RJJaubZ3UC" resolve="instancesToReplace" />
</node>
</node>
<node concept="3clFbH" id="4RJJaubYaTH" role="3cqZAp" />
</node>
<node concept="3cpWsn" id="4RJJaubeT55" role="1Duv9x">
<property role="TrG5h" value="module" />
......
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