ref: 8222d73799103f55611de1e17be73c8b7f34bbc6
parent: 07c984286ee567058dbe31f3eacc12bede156f0c
author: Lennart Augustsson <lennart@augustsson.net>
date: Sat Oct 28 13:51:53 EDT 2023
Make it compile
--- a/comb/mhs.comb
+++ b/comb/mhs.comb
@@ -1,3 +1,3 @@
v4.0
-1129
-((A :0 _952) ((A :1 ((B _998) _0)) ((A :2 (((S' _998) _0) I)) ((A :3 _922) ((A :4 (_3 "undefined")) ((A :5 I) ((A :6 (((C' B) _951) ((C _84) _5))) ((A :7 (((C' _6) (_969 _73)) ((_84 _967) _72))) ((A :8 ((B ((S _998) _967)) _3)) ((A :9 T) ((A :10 (T I)) ((A :11 ((B (_84 _210)) _10)) ((A :12 ((B (B (_82 _9))) (((C' B) ((B C) _10)) (B _10)))) ((A :13 ((B (B (_82 _9))) (((C' B) ((B C) _10)) (BK _10)))) ((A :14 ((B (_82 _9)) P)) ((A :15 ((B (B (_82 _9))) ((B ((C' C) _10)) (B P)))) ((A :16 _15) ((A :17 (((C' B) _12) (((C' B) _12) (B _14)))) ((A :18 ((B (_82 _9)) (B (P _880)))) ((A :19 ((B (_82 _9)) (BK (P _880)))) ((A :20 ((_82 _9) ((S P) I))) ((A :21 ((B (_82 _9)) ((C (S' P)) I))) ((A :22 ((B Y) ((B (B (P (_14 _122)))) (((C' B) ((B (C' B)) (B _12))) (((C' (C' B)) (B _12)) ((B (B _14)) _123)))))) ((A :23 ((B Y) ((B (B (P (_14 _880)))) ((B (C' B)) (B _13))))) ((A :24 _3) ((A :25 (T (_14 _880))) ((A :26 (_22 _85)) ((A :27 (R _34)) ((A :28 (T _33)) ((A :29 ((P _34) _33)) ((A :30 _34) ((A :31 ((C ((C S') _29)) I)) ((A :32 ((C S) _29)) ((A :33 K) ((A :34 A) ((A :35 ((_76 _916) _917)) ((A :36 ((_76 _926) (_80 _36))) ((A :37 _927) ((A :38 _928) ((A :39 (((S' _28) (_919 #97)) ((C _919) #122))) ((A :40 (((S' _28) (_919 #65)) ((C _919) #90))) ((A :41 (((S' _27) _39) _40)) ((A :42 (((S' _28) (_919 #48)) ((C _919) #57))) ((A :43 (((S' _28) (_919 #32)) ((C _919) #126))) ((A :44 _916) ((A :45 _917) ((A :46 _919) ((A :47 _918) ((A :48 (((S' _27) ((C (_77 _35)) #32)) (((S' _27) ((C (_77 _35)) #9)) ((C (_77 _35)) #10)))) ((A :49 ((S ((S (((S' _28) (_46 #65)) ((C _46) #90))) (_34 (((_879 "lib/Data/Char.hs") #3) #8)))) ((B _37) (((C' _91) (((C' _92) _38) (_38 #65))) (_38 #97))))) ((A :50 ((S ((S (((S' _28) (_46 #97)) ((C _46) #97))) (_34 (((_879 "lib/Data/Char.hs") #3) #8)))) ((B _37) (((C' _91) (((C' _92) _38) (_38 #97))) (_38 #65))))) ((A :51 _887) ((A :52 _888) ((A :53 _889) ((A :54 _890) ((A :55 (_52 %0.0)) ((A :56 _51) ((A :57 _52) ((A :58 _53) ((A :59 _54) ((A :60 ((_76 _891) _892)) ((A :61 (_77 _60)) ((A :62 (_78 _60)) ((A :63 _893) ((A :64 _894) ((A :65 _895) ((A :66 _896) ((A :67 _63) ((A :68 _64) ((A :69 _65) ((A :70 _66) ((A :71 _897) ((A :72 ((B BK) T)) ((A :73 (BK T)) ((A :74 (((S' _76) (((S' C) ((B (C S')) (((C' C) ((B (C C')) ((B _77) (T K)))) (K _33)))) ((B ((C' B) (T (K _33)))) ((B _77) (T A))))) ((B _80) ((B _74) (((S' P) (T K)) (T A)))))) ((A :75 P) ((A :76 P) ((A :77 (T K)) ((A :78 (T A)) ((A :79 (K (noDefault "Eq.=="))) ((A :80 ((B (B (B _29))) _77)) ((A :81 ((_76 ((C ((C S') _29)) I)) (_80 _81))) ((A :82 I) ((A :83 (S _924)) ((A :84 B) ((A :85 I) ((A :86 K) ((A :87 C) ((A :88 _923) ((A :89 ((C ((C S') _210)) _211)) ((A :90 (((C' (S' (C' B))) B) I)) ((A :91 _881) ((A :92 _882) ((A :93 _883) ((A :94 _884) ((A :95 _885) ((A :96 _886) ((A :97 (_92 #0)) ((A :98 ((_76 _904) _905)) ((A :99 _906) ((A :100 _907) ((A :101 _908) ((A :102 _909) ((A :103 (BK K)) ((A :104 ((B BK) ((B (B BK)) P))) ((A :105 ((B (B (B BK))) ((B (B (B BK))) ((B (B (B C))) ((B (B C)) P))))) ((A :106 (((S' S) (((S' (S' C)) (((C' (C' S)) (((C' B) ((B (S' S')) (((C' B) ((B _27) (_100 #0))) ((C (_77 _98)) #0)))) ((B (B ((C' P) (_96 #1)))) _91))) (C P))) _94)) _95)) ((A :107 _103) ((A :108 (((S' C) ((B (P _197)) (((C' (C' B)) (((C' C) (_77 _98)) _197)) _198))) ((B ((C' (C' (C' C))) (((C' (C' (C' C))) (((C' (C' (C' (C' S')))) ((B (B (B (B C)))) ((B ((C' (C' (C' C))) ((B (B (B ((S' S') ((C (_77 _98)) #0))))) ((B ((C' (C' C)) ((B (B ((S' S') ((C (_77 _98)) #1)))) ((B ((C' C) ((B ((C' S') ((C (_77 _98)) #2))) (C _108)))) (C _108))))) (C _108))))) (C _108)))) (T K))) (T A)))) ((C _106) #4)))) ((A :109 (_115 _86)) ((A :110 ((_131 (_89 _109)) _107)) ((A :111 ((C (((C' B) ((P _122) (((C' (C' O)) P) K))) (((S' (C' (C' (C' B)))) ((B (B (B (B _112)))) (((S' (C' (C' B))) ((B (B (B _112))) (((S' (C' B)) ((B (B _112)) (((C' B) ((B _129) (T #0))) _111))) (((C' B) ((B _129) (T #1))) _111)))) (((C' B) ((B _129) (T #2))) _111)))) (((C' B) ((B _129) (T #3))) _111)))) ((B T) ((B (B P)) ((C' _91) (_93 #4)))))) ((A :112 ((S S) ((B BK) ((B BK) (((S' S) T) ((B BK) ((B BK) ((C (((S' C')
\ No newline at end of file
+1131
+((A :0 _954) ((A :1 ((B _1000) _0)) ((A :2 (((S' _1000) _0) I)) ((A :3 _924) ((A :4 (_3 "undefined")) ((A :5 I) ((A :6 (((C' B) _953) ((C _84) _5))) ((A :7 (((C' _6) (_971 _73)) ((_84 _969) _72))) ((A :8 ((B ((S _1000) _969)) _3)) ((A :9 T) ((A :10 (T I)) ((A :11 ((B (_84 _210)) _10)) ((A :12 ((B (B (_82 _9))) (((C' B) ((B C) _10)) (B _10)))) ((A :13 ((B (B (_82 _9))) (((C' B) ((B C) _10)) (BK _10)))) ((A :14 ((B (_82 _9)) P)) ((A :15 ((B (B (_82 _9))) ((B ((C' C) _10)) (B P)))) ((A :16 _15) ((A :17 (((C' B) _12) (((C' B) _12) (B _14)))) ((A :18 ((B (_82 _9)) (B (P _882)))) ((A :19 ((B (_82 _9)) (BK (P _882)))) ((A :20 ((_82 _9) ((S P) I))) ((A :21 ((B (_82 _9)) ((C (S' P)) I))) ((A :22 ((B Y) ((B (B (P (_14 _122)))) (((C' B) ((B (C' B)) (B _12))) (((C' (C' B)) (B _12)) ((B (B _14)) _123)))))) ((A :23 ((B Y) ((B (B (P (_14 _882)))) ((B (C' B)) (B _13))))) ((A :24 _3) ((A :25 (T (_14 _882))) ((A :26 (_22 _85)) ((A :27 (R _34)) ((A :28 (T _33)) ((A :29 ((P _34) _33)) ((A :30 _34) ((A :31 ((C ((C S') _29)) I)) ((A :32 ((C S) _29)) ((A :33 K) ((A :34 A) ((A :35 ((_76 _918) _919)) ((A :36 ((_76 _928) (_80 _36))) ((A :37 _929) ((A :38 _930) ((A :39 (((S' _28) (_921 #97)) ((C _921) #122))) ((A :40 (((S' _28) (_921 #65)) ((C _921) #90))) ((A :41 (((S' _27) _39) _40)) ((A :42 (((S' _28) (_921 #48)) ((C _921) #57))) ((A :43 (((S' _28) (_921 #32)) ((C _921) #126))) ((A :44 _918) ((A :45 _919) ((A :46 _921) ((A :47 _920) ((A :48 (((S' _27) ((C (_77 _35)) #32)) (((S' _27) ((C (_77 _35)) #9)) ((C (_77 _35)) #10)))) ((A :49 ((S ((S (((S' _28) (_46 #65)) ((C _46) #90))) (_34 (((_881 "lib/Data/Char.hs") #3) #8)))) ((B _37) (((C' _91) (((C' _92) _38) (_38 #65))) (_38 #97))))) ((A :50 ((S ((S (((S' _28) (_46 #97)) ((C _46) #97))) (_34 (((_881 "lib/Data/Char.hs") #3) #8)))) ((B _37) (((C' _91) (((C' _92) _38) (_38 #97))) (_38 #65))))) ((A :51 _889) ((A :52 _890) ((A :53 _891) ((A :54 _892) ((A :55 (_52 %0.0)) ((A :56 _51) ((A :57 _52) ((A :58 _53) ((A :59 _54) ((A :60 ((_76 _893) _894)) ((A :61 (_77 _60)) ((A :62 (_78 _60)) ((A :63 _895) ((A :64 _896) ((A :65 _897) ((A :66 _898) ((A :67 _63) ((A :68 _64) ((A :69 _65) ((A :70 _66) ((A :71 _899) ((A :72 ((B BK) T)) ((A :73 (BK T)) ((A :74 (((S' _76) (((S' C) ((B (C S')) (((C' C) ((B (C C')) ((B _77) (T K)))) (K _33)))) ((B ((C' B) (T (K _33)))) ((B _77) (T A))))) ((B _80) ((B _74) (((S' P) (T K)) (T A)))))) ((A :75 P) ((A :76 P) ((A :77 (T K)) ((A :78 (T A)) ((A :79 (K (noDefault "Eq.=="))) ((A :80 ((B (B (B _29))) _77)) ((A :81 ((_76 ((C ((C S') _29)) I)) (_80 _81))) ((A :82 I) ((A :83 (S _926)) ((A :84 B) ((A :85 I) ((A :86 K) ((A :87 C) ((A :88 _925) ((A :89 ((C ((C S') _210)) _211)) ((A :90 (((C' (S' (C' B))) B) I)) ((A :91 _883) ((A :92 _884) ((A :93 _885) ((A :94 _886) ((A :95 _887) ((A :96 _888) ((A :97 (_92 #0)) ((A :98 ((_76 _906) _907)) ((A :99 _908) ((A :100 _909) ((A :101 _910) ((A :102 _911) ((A :103 (BK K)) ((A :104 ((B BK) ((B (B BK)) P))) ((A :105 ((B (B (B BK))) ((B (B (B BK))) ((B (B (B C))) ((B (B C)) P))))) ((A :106 (((S' S) (((S' (S' C)) (((C' (C' S)) (((C' B) ((B (S' S')) (((C' B) ((B _27) (_100 #0))) ((C (_77 _98)) #0)))) ((B (B ((C' P) (_96 #1)))) _91))) (C P))) _94)) _95)) ((A :107 _103) ((A :108 (((S' C) ((B (P _197)) (((C' (C' B)) (((C' C) (_77 _98)) _197)) _198))) ((B ((C' (C' (C' C))) (((C' (C' (C' C))) (((C' (C' (C' (C' S')))) ((B (B (B (B C)))) ((B ((C' (C' (C' C))) ((B (B (B ((S' S') ((C (_77 _98)) #0))))) ((B ((C' (C' C)) ((B (B ((S' S') ((C (_77 _98)) #1)))) ((B ((C' C) ((B ((C' S') ((C (_77 _98)) #2))) (C _108)))) (C _108))))) (C _108))))) (C _108)))) (T K))) (T A)))) ((C _106) #4)))) ((A :109 (_115 _86)) ((A :110 ((_131 (_89 _109)) _107)) ((A :111 ((C (((C' B) ((P _122) (((C' (C' O)) P) K))) (((S' (C' (C' (C' B)))) ((B (B (B (B _112)))) (((S' (C' (C' B))) ((B (B (B _112))) (((S' (C' B)) ((B (B _112)) (((C' B) ((B _129) (T #0))) _111))) (((C' B) ((B _129) (T #1))) _111)))) (((C' B) ((B _129) (T #2))) _111)))) (((C' B) ((B _129) (T #3))) _111)))) ((B T) ((B (B P)) ((C' _91) (_93 #4)))))) ((A :112 ((S S) ((B BK) ((B BK) (((S' S) T) ((B BK) ((B BK) ((C (((S' C
\ No newline at end of file
--- a/src/MicroHs/Expr.hs
+++ b/src/MicroHs/Expr.hs
@@ -30,7 +30,7 @@
getSLocExpr, setSLocExpr,
getSLocEqns,
errorMessage,
- Assoc(..), eqAssoc, Fixity
+ Assoc(..), eqAssoc, Fixity,
getBindsVars,
) where
import Prelude --Xhiding (Monad(..), Applicative(..), MonadFail(..), Functor(..), (<$>), showString, showChar, showList, (<>))
--- a/src/MicroHs/TypeCheck.hs
+++ b/src/MicroHs/TypeCheck.hs
@@ -1689,7 +1689,7 @@
tcBinds xbs ta = T.do
let
tmap = M.fromList [ (i, t) | BSign i t <- xbs ]
- xs = concatMap getBindVars xbs
+ xs = getBindsVars xbs
multCheck xs
xts <- T.mapM (tcBindVarT tmap) xs
withExtVals xts $ T.do
--
⑨