ref: bdfec110cf9b15a7ff80105fa7d7c3e7a4a15f55
parent: cc824596711c42777e8f0584377072ffde6d7b0a
author: Lennart Augustsson <lennart@augustsson.net>
date: Thu Nov 2 14:56:59 EDT 2023
Get rid of eqBool
--- a/comb/mhs.comb
+++ b/comb/mhs.comb
@@ -1,3 +1,3 @@
v4.0
-1197
-((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' _132) ((B _12) _1)) _240))) _5)) ((A :9 ((S (((S' C') _3) _4)) (((C' _13) _1) _239))) ((A :10 (((S' P) _2) (((C' _13) _1) _958))) ((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' _129) _12) _121))) ((A :20 (((S' B) _14) (((C' _132) _12) _122))) ((A :21 _1030) ((A :22 ((B _1073) _21)) ((A :23 (((S' _1073) _21) I)) ((A :24 _1000) ((A :25 (_24 "undefined")) ((A :26 I) ((A :27 (((C' B) _1029) ((C _120) _26))) ((A :28 (((C' _27) ((_128 _1043) _109)) ((_120 (_34 _1045)) _108))) ((A :29 ((B ((S _1073) (_34 _1045))) _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) _239)))) (((S' (C' B)) ((B (B (C' B))) (B' _32))) (((S' (C' (C' B))) (B' _32)) (((C' B) (B' _34)) _240)))))) ((A :44 ((B (B Y)) (((S' B) (B' ((B P) ((C _34) _958)))) (((C' (C' B)) ((B (B (C' B))) (B' _32))) BK)))) ((A :45 ((B T) ((C _34) _958))) ((A :46 ((C _43) _121)) ((A :47 ((B _123) _32)) ((A :48 ((B C) ((B C') _32))) ((A :49 ((B _123) _48)) ((A :50 T) ((A :51 ((_127 ((B (B (_118 _50))) ((B ((C' C) _54)) (B P)))) (_131 _51))) ((A :52 (((((_11 _51) ((B (_118 _50)) P)) (_38 _53)) ((B (B (_118 _50))) (((C' B) ((B C) _54)) (BK _54)))) (_20 _52))) ((A :53 ((((_30 _52) ((B (B (_118 _50))) (((C' B) ((B C) _54)) (B _54)))) (_15 _52)) (_13 _52))) ((A :54 (T I)) ((A :55 ((B (_120 _278)) _54)) ((A :56 ((B (_118 _50)) (B (P _958)))) ((A :57 ((B (_118 _50)) (BK (P _958)))) ((A :58 ((_118 _50) ((S P) I))) ((A :59 ((B (_118 _50)) ((C (S' P)) I))) ((A :60 ((_113 ((C ((C S') _63)) I)) (_117 _60))) ((A :61 (R _69)) ((A :62 (T _68)) ((A :63 ((P _69) _68)) ((A :64 _69) ((A :65 ((C ((C S') _63)) I)) ((A :66 ((C S) _63)) ((A :67 (((_1171 (K ((P (_1180 "False")) (_1180 "True")))) (_1176 _67)) (_1177 _67))) ((A :68 K) ((A :69 A) ((A :70 ((_113 _994) _995)) ((A :71 ((((((((_256 _70) (_265 _71)) _996) _997) _998) _999) (_270 _71)) (_271 _71))) ((A :72 ((_113 _1004) (_117 _72))) ((A :73 ((((((((_256 _72) _1003) (((C' (C' (_114 _272))) _1003) _275)) (((C' (C' (_115 _272))) _1003) _277)) (((C' (C' (_114 _272))) _1003) _277)) (((C' (C' (_115 _272))) _1003) _277)) (_270 _73)) (_271 _73))) ((A :74 _1005) ((A :75 _1006) ((A :76 (((S' _62) (_997 #97)) ((C _997) #122))) ((A :77 (((S' _62) (_997 #65)) ((C _997) #90))) ((A :78 (((S' _61) _76) _77)) ((A :79 (((S' _62) (_997 #48)) ((C _997) #57))) ((A :80 (((S' _61) _78) _79)) ((A :81 (((S' _62) (_997 #32)) ((C _997) #126))) ((A :82 (((S' _61) ((C (_114 _70)) #32)) (((S' _61) ((C (_114 _70)) #9)) ((C (_114 _70)) #10)))) ((A :83 ((S ((S (((S' _62) (_997 #65)) ((C _997) #90))) (_69 (((noMatch "lib/Data/Char.hs") #3) #8)))) ((B _74) (((C' _133) (((C' _134) _75) (_75 #65))) (_75 #97))))) ((A :84 ((S ((S (((S' _62) (_997 #97)) ((C _997) #97))) (_69 (((noMatch "lib/Data/Char.hs") #3) #8)))) ((B _74) (((C' _133) (((C' _134) _75) (_75 #97))) (_75 #65))))) ((A :85 (((_1171 (K ((C ((S ((C ==) #39)) ((B (_120 (_1179 #39))) (((C' _120) ((B _1180) _86)) (_1179 #39))))) (_1180 "'\92&''")))) (_1176 _85)) ((B (_120 (_1179 #34))) (Y ((B (P (_1179 #34))) (((S' C) ((B ((S' S') ((C (_114 _70)) #34))) ((C' B) ((B _120) ((B _1180) _86))))) (B (_120 (_1180 "\92&\34&"))))))))) ((A :86 (((C' Y) (((S' B) ((B P) ((S ((S _81) ((B (_241 "'\92&")) (((C' _241) ((B (_1
\ No newline at end of file
+1195
+((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' _130) ((B _12) _1)) _238))) _5)) ((A :9 ((S (((S' C') _3) _4)) (((C' _13) _1) _237))) ((A :10 (((S' P) _2) (((C' _13) _1) _956))) ((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' _127) _12) _119))) ((A :20 (((S' B) _14) (((C' _130) _12) _120))) ((A :21 _1028) ((A :22 ((B _1071) _21)) ((A :23 (((S' _1071) _21) I)) ((A :24 _998) ((A :25 (_24 "undefined")) ((A :26 I) ((A :27 (((C' B) _1027) ((C _118) _26))) ((A :28 (((C' _27) ((_126 _1041) _107)) ((_118 (_34 _1043)) _106))) ((A :29 ((B ((S _1071) (_34 _1043))) _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) _237)))) (((S' (C' B)) ((B (B (C' B))) (B' _32))) (((S' (C' (C' B))) (B' _32)) (((C' B) (B' _34)) _238)))))) ((A :44 ((B (B Y)) (((S' B) (B' ((B P) ((C _34) _956)))) (((C' (C' B)) ((B (B (C' B))) (B' _32))) BK)))) ((A :45 ((B T) ((C _34) _956))) ((A :46 ((C _43) _119)) ((A :47 ((B _121) _32)) ((A :48 ((B C) ((B C') _32))) ((A :49 ((B _121) _48)) ((A :50 T) ((A :51 ((_125 ((B (B (_116 _50))) ((B ((C' C) _54)) (B P)))) (_129 _51))) ((A :52 (((((_11 _51) ((B (_116 _50)) P)) (_38 _53)) ((B (B (_116 _50))) (((C' B) ((B C) _54)) (BK _54)))) (_20 _52))) ((A :53 ((((_30 _52) ((B (B (_116 _50))) (((C' B) ((B C) _54)) (B _54)))) (_15 _52)) (_13 _52))) ((A :54 (T I)) ((A :55 ((B (_118 _276)) _54)) ((A :56 ((B (_116 _50)) (B (P _956)))) ((A :57 ((B (_116 _50)) (BK (P _956)))) ((A :58 ((_116 _50) ((S P) I))) ((A :59 ((B (_116 _50)) ((C (S' P)) I))) ((A :60 ((_111 ((C ((C S') _64)) I)) (_115 _60))) ((A :61 (((_1169 (K ((P (_1178 "False")) (_1178 "True")))) (_1174 _61)) (_1175 _61))) ((A :62 (R _67)) ((A :63 (T _66)) ((A :64 ((P _67) _66)) ((A :65 _67) ((A :66 K) ((A :67 A) ((A :68 ((_111 _992) _993)) ((A :69 ((((((((_254 _68) (_263 _69)) _994) _995) _996) _997) (_268 _69)) (_269 _69))) ((A :70 ((_111 _1002) (_115 _70))) ((A :71 ((((((((_254 _70) _1001) (((C' (C' (_112 _270))) _1001) _273)) (((C' (C' (_113 _270))) _1001) _275)) (((C' (C' (_112 _270))) _1001) _275)) (((C' (C' (_113 _270))) _1001) _275)) (_268 _71)) (_269 _71))) ((A :72 _1003) ((A :73 _1004) ((A :74 (((S' _63) (_995 #97)) ((C _995) #122))) ((A :75 (((S' _63) (_995 #65)) ((C _995) #90))) ((A :76 (((S' _62) _74) _75)) ((A :77 (((S' _63) (_995 #48)) ((C _995) #57))) ((A :78 (((S' _62) _76) _77)) ((A :79 (((S' _63) (_995 #32)) ((C _995) #126))) ((A :80 (((S' _62) ((C (_112 _68)) #32)) (((S' _62) ((C (_112 _68)) #9)) ((C (_112 _68)) #10)))) ((A :81 ((S ((S (((S' _63) (_995 #65)) ((C _995) #90))) (_67 (((noMatch "lib/Data/Char.hs") #79) #1)))) ((B _72) (((C' _131) (((C' _132) _73) (_73 #65))) (_73 #97))))) ((A :82 ((S ((S (((S' _63) (_995 #97)) ((C _995) #97))) (_67 (((noMatch "lib/Data/Char.hs") #83) #1)))) ((B _72) (((C' _131) (((C' _132) _73) (_73 #97))) (_73 #65))))) ((A :83 (((_1169 (K ((C ((S ((C ==) #39)) ((B (_118 (_1177 #39))) (((C' _118) ((B _1178) _84)) (_1177 #39))))) (_1178 "'\92&''")))) (_1174 _83)) ((B (_118 (_1177 #34))) (Y ((B (P (_1177 #34))) (((S' C) ((B ((S' S') ((C (_112 _68)) #34))) ((C' B) ((B _118) ((B _1178) _84))))) (B (_118 (_1178 "\92&\34&"))))))))) ((A :84 (((C' Y) (((S' B) ((B P) ((S ((S _79) ((B (_239 "'\92&")) (((C' _239) ((B (_1171 _140)) _73)) ((O #39) K))))) ((C O) K)))) ((B
\ No newline at end of file
--- a/lib/Data/Bool.hs
+++ b/lib/Data/Bool.hs
@@ -13,6 +13,10 @@
False == x = not x
True == x = x
+instance Show Bool where
+ showsPrec _ False = showString "False"
+ showsPrec _ True = showString "True"
+
infixr 2 ||
(||) :: Bool -> Bool -> Bool
(||) False y = y
@@ -29,15 +33,3 @@
otherwise :: Bool
otherwise = True
-
-eqBool :: Bool -> Bool -> Bool
-eqBool True x = x
-eqBool False x = not x
-
-neBool :: Bool -> Bool -> Bool
-neBool True x = not x
-neBool False x = x
-
-instance Show Bool where
- showsPrec _ False = showString "False"
- showsPrec _ True = showString "True"
--- a/lib/Text/PrettyPrint/HughesPJ.hs
+++ b/lib/Text/PrettyPrint/HughesPJ.hs
@@ -197,7 +197,7 @@
beside Empty _ q = q
beside (Nest k p) g q = nest_ k $! beside p g q
beside p@(Beside p1 g1 q1) g2 q2
- | eqBool g1 g2 = beside p1 g1 $! beside q1 g2 q2
+ | g1 == g2 = beside p1 g1 $! beside q1 g2 q2
| otherwise = beside (reduceDoc p) g2 q2
beside p@(Above _ _ _) g q = let { d = reduceDoc p } in beside d g qbeside (NilAbove p) g q = nilAbove_ $! beside p g q
--
⑨