Commit 63d6f349 authored by André Pacak's avatar André Pacak
Browse files

lookup bug for let bindings fixed

parent a232b62f
<?xml version="1.0" encoding="UTF-8"?>
<debug-info version="2" />
<?xml version="1.0" encoding="UTF-8"?>
<debug-info version="2" />
......@@ -287,6 +287,9 @@
<concept id="996292992025672789" name="org.inca.core.structure.ConceptReferenceType" flags="ng" index="2kdjtB">
<reference id="7241148409041409499" name="concept" index="2UGuZ7" />
</concept>
<concept id="3798692733285372749" name="org.inca.core.structure.BackendOption" flags="ng" index="mSFAB">
<child id="3798692733285425707" name="kind" index="mS$z1" />
</concept>
<concept id="2281067221947980594" name="org.inca.core.structure.VariableReference" flags="ng" index="2vme6Z">
<reference id="768444928085405086" name="variable" index="XkjO9" />
</concept>
......@@ -338,9 +341,14 @@
<concept id="1925259677761400360" name="org.inca.core.structure.IPathElement" flags="ng" index="3zVwHh">
<reference id="1925259677761400369" name="interfacePart" index="3zVwH9" />
</concept>
<concept id="16616543033264178" name="org.inca.core.structure.ScatteredSeqTimelyKind" flags="ng" index="1CRS2q" />
<concept id="1118899187025157789" name="org.inca.core.structure.IIncaModule" flags="ng" index="3DBbTW">
<child id="8118018043742924547" name="imports" index="xaH5_" />
</concept>
<concept id="4799072788058982092" name="org.inca.core.structure.EmptyCompilerOption" flags="ng" index="1HTBQa" />
<concept id="4799072788058981840" name="org.inca.core.structure.IncACompilerOptions" flags="ng" index="1HTBUm">
<child id="4799072788058988391" name="options" index="1HTAgx" />
</concept>
</language>
<language id="08d23328-33fa-47ce-89df-daaa7554f251" name="SumTypes">
<concept id="7997266186981964043" name="SumTypes.structure.ModuleElemDef" flags="ng" index="2BHCoM">
......@@ -1914,6 +1922,22 @@
<node concept="3zyOaA" id="5nh18u8Pkfi" role="1dubk0">
<property role="TrG5h" value="lookup" />
<node concept="3zV_Rz" id="5nh18u8Pkfj" role="3zVECS">
<node concept="34ocy7" id="6m6bBlHtMqF" role="1dgzf0">
<node concept="34ofUU" id="6m6bBlHtSZ1" role="34ocs8">
<node concept="30NkWi" id="6m6bBlHtVh2" role="34ocZk">
<ref role="XkjO9" node="5nh18u8PloH" resolve="v" />
</node>
<node concept="2k1GkI" id="6m6bBlHtOAE" role="34ocZn">
<node concept="2k1_uq" id="6m6bBlHtOAC" role="2nKVj6">
<ref role="2nKBpL" node="5nh18u9eXQP" resolve="allvars" />
<node concept="30NkWi" id="6m6bBlHtQI4" role="2nKBpO">
<ref role="XkjO9" node="5nh18u8Plo4" resolve="term" />
</node>
</node>
</node>
</node>
</node>
<node concept="1XdyHe" id="6m6bBlHtXne" role="1dgzf0" />
<node concept="3_zFnA" id="5nh18u8Qqqa" role="1dgzf0">
<node concept="2kdhWc" id="5nh18u8QsA_" role="3_$Z8E">
<node concept="3lV9gE" id="5nh18u8QtGV" role="3zVzRQ">
......@@ -2203,28 +2227,15 @@
</node>
</node>
<node concept="CU8gp" id="6AVADwUC1Ia" role="CBsOy">
<node concept="34odk1" id="6AVADwUC1Ib" role="1dgzf0">
<node concept="2k1GkI" id="6AVADwUC1Ic" role="34ocZk">
<node concept="2k1_uq" id="6AVADwUC1Id" role="2nKVj6">
<node concept="30Nfyg" id="6m6bBlI8VEj" role="1dgzf0">
<node concept="2k1GkI" id="6m6bBlI8XHF" role="30Nf_D">
<node concept="2k1_uq" id="6m6bBlI8XHD" role="2nKVj6">
<ref role="2nKBpL" node="5nh18u8IAjw" resolve="infer" />
<node concept="30NkWi" id="32tV0xLfZz2" role="2nKBpO">
<node concept="30NkWi" id="6m6bBlI8ZJ5" role="2nKBpO">
<ref role="XkjO9" node="5nh18u8SpyW" resolve="t1" />
</node>
</node>
</node>
<node concept="30KbLJ" id="6AVADwUC1If" role="34ocZn">
<property role="TrG5h" value="ty" />
</node>
</node>
<node concept="30Nfyg" id="6AVADwUC1Ig" role="1dgzf0">
<node concept="2k1GkI" id="6AVADwUC1Ih" role="30Nf_D">
<node concept="2k1_uq" id="6AVADwUC1Ii" role="2nKVj6">
<ref role="2nKBpL" node="5nh18u8IrfH" resolve="asLType" />
<node concept="30NkWi" id="6AVADwUC1Ij" role="2nKBpO">
<ref role="XkjO9" node="6AVADwUC1If" resolve="ty" />
</node>
</node>
</node>
</node>
</node>
<node concept="CU8gp" id="6AVADwUC1Ik" role="CBsOw">
......@@ -2275,16 +2286,6 @@
</node>
</node>
<node concept="3_zGKi" id="5nh18u8UyEk" role="3_zGzd">
<node concept="34ocy7" id="5nh18u8UBu6" role="1dgzf0">
<node concept="34ofUU" id="5nh18u8UD3e" role="34ocs8">
<node concept="30NkWi" id="5nh18u8UECg" role="34ocZk">
<ref role="XkjO9" node="5nh18u8U_UK" resolve="t" />
</node>
<node concept="30NkWi" id="5nh18u8UD39" role="34ocZn">
<ref role="XkjO9" node="5nh18u8Plo4" resolve="term" />
</node>
</node>
</node>
<node concept="CBsOA" id="5nh18u8URti" role="1dgzf0">
<node concept="CU8gp" id="5nh18u8URtl" role="CBsOy">
<node concept="34odk1" id="5nh18u8V9os" role="1dgzf0">
......@@ -2467,16 +2468,6 @@
</node>
</node>
<node concept="3_zGKi" id="5nh18u8WFS0" role="3_zGzd">
<node concept="34ocy7" id="5nh18u8WNgp" role="1dgzf0">
<node concept="34ofUU" id="5nh18u8WQUD" role="34ocs8">
<node concept="30NkWi" id="5nh18u8WSIW" role="34ocZk">
<ref role="XkjO9" node="5nh18u8WLu4" resolve="t" />
</node>
<node concept="30NkWi" id="5nh18u8WP6q" role="34ocZn">
<ref role="XkjO9" node="5nh18u8Plo4" resolve="term" />
</node>
</node>
</node>
<node concept="30Nfyg" id="5nh18u8WWkU" role="1dgzf0">
<node concept="2k1GkI" id="5nh18u8WY9k" role="30Nf_D">
<node concept="2k1_uq" id="5nh18u8WY9i" role="2nKVj6">
......@@ -2524,16 +2515,6 @@
<property role="TrG5h" value="p" />
</node>
</node>
<node concept="34ocy7" id="5nh18u8XeQ3" role="1dgzf0">
<node concept="34ofUU" id="5nh18u8XiAy" role="34ocs8">
<node concept="30NkWi" id="5nh18u8XkAf" role="34ocZk">
<ref role="XkjO9" node="5nh18u8XePx" resolve="t" />
</node>
<node concept="30NkWi" id="5nh18u8XgIp" role="34ocZn">
<ref role="XkjO9" node="5nh18u8Plo4" resolve="term" />
</node>
</node>
</node>
<node concept="30Nfyg" id="5nh18u8XogH" role="1dgzf0">
<node concept="2k1GkI" id="5nh18u8Xq7J" role="30Nf_D">
<node concept="2k1_uq" id="5nh18u8Xq7H" role="2nKVj6">
......@@ -2813,6 +2794,27 @@
</node>
</node>
</node>
<node concept="3_zGKi" id="6m6bBlGqkns" role="3_zGzd">
<node concept="30Nfyg" id="6m6bBlGquH5" role="1dgzf0">
<node concept="2k1GkI" id="6m6bBlGVciF" role="30Nf_D">
<node concept="2k1_uq" id="6m6bBlGVciD" role="2nKVj6">
<ref role="2nKBpL" node="5nh18u8Pkfi" resolve="lookup" />
<node concept="2kdhWc" id="6m6bBlGVUI_" role="2nKBpO">
<node concept="3lV9gE" id="6m6bBlGVWNc" role="3zVzRQ">
<ref role="3zVwH9" to="hqsm:7A0HCuGt5rZ" resolve="parent" />
</node>
<node concept="30NkWi" id="6m6bBlGVSIv" role="2kdhYM">
<ref role="XkjO9" node="5nh18u8Plo4" resolve="term" />
</node>
</node>
<node concept="30NkWi" id="6m6bBlGVYQ4" role="2nKBpO">
<ref role="XkjO9" node="5nh18u8PloH" resolve="v" />
</node>
</node>
</node>
</node>
<node concept="1xQMsc" id="6m6bBlGVQFt" role="3_$9z_" />
</node>
</node>
</node>
<node concept="1VLyuc" id="5nh18u8Plo4" role="1dv5OJ">
......@@ -3574,19 +3576,6 @@
</node>
</node>
<node concept="3_zGKi" id="5nh18u8PcLl" role="3_zGzd">
<node concept="30Nfyg" id="5nh18u8PfSw" role="1dgzf0">
<node concept="2k1GkI" id="5nh18u8PmrP" role="30Nf_D">
<node concept="2k1_uq" id="5nh18u8PmrN" role="2nKVj6">
<ref role="2nKBpL" node="5nh18u8Pkfi" resolve="lookup" />
<node concept="30NkWi" id="5nh18u8PuwZ" role="2nKBpO">
<ref role="XkjO9" node="5nh18u8IAL0" resolve="term" />
</node>
<node concept="30NkWi" id="5nh18u8Pw$6" role="2nKBpO">
<ref role="XkjO9" node="5nh18u8PosG" resolve="var" />
</node>
</node>
</node>
</node>
<node concept="1XyUHm" id="5nh18u8Pqsm" role="3_$9z_">
<node concept="27PwoL" id="5nh18u8PosG" role="1XBmw5">
<property role="TrG5h" value="var" />
......@@ -3597,6 +3586,19 @@
</node>
</node>
</node>
<node concept="30Nfyg" id="6m6bBlFWAvN" role="1dgzf0">
<node concept="2k1GkI" id="6m6bBlGqbVp" role="30Nf_D">
<node concept="2k1_uq" id="6m6bBlGqbVn" role="2nKVj6">
<ref role="2nKBpL" node="5nh18u8Pkfi" resolve="lookup" />
<node concept="30NkWi" id="6m6bBlGqe9Y" role="2nKBpO">
<ref role="XkjO9" node="5nh18u8IAL0" resolve="term" />
</node>
<node concept="30NkWi" id="6m6bBlGqijo" role="2nKBpO">
<ref role="XkjO9" node="5nh18u8PosG" resolve="var" />
</node>
</node>
</node>
</node>
</node>
<node concept="3_zGKi" id="5nh18u8OWOg" role="3_zGzd">
<node concept="27Pwox" id="5nh18u8OXOS" role="3_$9z_">
......@@ -3627,7 +3629,7 @@
<node concept="3_JagS" id="5nh18u8P5MN" role="1p__f_">
<ref role="3_Jajq" node="6JCho9VD4ev" resolve="LType" />
</node>
<node concept="2ZRyFJ" id="6hDWkHFKzks" role="1p_StM">
<node concept="2ZRyFJ" id="6m6bBlFrRlo" role="1p_StM">
<ref role="2ZRyFH" node="6hDWkHFK5Y8" resolve="Any" />
</node>
</node>
......@@ -4712,8 +4714,8 @@
</node>
</node>
</node>
<node concept="27Pwox" id="5nh18u8IrvX" role="3_$9z_">
<node concept="2kdjtB" id="5nh18u8IrvV" role="27Pwoi">
<node concept="27Pwox" id="6m6bBlFWrTI" role="3_$9z_">
<node concept="2kdjtB" id="6m6bBlFWrTH" role="27Pwoi">
<ref role="2UGuZ7" to="xkot:1Da9ityUTfG" resolve="Nat" />
</node>
</node>
......@@ -5565,5 +5567,11 @@
</node>
<node concept="3Tm1VV" id="2fgAgwSOTFH" role="1B3o_S" />
</node>
<node concept="1HTBUm" id="6m6bBlI6y6c">
<node concept="mSFAB" id="6m6bBlI6y6h" role="1HTAgx">
<node concept="1CRS2q" id="6m6bBlI6y6q" role="mS$z1" />
</node>
<node concept="1HTBQa" id="6m6bBlI6y6d" role="1HTAgx" />
</node>
</model>
......@@ -13,10 +13,23 @@
<concept id="5790571747095872620" name="SumTypes.structure.Module" flags="ng" index="1gj3CZ">
<child id="5790571747095872621" name="elems" index="1gj3CY" />
</concept>
<concept id="1894367444356272930" name="SumTypes.structure.Lam" flags="ng" index="1SCro5">
<child id="1894367444356272950" name="t" index="1SCroh" />
<concept id="1894367444356272954" name="SumTypes.structure.Let" flags="ng" index="1SCrot">
<child id="1894367444356272974" name="bound" index="1SCrpD" />
<child id="1894367444356272978" name="body" index="1SCrpP" />
</concept>
<concept id="1894367444356272898" name="SumTypes.structure.Add" flags="ng" index="1SCro_">
<child id="1894367444356272903" name="t1" index="1SCrow" />
<child id="1894367444356272907" name="t2" index="1SCroG" />
</concept>
<concept id="1894367444356272914" name="SumTypes.structure.Mult" flags="ng" index="1SCroP">
<child id="1894367444356272919" name="t1" index="1SCroK" />
<child id="1894367444356272923" name="t2" index="1SCroW" />
</concept>
<concept id="1894367444356272864" name="SumTypes.structure.Var" flags="ng" index="1SCrv7" />
<concept id="1894367444356272855" name="SumTypes.structure.Succ" flags="ng" index="1SCrvK">
<child id="1894367444356272860" name="t" index="1SCrvV" />
</concept>
<concept id="1894367444356272850" name="SumTypes.structure.Zero" flags="ng" index="1SCrvP" />
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
......@@ -28,10 +41,21 @@
<property role="TrG5h" value="TestOkLetWithArithmetic" />
<node concept="2BHCoM" id="7Sr$8awKfLY" role="1gj3CY">
<property role="TrG5h" value="test" />
<node concept="1SCro5" id="38MBpdjBbKz" role="2BHfFu">
<node concept="1SCrot" id="6m6bBlEVf$U" role="2BHfFu">
<property role="TrG5h" value="x" />
<node concept="1SCrv7" id="1BU4o1$nk3c" role="1SCroh">
<property role="TrG5h" value="x" />
<node concept="1SCro_" id="6m6bBlIaKcV" role="1SCrpD">
<node concept="1SCrvK" id="6m6bBlIaKdr" role="1SCroG">
<node concept="1SCrvP" id="6m6bBlIaKdy" role="1SCrvV" />
</node>
<node concept="1SCrvP" id="6m6bBlEVf_9" role="1SCrow" />
</node>
<node concept="1SCroP" id="6m6bBlIaKdB" role="1SCrpP">
<node concept="1SCrvP" id="6m6bBlIaKdQ" role="1SCroK" />
<node concept="1SCrvK" id="6m6bBlIaKei" role="1SCroW">
<node concept="1SCrv7" id="6m6bBlIaKer" role="1SCrvV">
<property role="TrG5h" value="x" />
</node>
</node>
</node>
</node>
</node>
......
<?xml version="1.0" encoding="UTF-8"?>
<product version="3" modelHash="-2nlixlnaqxvyojsou73f5s1iy8c4c84">
<files names="AnalysisResultAccess.java:ConstantDefinitions.java:LType.java:QuerySpecificationHints.java:Typing_AllvarsQuerySpecification.java:Typing_Allvars_0_switchCommonQuerySpecification.java:Typing_AsLTypeQuerySpecification.java:Typing_AsLType_0_switchCommonQuerySpecification.java:Typing_AsLType_WrappedBody0QuerySpecification.java:Typing_AsLType_WrappedBody1QuerySpecification.java:Typing_AsLType_WrappedBody2QuerySpecification.java:Typing_AsLType_WrappedBody3QuerySpecification.java:Typing_AsLType_WrappedQuerySpecification.java:Typing_CheckErrorQuerySpecification.java:Typing_CheckQuerySpecification.java:Typing_Check_0_switchCommonQuerySpecification.java:Typing_InferQuerySpecification.java:Typing_Infer_0_switchCommonQuerySpecification.java:Typing_Infer_WrappedBody0QuerySpecification.java:Typing_Infer_WrappedBody1QuerySpecification.java:Typing_Infer_WrappedBody2QuerySpecification.java:Typing_Infer_WrappedBody3QuerySpecification.java:Typing_Infer_WrappedBody4QuerySpecification.java:Typing_Infer_WrappedBody5QuerySpecification.java:Typing_Infer_WrappedBody6QuerySpecification.java:Typing_Infer_WrappedBody7QuerySpecification.java:Typing_Infer_WrappedBody8QuerySpecification.java:Typing_Infer_WrappedBody9QuerySpecification.java:Typing_Infer_WrappedQuerySpecification.java:Typing_LookupFailureQuerySpecification.java:Typing_LookupFailure_0_switchCommonQuerySpecification.java:Typing_LookupQuerySpecification.java:Typing_Lookup_0_switchCommonQuerySpecification.java:Typing_Lookup_WrappedBody0QuerySpecification.java:Typing_Lookup_WrappedBody10QuerySpecification.java:Typing_Lookup_WrappedBody11QuerySpecification.java:Typing_Lookup_WrappedBody12QuerySpecification.java:Typing_Lookup_WrappedBody13QuerySpecification.java:Typing_Lookup_WrappedBody14QuerySpecification.java:Typing_Lookup_WrappedBody15QuerySpecification.java:Typing_Lookup_WrappedBody16QuerySpecification.java:Typing_Lookup_WrappedBody17QuerySpecification.java:Typing_Lookup_WrappedBody18QuerySpecification.java:Typing_Lookup_WrappedBody19QuerySpecification.java:Typing_Lookup_WrappedBody1QuerySpecification.java:Typing_Lookup_WrappedBody20QuerySpecification.java:Typing_Lookup_WrappedBody2QuerySpecification.java:Typing_Lookup_WrappedBody3QuerySpecification.java:Typing_Lookup_WrappedBody4QuerySpecification.java:Typing_Lookup_WrappedBody5QuerySpecification.java:Typing_Lookup_WrappedBody6QuerySpecification.java:Typing_Lookup_WrappedBody7QuerySpecification.java:Typing_Lookup_WrappedBody8QuerySpecification.java:Typing_Lookup_WrappedBody9QuerySpecification.java:Typing_Lookup_WrappedQuerySpecification.java:Typing_MatchFunFailureQuerySpecification.java:Typing_MatchFunFailure_0_switchCommonQuerySpecification.java:Typing_MatchSumFailureQuerySpecification.java:Typing_MatchSumFailure_0_switchCommonQuerySpecification.java:Typing_RequiredQuerySpecification.java:Typing_Required_0_switchCommonQuerySpecification.java:Typing_Required_WrappedBody0QuerySpecification.java:Typing_Required_WrappedBody10QuerySpecification.java:Typing_Required_WrappedBody11QuerySpecification.java:Typing_Required_WrappedBody12QuerySpecification.java:Typing_Required_WrappedBody1QuerySpecification.java:Typing_Required_WrappedBody2QuerySpecification.java:Typing_Required_WrappedBody3QuerySpecification.java:Typing_Required_WrappedBody4QuerySpecification.java:Typing_Required_WrappedBody5QuerySpecification.java:Typing_Required_WrappedBody6QuerySpecification.java:Typing_Required_WrappedBody7QuerySpecification.java:Typing_Required_WrappedBody8QuerySpecification.java:Typing_Required_WrappedBody9QuerySpecification.java:Typing_Required_WrappedQuerySpecification.java" />
<product version="3" modelHash="-2d2aluaolrixayojr7y7wlora496zic">
<files names="AnalysisResultAccess.java:ConstantDefinitions.java:LType.java:QuerySpecificationHints.java:Typing_AllvarsQuerySpecification.java:Typing_Allvars_0_switchCommonQuerySpecification.java:Typing_AsLTypeQuerySpecification.java:Typing_AsLType_0_switchCommonQuerySpecification.java:Typing_CheckErrorQuerySpecification.java:Typing_CheckQuerySpecification.java:Typing_Check_0_switchCommonQuerySpecification.java:Typing_InferQuerySpecification.java:Typing_Infer_0_switchCommonQuerySpecification.java:Typing_Infer_WrappedQuerySpecification.java:Typing_LookupFailureQuerySpecification.java:Typing_LookupFailure_0_switchCommonQuerySpecification.java:Typing_LookupQuerySpecification.java:Typing_Lookup_0_switchCommonQuerySpecification.java:Typing_MatchFunFailureQuerySpecification.java:Typing_MatchFunFailure_0_switchCommonQuerySpecification.java:Typing_MatchSumFailureQuerySpecification.java:Typing_MatchSumFailure_0_switchCommonQuerySpecification.java:Typing_RequiredQuerySpecification.java:Typing_Required_0_switchCommonQuerySpecification.java" />
</product>
<?xml version="1.0" encoding="UTF-8"?>
<product version="3" modelHash="6dxqdgcq3bhy3qsaqsorb3xddg8w2sf" />
<?xml version="1.0" encoding="UTF-8"?>
<product version="3" modelHash="1v35ytc7lxawk26a22a73fkji8gujdf" />
<?xml version="1.0" encoding="UTF-8"?>
<product version="3" modelHash="9q9ut846g4o0a5z3jp0mw89d1gjbrm0" />
<?xml version="1.0" encoding="UTF-8"?>
<product version="3" modelHash="-923ssifgejdfeirc6ntrz5th76ljffg" />
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