c5eec39 · elk · git.iko.soy

git.iko.soy/elk

Merge branch 'dev' into topic/best_practice_webgl

commitc5eec398f13cca1cb1591f7f346ae3a7d11007ae authorJohn P Mayer Jr <john.p.mayer.jr@gmail.com> dateTue 3 Dec 2013, 00:55 (13 years ago) parent087562e 47c6cbc

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 Generate.Markdown,

@@ -102,7 +103,6 @@ Library

102103

103104Executable elm

104105 Main-is: Compiler.hs

105− ghc-options: -threaded -O2

106106 Hs-Source-Dirs: compiler

107107 other-modules: SourceSyntax.Declaration,

108108 SourceSyntax.Expression,

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

116116 SourceSyntax.Type,

117117 Generate.JavaScript,

118118 Generate.Noscript,

119+ Generate.Markdown,

119120 Generate.Html,

120121 Generate.Cases,

121122 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