natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lc: Fix spurious typeConstraints reactivation on forall gen. Fix recursive case in instanceCheck. 

As a consequence, there's a simplification of produceTypeConstraints rules.
Also add comments and fix some test cases: some of them are actually typeable.
Now tests are correct (checked against Haskell's typechecker) and all pass.
This commit is contained in:
grigorii.kirgizov 2019-01-28 13:32:32 +03:00
parent 0a5a7ec3c6
commit a2012219b7
3 changed files with 743 additions and 736 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

827
samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
View File

File diff suppressed because it is too large Load Diff

589
samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps
View File

@ -2208,6 +2208,9 @@
<node concept="t0$VC" id="48ZGLP8pFrZ" role="1DVIo4">
<ref role="t0$VJ" node="JqEP$8s1kx" resolve="g" />
</node>
<node concept="1U20sH" id="47xL5G3iXBz" role="lGtFl">
<property role="1U20sK" value="error" />
</node>
</node>
<node concept="1DVIo5" id="48ZGLP8pFss" role="3EUmh">
<node concept="3EUms" id="48ZGLP8pFsH" role="1DVIo8">
@ -2217,9 +2220,6 @@
<node concept="t0$VC" id="48ZGLP8pFsn" role="1DVIo4">
<ref role="t0$VJ" node="JqEP$8s1kx" resolve="g" />
</node>
<node concept="1U20sH" id="1IKbs5XIGbZ" role="lGtFl">
<property role="1U20sK" value="error" />
</node>
</node>
</node>
</node>
@ -4534,6 +4534,9 @@
<property role="TrG5h" value="d" />
</node>
</node>
<node concept="1U20sH" id="47xL5G3gi4a" role="lGtFl">
<property role="1U20sK" value="error" />
</node>
</node>
</node>
<node concept="1DVIo5" id="47tET_Whdej" role="3EUmh">
@ -4607,146 +4610,147 @@
</node>
</node>
</node>
<node concept="1U20sH" id="47tET_Xpa$f" role="lGtFl">
<property role="1U20sK" value="error" />
</node>
</node>
</node>
<node concept="1DVJbV" id="47tET_Whdid" role="1DVIru">
<node concept="1DVIrG" id="47tET_Whdie" role="j9CMd">
<node concept="1DVIrU" id="47tET_Whdif" role="1DVIrD">
<node concept="1DVIrB" id="47tET_Whdig" role="1DVIr_">
<node concept="1DVIoH" id="47tET_Whdih" role="1DVIrA">
<property role="TrG5h" value="x" />
<node concept="1X3_iC" id="47xL5G3jgRB" role="lGtFl">
<property role="3V$3am" value="clause" />
<property role="3V$3ak" value="af858d84-85f2-42f4-a854-0b3c6b5cd482/8739282858702982568/8739282858702982571" />
<node concept="1DVJbV" id="47tET_Whdid" role="8Wnug">
<node concept="1DVIrG" id="47tET_Whdie" role="j9CMd">
<node concept="1DVIrU" id="47tET_Whdif" role="1DVIrD">
<node concept="1DVIrB" id="47tET_Whdig" role="1DVIr_">
<node concept="1DVIoH" id="47tET_Whdih" role="1DVIrA">
<property role="TrG5h" value="x" />
</node>
</node>
</node>
<node concept="1DVIrU" id="47tET_Whdii" role="1DVIrw">
<node concept="1DVIrB" id="47tET_Whdij" role="1DVIr_">
<node concept="3TPQf" id="47tET_Whdik" role="1DVIrA">
<node concept="1DVIoH" id="47tET_Whdil" role="3TPQ0">
<property role="TrG5h" value="g" />
</node>
<node concept="3JbUGG" id="47tET_Whdim" role="3TPQk">
<node concept="1jz_ff" id="47tET_Whdio" role="3JbKvY">
<node concept="3EVAj" id="47tET_Whdip" role="1jz_f_">
<node concept="aFS0r" id="47tET_Whdiq" role="3EVAi">
<node concept="1DVIrU" id="47tET_Whdii" role="1DVIrw">
<node concept="1DVIrB" id="47tET_Whdij" role="1DVIr_">
<node concept="3TPQf" id="47tET_Whdik" role="1DVIrA">
<node concept="1DVIoH" id="47tET_Whdil" role="3TPQ0">
<property role="TrG5h" value="g" />
</node>
<node concept="3JbUGG" id="47tET_Whdim" role="3TPQk">
<node concept="1jz_ff" id="47tET_Whdio" role="3JbKvY">
<node concept="3EVAj" id="47tET_Whdip" role="1jz_f_">
<node concept="aFS0r" id="47tET_Whdiq" role="3EVAi">
<ref role="aFS0e" node="47tET_Whdit" resolve="b" />
</node>
<node concept="aFS0r" id="47tET_Whdir" role="3EVAk">
<ref role="aFS0e" node="47tET_Whdiu" resolve="c" />
</node>
</node>
<node concept="aFS0r" id="47tET_Whdis" role="1jz_fp">
<ref role="aFS0e" node="47tET_Whdit" resolve="b" />
</node>
<node concept="aFS0r" id="47tET_Whdir" role="3EVAk">
<ref role="aFS0e" node="47tET_Whdiu" resolve="c" />
</node>
</node>
<node concept="aFS0r" id="47tET_Whdis" role="1jz_fp">
<ref role="aFS0e" node="47tET_Whdit" resolve="b" />
<node concept="2BbKIm" id="47tET_Whdit" role="5lUUh">
<property role="TrG5h" value="b" />
</node>
<node concept="2BbKIm" id="47tET_Whdiu" role="5lUUh">
<property role="TrG5h" value="c" />
</node>
</node>
<node concept="2BbKIm" id="47tET_Whdit" role="5lUUh">
<property role="TrG5h" value="b" />
</node>
<node concept="2BbKIm" id="47tET_Whdiu" role="5lUUh">
<property role="TrG5h" value="c" />
</node>
</node>
</node>
</node>
<node concept="3EUms" id="47tET_Whdiv" role="1DVIrw">
<node concept="1DVIo5" id="47tET_Whdiw" role="3EUmv">
<node concept="3P8L2H" id="47tET_Whdix" role="1DVIo8" />
<node concept="3TPRf" id="47tET_Whdiy" role="1DVIo4">
<node concept="t0$VC" id="47tET_Whdiz" role="3TPR0">
<ref role="t0$VJ" node="47tET_Whdik" resolve="g" />
</node>
<node concept="3JbUGG" id="47tET_Whdi$" role="3TPQk">
<node concept="1jz_ff" id="47tET_Whdi_" role="3JbKvY">
<node concept="aFS0r" id="47tET_WhdiA" role="1jz_fp">
<ref role="aFS0e" node="47tET_WhdiE" resolve="d" />
</node>
<node concept="3EVAj" id="47tET_WhdiB" role="1jz_f_">
<node concept="aFS0r" id="47tET_WhdiC" role="3EVAi">
<node concept="3EUms" id="47tET_Whdiv" role="1DVIrw">
<node concept="1DVIo5" id="47tET_Whdiw" role="3EUmv">
<node concept="3P8L2H" id="47tET_Whdix" role="1DVIo8" />
<node concept="3TPRf" id="47tET_Whdiy" role="1DVIo4">
<node concept="t0$VC" id="47tET_Whdiz" role="3TPR0">
<ref role="t0$VJ" node="47tET_Whdik" resolve="g" />
</node>
<node concept="3JbUGG" id="47tET_Whdi$" role="3TPQk">
<node concept="1jz_ff" id="47tET_Whdi_" role="3JbKvY">
<node concept="aFS0r" id="47tET_WhdiA" role="1jz_fp">
<ref role="aFS0e" node="47tET_WhdiE" resolve="d" />
</node>
<node concept="aFS0r" id="47tET_WhdiD" role="3EVAk">
<ref role="aFS0e" node="47tET_Whdj8" resolve="a" />
<node concept="3EVAj" id="47tET_WhdiB" role="1jz_f_">
<node concept="aFS0r" id="47tET_WhdiC" role="3EVAi">
<ref role="aFS0e" node="47tET_WhdiE" resolve="d" />
</node>
<node concept="aFS0r" id="47tET_WhdiD" role="3EVAk">
<ref role="aFS0e" node="47tET_Whdj8" resolve="a" />
</node>
</node>
</node>
<node concept="2BbKIm" id="47tET_WhdiE" role="5lUUh">
<property role="TrG5h" value="d" />
</node>
</node>
</node>
</node>
<node concept="1DVIo5" id="47tET_WhdiF" role="3EUmh">
<node concept="t0$VC" id="47tET_WhdiG" role="1DVIo4">
<ref role="t0$VJ" node="47tET_Whdik" resolve="g" />
</node>
<node concept="3EUms" id="47tET_WhdiH" role="1DVIo8">
<node concept="3P8MHP" id="47tET_WhdiI" role="3EUmv" />
<node concept="3P8MHP" id="47tET_WhdiJ" role="3EUmh" />
</node>
</node>
</node>
</node>
</node>
<node concept="3TPQf" id="47tET_WhdiK" role="1DVIrJ">
<node concept="1DVIoH" id="47tET_WhdiL" role="3TPQ0">
<property role="TrG5h" value="qq_lb4" />
</node>
<node concept="3JbUGG" id="47tET_WhdiM" role="3TPQk">
<node concept="1FkZV4" id="47tET_WhdiN" role="1FkZ4g">
<ref role="1FvTW1" node="47tET_Whdj8" resolve="a" />
<ref role="1FkZV7" node="47tET_Wha9b" resolve="C1" />
</node>
<node concept="1jz_ff" id="47tET_WhdiO" role="3JbKvY">
<node concept="aFS0r" id="47tET_WhdiP" role="1jz_fp">
<ref role="aFS0e" node="47tET_Whdj8" resolve="a" />
</node>
<node concept="1jz_ff" id="47tET_WhdiQ" role="1jz_f_">
<node concept="3EVAj" id="47tET_WhdiR" role="1jz_f_">
<node concept="3EVAj" id="47tET_WhdiS" role="3EVAk">
<node concept="aFS0r" id="47tET_WhdiT" role="3EVAk">
<ref role="aFS0e" node="47tET_Whdj8" resolve="a" />
</node>
<node concept="3P8Jbz" id="47tET_WhdiU" role="3EVAi" />
</node>
<node concept="3EVAj" id="47tET_WhdiV" role="3EVAi">
<node concept="aFS0r" id="47tET_WhdiW" role="3EVAk">
<ref role="aFS0e" node="47tET_Whdj8" resolve="a" />
</node>
<node concept="3EVAj" id="47tET_WhdiX" role="3EVAi">
<node concept="3P8Jbz" id="47tET_WhdiY" role="3EVAk" />
<node concept="3P8Jbz" id="47tET_WhdiZ" role="3EVAi" />
</node>
</node>
</node>
<node concept="3JbUGG" id="47tET_Whdj0" role="1jz_fp">
<node concept="2BbKIm" id="47tET_Whdj1" role="5lUUh">
<property role="TrG5h" value="b" />
</node>
<node concept="2BbKIm" id="47tET_Whdj2" role="5lUUh">
<property role="TrG5h" value="c" />
</node>
<node concept="1jz_ff" id="47tET_Whdj3" role="3JbKvY">
<node concept="aFS0r" id="47tET_Whdj4" role="1jz_fp">
<ref role="aFS0e" node="47tET_Whdj1" resolve="b" />
</node>
<node concept="3EVAj" id="47tET_Whdj5" role="1jz_f_">
<node concept="aFS0r" id="47tET_Whdj6" role="3EVAi">
<ref role="aFS0e" node="47tET_Whdj1" resolve="b" />
</node>
<node concept="aFS0r" id="47tET_Whdj7" role="3EVAk">
<ref role="aFS0e" node="47tET_Whdj2" resolve="c" />
</node>
</node>
</node>
<node concept="2BbKIm" id="47tET_WhdiE" role="5lUUh">
<property role="TrG5h" value="d" />
</node>
</node>
</node>
</node>
<node concept="1DVIo5" id="47tET_WhdiF" role="3EUmh">
<node concept="t0$VC" id="47tET_WhdiG" role="1DVIo4">
<ref role="t0$VJ" node="47tET_Whdik" resolve="g" />
</node>
<node concept="3EUms" id="47tET_WhdiH" role="1DVIo8">
<node concept="3P8MHP" id="47tET_WhdiI" role="3EUmv" />
<node concept="3P8MHP" id="47tET_WhdiJ" role="3EUmh" />
</node>
<node concept="2BbKIm" id="47tET_Whdj8" role="5lUUh">
<property role="TrG5h" value="a" />
</node>
</node>
</node>
</node>
<node concept="3TPQf" id="47tET_WhdiK" role="1DVIrJ">
<node concept="1DVIoH" id="47tET_WhdiL" role="3TPQ0">
<property role="TrG5h" value="qq_lb4" />
</node>
<node concept="3JbUGG" id="47tET_WhdiM" role="3TPQk">
<node concept="1FkZV4" id="47tET_WhdiN" role="1FkZ4g">
<ref role="1FvTW1" node="47tET_Whdj8" resolve="a" />
<ref role="1FkZV7" node="47tET_Wha9b" resolve="C1" />
</node>
<node concept="1jz_ff" id="47tET_WhdiO" role="3JbKvY">
<node concept="aFS0r" id="47tET_WhdiP" role="1jz_fp">
<ref role="aFS0e" node="47tET_Whdj8" resolve="a" />
</node>
<node concept="1jz_ff" id="47tET_WhdiQ" role="1jz_f_">
<node concept="3EVAj" id="47tET_WhdiR" role="1jz_f_">
<node concept="3EVAj" id="47tET_WhdiS" role="3EVAk">
<node concept="aFS0r" id="47tET_WhdiT" role="3EVAk">
<ref role="aFS0e" node="47tET_Whdj8" resolve="a" />
</node>
<node concept="3P8Jbz" id="47tET_WhdiU" role="3EVAi" />
</node>
<node concept="3EVAj" id="47tET_WhdiV" role="3EVAi">
<node concept="aFS0r" id="47tET_WhdiW" role="3EVAk">
<ref role="aFS0e" node="47tET_Whdj8" resolve="a" />
</node>
<node concept="3EVAj" id="47tET_WhdiX" role="3EVAi">
<node concept="3P8Jbz" id="47tET_WhdiY" role="3EVAk" />
<node concept="3P8Jbz" id="47tET_WhdiZ" role="3EVAi" />
</node>
</node>
</node>
<node concept="3JbUGG" id="47tET_Whdj0" role="1jz_fp">
<node concept="2BbKIm" id="47tET_Whdj1" role="5lUUh">
<property role="TrG5h" value="b" />
</node>
<node concept="2BbKIm" id="47tET_Whdj2" role="5lUUh">
<property role="TrG5h" value="c" />
</node>
<node concept="1jz_ff" id="47tET_Whdj3" role="3JbKvY">
<node concept="aFS0r" id="47tET_Whdj4" role="1jz_fp">
<ref role="aFS0e" node="47tET_Whdj1" resolve="b" />
</node>
<node concept="3EVAj" id="47tET_Whdj5" role="1jz_f_">
<node concept="aFS0r" id="47tET_Whdj6" role="3EVAi">
<ref role="aFS0e" node="47tET_Whdj1" resolve="b" />
</node>
<node concept="aFS0r" id="47tET_Whdj7" role="3EVAk">
<ref role="aFS0e" node="47tET_Whdj2" resolve="c" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2BbKIm" id="47tET_Whdj8" role="5lUUh">
<property role="TrG5h" value="a" />
</node>
</node>
</node>
</node>
</node>
<node concept="1FkZNw" id="2O9ahh6znzy" role="1DVIru">
@ -4938,6 +4942,9 @@
<node concept="3P8L2H" id="47tET_WwVsa" role="3EUmv" />
<node concept="3P8L2H" id="47tET_WwVsc" role="3EUmh" />
</node>
<node concept="1U20sH" id="47xL5G3iI7i" role="lGtFl">
<property role="1U20sK" value="error" />
</node>
</node>
<node concept="3EUms" id="47tET_WwVs0" role="1DVIo8">
<node concept="3P8L2H" id="47tET_WwVs2" role="3EUmv" />
@ -4949,7 +4956,7 @@
<node concept="1DVJbV" id="47tET_WwVeW" role="1DVIru">
<node concept="1DVIrG" id="47tET_WwVeX" role="j9CMd">
<node concept="1DVIoH" id="47tET_WwVeY" role="1DVIrJ">
<property role="TrG5h" value="ii2" />
<property role="TrG5h" value="ii2bool" />
</node>
<node concept="1DVIo5" id="47tET_WwVeZ" role="1DVIrD">
<node concept="1DVIo5" id="47tET_WwVf0" role="1DVIo4">
@ -4979,7 +4986,7 @@
<node concept="1DVJbV" id="47tET_WwV6e" role="1DVIru">
<node concept="1DVIrG" id="47tET_WwV6f" role="j9CMd">
<node concept="1DVIoH" id="47tET_WwV6g" role="1DVIrJ">
<property role="TrG5h" value="ii2_bad" />
<property role="TrG5h" value="ii2free" />
</node>
<node concept="1DVIo5" id="47tET_WwV6h" role="1DVIrD">
<node concept="1DVIo5" id="47tET_WwV6j" role="1DVIo4">
@ -4996,9 +5003,6 @@
<ref role="t0$VJ" node="47tET_WwVda" resolve="x" />
</node>
</node>
<node concept="1U20sH" id="47tET_XliIO" role="lGtFl">
<property role="1U20sK" value="error" />
</node>
</node>
<node concept="1DVIrU" id="47tET_WwVdg" role="1DVIo8">
<node concept="1DVIrB" id="47tET_WwVdh" role="1DVIr_">
@ -5016,7 +5020,7 @@
<node concept="1DVJbV" id="47tET_Xliiq" role="1DVIru">
<node concept="1DVIrG" id="47tET_Xliir" role="j9CMd">
<node concept="1DVIoH" id="47tET_Xliis" role="1DVIrJ">
<property role="TrG5h" value="ii2a" />
<property role="TrG5h" value="ii2anno" />
</node>
<node concept="1DVIo5" id="47tET_Xliit" role="1DVIrD">
<node concept="1DVIo5" id="47tET_Xliiu" role="1DVIo4">
@ -5078,7 +5082,7 @@
<node concept="1DVJbV" id="47tET_XliM6" role="1DVIru">
<node concept="1DVIrG" id="47tET_XliM7" role="j9CMd">
<node concept="1DVIoH" id="47tET_XliM8" role="1DVIrJ">
<property role="TrG5h" value="ii3" />
<property role="TrG5h" value="ii3bool" />
</node>
<node concept="1DVIo5" id="47tET_XliM9" role="1DVIrD">
<node concept="1DVIo5" id="47tET_XliMa" role="1DVIo4">
@ -5129,7 +5133,7 @@
<node concept="1DVJbV" id="47tET_XljbM" role="1DVIru">
<node concept="1DVIrG" id="47tET_XljbN" role="j9CMd">
<node concept="1DVIoH" id="47tET_XljbO" role="1DVIrJ">
<property role="TrG5h" value="ii3_bad" />
<property role="TrG5h" value="ii3free" />
</node>
<node concept="1DVIo5" id="47tET_XljbP" role="1DVIrD">
<node concept="1DVIo5" id="47tET_XljbQ" role="1DVIo4">
@ -5177,15 +5181,12 @@
</node>
</node>
</node>
<node concept="1U20sH" id="47tET_XpfVS" role="lGtFl">
<property role="1U20sK" value="error" />
</node>
</node>
</node>
<node concept="1DVJbV" id="47tET_Xljn5" role="1DVIru">
<node concept="1DVIrG" id="47tET_Xljn6" role="j9CMd">
<node concept="1DVIoH" id="47tET_Xljn7" role="1DVIrJ">
<property role="TrG5h" value="ii3a_unclear" />
<property role="TrG5h" value="ii3anno_unclear" />
</node>
<node concept="1DVIo5" id="47tET_Xljn8" role="1DVIrD">
<node concept="1DVIo5" id="47tET_Xljn9" role="1DVIo4">
@ -5257,7 +5258,7 @@
<node concept="1DVJbV" id="47tET_Xliwm" role="1DVIru">
<node concept="1DVIrG" id="47tET_Xliwn" role="j9CMd">
<node concept="1DVIoH" id="47tET_Xliwo" role="1DVIrJ">
<property role="TrG5h" value="ii4" />
<property role="TrG5h" value="ii4_bad" />
</node>
<node concept="1DVIo5" id="47tET_Xliwp" role="1DVIrD">
<node concept="1DVIo5" id="47tET_Xliwq" role="1DVIo4">
@ -5288,6 +5289,9 @@
</node>
</node>
</node>
<node concept="1U20sH" id="47xL5G3h3nw" role="lGtFl">
<property role="1U20sK" value="error" />
</node>
</node>
<node concept="1DVIrU" id="47tET_Xliw_" role="1DVIo8">
<node concept="1DVIrB" id="47tET_XliwA" role="1DVIr_">
@ -5811,5 +5815,322 @@
</node>
</node>
</node>
<node concept="1DVIrt" id="47xL5G3jc4X">
<property role="TrG5h" value="TypeclassesTest2" />
<node concept="1FkZNM" id="47xL5G3jc4Y" role="1DVIru">
<property role="TrG5h" value="Monoid3" />
<node concept="2BbKIm" id="47xL5G3jc4Z" role="1FkZN_">
<property role="TrG5h" value="z" />
</node>
<node concept="1FkZNY" id="47xL5G3jc50" role="1FkZNV">
<node concept="3TPQf" id="47xL5G3jc51" role="1FkZNT">
<node concept="1DVIoH" id="47xL5G3jc52" role="3TPQ0">
<property role="TrG5h" value="mempty" />
</node>
<node concept="aFS0r" id="47xL5G3jc53" role="3TPQk">
<ref role="aFS0e" node="47xL5G3jc4Z" resolve="z" />
</node>
</node>
</node>
<node concept="1FkZNY" id="47xL5G3jc54" role="1FkZNV">
<node concept="3TPQf" id="47xL5G3jc55" role="1FkZNT">
<node concept="1DVIoH" id="47xL5G3jc56" role="3TPQ0">
<property role="TrG5h" value="mappend" />
</node>
<node concept="1jz_ff" id="47xL5G3jc57" role="3TPQk">
<node concept="aFS0r" id="47xL5G3jc58" role="1jz_fp">
<ref role="aFS0e" node="47xL5G3jc4Z" resolve="z" />
</node>
<node concept="1jz_ff" id="47xL5G3jc59" role="1jz_f_">
<node concept="aFS0r" id="47xL5G3jc5a" role="1jz_f_">
<ref role="aFS0e" node="47xL5G3jc4Z" resolve="z" />
</node>
<node concept="aFS0r" id="47xL5G3jc5b" role="1jz_fp">
<ref role="aFS0e" node="47xL5G3jc4Z" resolve="z" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1FkZNw" id="47xL5G3jc5E" role="1DVIru">
<ref role="1FkZWm" node="47xL5G3jc4Y" resolve="Monoid3" />
<node concept="1FkZNI" id="47xL5G3jc5F" role="1FkZNz">
<ref role="1FkZND" node="2O9ahh6x9Cq" resolve="mappend" />
<node concept="1DVIrU" id="47xL5G3jc5G" role="1FkZNF">
<node concept="1DVIrB" id="47xL5G3jc5H" role="1DVIr_">
<node concept="1DVIoH" id="47xL5G3jc5I" role="1DVIrA">
<property role="TrG5h" value="a" />
</node>
</node>
<node concept="1DVIrU" id="47xL5G3jc5J" role="1DVIrw">
<node concept="1DVIrB" id="47xL5G3jc5K" role="1DVIr_">
<node concept="1DVIoH" id="47xL5G3jc5L" role="1DVIrA">
<property role="TrG5h" value="b" />
</node>
</node>
<node concept="1DVIrH" id="47xL5G3jc5M" role="1DVIrw">
<node concept="1DVIo5" id="47xL5G3jc5N" role="1DVIrk">
<node concept="t0$VC" id="47xL5G3jc5O" role="1DVIo8">
<ref role="t0$VJ" node="47xL5G3jc5L" resolve="b" />
</node>
<node concept="1DVIo5" id="47xL5G3jc5P" role="1DVIo4">
<node concept="t0$VC" id="47xL5G3jc5Q" role="1DVIo8">
<ref role="t0$VJ" node="47xL5G3jc5I" resolve="a" />
</node>
<node concept="t0$VC" id="47xL5G3jc5R" role="1DVIo4">
<ref role="t0$VJ" node="47xL5G3jc5T" resolve="and" />
</node>
</node>
</node>
<node concept="1DVIrG" id="47xL5G3jc5S" role="1DVIrE">
<node concept="1DVIoH" id="47xL5G3jc5T" role="1DVIrJ">
<property role="TrG5h" value="and" />
</node>
<node concept="1DVIrU" id="47xL5G3jc5U" role="1DVIrD">
<node concept="1DVIrB" id="47xL5G3jc5V" role="1DVIr_">
<node concept="1DVIoH" id="47xL5G3jc5W" role="1DVIrA">
<property role="TrG5h" value="a" />
</node>
</node>
<node concept="1DVIrU" id="47xL5G3jc5X" role="1DVIrw">
<node concept="1DVIrB" id="47xL5G3jc5Y" role="1DVIr_">
<node concept="1DVIoH" id="47xL5G3jc5Z" role="1DVIrA">
<property role="TrG5h" value="b" />
</node>
</node>
<node concept="FlqVS" id="47xL5G3jc60" role="1DVIrw">
<node concept="t0$VC" id="47xL5G3jc61" role="FlqVt">
<ref role="t0$VJ" node="47xL5G3jc5W" resolve="a" />
</node>
<node concept="t0$VC" id="47xL5G3jc62" role="FlqVr">
<ref role="t0$VJ" node="47xL5G3jc5Z" resolve="b" />
</node>
<node concept="t0$VC" id="47xL5G3jc63" role="FlqVm">
<ref role="t0$VJ" node="47xL5G3jc5W" resolve="a" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1FkZNI" id="47xL5G3jc64" role="1FkZNz">
<ref role="1FkZND" node="2O9ahh6x9CE" resolve="mempty" />
<node concept="3P8L2H" id="47xL5G3jc65" role="1FkZNF" />
</node>
<node concept="3JbUGG" id="47xL5G3jc66" role="1FkZNx">
<node concept="3P8Jbz" id="47xL5G3jc67" role="3JbKvY" />
</node>
</node>
<node concept="1DVJbV" id="47xL5G3jiba" role="1DVIru">
<node concept="1DVIrG" id="47xL5G3jibb" role="j9CMd">
<node concept="1DVIrU" id="47xL5G3jibc" role="1DVIrD">
<node concept="1DVIrB" id="47xL5G3jibd" role="1DVIr_">
<node concept="1DVIoH" id="47xL5G3jibe" role="1DVIrA">
<property role="TrG5h" value="x" />
</node>
</node>
<node concept="1DVIrU" id="47xL5G3jibf" role="1DVIrw">
<node concept="1DVIrB" id="47xL5G3jibg" role="1DVIr_">
<node concept="3TPQf" id="47xL5G3jibh" role="1DVIrA">
<node concept="1DVIoH" id="47xL5G3jibi" role="3TPQ0">
<property role="TrG5h" value="g" />
</node>
<node concept="3JbUGG" id="47xL5G3jibj" role="3TPQk">
<node concept="1FkZV4" id="47xL5G3jibk" role="1FkZ4g">
<ref role="1FvTW1" node="47xL5G3jibr" resolve="c" />
<ref role="1FkZV7" node="47tET_Wha9b" resolve="C1" />
</node>
<node concept="1jz_ff" id="47xL5G3jibl" role="3JbKvY">
<node concept="3EVAj" id="47xL5G3jibm" role="1jz_f_">
<node concept="aFS0r" id="47xL5G3jibn" role="3EVAi">
<ref role="aFS0e" node="47xL5G3jibq" resolve="b" />
</node>
<node concept="aFS0r" id="47xL5G3jibo" role="3EVAk">
<ref role="aFS0e" node="47xL5G3jibr" resolve="c" />
</node>
</node>
<node concept="aFS0r" id="47xL5G3jibp" role="1jz_fp">
<ref role="aFS0e" node="47xL5G3jibq" resolve="b" />
</node>
</node>
<node concept="2BbKIm" id="47xL5G3jibq" role="5lUUh">
<property role="TrG5h" value="b" />
</node>
<node concept="2BbKIm" id="47xL5G3jibr" role="5lUUh">
<property role="TrG5h" value="c" />
</node>
</node>
</node>
</node>
<node concept="3EUms" id="47xL5G3jibs" role="1DVIrw">
<node concept="1DVIo5" id="47xL5G3jibt" role="3EUmv">
<node concept="3P8L2H" id="47xL5G3jibu" role="1DVIo8" />
<node concept="3TPRf" id="47xL5G3jibv" role="1DVIo4">
<node concept="t0$VC" id="47xL5G3jibw" role="3TPR0">
<ref role="t0$VJ" node="47xL5G3jibh" resolve="g" />
</node>
<node concept="3JbUGG" id="47xL5G3jibx" role="3TPQk">
<node concept="1jz_ff" id="47xL5G3jiby" role="3JbKvY">
<node concept="aFS0r" id="47xL5G3jibz" role="1jz_fp">
<ref role="aFS0e" node="47xL5G3jibB" resolve="d" />
</node>
<node concept="3EVAj" id="47xL5G3jib$" role="1jz_f_">
<node concept="aFS0r" id="47xL5G3jib_" role="3EVAi">
<ref role="aFS0e" node="47xL5G3jibB" resolve="d" />
</node>
<node concept="aFS0r" id="47xL5G3jibA" role="3EVAk">
<ref role="aFS0e" node="47xL5G3jic6" resolve="a" />
</node>
</node>
</node>
<node concept="2BbKIm" id="47xL5G3jibB" role="5lUUh">
<property role="TrG5h" value="d" />
</node>
</node>
<node concept="1U20sH" id="47xL5G3jibC" role="lGtFl">
<property role="1U20sK" value="error" />
</node>
</node>
</node>
<node concept="1DVIo5" id="47xL5G3jibD" role="3EUmh">
<node concept="t0$VC" id="47xL5G3jibE" role="1DVIo4">
<ref role="t0$VJ" node="47xL5G3jibh" resolve="g" />
</node>
<node concept="3EUms" id="47xL5G3jibF" role="1DVIo8">
<node concept="3P8MHP" id="47xL5G3jibG" role="3EUmv" />
<node concept="3P8MHP" id="47xL5G3jibH" role="3EUmh" />
</node>
</node>
</node>
</node>
</node>
<node concept="3TPQf" id="47xL5G3jibI" role="1DVIrJ">
<node concept="1DVIoH" id="47xL5G3jibJ" role="3TPQ0">
<property role="TrG5h" value="qq_lb4_bad" />
</node>
<node concept="3JbUGG" id="47xL5G3jibK" role="3TPQk">
<node concept="1jz_ff" id="47xL5G3jibL" role="3JbKvY">
<node concept="aFS0r" id="47xL5G3jibM" role="1jz_fp">
<ref role="aFS0e" node="47xL5G3jic6" resolve="a" />
</node>
<node concept="1jz_ff" id="47xL5G3jibN" role="1jz_f_">
<node concept="3EVAj" id="47xL5G3jibO" role="1jz_f_">
<node concept="3EVAj" id="47xL5G3jibP" role="3EVAk">
<node concept="aFS0r" id="47xL5G3jibQ" role="3EVAk">
<ref role="aFS0e" node="47xL5G3jic6" resolve="a" />
</node>
<node concept="3P8Jbz" id="47xL5G3jibR" role="3EVAi" />
</node>
<node concept="3EVAj" id="47xL5G3jibS" role="3EVAi">
<node concept="aFS0r" id="47xL5G3jibT" role="3EVAk">
<ref role="aFS0e" node="47xL5G3jic6" resolve="a" />
</node>
<node concept="3EVAj" id="47xL5G3jibU" role="3EVAi">
<node concept="3P8Jbz" id="47xL5G3jibV" role="3EVAk" />
<node concept="3P8Jbz" id="47xL5G3jibW" role="3EVAi" />
</node>
</node>
</node>
<node concept="3JbUGG" id="47xL5G3jibX" role="1jz_fp">
<node concept="1FkZV4" id="47xL5G3jibY" role="1FkZ4g">
<ref role="1FkZV7" node="47tET_Wha9b" resolve="C1" />
<ref role="1FvTW1" node="47xL5G3jic0" resolve="c" />
</node>
<node concept="2BbKIm" id="47xL5G3jibZ" role="5lUUh">
<property role="TrG5h" value="b" />
</node>
<node concept="2BbKIm" id="47xL5G3jic0" role="5lUUh">
<property role="TrG5h" value="c" />
</node>
<node concept="1jz_ff" id="47xL5G3jic1" role="3JbKvY">
<node concept="aFS0r" id="47xL5G3jic2" role="1jz_fp">
<ref role="aFS0e" node="47xL5G3jibZ" resolve="b" />
</node>
<node concept="3EVAj" id="47xL5G3jic3" role="1jz_f_">
<node concept="aFS0r" id="47xL5G3jic4" role="3EVAi">
<ref role="aFS0e" node="47xL5G3jibZ" resolve="b" />
</node>
<node concept="aFS0r" id="47xL5G3jic5" role="3EVAk">
<ref role="aFS0e" node="47xL5G3jic0" resolve="c" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2BbKIm" id="47xL5G3jic6" role="5lUUh">
<property role="TrG5h" value="a" />
</node>
</node>
</node>
</node>
</node>
<node concept="1X3_iC" id="47xL5G3jiPv" role="lGtFl">
<property role="3V$3am" value="clause" />
<property role="3V$3ak" value="af858d84-85f2-42f4-a854-0b3c6b5cd482/8739282858702982568/8739282858702982571" />
<node concept="1DVJbV" id="47xL5G3jiy5" role="8Wnug">
<node concept="1DVIrG" id="47xL5G3jiy7" role="j9CMd">
<node concept="1DVIoH" id="47xL5G3jiy9" role="1DVIrJ">
<property role="TrG5h" value="dummy" />
</node>
<node concept="1DVIrH" id="47xL5G3jiEQ" role="1DVIrD">
<node concept="1DVIo5" id="47xL5G3jiJl" role="1DVIrk">
<node concept="t0$VC" id="47xL5G3jiF8" role="1DVIo4">
<ref role="t0$VJ" node="47xL5G3jiEV" resolve="fdummy" />
</node>
<node concept="3EUms" id="47xL5G3ji$d" role="1DVIo8">
<node concept="3P8MHP" id="47xL5G3ji$f" role="3EUmv" />
<node concept="3P8MHP" id="47xL5G3ji$h" role="3EUmh" />
</node>
</node>
<node concept="1DVIrG" id="47xL5G3jiEU" role="1DVIrE">
<node concept="1DVIoH" id="47xL5G3jiEV" role="1DVIrJ">
<property role="TrG5h" value="fdummy" />
</node>
<node concept="1DVIrU" id="47xL5G3ji$7" role="1DVIrD">
<node concept="1DVIrB" id="47xL5G3ji$8" role="1DVIr_">
<node concept="1DVIoH" id="47xL5G3ji$9" role="1DVIrA">
<property role="TrG5h" value="x" />
</node>
</node>
<node concept="t0$VC" id="47xL5G3jiF6" role="1DVIrw">
<ref role="t0$VJ" node="47xL5G3ji$9" resolve="x" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1DVJbV" id="47xL5G3jc3J" role="1DVIru">
<node concept="1DVIrG" id="47xL5G3jc3K" role="j9CMd">
<node concept="1DVIoH" id="47xL5G3jc3L" role="1DVIrJ">
<property role="TrG5h" value="ii1_bad" />
</node>
<node concept="1DVIo5" id="47xL5G3jc3M" role="1DVIrD">
<node concept="1DVIo5" id="47xL5G3jc3N" role="1DVIo4">
<node concept="t0$VC" id="47xL5G3jcaD" role="1DVIo4">
<ref role="t0$VJ" node="47xL5G3jc55" resolve="mappend" />
</node>
<node concept="3EUms" id="47xL5G3jc3P" role="1DVIo8">
<node concept="3P8L2H" id="47xL5G3jc3Q" role="3EUmv" />
<node concept="3P8L2H" id="47xL5G3jc3R" role="3EUmh" />
</node>
<node concept="1U20sH" id="47xL5G3jc3S" role="lGtFl">
<property role="1U20sK" value="error" />
</node>
</node>
<node concept="3EUms" id="47xL5G3jc3T" role="1DVIo8">
<node concept="3P8L2H" id="47xL5G3jc3U" role="3EUmv" />
<node concept="3P8L2H" id="47xL5G3jc3V" role="3EUmh" />
</node>
</node>
</node>
</node>
</node>
</model>

63
samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
View File

@ -69,12 +69,6 @@
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
<concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
<property id="6329021646629104958" name="text" index="3SKdUp" />
</concept>
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
<child id="6329021646629175155" name="commentPart" index="3SKWNk" />
</concept>
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
</language>
<language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
@ -132,19 +126,9 @@
</concept>
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
</concept>
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
<concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
<property id="709746936026609031" name="linkId" index="3V$3ak" />
<property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
</concept>
<concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
<child id="3078666699043039389" name="commentedNode" index="8Wnug" />
</concept>
</language>
</registry>
<node concept="2XOHcx" id="6EwjVjWuXZY">
@ -394,41 +378,32 @@
<property role="TrG5h" value="DemoScopes" />
<node concept="3cqZAl" id="1IKbs5XIs8H" role="3clF45" />
<node concept="3clFbS" id="1IKbs5XIs8L" role="3clF47">
<node concept="3SKdUt" id="2tst4bvYo3Z" role="3cqZAp">
<node concept="3SKdUq" id="2tst4bvYo41" role="3SKWNk">
<property role="3SKdUp" value="FIXME test temporarily disabled" />
</node>
</node>
<node concept="1X3_iC" id="2tst4bvYo2M" role="lGtFl">
<property role="3V$3am" value="statement" />
<property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
<node concept="2Hmddi" id="RcyXiSVPlH" role="8Wnug">
<node concept="2OqwBi" id="RcyXiSVPlI" role="2Hmdds">
<node concept="2OqwBi" id="RcyXiSVPlJ" role="2Oq$k0">
<node concept="2YIFZM" id="RcyXiSVPlK" role="2Oq$k0">
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
<ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
<node concept="2OqwBi" id="RcyXiSVPlL" role="37wK5m">
<node concept="2WthIp" id="RcyXiSVPlM" role="2Oq$k0" />
<node concept="2XshWL" id="RcyXiSVPlN" role="2OqNvi">
<ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
<node concept="2tJFMh" id="RcyXiSVPlO" role="2XxRq1">
<node concept="ZC_QK" id="RcyXiSVPvg" role="2tJFKM">
<ref role="2aWVGs" to="ysck:JqEP$8t9fh" resolve="DemoScopes" />
</node>
<node concept="2Hmddi" id="RcyXiSVPlH" role="3cqZAp">
<node concept="2OqwBi" id="RcyXiSVPlI" role="2Hmdds">
<node concept="2OqwBi" id="RcyXiSVPlJ" role="2Oq$k0">
<node concept="2YIFZM" id="RcyXiSVPlK" role="2Oq$k0">
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TestLaunchTypechecking" />
<ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
<node concept="2OqwBi" id="RcyXiSVPlL" role="37wK5m">
<node concept="2WthIp" id="RcyXiSVPlM" role="2Oq$k0" />
<node concept="2XshWL" id="RcyXiSVPlN" role="2OqNvi">
<ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
<node concept="2tJFMh" id="RcyXiSVPlO" role="2XxRq1">
<node concept="ZC_QK" id="RcyXiSVPvg" role="2tJFKM">
<ref role="2aWVGs" to="ysck:JqEP$8t9fh" resolve="DemoScopes" />
</node>
</node>
</node>
<node concept="1jxXqW" id="RcyXiSVPlQ" role="37wK5m" />
</node>
<node concept="liA8E" id="RcyXiSVPlR" role="2OqNvi">
<ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
</node>
<node concept="1jxXqW" id="RcyXiSVPlQ" role="37wK5m" />
</node>
<node concept="liA8E" id="RcyXiSVPlS" role="2OqNvi">
<ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
<node concept="liA8E" id="RcyXiSVPlR" role="2OqNvi">
<ref role="37wK5l" to="tj24:27bTNFfaVLW" resolve="skipLocal" />
</node>
</node>
<node concept="liA8E" id="RcyXiSVPlS" role="2OqNvi">
<ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
</node>
</node>
</node>
</node>