0558972 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

on master help sign in

Fix parsing of indented blocks

0558972Edwin Brady13 years ago

src/Idris/Parser.hs+9−1

@@ -211,7 +211,15 @@ openBlock = do lchar '{'

211 ist <- getState

212 setState (ist { brace_stack = Nothing : brace_stack ist })

213 <|> do ist <- getState

214− lvl <- indent

214+ lvl' <- indent

215+ -- if we're not indented further, it's an empty block, so

216+ -- increment lvl to ensure we get to the end

217+ let lvl = case brace_stack ist of

218+ Just lvl_old : _ ->

219+ if lvl' <= lvl_old then lvl_old+1

220+ else lvl'

221+ [] -> if lvl' == 1 then 2 else lvl'

222+ _ -> lvl'

215 setState (ist { brace_stack = Just lvl : brace_stack ist })

223 setState (ist { brace_stack = Just lvl : brace_stack ist })

216

224

217closeBlock :: IParser ()

225closeBlock :: IParser ()