shithub: MicroHs

Download patch

ref: fa260f9e2ea057691dbe74cb789beddfc4c672b3
parent: 7dbe7a65c61f1c773c1f5adae8c88c8d0d02ba92
author: Lennart Augustsson <lennart.augustsson@epicgames.com>
date: Wed Sep 27 12:22:00 EDT 2023

Make tests work again

--- a/comb/mhs.comb
+++ b/comb/mhs.comb
@@ -1,3 +1,3 @@
 v3.5
-928
+929
 (($A :0 _813) (($A :1 (($B _859) _0)) (($A :2 ((($S' _859) _0) $I)) (($A :3 _783) (($A :4 (_3 "undefined")) (($A :5 $I) (($A :6 ((($C' $B) _812) (($C _73) _5))) (($A :7 ((($C' _6) (_830 _70)) ((_73 _828) _69))) (($A :8 (($B (($S _859) _828)) _3)) (($A :9 $T) (($A :10 ($T $I)) (($A :11 (($B (_73 _185)) _10)) (($A :12 (($B ($B (_72 _9))) ((($C' $B) (($B $C) _10)) ($B _10)))) (($A :13 (($B ($B (_72 _9))) ((($C' $B) (($B $C) _10)) ($BK _10)))) (($A :14 (($B (_72 _9)) $P)) (($A :15 (($B ($B (_72 _9))) (($B (($C' $C) _10)) ($B $P)))) (($A :16 _15) (($A :17 (($B (_72 _9)) ($B ($P _741)))) (($A :18 (($B (_72 _9)) ($BK ($P _741)))) (($A :19 ((_72 _9) (($S $P) $I))) (($A :20 (($B (_72 _9)) (($C ($S' $P)) $I))) (($A :21 (($B $Y) (($B ($B ($P (_14 _113)))) ((($C' $B) (($B ($C' $B)) ($B _12))) ((($C' ($C' $B)) ($B _12)) (($B ($B _14)) _114)))))) (($A :22 (($B $Y) (($B ($B ($P (_14 _741)))) (($B ($C' $B)) ($B _13))))) (($A :23 _3) (($A :24 ($T (_14 _741))) (($A :25 (($C $C) _32)) (($A :26 ($T _31)) (($A :27 (($P _32) _31)) (($A :28 _32) (($A :29 (($C (($C $S') _27)) $I)) (($A :30 (($C $S) _27)) (($A :31 $K) (($A :32 $A) (($A :33 _788) (($A :34 _789) (($A :35 ((($S' _26) (_780 97)) (($C _780) 122))) (($A :36 ((($S' _26) (_780 65)) (($C _780) 90))) (($A :37 ((($S' _25) _35) _36)) (($A :38 ((($S' _26) (_780 48)) (($C _780) 57))) (($A :39 ((($S' _26) (_780 32)) (($C _780) 126))) (($A :40 _777) (($A :41 _778) (($A :42 _780) (($A :43 _779) (($A :44 ((($S' _25) (($C _40) 32)) ((($S' _25) (($C _40) 9)) (($C _40) 10)))) (($A :45 (($S (($S ((($S' _26) (_42 65)) (($C _42) 90))) (_32 (((_740 "lib/Data/Char.hs") 3) 8)))) (($B _33) ((($C' _80) ((($C' _81) _34) (_34 65))) (_34 97))))) (($A :46 (($S (($S ((($S' _26) (_42 97)) (($C _42) 97))) (_32 (((_740 "lib/Data/Char.hs") 3) 8)))) (($B _33) ((($C' _80) ((($C' _81) _34) (_34 97))) (_34 65))))) (($A :47 _748) (($A :48 _749) (($A :49 _750) (($A :50 _751) (($A :51 (_48 %0.0)) (($A :52 _47) (($A :53 _48) (($A :54 _49) (($A :55 _50) (($A :56 _752) (($A :57 _753) (($A :58 _56) (($A :59 _57) (($A :60 _754) (($A :61 _755) (($A :62 _756) (($A :63 _757) (($A :64 _60) (($A :65 _61) (($A :66 _62) (($A :67 _63) (($A :68 _758) (($A :69 (($B $BK) $T)) (($A :70 ($BK $T)) (($A :71 $P) (($A :72 $I) (($A :73 $B) (($A :74 $I) (($A :75 $K) (($A :76 $C) (($A :77 _784) (($A :78 (($C (($C $S') _185)) _186)) (($A :79 ((($C' ($S' ($C' $B))) $B) $I)) (($A :80 _742) (($A :81 _743) (($A :82 _744) (($A :83 _745) (($A :84 _746) (($A :85 _747) (($A :86 (_81 0)) (($A :87 _765) (($A :88 _766) (($A :89 _767) (($A :90 _768) (($A :91 _769) (($A :92 _770) (($A :93 _87) (($A :94 ($BK $K)) (($A :95 (($B $BK) (($B ($B $BK)) $P))) (($A :96 (($B ($B ($B $BK))) (($B ($B ($B $BK))) (($B ($B ($B $C))) (($B ($B $C)) $P))))) (($A :97 ((($S' $S) ((($S' ($S' $C)) ((($C' ($C' $S)) ((($C' $B) (($B ($S' $S')) ((($C' $B) (($B _25) (_90 0))) (_87 0)))) (($B ($B (($C' $P) (_85 1)))) _80))) ($C $P))) _83)) _84)) (($A :98 _94) (($A :99 ((($S' $C) (($B ($P _174)) ((($C' ($C' $B)) ((($C' $C) _87) _174)) _175))) (($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') (_87 0))))) (($B (($C' ($C' $C)) (($B ($B (($S' $S') (_87 1)))) (($B (($C' $C) (($B (($C' $S') (_87 2))) ($C _99)))) ($C _99))))) ($C _99))))) ($C _99)))) ($T $K))) ($T $A)))) (($C _97) 4)))) (($A :100 (_106 _75)) (($A :101 ((_121 (_78 _100)) _98)) (($A :102 (($C ((($C' $B) (($P _113) ((($C' ($C' $O)) $P) $K))) ((($S' ($C' ($C' ($C' $B)))) (($B ($B ($B ($B _103)))) ((($S' ($C' ($C' $B))) (($B ($B ($B _103))) ((($S' ($C' $B)) (($B ($B _103)) ((($C' $B) (($B _119) ($T 0))) _102))) ((($C' $B) (($B _119) ($T 1))) _102)))) ((($C' $B) (($B _119) ($T 2))) _102)))) ((($C' $B) (($B _119) ($T 3))) _102)))) (($B $T) (($B ($B $P)) (($C' _80) (_82 4)))))) (($A :103 (($S $S) (($B $BK) (($B $BK) ((($S' $S) $T) (($B $BK) (($B $BK) (($C ((($S' $C') $S) (($B ($B ($B ($S $B)))) (($B ($B ($B ($B ($B $BK))))) (($B (($S' ($C' $B)) (($B $B') $B'))) (($B ($B ($B ($B ($B ($S $B)))))) (($B ($B ($B ($B ($B ($B ($B $BK)))))))
\ No newline at end of file
--- a/lib/Data/Map.hs
+++ b/lib/Data/Map.hs
@@ -7,7 +7,7 @@
   Map,
   insertBy, insertByWith, fromListByWith, fromListBy, lookupBy, empty, elems, size, toList, deleteBy,
   ) where
-import Prelude
+import Prelude hiding (lookupBy, deleteBy)
 
 data Map k a
   = Nil           -- empty tree
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,5 +1,5 @@
 MHS=../bin/mhs -i../lib
-EVAL=../bin/eval
+EVAL=../bin/mhseval
 .PHONY: test time clean
 
 test:
--