git.iko.soy/Idris-dev
on master help sign in
Merge branch 'master' of github.com:edwinb/Idris-dev
6367eb5Edwin Brady
idris.cabal−2
compare with master
unifiedsplit
@@ -93,8 +93,6 @@ Extra-source-files:
93 javascript/Makefile
93 javascript/Makefile
94 javascript/javascript.ipkg
94 javascript/javascript.ipkg
95
95
96− js/*.js
97−
98 llvm/*.c
96 llvm/*.c
99 llvm/Makefile
97 llvm/Makefile
100
98
src/Idris/ParseHelpers.hs+1−1
@@ -371,7 +371,7 @@ terminator = do lchar ';'; popIndent
371 <|> do c <- indent; l <- lastIndent
371 <|> do c <- indent; l <- lastIndent
372 if c <= l then popIndent else fail "not a terminator"
372 if c <= l then popIndent else fail "not a terminator"
373 <|> do isParen <- lookAheadMatches (oneOf ")}")
373 <|> do isParen <- lookAheadMatches (oneOf ")}")
374− if isParen then popIndent else fail "not a termiantor"
374+ if isParen then popIndent else fail "not a terminator"
375 <|> lookAhead eof
375 <|> lookAhead eof
376
376
377-- | Parses and keeps a terminator
377-- | Parses and keeps a terminator