c5eec39 · elk · git.iko.soy

git.iko.soy/elk

on master help sign in

Merge branch 'dev' into topic/best_practice_webgl

c5eec39John P Mayer Jr13 years ago

Elm.cabal+2−1

compare with master

unifiedsplit

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

44 SourceSyntax.Type,

45 Generate.JavaScript,

46 Generate.Noscript,

47+ Generate.Markdown,

47 Generate.Html,

48 Generate.Html,

48 Generate.Cases,

49 Generate.Cases,

49 Generate.Markdown,

50 Generate.Markdown,

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

102

103

103Executable elm

104Executable elm

104 Main-is: Compiler.hs

105 Main-is: Compiler.hs

105− ghc-options: -threaded -O2

106 Hs-Source-Dirs: compiler

107 other-modules: SourceSyntax.Declaration,

108 SourceSyntax.Expression,

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

116 SourceSyntax.Type,

117 Generate.JavaScript,

118 Generate.Noscript,

119+ Generate.Markdown,

119 Generate.Html,

120 Generate.Html,

120 Generate.Cases,

121 Generate.Cases,

121 Transform.Canonicalize,

122 Transform.Canonicalize,

compiler/Docs.hs+2−1

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

5import System.Directory

6import System.FilePath

7import System.Exit

8+import System.IO

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

58docs :: IParser Value

59docs :: IParser Value