git.iko.soy/elk
on master help sign in
Merge branch 'master' into dev
47c6cbcEvan Czaplicki
Elm.cabal+2−1
compare with master
unifiedsplit
@@ -44,6 +44,7 @@ Library
44 SourceSyntax.Type,
44 SourceSyntax.Type,
45 Generate.JavaScript,
45 Generate.JavaScript,
46 Generate.Noscript,
46 Generate.Noscript,
47+ Generate.Markdown,
47 Generate.Html,
48 Generate.Html,
48 Generate.Cases,
49 Generate.Cases,
49 Transform.Canonicalize,
50 Transform.Canonicalize,
@@ -100,7 +101,6 @@ Library
100
101
101Executable elm
102Executable elm
102 Main-is: Compiler.hs
103 Main-is: Compiler.hs
103− ghc-options: -threaded -O2
104 Hs-Source-Dirs: compiler
104 Hs-Source-Dirs: compiler
105 other-modules: SourceSyntax.Declaration,
105 other-modules: SourceSyntax.Declaration,
106 SourceSyntax.Expression,
106 SourceSyntax.Expression,
@@ -114,6 +114,7 @@ Executable elm
114 SourceSyntax.Type,
114 SourceSyntax.Type,
115 Generate.JavaScript,
115 Generate.JavaScript,
116 Generate.Noscript,
116 Generate.Noscript,
117+ Generate.Markdown,
117 Generate.Html,
118 Generate.Html,
118 Generate.Cases,
119 Generate.Cases,
119 Transform.Canonicalize,
120 Transform.Canonicalize,
compiler/Docs.hs+2−1
@@ -5,6 +5,7 @@ import System.Console.CmdArgs
5import System.Directory
5import System.Directory
6import System.FilePath
6import System.FilePath
7import System.Exit
7import System.Exit
8+import System.IO
8
9
9import Control.Applicative ((<$>), (<*>))
10import Control.Applicative ((<$>), (<*>))
10import Data.Aeson
11import Data.Aeson
@@ -52,7 +53,7 @@ parseFile path = do
52 createDirectoryIfMissing True (dropFileName docPath)
53 createDirectoryIfMissing True (dropFileName docPath)
53 BS.writeFile docPath (encodePretty' config json)
54 BS.writeFile docPath (encodePretty' config json)
54 Left err -> do
55 Left err -> do
55− putStrLn $ "Parse error in " ++ path ++ " at " ++ show err
56+ hPutStrLn stderr $ "Parse error in " ++ path ++ " at " ++ show err
56 exitFailure
57 exitFailure
57
58
58docs :: IParser Value
59docs :: IParser Value