git.iko.soy/elk
on master help sign in
Corrections for second release.
ea05fbeevancz
Elm.cabal+7−5
compare with master
unifiedsplit
@@ -1,6 +1,6 @@
1
1
2Name: Elm
2Name: Elm
3−Version: 0.1.1.2
3+Version: 0.1.1.4
4Synopsis: The Elm compiler and server.
4Synopsis: The Elm compiler and server.
5Description: Elm aims to make client-side web-development more pleasant.
5Description: Elm aims to make client-side web-development more pleasant.
6 It is a statically/strongly typed, functional reactive
6 It is a statically/strongly typed, functional reactive
@@ -37,10 +37,11 @@ Executable elm
37 Types, Constrain, Hints, Types, Unify
37 Types, Constrain, Hints, Types, Unify
38
38
39 -- Packages needed in order to build this package.
39 -- Packages needed in order to build this package.
40− ghc-options: -O3 -rtsopts -auto-all -caf-all
40+ ghc-options: -O3
41 Build-depends: base >=4.2 && <5, containers >= 0.3,
41 Build-depends: base >=4.2 && <5, containers >= 0.3,
42 transformers >= 0.2, mtl >= 2, parsec >= 3.1.1,
42 transformers >= 0.2, mtl >= 2, parsec >= 3.1.1,
43− blaze-html == 0.5.0.*, blaze-markup == 0.5.1.*, deepseq
43+ blaze-html == 0.5.0.*, blaze-markup == 0.5.1.*,
44+ deepseq
44
45
45 -- Modules not exported by this package.
46 -- Modules not exported by this package.
46 -- Other-modules:
47 -- Other-modules:
@@ -56,10 +57,11 @@ Executable elm-server
56 Rename, Language.Elm, Binop, Combinators, Lexer,
57 Rename, Language.Elm, Binop, Combinators, Lexer,
57 ParsePatterns, Parser, ParserLib, ParseTypes, Tokens,
58 ParsePatterns, Parser, ParserLib, ParseTypes, Tokens,
58 Types, Constrain, Hints, Types, Unify
59 Types, Constrain, Hints, Types, Unify
59− ghc-options: -O3 -rtsopts -auto-all -caf-all
60+ ghc-options: -O3
60 Build-depends: base >=4.2 && <5, containers >= 0.3, transformers >= 0.2,
61 Build-depends: base >=4.2 && <5, containers >= 0.3, transformers >= 0.2,
61 mtl >= 2, parsec >= 3.1.1, blaze-html == 0.5.0.*,
62 mtl >= 2, parsec >= 3.1.1, blaze-html == 0.5.0.*,
62− HTTP >= 4000, happstack-server == 7.0.2
63+ HTTP >= 4000, happstack-server == 7.0.2,
64+ deepseq
63
65
64Library
66Library
65 exposed-modules: Language.Elm
67 exposed-modules: Language.Elm
src/Compiler.hs+1−1
@@ -10,7 +10,7 @@ import Text.Blaze.Html.Renderer.String (renderHtml)
10main = getArgs >>= parse
10main = getArgs >>= parse
11
11
12parse ("--help":_) = putStrLn usage
12parse ("--help":_) = putStrLn usage
13−parse ("--version":_) = putStrLn "The Elm Compiler 0.1.1.1"
13+parse ("--version":_) = putStrLn "The Elm Compiler 0.1.1.4"
14parse [loc,file]
14parse [loc,file]
15 | "--runtime-location=" `isPrefixOf` loc =
15 | "--runtime-location=" `isPrefixOf` loc =
16 produceHtml (tail $ dropWhile (/='=') loc) file
16 produceHtml (tail $ dropWhile (/='=') loc) file
src/Server.hs+2−2
@@ -11,7 +11,7 @@ import Language.Elm
11
11
12serve :: String -> IO ()
12serve :: String -> IO ()
13serve libLoc = do
13serve libLoc = do
14− putStrLn "Elm Server 0.1.1.1: running at <http://localhost:8000>"
14+ putStrLn "Elm Server 0.1.1.4: running at <http://localhost:8000>"
15 simpleHTTP nullConf $ do
15 simpleHTTP nullConf $ do
16 compressedResponseFilter
16 compressedResponseFilter
17 msum [ uriRest (serveElm libLoc)
17 msum [ uriRest (serveElm libLoc)
@@ -31,7 +31,7 @@ serveElm libLoc fp = do
31main = getArgs >>= parse
31main = getArgs >>= parse
32
32
33parse ("--help":_) = putStrLn usage
33parse ("--help":_) = putStrLn usage
34−parse ("--version":_) = putStrLn "The Elm Server 0.1.1.1"
34+parse ("--version":_) = putStrLn "The Elm Server 0.1.1.4"
35parse [] = serve "/elm-mini.js"
35parse [] = serve "/elm-mini.js"
36parse [arg]
36parse [arg]
37 | "--runtime-location=" `isPrefixOf` arg =
37 | "--runtime-location=" `isPrefixOf` arg =
src/Types/Unify.hs+1−1
@@ -9,7 +9,7 @@ import qualified Data.Set as Set
9import Guid
9import Guid
10import Types
10import Types
11
11
12−import Control.DeepSeq
12+import Control.DeepSeq (NFData (..), deepseq)
13
13
14unify hints expr = run $ do
14unify hints expr = run $ do
15 cs <- constrain hints expr
15 cs <- constrain hints expr