47c6cbc · elk · git.iko.soy

git.iko.soy/elk

Merge branch 'master' into dev

commit47c6cbc38f6d6e9776e02f01a7b8cefcaadec846 authorEvan Czaplicki <info@elm-lang.org> dateTue 26 Nov 2013, 00:12 (13 years ago) parente32eab0 9633af6

2 files changed+4−2

compare with master

unifiedsplit

Elm.cabal+2−1 compiler/Docs.hs+2−1

Elm.cabal+2−1

@@ -44,6 +44,7 @@ Library

4444 SourceSyntax.Type,

4545 Generate.JavaScript,

4646 Generate.Noscript,

47+ Generate.Markdown,

4748 Generate.Html,

4849 Generate.Cases,

4950 Transform.Canonicalize,

@@ -100,7 +101,6 @@ Library

100101

101102Executable elm

102103 Main-is: Compiler.hs

103− ghc-options: -threaded -O2

104104 Hs-Source-Dirs: compiler

105105 other-modules: SourceSyntax.Declaration,

106106 SourceSyntax.Expression,

@@ -114,6 +114,7 @@ Executable elm

114114 SourceSyntax.Type,

115115 Generate.JavaScript,

116116 Generate.Noscript,

117+ Generate.Markdown,

117118 Generate.Html,

118119 Generate.Cases,

119120 Transform.Canonicalize,

compiler/Docs.hs+2−1

@@ -5,6 +5,7 @@ import System.Console.CmdArgs

55import System.Directory

66import System.FilePath

77import System.Exit

8+import System.IO

910import Control.Applicative ((<$>), (<*>))

1011import Data.Aeson

@@ -52,7 +53,7 @@ parseFile path = do

5253 createDirectoryIfMissing True (dropFileName docPath)

5354 BS.writeFile docPath (encodePretty' config json)

5455 Left err -> do

55− putStrLn $ "Parse error in " ++ path ++ " at " ++ show err

56+ hPutStrLn stderr $ "Parse error in " ++ path ++ " at " ++ show err

5657 exitFailure

5758

5859docs :: IParser Value