Merge branch 'master' of github.com:edwinb/Idris-dev
commit6367eb557f86bf3f88f23a30bb940c2decab7092
authorEdwin Brady <ecb10@st-andrews.ac.uk>
dateSun 13 Oct 2013, 22:31 (13 years ago)
parentb9d0b7ee7d962d
idris.cabal−2
@@ -93,8 +93,6 @@ Extra-source-files:
9393 javascript/Makefile
9494 javascript/javascript.ipkg
9595
96− js/*.js
97−
9896 llvm/*.c
9997 llvm/Makefile
10098
src/Idris/ParseHelpers.hs+1−1
@@ -371,7 +371,7 @@ terminator = do lchar ';'; popIndent
371371 <|> do c <- indent; l <- lastIndent
372372 if c <= l then popIndent else fail "not a terminator"
373373 <|> do isParen <- lookAheadMatches (oneOf ")}")
374− if isParen then popIndent else fail "not a termiantor"
374+ if isParen then popIndent else fail "not a terminator"
375375 <|> lookAhead eof
376376
377377-- | Parses and keeps a terminator