eaff976 · elk · git.iko.soy

git.iko.soy/elk

Merge branch 'master' into canonicalize

Conflicts: compiler/Parse/Expression.hs

commiteaff9760da1c45e90942de679569179f9540eb37 authorEvan Czaplicki <info@elm-lang.org> dateTue 20 May 2014, 14:31 (12 years ago) parente99d840 a474531

4 files changed+18−17

compare with master

unifiedsplit

Elm.cabal+5−5 compiler/Parse/Expression.hs+7−6 compiler/Parse/Helpers.hs+3−3 libraries/elm_dependencies.json+3−3

Elm.cabal+5−5

@@ -1,5 +1,5 @@

11Name: Elm

2−Version: 0.12.2

2+Version: 0.12.3

33Synopsis: The Elm language module.

44Description: Elm aims to make client-side web-development more pleasant.

55 It is a statically/strongly typed, functional reactive

@@ -108,7 +108,7 @@ Library

108108 filepath,

109109 indents,

110110 language-ecmascript >=0.15 && < 1.0,

111− language-glsl,

111+ language-glsl >= 0.0.2,

112112 mtl >= 2,

113113 pandoc >= 1.10,

114114 parsec >= 3.1.1,

@@ -195,7 +195,7 @@ Executable elm

195195 filepath,

196196 indents,

197197 language-ecmascript >=0.15 && < 1.0,

198− language-glsl,

198+ language-glsl >= 0.0.2,

199199 mtl >= 2,

200200 pandoc >= 1.10,

201201 parsec >= 3.1.1,

@@ -239,7 +239,7 @@ Executable elm-doc

239239 directory,

240240 filepath,

241241 indents,

242− language-glsl,

242+ language-glsl >= 0.0.2,

243243 mtl >= 2,

244244 pandoc >= 1.10,

245245 parsec >= 3.1.1,

@@ -279,7 +279,7 @@ Test-Suite compiler-tests

279279 filepath,

280280 indents,

281281 language-ecmascript >=0.15 && < 1.0,

282− language-glsl,

282+ language-glsl >= 0.0.2,

283283 mtl >= 2,

284284 pandoc >= 1.10,

285285 parsec >= 3.1.1,

compiler/Parse/Expression.hs+7−6

@@ -6,7 +6,7 @@ import Text.Parsec hiding (newline,spaces)

66import Text.Parsec.Indent

88import Parse.Binop

9−import Parse.Helpers

9+import Parse.Helpers as Help

1010import Parse.Literal

1111import qualified Parse.Pattern as Pattern

1212import qualified Parse.Type as Type

@@ -46,7 +46,7 @@ negative = do

4646-------- Complex Terms --------

4747

4848listTerm :: IParser Source.Expr'

49−listTerm = markdown' <|> glShader' <|> braces (try range <|> ExplicitList <$> commaSep expr)

49+listTerm = markdown' <|> shader' <|> braces (try range <|> ExplicitList <$> commaSep expr)

5050 where

5151 range = do

5252 lo <- expr

@@ -56,17 +56,18 @@ listTerm = markdown' <|> glShader' <|> braces (try range <|> ExplicitList <$> co

5656 markdown' = do

5757 pos <- getPosition

5858 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)

59− (rawText, exprs) <- markdown (interpolation uid)

59+ (rawText, exprs) <- Help.markdown (interpolation uid)

6060 return (Markdown uid (filter (/='\r') rawText) exprs)

6161

62− glShader' = do

62+ shader' = do

6363 pos <- getPosition

6464 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)

65− (rawSrc, tipe) <- glShader

65+ (rawSrc, tipe) <- Help.shader

6666 return $ GLShader uid (filter (/='\r') rawSrc) tipe

6767

6868 span uid index =

69− "<span id=\"md-" ++ uid ++ "-" ++ show index ++ "\">{{ markdown interpolation is in the pipeline, but still needs more testing }}</span>"

69+ "<span id=\"md-" ++ uid ++ "-" ++ show index ++

70+ "\">{{ markdown interpolation is in the pipeline, but still needs more testing }}</span>"

7071

7172 interpolation uid exprs = do

7273 try (string "{{")

compiler/Parse/Helpers.hs+3−3

@@ -325,9 +325,9 @@ markdown interpolation =

325325 closeMarkdown (markdownBuilder . (c:)) stuff

326326 ]

327327

328−glShader :: IParser (String, Literal.GLShaderTipe)

329−glShader =

330− do try (string "[glShader|")

328+shader :: IParser (String, Literal.GLShaderTipe)

329+shader =

330+ do try (string "[glsl|")

331331 rawSrc <- closeShader id

332332 case glSource rawSrc of

333333 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"

22, "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."

44, "license": "BSD3"

55, "repository": "http://github.com/elm-lang/Elm.git"

6−, "elm-version": "0.12.1"

6+, "elm-version": "0.12.3"

77, "dependencies": {}

88, "exposed-modules":

99 [ "Array"