git.iko.soy/elk
on master help sign in
Merge branch 'master' into canonicalize
eaff976Evan Czaplicki
Elm.cabal+5−5
compare with master
unifiedsplit
@@ -1,5 +1,5 @@
1Name: Elm
1Name: Elm
2−Version: 0.12.2
2+Version: 0.12.3
3Synopsis: The Elm language module.
3Synopsis: The Elm language module.
4Description: Elm aims to make client-side web-development more pleasant.
4Description: Elm aims to make client-side web-development more pleasant.
5 It is a statically/strongly typed, functional reactive
5 It is a statically/strongly typed, functional reactive
@@ -108,7 +108,7 @@ Library
108 filepath,
108 filepath,
109 indents,
109 indents,
110 language-ecmascript >=0.15 && < 1.0,
110 language-ecmascript >=0.15 && < 1.0,
111− language-glsl,
111+ language-glsl >= 0.0.2,
112 mtl >= 2,
112 mtl >= 2,
113 pandoc >= 1.10,
113 pandoc >= 1.10,
114 parsec >= 3.1.1,
114 parsec >= 3.1.1,
@@ -195,7 +195,7 @@ Executable elm
195 filepath,
195 filepath,
196 indents,
196 indents,
197 language-ecmascript >=0.15 && < 1.0,
197 language-ecmascript >=0.15 && < 1.0,
198− language-glsl,
198+ language-glsl >= 0.0.2,
199 mtl >= 2,
199 mtl >= 2,
200 pandoc >= 1.10,
200 pandoc >= 1.10,
201 parsec >= 3.1.1,
201 parsec >= 3.1.1,
@@ -239,7 +239,7 @@ Executable elm-doc
239 directory,
239 directory,
240 filepath,
240 filepath,
241 indents,
241 indents,
242− language-glsl,
242+ language-glsl >= 0.0.2,
243 mtl >= 2,
243 mtl >= 2,
244 pandoc >= 1.10,
244 pandoc >= 1.10,
245 parsec >= 3.1.1,
245 parsec >= 3.1.1,
@@ -279,7 +279,7 @@ Test-Suite compiler-tests
279 filepath,
279 filepath,
280 indents,
280 indents,
281 language-ecmascript >=0.15 && < 1.0,
281 language-ecmascript >=0.15 && < 1.0,
282− language-glsl,
282+ language-glsl >= 0.0.2,
283 mtl >= 2,
283 mtl >= 2,
284 pandoc >= 1.10,
284 pandoc >= 1.10,
285 parsec >= 3.1.1,
285 parsec >= 3.1.1,
compiler/Parse/Expression.hs+7−6
@@ -6,7 +6,7 @@ import Text.Parsec hiding (newline,spaces)
6import Text.Parsec.Indent
6import Text.Parsec.Indent
7
7
8import Parse.Binop
8import Parse.Binop
9−import Parse.Helpers
9+import Parse.Helpers as Help
10import Parse.Literal
10import Parse.Literal
11import qualified Parse.Pattern as Pattern
11import qualified Parse.Pattern as Pattern
12import qualified Parse.Type as Type
12import qualified Parse.Type as Type
@@ -46,7 +46,7 @@ negative = do
46-------- Complex Terms --------
46-------- Complex Terms --------
47
47
48listTerm :: IParser Source.Expr'
48listTerm :: IParser Source.Expr'
49−listTerm = markdown' <|> glShader' <|> braces (try range <|> ExplicitList <$> commaSep expr)
49+listTerm = markdown' <|> shader' <|> braces (try range <|> ExplicitList <$> commaSep expr)
50 where
50 where
51 range = do
51 range = do
52 lo <- expr
52 lo <- expr
@@ -56,17 +56,18 @@ listTerm = markdown' <|> glShader' <|> braces (try range <|> ExplicitList <$> co
56 markdown' = do
56 markdown' = do
57 pos <- getPosition
57 pos <- getPosition
58 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)
58 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)
59− (rawText, exprs) <- markdown (interpolation uid)
59+ (rawText, exprs) <- Help.markdown (interpolation uid)
60 return (Markdown uid (filter (/='\r') rawText) exprs)
60 return (Markdown uid (filter (/='\r') rawText) exprs)
61
61
62− glShader' = do
62+ shader' = do
63 pos <- getPosition
63 pos <- getPosition
64 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)
64 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)
65− (rawSrc, tipe) <- glShader
65+ (rawSrc, tipe) <- Help.shader
66 return $ GLShader uid (filter (/='\r') rawSrc) tipe
66 return $ GLShader uid (filter (/='\r') rawSrc) tipe
67
67
68 span uid index =
68 span uid index =
69+ "<span id=\"md-" ++ uid ++ "-" ++ show index ++
69− "<span id=\"md-" ++ uid ++ "-" ++ show index ++ "\">{{ markdown interpolation is in the pipeline, but still needs more testing }}</span>"
70+ "\">{{ markdown interpolation is in the pipeline, but still needs more testing }}</span>"
70
71
71 interpolation uid exprs = do
72 interpolation uid exprs = do
72 try (string "{{")
73 try (string "{{")
compiler/Parse/Helpers.hs+3−3
@@ -325,9 +325,9 @@ markdown interpolation =
325 closeMarkdown (markdownBuilder . (c:)) stuff
325 closeMarkdown (markdownBuilder . (c:)) stuff
326 ]
326 ]
327
327
328−glShader :: IParser (String, Literal.GLShaderTipe)
328+shader :: IParser (String, Literal.GLShaderTipe)
329−glShader =
329+shader =
330− do try (string "[glShader|")
330+ do try (string "[glsl|")
331 rawSrc <- closeShader id
331 rawSrc <- closeShader id
332 case glSource rawSrc of
332 case glSource rawSrc of
333 Left err -> parserFail . show $ err
333 Left err -> parserFail . show $ err
libraries/elm_dependencies.json+3−3
@@ -1,9 +1,9 @@
1−{ "version": "0.12.1"
1+{ "version": "0.12.3"
2, "summary": "Elm's standard libraries"
2, "summary": "Elm's standard libraries"
3−, "description": "The full set of standard libraries for Elm. This library is pegged to the version number of the compiler, so if you are using Elm 0.12.1, you should be using version 0.12.1 of the standard libraries."
3+, "description": "The full set of standard libraries for Elm. This library is pegged to the version number of the compiler, so if you are using Elm 0.12.3, you should be using version 0.12.3 of the standard libraries."
4, "license": "BSD3"
4, "license": "BSD3"
5, "repository": "http://github.com/elm-lang/Elm.git"
5, "repository": "http://github.com/elm-lang/Elm.git"
6−, "elm-version": "0.12.1"
6+, "elm-version": "0.12.3"
7, "dependencies": {}
7, "dependencies": {}
8, "exposed-modules":
8, "exposed-modules":
9 [ "Array"
9 [ "Array"