shithub: MicroHs

Download patch

ref: da640efcd29b99ca3694003b129b32194bd524da
parent: 31b00e73e432725eeb1c55a4d3401126e2e59102
author: Lennart Augustsson <lennart.augustsson@epicgames.com>
date: Mon Oct 23 06:58:23 EDT 2023 

Get rid of some eqChar.


--- a/comb/mhs.comb
+++ b/comb/mhs.comb
@@ -1,3 +1,3 @@
 v4.0
-1118
-((A :0 _941) ((A :1 ((B _987) _0)) ((A :2 (((S' _987) _0) I)) ((A :3 _911) ((A :4 (_3 "undefined")) ((A :5 I) ((A :6 (((C' B) _940) ((C _84) _5))) ((A :7 (((C' _6) (_958 _73)) ((_84 _956) _72))) ((A :8 ((B ((S _987) _956)) _3)) ((A :9 T) ((A :10 (T I)) ((A :11 ((B (_84 _207)) _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 _869)))) ((A :19 ((B (_82 _9)) (BK (P _869)))) ((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 _869)))) ((B (C' B)) (B _13))))) ((A :24 _3) ((A :25 (T (_14 _869))) ((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 _905) _906)) ((A :36 ((_76 _915) (_80 _36))) ((A :37 _916) ((A :38 _917) ((A :39 (((S' _28) (_908 #97)) ((C _908) #122))) ((A :40 (((S' _28) (_908 #65)) ((C _908) #90))) ((A :41 (((S' _27) _39) _40)) ((A :42 (((S' _28) (_908 #48)) ((C _908) #57))) ((A :43 (((S' _28) (_908 #32)) ((C _908) #126))) ((A :44 _905) ((A :45 _906) ((A :46 _908) ((A :47 _907) ((A :48 (((S' _27) ((C _44) #32)) (((S' _27) ((C _44) #9)) ((C _44) #10)))) ((A :49 ((S ((S (((S' _28) (_46 #65)) ((C _46) #90))) (_34 (((_868 "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 (((_868 "lib/Data/Char.hs") #3) #8)))) ((B _37) (((C' _91) (((C' _92) _38) (_38 #97))) (_38 #65))))) ((A :51 _876) ((A :52 _877) ((A :53 _878) ((A :54 _879) ((A :55 (_52 %0.0)) ((A :56 _51) ((A :57 _52) ((A :58 _53) ((A :59 _54) ((A :60 ((_76 _880) _881)) ((A :61 (_77 _60)) ((A :62 (_78 _60)) ((A :63 _882) ((A :64 _883) ((A :65 _884) ((A :66 _885) ((A :67 _63) ((A :68 _64) ((A :69 _65) ((A :70 _66) ((A :71 _886) ((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 _913)) ((A :84 B) ((A :85 I) ((A :86 K) ((A :87 C) ((A :88 _912) ((A :89 ((C ((C S') _207)) _208)) ((A :90 (((C' (S' (C' B))) B) I)) ((A :91 _870) ((A :92 _871) ((A :93 _872) ((A :94 _873) ((A :95 _874) ((A :96 _875) ((A :97 (_92 #0)) ((A :98 ((_76 _893) _894)) ((A :99 _895) ((A :100 _896) ((A :101 _897) ((A :102 _898) ((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 _194)) (((C' (C' B)) (((C' C) (_77 _98)) _194)) _195))) ((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') S) ((B (B (B (S B)
\ No newline at end of file
+1120
+((A :0 _943) ((A :1 ((B _989) _0)) ((A :2 (((S' _989) _0) I)) ((A :3 _913) ((A :4 (_3 "undefined")) ((A :5 I) ((A :6 (((C' B) _942) ((C _84) _5))) ((A :7 (((C' _6) (_960 _73)) ((_84 _958) _72))) ((A :8 ((B ((S _989) _958)) _3)) ((A :9 T) ((A :10 (T I)) ((A :11 ((B (_84 _209)) _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 _871)))) ((A :19 ((B (_82 _9)) (BK (P _871)))) ((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 _871)))) ((B (C' B)) (B _13))))) ((A :24 _3) ((A :25 (T (_14 _871))) ((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 _907) _908)) ((A :36 ((_76 _917) (_80 _36))) ((A :37 _918) ((A :38 _919) ((A :39 (((S' _28) (_910 #97)) ((C _910) #122))) ((A :40 (((S' _28) (_910 #65)) ((C _910) #90))) ((A :41 (((S' _27) _39) _40)) ((A :42 (((S' _28) (_910 #48)) ((C _910) #57))) ((A :43 (((S' _28) (_910 #32)) ((C _910) #126))) ((A :44 _907) ((A :45 _908) ((A :46 _910) ((A :47 _909) ((A :48 (((S' _27) ((C _44) #32)) (((S' _27) ((C _44) #9)) ((C _44) #10)))) ((A :49 ((S ((S (((S' _28) (_46 #65)) ((C _46) #90))) (_34 (((_870 "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 (((_870 "lib/Data/Char.hs") #3) #8)))) ((B _37) (((C' _91) (((C' _92) _38) (_38 #97))) (_38 #65))))) ((A :51 _878) ((A :52 _879) ((A :53 _880) ((A :54 _881) ((A :55 (_52 %0.0)) ((A :56 _51) ((A :57 _52) ((A :58 _53) ((A :59 _54) ((A :60 ((_76 _882) _883)) ((A :61 (_77 _60)) ((A :62 (_78 _60)) ((A :63 _884) ((A :64 _885) ((A :65 _886) ((A :66 _887) ((A :67 _63) ((A :68 _64) ((A :69 _65) ((A :70 _66) ((A :71 _888) ((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 _915)) ((A :84 B) ((A :85 I) ((A :86 K) ((A :87 C) ((A :88 _914) ((A :89 ((C ((C S') _209)) _210)) ((A :90 (((C' (S' (C' B))) B) I)) ((A :91 _872) ((A :92 _873) ((A :93 _874) ((A :94 _875) ((A :95 _876) ((A :96 _877) ((A :97 (_92 #0)) ((A :98 ((_76 _895) _896)) ((A :99 _897) ((A :100 _898) ((A :101 _899) ((A :102 _900) ((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 _196)) (((C' (C' B)) (((C' C) (_77 _98)) _196)) _197))) ((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') S) ((B (B (B (S B)
\ No newline at end of file
--- a/src/MicroHs/Compile.hs
+++ b/src/MicroHs/Compile.hs
@@ -115,7 +115,7 @@
 compileModule flags nm = S.do
   t1 <- liftIO getTimeMilli
   let
-    fn = map (\ c -> if eqChar c '.' then '/' else c) (unIdent nm) ++ ".hs"
+    fn = map (\ c -> if c == '.' then '/' else c) (unIdent nm) ++ ".hs"
   (pathfn, file) <- liftIO (readFilePath (paths flags) fn)
   let mdl@(EModule nmn _ defs) = parseDie pTop pathfn file
   -- liftIO $ putStrLn $ showEModule mdl
--- a/src/MicroHs/Exp.hs
+++ b/src/MicroHs/Exp.hs
@@ -179,7 +179,7 @@
 quoteString s =
   let
     achar c =
-      if eqChar c '"' || eqChar c '\\' || ltChar c ' ' || ltChar '~' c then
+      if c == '"' || c == '\\' || ltChar c ' ' || ltChar '~' c then
         '\\' : showInt (ord c) ++ ['&']
       else
         [c]
--- a/src/MicroHs/Expr.hs
+++ b/src/MicroHs/Expr.hs
@@ -146,7 +146,7 @@
 
 eqLit :: Lit -> Lit -> Bool
 eqLit (LInt x)  (LInt  y) = x == y
-eqLit (LChar x) (LChar y) = eqChar x y
+eqLit (LChar x) (LChar y) = x == y
 eqLit (LStr  x) (LStr  y) = eqString x y
 eqLit (LPrim x) (LPrim y) = eqString x y
 eqLit (LForImp x) (LForImp y) = eqString x y
@@ -460,7 +460,7 @@
     ppApp as (EApp f a) = ppApp (a:as) f
     ppApp as (EVar i) | eqString op "->", [a, b] <- as = parens $ ppExpr a <+> text "->" <+> ppExpr b
                       | eqString op "=>", [a, b] <- as = parens $ ppExpr a <+> text "=>" <+> ppExpr b
-                      | eqChar (head op) ',' = ppExpr (ETuple as)
+                      | head op == ',' = ppExpr (ETuple as)
                       | eqString op "[]", length as == 1 = ppExpr (EListish (LList as))
                         where op = unQualString (unIdent i)
     ppApp as f = parens $ hsep (map ppExpr (f:as))
--- a/src/MicroHs/Ident.hs
+++ b/src/MicroHs/Ident.hs
@@ -96,16 +96,16 @@
 isConIdent (Ident _ i) =
   let
     c = head i
-  in isUpper c || eqChar c ':' || eqChar c ',' || eqString i "[]"  || eqString i "()"
+  in isUpper c || c == ':' || c == ',' || eqString i "[]"  || eqString i "()"
 
 isOperChar :: Char -> Bool
-isOperChar c = elemBy eqChar c "@\\=+-:<>.!#$%^&*/|~?"
+isOperChar c = elem c "@\\=+-:<>.!#$%^&*/|~?"
 
 isIdentChar :: Char -> Bool
-isIdentChar c = isLower_ c || isUpper c || isDigit c || eqChar c '\''
+isIdentChar c = isLower_ c || isUpper c || isDigit c || c == '\''
 
 isLower_ :: Char -> Bool
-isLower_ c = isLower c || eqChar c '_'
+isLower_ c = isLower c || c == '_'
 
 dummyIdent :: Ident
 dummyIdent = mkIdent "_"
--- a/src/MicroHs/Lex.hs
+++ b/src/MicroHs/Lex.hs
@@ -81,7 +81,7 @@
 lex loc ('{':'-':cs) = skipNest (addCol loc 2) 1 cs
 lex loc ('-':'-':cs) | isComm rs = skipLine (addCol loc $ 2+length ds) cs
   where
-    (ds, rs) = span (eqChar '-') cs
+    (ds, rs) = span (== '-') cs
     isComm [] = True
     isComm (d:_) = not (isOperChar d)
 lex loc (d:cs) | isLower_ d =
@@ -108,7 +108,7 @@
 number :: Loc -> String -> String -> [Token]   -- neg=1 means negative, neg=0 means positive
 number loc sign cs =
   case span isDigit cs of
-    (ds, rs) | null rs || not (eqChar (head rs) '.') || eqString (take 2 rs) ".." ->
+    (ds, rs) | null rs || not (head rs == '.') || eqString (take 2 rs) ".." ->
                let s = sign ++ ds
                    i = readInt s
                in  TInt loc i : lex (addCol loc $ length s) rs
@@ -121,9 +121,9 @@
                          Nothing -> mkD s rs'
                          Just (es, rs'') -> mkD (s ++ es) rs''
   where
-    expo (e:'-':xs@(d:_)) | eqChar (toLower e) 'w' && isDigit d = Just ('e':'-':as, bs) where (as, bs) = span isDigit xs
-    expo (e:'+':xs@(d:_)) | eqChar (toLower e) 'w' && isDigit d = Just ('e':'+':as, bs) where (as, bs) = span isDigit xs
-    expo (e:    xs@(d:_)) | eqChar (toLower e) 'w' && isDigit d = Just ('e':    as, bs) where (as, bs) = span isDigit xs
+    expo (e:'-':xs@(d:_)) | toLower e == 'e' && isDigit d = Just ('e':'-':as, bs) where (as, bs) = span isDigit xs
+    expo (e:'+':xs@(d:_)) | toLower e == 'e' && isDigit d = Just ('e':'+':as, bs) where (as, bs) = span isDigit xs
+    expo (e:    xs@(d:_)) | toLower e == 'e' && isDigit d = Just ('e':    as, bs) where (as, bs) = span isDigit xs
     expo _ = Nothing
 
 -- Skip a {- -} style comment
@@ -154,7 +154,7 @@
 takeChars loc fn c n str ('\\':cs) =
   case decodeChar (n+1) cs of
     (d, m, rs) -> takeChars loc fn c m (d:str) rs
-takeChars   _ fn c n str (d:cs) | eqChar c d = (fn (reverse str), n, cs)
+takeChars   _ fn c n str (d:cs) | c == d = (fn (reverse str), n, cs)
 takeChars loc fn c n str (d:cs) = takeChars loc fn c (n+1) (d:str) cs
 
 decodeChar :: Int -> String -> (Char, Int, String)
@@ -166,7 +166,7 @@
 decodeChar n []       = ('X',  n,   [])
 
 isSpec :: Char -> Bool
-isSpec c = elemBy eqChar c "()[],{}`;"
+isSpec c = elem c "()[],{}`;"
 
 upperIdent :: Loc -> Loc -> [String] -> String -> [Token]
 --upperIdent l c qs acs | trace (show (l, c, qs, acs)) False = undefined
-- 
⑨