Add lines/s flag

Makefile

@@ -152,13 +152,13 @@ bin/umhs: bin/mhs
 
 #
 timecompile: bin/mhs
-	time bin/mhs +RTS -v -RTS $(MHSINC) MicroHs.Main
+	time bin/mhs +RTS -v -RTS -s $(MHSINC) MicroHs.Main
 
 #
 timecachecompile: bin/mhs
 	@-rm -f .mhscache
 	time bin/mhs +RTS -v -RTS -CW AllOfLib
-	time bin/mhs +RTS -v -RTS -CR $(MHSINC) MicroHs.Main
+	time bin/mhs +RTS -v -RTS -CR -s $(MHSINC) MicroHs.Main
 
 #
 cachelib:
@@ -213,8 +213,8 @@ nfibtest: bin/mhs bin/mhseval
 
 ######
 
-VERSION=0.11.1.1
-HVERSION=0,11,1,1
+VERSION=0.11.1.2
+HVERSION=0,11,1,2
 MCABAL=$(HOME)/.mcabal
 MCABALMHS=$(MCABAL)/mhs-$(VERSION)
 MDATA=$(MCABALMHS)/packages/mhs-$(VERSION)/data

MicroHs.cabal

@@ -1,6 +1,6 @@
 cabal-version:       3.0
 name:                MicroHs
-version:             0.11.1.1
+version:             0.11.1.2
                      -- *** When changing the version number, also
                      -- *** run 'sh updateversion.sh'
                      -- *** Yeah, it stinks.

README.md

@@ -163,6 +163,7 @@ it will be the entry point to the program.
 * `-T` generate dynamic function usage statistics
 * `-z` compress combinator code generated in the `.c` file
 * `-l` show every time a module is loaded
+* `-s` show compilation speed in lines/s
 * `-XCPP` run `cpphs` on source files
 * `-Dxxx` passed to `cpphs`
 * `-Ixxx` passed to `cpphs`

lib/libs.cabal

@@ -1,6 +1,6 @@
 cabal-version:  3.0
 name:           libs
-version:        0.11.1.1
+version:        0.11.1.2
 license:        Apache
 license-file:   LICENSE
 maintainer:     lennart@augustsson.net

paths/Paths_MicroHs.hs

@@ -10,4 +10,4 @@ getDataDir :: IO FilePath
 getDataDir = return "."
 
 version :: Version
-version = makeVersion [0,11,1,1]
+version = makeVersion [0,11,1,2]

src/MicroHs/Flags.hs

@@ -8,6 +8,7 @@ data Flags = Flags {
   paths      :: [FilePath], -- module search path
   output     :: String,     -- output file
   loading    :: Bool,       -- show loading message
+  speed      :: Bool,       -- show lines/s
   readCache  :: Bool,       -- read and use cache
   writeCache :: Bool,       -- generate cache
   useTicks   :: Bool,       -- emit ticks
@@ -34,6 +35,7 @@ defaultFlags dir = Flags {
   paths      = [".", dir ++ "/lib"],
   output     = "out.comb",
   loading    = False,
+  speed      = False,
   readCache  = False,
   writeCache = False,
   useTicks   = False,

src/MicroHs/Ident.hs

@@ -16,7 +16,7 @@ module MicroHs.Ident(
   qualOf,
   addIdentSuffix,
   SLoc(..), noSLoc,
-  showSLoc,
+  showSLoc, slocFile,
   ) where
 import Prelude(); import MHSPrelude hiding(head)
 import Data.Char
@@ -179,3 +179,6 @@ showSLoc (SLoc fn l c) =
     if l == 0  then "no location" else
     if l == -1 then "end-of-file" else
     "line " ++ show l ++ ", col " ++ show c
+
+slocFile :: SLoc -> FilePath
+slocFile (SLoc f _ _) = f

src/MicroHs/Main.hs

@@ -64,7 +64,7 @@ main = do
                 _   -> error usage
 
 usage :: String
-usage = "Usage: mhs [--version] [--numeric-version] [-v] [-q] [-l] [-r] [-C[R|W]] [-XCPP] [-DDEF] [-IPATH] [-T] [-z] [-iPATH] [-oFILE] [-a[PATH]] [-L[PATH|PKG]] [-PPKG] [-Q PKG [DIR]] [-tTARGET] [-optc OPTION] [MODULENAME..|FILE]"
+usage = "Usage: mhs [--version] [--numeric-version] [-v] [-q] [-l] [-s] [-r] [-C[R|W]] [-XCPP] [-DDEF] [-IPATH] [-T] [-z] [-iPATH] [-oFILE] [-a[PATH]] [-L[PATH|PKG]] [-PPKG] [-Q PKG [DIR]] [-tTARGET] [-optc OPTION] [MODULENAME..|FILE]"
 
 decodeArgs :: Flags -> [String] -> [String] -> (Flags, [String], [String])
 decodeArgs f mdls [] = (f, mdls, [])
@@ -75,6 +75,7 @@ decodeArgs f mdls (arg:args) =
     "-q"        -> decodeArgs f{verbose = -1} mdls args
     "-r"        -> decodeArgs f{runIt = True} mdls args
     "-l"        -> decodeArgs f{loading = True} mdls args
+    "-s"        -> decodeArgs f{speed = True} mdls args
     "-CR"       -> decodeArgs f{readCache = True} mdls args
     "-CW"       -> decodeArgs f{writeCache = True} mdls args
     "-C"        -> decodeArgs f{readCache=True, writeCache = True} mdls args
@@ -207,6 +208,7 @@ mainListPkg' _flags pkgfn = do
 
 mainCompile :: Flags -> Ident -> IO ()
 mainCompile flags mn = do
+  t0 <- getTimeMilli
   (cash, (rmn, allDefs)) <- do
     cash <- getCached flags
     (rds, _, cash') <- compileCacheTop flags mn cash
@@ -236,6 +238,11 @@ mainCompile flags mn = do
     when (verbosityGT flags 0) $
       putStrLn $ "final pass            " ++ padLeft 6 (show (t2-t1)) ++ "ms"
 
+    when (speed flags) $ do
+      let fns = filter (isSuffixOf ".hs") $ map (slocFile . slocIdent) $ cachedModuleNames cash
+      locs <- sum . map (length . lines) <$> mapM readFile fns
+      putStrLn $ show (locs * 1000 `div` (t2 - t0)) ++ " lines/s"
+
     let cCode = makeCArray flags outData ++ makeFFI flags allDefs
 
     -- Decode what to do: