git.iko.soy/elk
on master help sign in
Make changes for 7.10.1
404f0e6Evan
elm-compiler.cabal+4−4
compare with master
unifiedsplit
@@ -33,7 +33,7 @@ source-repository head
33
33
34Library
34Library
35 ghc-options:
35 ghc-options:
36− -threaded -O2 -W -Werror
36+ -threaded -O2 -W
37
37
38 Hs-Source-Dirs:
38 Hs-Source-Dirs:
39 src
39 src
@@ -126,7 +126,7 @@ Library
126 filepath >= 1 && < 2.0,
126 filepath >= 1 && < 2.0,
127 indents >= 0.3 && < 0.4,
127 indents >= 0.3 && < 0.4,
128 language-ecmascript >= 0.15 && < 0.18,
128 language-ecmascript >= 0.15 && < 0.18,
129− language-glsl >= 0.0.2 && < 0.2,
129+ language-glsl >= 0.0.2 && < 0.3,
130 mtl >= 2.2 && < 3,
130 mtl >= 2.2 && < 3,
131 parsec >= 3.1.1 && < 3.5,
131 parsec >= 3.1.1 && < 3.5,
132 pretty >= 1.0 && < 2.0,
132 pretty >= 1.0 && < 2.0,
@@ -162,7 +162,7 @@ Executable elm
162 directory >= 1.0 && < 2.0,
162 directory >= 1.0 && < 2.0,
163 filepath >= 1 && < 2.0,
163 filepath >= 1 && < 2.0,
164 indents >= 0.3 && < 0.4,
164 indents >= 0.3 && < 0.4,
165− language-glsl >= 0.0.2 && < 0.2,
165+ language-glsl >= 0.0.2 && < 0.3,
166 mtl >= 2.2 && < 3,
166 mtl >= 2.2 && < 3,
167 parsec >= 3.1.1 && < 3.5,
167 parsec >= 3.1.1 && < 3.5,
168 pretty >= 1.0 && < 2.0,
168 pretty >= 1.0 && < 2.0,
@@ -213,7 +213,7 @@ Test-Suite compiler-tests
213 filepath >= 1 && < 2.0,
213 filepath >= 1 && < 2.0,
214 indents >= 0.3 && < 0.4,
214 indents >= 0.3 && < 0.4,
215 language-ecmascript >= 0.15 && < 0.18,
215 language-ecmascript >= 0.15 && < 0.18,
216− language-glsl >= 0.0.2 && < 0.2,
216+ language-glsl >= 0.0.2 && < 0.3,
217 mtl >= 2.2 && < 3,
217 mtl >= 2.2 && < 3,
218 parsec >= 3.1.1 && < 3.5,
218 parsec >= 3.1.1 && < 3.5,
219 pretty >= 1.0 && < 2.0,
219 pretty >= 1.0 && < 2.0,
src/Parse/Helpers.hs+12−8
@@ -231,6 +231,7 @@ followedBy a b =
231 return x
231 return x
232
232
233
233
234+betwixt :: Char -> Char -> IParser a -> IParser a
234betwixt a b c =
235betwixt a b c =
235 do char a
236 do char a
236 out <- c
237 out <- c
@@ -238,6 +239,7 @@ betwixt a b c =
238 return out
239 return out
239
240
240
241
242+surround :: Char -> Char -> String -> IParser a -> IParser a
241surround a z name p = do
243surround a z name p = do
242 char a
244 char a
243 v <- padded p
245 v <- padded p
@@ -483,14 +485,16 @@ shader =
483 case glSource rawSrc of
485 case glSource rawSrc of
484 Left err -> parserFail . show $ err
486 Left err -> parserFail . show $ err
485 Right tipe -> return (rawSrc, tipe)
487 Right tipe -> return (rawSrc, tipe)
486− where
488+
489+
490+closeShader :: (String -> a) -> IParser a
487− closeShader builder =
491+closeShader builder =
488− choice
492+ choice
489− [ do try (string "|]")
493+ [ do try (string "|]")
490− return (builder "")
494+ return (builder "")
491− , do c <- anyChar
495+ , do c <- anyChar
492− closeShader (builder . (c:))
496+ closeShader (builder . (c:))
493− ]
497+ ]
494
498
495
499
496glSource :: String -> Either ParseError L.GLShaderTipe
500glSource :: String -> Either ParseError L.GLShaderTipe