[finished cleanup of module / import jupdike@gmail.com**20080211174747] { hunk ./CPSParser.lhs 1 -> module CPSParser - - ( CPS, - > -- get next token etc - > item, unItem, end, - > -- error handling - > Parser, ParseResult, - > runParserCPS, - > parseError, mandatory, probe - > ) +> module CPSParser ( +> -- get next token etc +> item, unItem, end, +> -- error handling +> Parser, ParseResult, +> runParserCPS, +> parseError, mandatory, probe +> ) hunk ./Convert.lhs 8 - ----------------------------------------------------------------------- - ----------------------------------------------------------------------- - +> hunk ./Convert.lhs 10 - -> import Prim -- ( Ident(..), Prim(..) ) -> import Expr -- ( Expr(..) ) -> import Function -- ( Function, minus, mone ) +> +> import Prim ( Ident, Prim (..) ) +> import Expr ( Expr (..) ) +> import Function ( Function (..), minus, mone ) hunk ./Convert.lhs 16 ----------------------------------------------------------------------- ----------------------------------------------------------------------- - - > infixr 1 :.: - > infixr 2 +++ - > infixr 3 *** - > infixr 5 :^: - hunk ./Derive.lhs 16 -> import Function - - ( Prim, Ident, Function, - > constant, - > minus, zero, one, mone, two, mtwo, half, mhalf ) +> import Function ( Prim (..), Ident, Function (..), +> constant, +> minus, zero, one, mone, two, mtwo, half, mhalf ) hunk ./Expr.lhs 14 - -< import Support - hunk ./Limes.lhs 5 -> module Limes -- ( Extended, mapE, limes -> -- ) +> module Limes ( Extended (..), mapE, limes +> ) hunk ./Limes.lhs 16 -> import Prim -> import Function --( Function(..), Prim(..), -> -- minus, (***), zero, one, mone, two, mtwo ) +> import Function ( Function(..), Prim(..), +> minus, (***), zero, one, mone, two, mtwo ) hunk ./Main.lhs 14 -> -> import Prim hunk ./OrdAssList.lhs 41 - - - hunk ./Parse.lhs 15 -> + hunk ./Pretty.lhs 22 - - > import Support ( spaces, intersperse, intersperses ) - > import IOSupport ( putLine ) - hunk ./Print.lhs 14 -> -- import Support ( replicate ) hunk ./Print.lhs 17 -> import Expr --( Prim(..), Expr(..) ) -> import Limes --( Extended(..) ) +> import Expr ( Prim(..), Expr(..) ) +> import Limes ( Extended(..) ) hunk ./REPL.hs 1 -module REPL - -where - --- import Calc - -import System.Console.Readline -import System - --- import Useful - - -{- -untag ('<':xs) = intag xs -untag (x:xs) = x : untag xs -untag [] = [] -intag ('>':xs) = untag xs -intag (x:xs) = intag xs -intag [] = [] --} - -main = do - path <- checkPath "units.txt" - cnts <- readFile path - hs <- newHashes - errors <- mapM (\s -> run hs s) (lines cnts) - mapM_ myPutStrLn errors - putStrLn startMessage - loop (myF hs) -- (untag . calc) - - -prompt = ">>> " - -isQuit (':':'q':_) = True -isQuit _ = False - --- isHelp (':':'h':_) = True --- isHelp _ = False - -version = "0.2.1" -startMessage = "calc "++version++"\n"++ - ":q or ^D to quit" -leavingMessage = "Leaving calc" - -loop f = do - s <- readline prompt - case s of - Nothing -> putStrLn $ "\n" ++ leavingMessage - Just str -> do - if isQuit str - then putStrLn leavingMessage - else do - addHistory str - result <- f str - putStrLn result -- $ f str - loop f -myF hs x = do - c <- calc hs x - return $ untag c - -myPutStrLn x = if x == "" then return () else putStrLn $ untag x rmfile ./REPL.hs hunk ./Replace.lhs 15 -> import Function -- ( Prim(..), Function(..) ) +> import Function ( Prim(..), Function(..) ) }