shithub: MicroHs

--- a/comb/mhs.comb

+++ b/comb/mhs.comb

@@ -1,3 +1,3 @@

 v4.0

-1171

-((A :0 ((B (B (B (B C)))) ((B (B (B C))) ((B (B C)) P)))) ((A :1 (T (BK (BK (BK K))))) ((A :2 (T (K (BK (BK K))))) ((A :3 (T (K (K (BK K))))) ((A :4 (T (K (K (K K))))) ((A :5 (T (K (K (K A))))) ((A :6 (K (noDefault "Alternative.empty"))) ((A :7 (K (noDefault "Alternative.<|>"))) ((A :8 ((S (((S' S') ((B _14) _1)) (((C' _128) ((B _12) _1)) _235))) _5)) ((A :9 ((S (((S' C') _3) _4)) (((C' _13) _1) _234))) ((A :10 (((S' P) _2) (((C' _13) _1) _937))) ((A :11 ((B (B (B (B C)))) ((B (B (B C))) ((B (B C)) P)))) ((A :12 (T (BK (BK (BK K))))) ((A :13 (T (K (BK (BK K))))) ((A :14 (T (K (K (BK K))))) ((A :15 (T (K (K (K K))))) ((A :16 (T (K (K (K A))))) ((A :17 (K (noDefault "Applicative.pure"))) ((A :18 (K (noDefault "Applicative.<*>"))) ((A :19 (((S' B) _14) (((C' _125) _12) _117))) ((A :20 (((S' B) _14) (((C' _128) _12) _118))) ((A :21 _1009) ((A :22 ((B _1051) _21)) ((A :23 (((S' _1051) _21) I)) ((A :24 _979) ((A :25 (_24 "undefined")) ((A :26 I) ((A :27 (((C' B) _1008) ((C _116) _26))) ((A :28 (((C' _27) ((_124 _1022) _106)) ((_116 (_34 _1024)) _105))) ((A :29 ((B ((S _1051) (_34 _1024))) _24)) ((A :30 ((B (B (B C))) ((B (B C)) P))) ((A :31 (T (BK (BK K)))) ((A :32 (T (K (BK K)))) ((A :33 (T (K (K K)))) ((A :34 (T (K (K A)))) ((A :35 (K (noDefault "Monad.>>="))) ((A :36 (((C' (C' B)) _32) K)) ((A :37 ((B _13) _31)) ((A :38 (((S' (C' B)) _32) (((S' (C' B)) _32) (B' _34)))) ((A :39 P) ((A :40 (T K)) ((A :41 (T A)) ((A :42 (K _24)) ((A :43 ((B (B Y)) (((S' B) (B' ((B P) ((C _34) _234)))) (((S' (C' B)) ((B (B (C' B))) (B' _32))) (((S' (C' (C' B))) (B' _32)) (((C' B) (B' _34)) _235)))))) ((A :44 ((B (B Y)) (((S' B) (B' ((B P) ((C _34) _937)))) (((C' (C' B)) ((B (B (C' B))) (B' _32))) BK)))) ((A :45 ((B T) ((C _34) _937))) ((A :46 ((C _43) _117)) ((A :47 ((B _119) _32)) ((A :48 ((B C) ((B C') _32))) ((A :49 ((B _119) _48)) ((A :50 T) ((A :51 ((_123 ((B (B (_114 _50))) ((B ((C' C) _54)) (B P)))) (_127 _51))) ((A :52 (((((_11 _51) ((B (_114 _50)) P)) (_38 _53)) ((B (B (_114 _50))) (((C' B) ((B C) _54)) (BK _54)))) (_20 _52))) ((A :53 ((((_30 _52) ((B (B (_114 _50))) (((C' B) ((B C) _54)) (B _54)))) (_15 _52)) (_13 _52))) ((A :54 (T I)) ((A :55 ((B (_116 _264)) _54)) ((A :56 ((B (_114 _50)) (B (P _937)))) ((A :57 ((B (_114 _50)) (BK (P _937)))) ((A :58 ((_114 _50) ((S P) I))) ((A :59 ((B (_114 _50)) ((C (S' P)) I))) ((A :60 ((_109 ((C ((C S') _63)) I)) (_113 _60))) ((A :61 (R _68)) ((A :62 (T _67)) ((A :63 ((P _68) _67)) ((A :64 _68) ((A :65 ((C ((C S') _63)) I)) ((A :66 ((C S) _63)) ((A :67 K) ((A :68 A) ((A :69 ((_109 _973) _974)) ((A :70 ((((((((_243 _69) (_252 _70)) _975) _976) _977) _978) (_257 _70)) (_258 _70))) ((A :71 ((_109 _983) (_113 _71))) ((A :72 ((((((((_243 _71) _982) (((C' (C' (_110 _259))) _982) _261)) (((C' (C' (_111 _259))) _982) _263)) (((C' (C' (_110 _259))) _982) _263)) (((C' (C' (_111 _259))) _982) _263)) (_257 _72)) (_258 _72))) ((A :73 _984) ((A :74 _985) ((A :75 (((S' _62) (_976 #97)) ((C _976) #122))) ((A :76 (((S' _62) (_976 #65)) ((C _976) #90))) ((A :77 (((S' _61) _75) _76)) ((A :78 (((S' _62) (_976 #48)) ((C _976) #57))) ((A :79 (((S' _61) _77) _78)) ((A :80 (((S' _62) (_976 #32)) ((C _976) #126))) ((A :81 (((S' _61) ((C (_110 _69)) #32)) (((S' _61) ((C (_110 _69)) #9)) ((C (_110 _69)) #10)))) ((A :82 ((S ((S (((S' _62) (_976 #65)) ((C _976) #90))) (_68 (((noMatch "lib/Data/Char.hs") #3) #8)))) ((B _73) (((C' _129) (((C' _130) _74) (_74 #65))) (_74 #97))))) ((A :83 ((S ((S (((S' _62) (_976 #97)) ((C _976) #97))) (_68 (((noMatch "lib/Data/Char.hs") #3) #8)))) ((B _73) (((C' _129) (((C' _130) _74) (_74 #97))) (_74 #65))))) ((A :84 _944) ((A :85 _945) ((A :86 _946) ((A :87 _947) ((A :88 (_85 %0.0)) ((A :89 _84) ((A :90 _85) ((A :91 _86) ((A :92 _87) ((A :93 ((_109 _948) _949)) ((A :94 (_110 _93)) ((A :95 (_111 _93)) ((A :96 _950) ((A :97 _951) ((A :98 _952) ((A :99 _953) ((A :100 _96) ((A :101 _97) ((A :102 _98) ((A :103 _99) ((A :104 _954) ((A :105 ((B BK) T)) ((A :106 (BK T)) ((A :107 (((S' _109) (((S' C) ((B (C S')) (((C' C) ((B (C C')) ((B _110) (T K)))) (K _67)))) ((B ((C' B) (T (K _67)))) ((B _110) (T

\ No newline at end of file

+1170

+((A :0 ((B (B (B (B C)))) ((B (B (B C))) ((B (B C)) P)))) ((A :1 (T (BK (BK (BK K))))) ((A :2 (T (K (BK (BK K))))) ((A :3 (T (K (K (BK K))))) ((A :4 (T (K (K (K K))))) ((A :5 (T (K (K (K A))))) ((A :6 (K (noDefault "Alternative.empty"))) ((A :7 (K (noDefault "Alternative.<|>"))) ((A :8 ((S (((S' S') ((B _14) _1)) (((C' _128) ((B _12) _1)) _235))) _5)) ((A :9 ((S (((S' C') _3) _4)) (((C' _13) _1) _234))) ((A :10 (((S' P) _2) (((C' _13) _1) _936))) ((A :11 ((B (B (B (B C)))) ((B (B (B C))) ((B (B C)) P)))) ((A :12 (T (BK (BK (BK K))))) ((A :13 (T (K (BK (BK K))))) ((A :14 (T (K (K (BK K))))) ((A :15 (T (K (K (K K))))) ((A :16 (T (K (K (K A))))) ((A :17 (K (noDefault "Applicative.pure"))) ((A :18 (K (noDefault "Applicative.<*>"))) ((A :19 (((S' B) _14) (((C' _125) _12) _117))) ((A :20 (((S' B) _14) (((C' _128) _12) _118))) ((A :21 _1008) ((A :22 ((B _1050) _21)) ((A :23 (((S' _1050) _21) I)) ((A :24 _978) ((A :25 (_24 "undefined")) ((A :26 I) ((A :27 (((C' B) _1007) ((C _116) _26))) ((A :28 (((C' _27) ((_124 _1021) _106)) ((_116 (_34 _1023)) _105))) ((A :29 ((B ((S _1050) (_34 _1023))) _24)) ((A :30 ((B (B (B C))) ((B (B C)) P))) ((A :31 (T (BK (BK K)))) ((A :32 (T (K (BK K)))) ((A :33 (T (K (K K)))) ((A :34 (T (K (K A)))) ((A :35 (K (noDefault "Monad.>>="))) ((A :36 (((C' (C' B)) _32) K)) ((A :37 ((B _13) _31)) ((A :38 (((S' (C' B)) _32) (((S' (C' B)) _32) (B' _34)))) ((A :39 P) ((A :40 (T K)) ((A :41 (T A)) ((A :42 (K _24)) ((A :43 ((B (B Y)) (((S' B) (B' ((B P) ((C _34) _234)))) (((S' (C' B)) ((B (B (C' B))) (B' _32))) (((S' (C' (C' B))) (B' _32)) (((C' B) (B' _34)) _235)))))) ((A :44 ((B (B Y)) (((S' B) (B' ((B P) ((C _34) _936)))) (((C' (C' B)) ((B (B (C' B))) (B' _32))) BK)))) ((A :45 ((B T) ((C _34) _936))) ((A :46 ((C _43) _117)) ((A :47 ((B _119) _32)) ((A :48 ((B C) ((B C') _32))) ((A :49 ((B _119) _48)) ((A :50 T) ((A :51 ((_123 ((B (B (_114 _50))) ((B ((C' C) _54)) (B P)))) (_127 _51))) ((A :52 (((((_11 _51) ((B (_114 _50)) P)) (_38 _53)) ((B (B (_114 _50))) (((C' B) ((B C) _54)) (BK _54)))) (_20 _52))) ((A :53 ((((_30 _52) ((B (B (_114 _50))) (((C' B) ((B C) _54)) (B _54)))) (_15 _52)) (_13 _52))) ((A :54 (T I)) ((A :55 ((B (_116 _264)) _54)) ((A :56 ((B (_114 _50)) (B (P _936)))) ((A :57 ((B (_114 _50)) (BK (P _936)))) ((A :58 ((_114 _50) ((S P) I))) ((A :59 ((B (_114 _50)) ((C (S' P)) I))) ((A :60 ((_109 ((C ((C S') _63)) I)) (_113 _60))) ((A :61 (R _68)) ((A :62 (T _67)) ((A :63 ((P _68) _67)) ((A :64 _68) ((A :65 ((C ((C S') _63)) I)) ((A :66 ((C S) _63)) ((A :67 K) ((A :68 A) ((A :69 ((_109 _972) _973)) ((A :70 ((((((((_243 _69) (_252 _70)) _974) _975) _976) _977) (_257 _70)) (_258 _70))) ((A :71 ((_109 _982) (_113 _71))) ((A :72 ((((((((_243 _71) _981) (((C' (C' (_110 _259))) _981) _261)) (((C' (C' (_111 _259))) _981) _263)) (((C' (C' (_110 _259))) _981) _263)) (((C' (C' (_111 _259))) _981) _263)) (_257 _72)) (_258 _72))) ((A :73 _983) ((A :74 _984) ((A :75 (((S' _62) (_975 #97)) ((C _975) #122))) ((A :76 (((S' _62) (_975 #65)) ((C _975) #90))) ((A :77 (((S' _61) _75) _76)) ((A :78 (((S' _62) (_975 #48)) ((C _975) #57))) ((A :79 (((S' _61) _77) _78)) ((A :80 (((S' _62) (_975 #32)) ((C _975) #126))) ((A :81 (((S' _61) ((C (_110 _69)) #32)) (((S' _61) ((C (_110 _69)) #9)) ((C (_110 _69)) #10)))) ((A :82 ((S ((S (((S' _62) (_975 #65)) ((C _975) #90))) (_68 (((noMatch "lib/Data/Char.hs") #3) #8)))) ((B _73) (((C' _129) (((C' _130) _74) (_74 #65))) (_74 #97))))) ((A :83 ((S ((S (((S' _62) (_975 #97)) ((C _975) #97))) (_68 (((noMatch "lib/Data/Char.hs") #3) #8)))) ((B _73) (((C' _129) (((C' _130) _74) (_74 #97))) (_74 #65))))) ((A :84 _943) ((A :85 _944) ((A :86 _945) ((A :87 _946) ((A :88 (_85 %0.0)) ((A :89 _84) ((A :90 _85) ((A :91 _86) ((A :92 _87) ((A :93 ((_109 _947) _948)) ((A :94 (_110 _93)) ((A :95 (_111 _93)) ((A :96 _949) ((A :97 _950) ((A :98 _951) ((A :99 _952) ((A :100 _96) ((A :101 _97) ((A :102 _98) ((A :103 _99) ((A :104 _953) ((A :105 ((B BK) T)) ((A :106 (BK T)) ((A :107 (((S' _109) (((S' C) ((B (C S')) (((C' C) ((B (C C')) ((B _110) (T K)))) (K _67)))) ((B ((C' B) (T (K _67)))) ((B _110) (T

\ No newline at end of file

--- a/src/MicroHs/Desugar.hs

+++ b/src/MicroHs/Desugar.hs

@@ -513,14 +513,14 @@

 --  f x = letrec f' y = ... f' ... in f'

 -- thus avoiding the extra argument passing.

 -- XXX should generalize for an arbitrary length prefix of variables.

+-- This gives a small speedup with overloading.

 lazier :: LDef -> LDef

-{-

 lazier def@(fcn, Lam x (Lam y body)) =

   let fcn' = addIdentSuffix fcn "@"

       vfcn' = Var fcn'

       repl :: Exp -> S.State Bool Exp

       repl (Lam i e) = Lam i <$> repl e

-      repl (App (Var af) (Var ax)) | eqIdent af fcn && eqIdent ax x = S.do

+      repl (App (Var af) (Var ax)) | af == fcn && ax == x = S.do

         put True

         S.return vfcn'

       repl (App f a) = App <$> repl f <*> repl a

@@ -529,5 +529,5 @@

   in  case S.runState (repl body) False of

         (_, False) -> def

         (e', True) -> (fcn, Lam x $ letRecE fcn' (Lam y e') vfcn')

--}

 lazier def = def

--

⑨