Elm 0.12.2 → 0.12.3
raw patch · 4 files changed
+15/−14 lines, 4 filesdep ~language-glslPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: language-glsl
API changes (from Hackage documentation)
Files
- Elm.cabal +5/−5
- compiler/Parse/Expression.hs +7/−6
- compiler/Parse/Helpers.hs +3/−3
- data/interfaces.data binary
Elm.cabal view
@@ -1,5 +1,5 @@ Name: Elm-Version: 0.12.2+Version: 0.12.3 Synopsis: The Elm language module. Description: Elm aims to make client-side web-development more pleasant. It is a statically/strongly typed, functional reactive@@ -107,7 +107,7 @@ filepath, indents, language-ecmascript >=0.15 && < 1.0,- language-glsl,+ language-glsl >= 0.0.2, mtl >= 2, pandoc >= 1.10, parsec >= 3.1.1,@@ -193,7 +193,7 @@ filepath, indents, language-ecmascript >=0.15 && < 1.0,- language-glsl,+ language-glsl >= 0.0.2, mtl >= 2, pandoc >= 1.10, parsec >= 3.1.1,@@ -237,7 +237,7 @@ directory, filepath, indents,- language-glsl,+ language-glsl >= 0.0.2, mtl >= 2, pandoc >= 1.10, parsec >= 3.1.1,@@ -277,7 +277,7 @@ filepath, indents, language-ecmascript >=0.15 && < 1.0,- language-glsl,+ language-glsl >= 0.0.2, mtl >= 2, pandoc >= 1.10, parsec >= 3.1.1,
compiler/Parse/Expression.hs view
@@ -6,7 +6,7 @@ import Text.Parsec.Indent import Parse.Binop-import Parse.Helpers+import Parse.Helpers as Help import Parse.Literal import qualified Parse.Pattern as Pattern import qualified Parse.Type as Type@@ -44,7 +44,7 @@ -------- Complex Terms -------- listTerm :: IParser ParseExpr'-listTerm = markdown' <|> glShader' <|> braces (try range <|> ExplicitList <$> commaSep expr)+listTerm = markdown' <|> shader' <|> braces (try range <|> ExplicitList <$> commaSep expr) where range = do lo <- expr@@ -54,17 +54,18 @@ markdown' = do pos <- getPosition let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)- (rawText, exprs) <- markdown (interpolation uid)+ (rawText, exprs) <- Help.markdown (interpolation uid) return (Markdown uid (filter (/='\r') rawText) exprs) - glShader' = do+ shader' = do pos <- getPosition let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)- (rawSrc, tipe) <- glShader+ (rawSrc, tipe) <- Help.shader return $ GLShader uid (filter (/='\r') rawSrc) tipe span uid index =- "<span id=\"md-" ++ uid ++ "-" ++ show index ++ "\">{{ markdown interpolation is in the pipeline, but still needs more testing }}</span>"+ "<span id=\"md-" ++ uid ++ "-" ++ show index +++ "\">{{ markdown interpolation is in the pipeline, but still needs more testing }}</span>" interpolation uid exprs = do try (string "{{")
compiler/Parse/Helpers.hs view
@@ -324,9 +324,9 @@ closeMarkdown (markdownBuilder . (c:)) stuff ] -glShader :: IParser (String, Literal.GLShaderTipe)-glShader =- do try (string "[glShader|")+shader :: IParser (String, Literal.GLShaderTipe)+shader =+ do try (string "[glsl|") rawSrc <- closeShader id case glSource rawSrc of Left err -> parserFail . show $ err
data/interfaces.data view
binary file changed (122647 → 122647 bytes)