6b20ec8 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

on golang help sign in

Merge pull request #509 from joneshf/docgen-stderr

6b20ec8Phil Freeman12 years ago

docgen/Main.hs+3−2

compare with golang

unifiedsplit

@@ -25,6 +25,7 @@ import qualified Paths_purescript as Paths

25import qualified System.IO.UTF8 as U

26import System.Console.CmdTheLine

27import System.Exit (exitSuccess, exitFailure)

28+import System.IO (stderr)

29docgen :: Bool -> [FilePath] -> IO ()

30docgen :: Bool -> [FilePath] -> IO ()

30docgen showHierarchy input = do

31docgen showHierarchy input = do

@@ -37,7 +38,7 @@ parseFile input = do

37 text <- U.readFile input

38 text <- U.readFile input

38 case P.runIndentParser input P.parseModules text of

39 case P.runIndentParser input P.parseModules text of

39 Left err -> do

40 Left err -> do

40− U.print err

41+ U.hPutStr stderr $ show err

41 exitFailure

42 exitFailure

42 Right ms -> do

43 Right ms -> do

43 return ms

44 return ms

@@ -168,7 +169,7 @@ prettyPrintType' :: P.Type -> String

168prettyPrintType' = P.prettyPrintType . P.everywhereOnTypes dePrim

169prettyPrintType' = P.prettyPrintType . P.everywhereOnTypes dePrim

169 where

170 where

170 dePrim ty@(P.TypeConstructor (P.Qualified _ name))

171 dePrim ty@(P.TypeConstructor (P.Qualified _ name))

171− | ty == P.tyBoolean || ty == P.tyNumber || ty == P.tyString =

172+ | ty == P.tyBoolean || ty == P.tyNumber || ty == P.tyString =

172 P.TypeConstructor $ P.Qualified Nothing name

173 P.TypeConstructor $ P.Qualified Nothing name

173 dePrim other = other

174 dePrim other = other

174

175

hierarchy/Main.hs+2−1

@@ -26,6 +26,7 @@ import System.Console.CmdTheLine

26import System.Directory (createDirectoryIfMissing)

27import System.FilePath ((</>))

28import System.Exit (exitFailure, exitSuccess)

29+import System.IO (stderr)

30import Text.Parsec (ParseError)

31import Text.Parsec (ParseError)

@@ -57,7 +58,7 @@ compile :: FilePath -> Maybe FilePath -> IO ()

57compile input mOutput = do

58compile input mOutput = do

58 modules <- readInput input

59 modules <- readInput input

59 case modules of

60 case modules of

60− Left err -> U.print err >> exitFailure

61+ Left err -> U.hPutStr stderr (show err) >> exitFailure

61 Right ms -> do

62 Right ms -> do

62 for_ ms $ \(P.Module moduleName decls _) ->

63 for_ ms $ \(P.Module moduleName decls _) ->

63 let name = runModuleName moduleName

64 let name = runModuleName moduleName