404f0e6 · elk · git.iko.soy

git.iko.soy/elk

Make changes for 7.10.1

commit404f0e6619ae485e44b49437b87c86526473fc40 authorEvan <evancz@gmail.com> dateMon 1 Jun 2015, 16:13 (11 years ago) parent6e8415e

2 files changed+16−12

compare with master

unifiedsplit

elm-compiler.cabal+4−4 src/Parse/Helpers.hs+12−8

elm-compiler.cabal+4−4

@@ -33,7 +33,7 @@ source-repository head

3333

3434Library

3535 ghc-options:

36− -threaded -O2 -W -Werror

36+ -threaded -O2 -W

3737

3838 Hs-Source-Dirs:

3939 src

@@ -126,7 +126,7 @@ Library

126126 filepath >= 1 && < 2.0,

127127 indents >= 0.3 && < 0.4,

128128 language-ecmascript >= 0.15 && < 0.18,

129− language-glsl >= 0.0.2 && < 0.2,

129+ language-glsl >= 0.0.2 && < 0.3,

130130 mtl >= 2.2 && < 3,

131131 parsec >= 3.1.1 && < 3.5,

132132 pretty >= 1.0 && < 2.0,

@@ -162,7 +162,7 @@ Executable elm

162162 directory >= 1.0 && < 2.0,

163163 filepath >= 1 && < 2.0,

164164 indents >= 0.3 && < 0.4,

165− language-glsl >= 0.0.2 && < 0.2,

165+ language-glsl >= 0.0.2 && < 0.3,

166166 mtl >= 2.2 && < 3,

167167 parsec >= 3.1.1 && < 3.5,

168168 pretty >= 1.0 && < 2.0,

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

213213 filepath >= 1 && < 2.0,

214214 indents >= 0.3 && < 0.4,

215215 language-ecmascript >= 0.15 && < 0.18,

216− language-glsl >= 0.0.2 && < 0.2,

216+ language-glsl >= 0.0.2 && < 0.3,

217217 mtl >= 2.2 && < 3,

218218 parsec >= 3.1.1 && < 3.5,

219219 pretty >= 1.0 && < 2.0,

src/Parse/Helpers.hs+12−8

@@ -231,6 +231,7 @@ followedBy a b =

231231 return x

232232

233233

234+betwixt :: Char -> Char -> IParser a -> IParser a

234235betwixt a b c =

235236 do char a

236237 out <- c

@@ -238,6 +239,7 @@ betwixt a b c =

238239 return out

239240

240241

242+surround :: Char -> Char -> String -> IParser a -> IParser a

241243surround a z name p = do

242244 char a

243245 v <- padded p

@@ -483,14 +485,16 @@ shader =

483485 case glSource rawSrc of

484486 Left err -> parserFail . show $ err

485487 Right tipe -> return (rawSrc, tipe)

486− where

487− closeShader builder =

488− choice

489− [ do try (string "|]")

490− return (builder "")

491− , do c <- anyChar

492− closeShader (builder . (c:))

493− ]

488+

489+

490+closeShader :: (String -> a) -> IParser a

491+closeShader builder =

492+ choice

493+ [ do try (string "|]")

494+ return (builder "")

495+ , do c <- anyChar

496+ closeShader (builder . (c:))

497+ ]

494498

495499

496500glSource :: String -> Either ParseError L.GLShaderTipe