ref: e1c8eca3b4c123543c57e72a344895dcdb41fa15
parent: 2cf8fa5c8198ac891bc832ad7c278725cbf16d78
author: Lennart Augustsson <lennart.augustsson@epicgames.com>
date: Mon Sep 18 19:35:13 EDT 2023
Tweak implementation for speed
--- a/comb/mhs.comb
+++ b/comb/mhs.comb
@@ -1,3 +1,3 @@
v3.4
-829
-(($A :0 ((_625 _576) (($B ((($S' ($C ((($C' ($S' _625)) (($B ($C _2)) _560)) (($B ($B (_625 _654))) ((($C' ($C' $C)) ((($C' ($S' ($C' $C))) ((($C' ($C' ($C' $C))) ((($C' ($C' ($C' ($C' $S')))) (($B ($B ($B ($B $C)))) ((($C' ($C' ($C' $B))) (($B ($B ($B ($C' $S)))) ((($C' ($C' ($C' ($C' $C)))) ((($C' ($C' ($C' ($C' ($C' $S'))))) (($B ($B ($B ($B ($B $C))))) ((($C' ($C' ($C' ($C' ($C' $C))))) ((($C' ($C' ($C' $B))) (($B ($B ($B ($C' ($C' $S'))))) ((($C' ($C' ($C' ($C' ($C' $C'))))) ((($C' ($C' ($C' ($S' ($C' $C'))))) (($B ($B ($B ($B $B')))) ((($S' $B) ($B' ($B' (($B ($S' $B)) (($B ($B _626)) ((($C' $B) (($B _723) (($B _644) ((($C' _760) _8) 0)))) (($B (_723 _647)) (($B (_660 "top level defns: ")) _606)))))))) ((($S' $B) ($B' (($B ($C' $B)) (($B $B') (($B ($B _626)) ((($C' $B) (($B _723) (($B _644) ((($C' _760) _8) 1)))) (_643 ($T (($B ($B (_723 _647))) ((($C' $B) (($B _660) ((($C' _660) _566) " = "))) _392)))))))))) ((($C' $B) ((($S' $C') (($B $C') (($B $C') _9))) ((($S' $B) (($B ($C' ($C' _626))) ((($C' $B) ($B' (($B _723) (($B _649) _11)))) (($B _660) ((($C' _660) (($B (_660 _1)) _606)) (($O 10) $K)))))) (($B ($B (_625 _654))) ((($C' $B) ($B' (($B _723) (($B _644) ((($C' _760) _8) 0))))) (($B ($B (_723 _647))) ((($C' ($C' _660)) (($B ($B (_660 "final pass "))) (($B ($B (_620 6))) (($B ($B _606)) _754)))) "ms"))))))) _3))))) (($B (($C' $C) (($B ($C _665)) _392))) (($C _678) (_695 0))))) (($B ($C $B)) (($B ($B ($C $B))) (($B ($B $BK)) ((($C' ($C' ($C' ($C' _660)))) (($B ($C' ($C' _660))) ((($C' ($C' ($C' _660))) (($B (($C' $B) (($B _660) ((($C' _660) (($B (_660 "(($A :")) _606)) (($O 32) $K))))) ($B _392))) ") "))) (($O 41) $K)))))))) $T)) (($B $Y) ((($C' ($C' $S)) ((($C' ($C' $S)) ((($C' $B) $P) ((($S' ($C' $B)) ($B _368)) $I))) ($BK $K))) $K))))) (($B (($S' _723) (($B _720) (($B (_723 _767)) (($B (_660 "main: findIdent: ")) _566))))) (($C' _595) _563)))) _602))) (($B ($B _599)) ((($C' $B) (($B _662) (($B $T) (($B ($C $B)) (($B ($B $BK)) ((($C' ($C' ($C' $O))) ($B (($C' $P) _563))) $K)))))) (($C _678) (_695 0))))))) ($T $A))) ($T $K))) $I)) (($B (_723 _367)) (($B (_723 _560)) (($B (_660 (($O 95) $K))) _606)))))))) (($S (($S ((($S' _7) (($B _677) (_664 (_618 "-v")))) ((_694 _618) "-r"))) (($B (_658 (($O 46) $K))) (($B _722) (_663 ((_682 _745) "-i")))))) (($B (_723 _689)) ((($C' _660) (($B _722) (_663 ((_682 _745) "-o")))) (($O "out.comb") $K))))) (($B (($S (($C ((($C' _756) _677) 1)) (_767 "Usage: mhs [-v] [-r] [-iPATH] [-oFILE] ModuleName"))) _689)) (_664 ((_724 _765) ((_724 (_618 (($O 45) $K))) (_675 1))))))) (_685 ((_724 _765) (_618 "--")))))) (($A :1 "v3.4\10&") (($A :2 ((($S' ($S' _625)) _16) (($B ($B ($B (_625 _654)))) ((($C' ($C' $B)) (($B ($B ($C' (($S' _626) (($B (_723 _645)) (($B (_723 (_676 1000000))) _192)))))) (($B ($B ($B ($B (_625 _654))))) ((($C' $B) (($B ($C' $B)) (($B ($B ($C' _626))) ((($C' $B) ($B' (($B _723) (($B _644) ((($C' _760) _8) 0))))) (($B ($B (_723 _647))) ((($C' ($C' _660)) (($B ($B (_660 "combinator conversion "))) (($B ($B (_620 6))) (($B ($B _606)) _754)))) "ms")))))) (($B ($B _627)) (($B $P) (($C _569) (_560 "main")))))))) (_662 ($T ((($C' ($C' $O)) ((($C' $B) $P) _395)) $K))))))) (($A :3 ($T (($C ((($C' $C') (($B ($S' ($B (_625 _576)))) (($B ($B ($B (($C' _577) ((($C' _749) (($B _677) (_685 ((_724 _765) (_618 "--"))))) 1))))) (($B ($B ($B (_723 _6)))) ($C $C))))) (($B ($B $Y)) (($B ($B ($B _551))) (($C' ($C' _662)) (($B ($B $T)) ((($C' ($C' ($C' ($C' $O)))) (($B ($B (($C' $B) $P))) ($B _4))) $K))))))) (($B (($S' _723) (($B _720) (($B (_723 _767)) (($B (_660 "not found ")) _566))))) ($C _552))))) (($A :4 ((($C' $C) ((($S' $C) ((($C' ($C' $S')) (($S $P) ((($S' ($C' $B)) (($B ($B _6)) _4)) _4))) ($BK $K))) ((($C' ($S' $C)) ((($C' ($C' $C)) (($B (($C' $C) (($B ($P _6)) $K))) ((($C' $B) _4) _394))) (($B (_723 (_720 (_767 "primlookup")))) (($C (_700 _618)) _5)))) $K))) (_767 "trans: impossible"))) (($A :5 (($O (($P (($O 66) $K)) $B)) (($O (($P (($O 79) $K)) $O)) (($O (($P (($O 75) $K)) $K)) (($O (($P "C'") $C')) (($O (($P (($O 67) $K)) $C)) (($O (($P (($O 65) $K)) $A)) (($O (($P "
\ No newline at end of file
+828
+(($A :0 ((_625 _576) (($B ((($S' ($C ((($C' ($S' _625)) (($B ($C _2)) _560)) (($B ($B (_625 _654))) ((($C' ($C' $C)) ((($C' ($S' ($C' $C))) ((($C' ($C' ($C' $C))) ((($C' ($C' ($C' ($C' $S')))) (($B ($B ($B ($B $C)))) ((($C' ($C' ($C' $B))) (($B ($B ($B ($C' $S)))) ((($C' ($C' ($C' ($C' $C)))) ((($C' ($C' ($C' ($C' ($C' $S'))))) (($B ($B ($B ($B ($B $C))))) ((($C' ($C' ($C' ($C' ($C' $C))))) ((($C' ($C' ($C' $B))) (($B ($B ($B ($C' ($C' $S'))))) ((($C' ($C' ($C' ($C' ($C' $C'))))) ((($C' ($C' ($C' ($S' ($C' $C'))))) (($B ($B ($B ($B $B')))) ((($S' $B) ($B' ($B' (($B ($S' $B)) (($B ($B _626)) ((($C' $B) (($B _722) (($B _644) ((($C' _759) _8) 0)))) (($B (_722 _647)) (($B (_660 "top level defns: ")) _606)))))))) ((($S' $B) ($B' (($B ($C' $B)) (($B $B') (($B ($B _626)) ((($C' $B) (($B _722) (($B _644) ((($C' _759) _8) 1)))) (_643 ($T (($B ($B (_722 _647))) ((($C' $B) (($B _660) ((($C' _660) _566) " = "))) _392)))))))))) ((($C' $B) ((($S' $C') (($B $C') (($B $C') _9))) ((($S' $B) (($B ($C' ($C' _626))) ((($C' $B) ($B' (($B _722) (($B _649) _11)))) (($B _660) ((($C' _660) (($B (_660 _1)) _606)) (($O 10) $K)))))) (($B ($B (_625 _654))) ((($C' $B) ($B' (($B _722) (($B _644) ((($C' _759) _8) 0))))) (($B ($B (_722 _647))) ((($C' ($C' _660)) (($B ($B (_660 "final pass "))) (($B ($B (_620 6))) (($B ($B _606)) _753)))) "ms"))))))) _3))))) (($B (($C' $C) (($B ($C _665)) _392))) (($C _678) (_694 0))))) (($B ($C $B)) (($B ($B ($C $B))) (($B ($B $BK)) ((($C' ($C' ($C' ($C' _660)))) (($B ($C' ($C' _660))) ((($C' ($C' ($C' _660))) (($B (($C' $B) (($B _660) ((($C' _660) (($B (_660 "(($A :")) _606)) (($O 32) $K))))) ($B _392))) ") "))) (($O 41) $K)))))))) $T)) (($B $Y) ((($C' ($C' $S)) ((($C' ($C' $S)) ((($C' $B) $P) ((($S' ($C' $B)) ($B _368)) $I))) ($BK $K))) $K))))) (($B (($S' _722) (($B _719) (($B (_722 _766)) (($B (_660 "main: findIdent: ")) _566))))) (($C' _595) _563)))) _602))) (($B ($B _599)) ((($C' $B) (($B _662) (($B $T) (($B ($C $B)) (($B ($B $BK)) ((($C' ($C' ($C' $O))) ($B (($C' $P) _563))) $K)))))) (($C _678) (_694 0))))))) ($T $A))) ($T $K))) $I)) (($B (_722 _367)) (($B (_722 _560)) (($B (_660 (($O 95) $K))) _606)))))))) (($S (($S ((($S' _7) (($B _677) (_664 (_618 "-v")))) ((_693 _618) "-r"))) (($B (_658 (($O 46) $K))) (($B _721) (_663 ((_682 _744) "-i")))))) (($B (_722 _689)) ((($C' _660) (($B _721) (_663 ((_682 _744) "-o")))) (($O "out.comb") $K))))) (($B (($S (($C ((($C' _755) _677) 1)) (_766 "Usage: mhs [-v] [-r] [-iPATH] [-oFILE] ModuleName"))) _689)) (_664 ((_723 _764) ((_723 (_618 (($O 45) $K))) (_675 1))))))) (_685 ((_723 _764) (_618 "--")))))) (($A :1 "v3.4\10&") (($A :2 ((($S' ($S' _625)) _16) (($B ($B ($B (_625 _654)))) ((($C' ($C' $B)) (($B ($B ($C' (($S' _626) (($B (_722 _645)) (($B (_722 (_676 1000000))) _192)))))) (($B ($B ($B ($B (_625 _654))))) ((($C' $B) (($B ($C' $B)) (($B ($B ($C' _626))) ((($C' $B) ($B' (($B _722) (($B _644) ((($C' _759) _8) 0))))) (($B ($B (_722 _647))) ((($C' ($C' _660)) (($B ($B (_660 "combinator conversion "))) (($B ($B (_620 6))) (($B ($B _606)) _753)))) "ms")))))) (($B ($B _627)) (($B $P) (($C _569) (_560 "main")))))))) (_662 ($T ((($C' ($C' $O)) ((($C' $B) $P) _395)) $K))))))) (($A :3 ($T (($C ((($C' $C') (($B ($S' ($B (_625 _576)))) (($B ($B ($B (($C' _577) ((($C' _748) (($B _677) (_685 ((_723 _764) (_618 "--"))))) 1))))) (($B ($B ($B (_722 _6)))) ($C $C))))) (($B ($B $Y)) (($B ($B ($B _551))) (($C' ($C' _662)) (($B ($B $T)) ((($C' ($C' ($C' ($C' $O)))) (($B ($B (($C' $B) $P))) ($B _4))) $K))))))) (($B (($S' _722) (($B _719) (($B (_722 _766)) (($B (_660 "not found ")) _566))))) ($C _552))))) (($A :4 ((($C' $C) ((($S' $C) ((($C' ($C' $S')) (($S $P) ((($S' ($C' $B)) (($B ($B _6)) _4)) _4))) ($BK $K))) ((($C' ($S' $C)) ((($C' ($C' $C)) (($B (($C' $C) (($B ($P _6)) $K))) ((($C' $B) _4) _394))) (($B (_722 (_719 (_766 "primlookup")))) (($C (_699 _618)) _5)))) $K))) (_766 "trans: impossible"))) (($A :5 (($O (($P (($O 66) $K)) $B)) (($O (($P (($O 79) $K)) $O)) (($O (($P (($O 75) $K)) $K)) (($O (($P "C'") $C')) (($O (($P (($O 67) $K)) $C)) (($O (($P (($O 65) $K)) $A)) (($O (($P "
\ No newline at end of file
--- a/src/MicroHs/IdentMap.hs
+++ b/src/MicroHs/IdentMap.hs
@@ -34,30 +34,32 @@
elems = M.elems
-}
--- This is a pretty bad implementation.
-data Map v = Map [(Ident, v)]
+-- This is a pretty bad implementation,
+-- but linear search is great for small maps.
+newtype Map v = Map [(Ident, v)]
--Xderiving(Show)
-insert k v (Map kvs) = Map ((k, v):kvs)
+insert k v (Map kvs) =
+ Map ((k, v):kvs)
+ -- This is much slower
+ --Map ((k, v) : filter (not . eqIdent k . fst) kvs)
-fromListWith un =
+fromListWith un xs =
let
- ins ikv akvs =
- case akvs of
- [] -> [ikv]
- kv : kvs ->
- case ikv of
- (ik, iv) ->
- case kv of
- (k, v) ->
- if eqIdent ik k then
+ ins ikv@(ik, iv) =
+ let eq = eqIdent ik
+ loop [] = [ikv]
+ loop (kv@(k, v):kvs) =
+ if eq k then
(k, un iv v) : kvs
else
- kv : ins ikv kvs
+ kv : loop kvs
+ in loop
in
- Map . foldr ins []
+ Map (foldr ins [] xs)
fromList = Map
+ --fromListWith const
{-union akvs1 akvs2 =
@@ -69,12 +71,12 @@
lookup ak (Map m) =
let
+ eq = eqIdent ak
look akvs =
case akvs of
[] -> Nothing
- kv : kvs ->
- case kv of
- (k, v) -> if eqIdent ak k then Just v else look kvs
+ (k, v) : kvs ->
+ if eq k then Just v else look kvs
in look m
empty = Map []
@@ -86,6 +88,7 @@
toList (Map kvs) = kvs
{-+
import qualified Data.Map as M
type Map v = M.Map Ident v
--
⑨