c0ff21a · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

on master help sign in

Implement our own someSpace

c0ff21aJason Felice9 years ago

src/Idris/Package/Parser.hs+7−8

compare with master

unifiedsplit

@@ -12,9 +12,8 @@ import Idris.CmdOptions

12import Idris.Imports

13import Idris.Package.Common

14import Idris.Parser.Helpers (IdrisInnerParser, MonadicParsing, eol, iName,

15− identifier, isEol, lchar, multiLineComment,

15+ identifier, isEol, lchar, packageName,

16− packageName, parseErrorDoc, reserved, runparser,

16+ parseErrorDoc, reserved, runparser, someSpace')

17− simpleWhiteSpace, singleLineComment)

19import Control.Applicative

18import Control.Applicative

20import Control.Monad.State.Strict

19import Control.Monad.State.Strict

@@ -43,7 +42,7 @@ instance {-# OVERLAPPING #-} P.DeltaParsing PParser where

43#endif

42#endif

45instance {-# OVERLAPPING #-} P.TokenParsing PParser where

44instance {-# OVERLAPPING #-} P.TokenParsing PParser where

46− someSpace = many (simpleWhiteSpace <|> singleLineComment <|> multiLineComment) *> pure ()

45+ someSpace = someSpace'

49parseDesc :: FilePath -> IO PkgDesc

48parseDesc :: FilePath -> IO PkgDesc

@@ -66,7 +65,7 @@ pPkg :: PParser PkgDesc

66pPkg = do

65pPkg = do

67 reserved "package"

66 reserved "package"

68 p <- pPkgName

67 p <- pPkgName

69− P.someSpace

68+ someSpace'

70 modify $ \st -> st { pkgname = p }

69 modify $ \st -> st { pkgname = p }

71 some pClause

70 some pClause

72 st <- get

71 st <- get

@@ -119,10 +118,10 @@ filename = (do

119 "filename must contain no directory component"

118 "filename must contain no directory component"

120

119

121textUntilEol :: MonadicParsing m => m String

120textUntilEol :: MonadicParsing m => m String

122−textUntilEol = many (P.satisfy (not . isEol)) <* eol <* P.someSpace

121+textUntilEol = many (P.satisfy (not . isEol)) <* eol <* someSpace'

123

122

124clause :: String -> PParser a -> (PkgDesc -> a -> PkgDesc) -> PParser ()

123clause :: String -> PParser a -> (PkgDesc -> a -> PkgDesc) -> PParser ()

125−clause name p f = do value <- reserved name *> lchar '=' *> p <* P.someSpace

124+clause name p f = do value <- reserved name *> lchar '=' *> p <* someSpace'

126 modify $ \st -> f st value

125 modify $ \st -> f st value

127

126

128commaSep :: MonadicParsing m => m a -> m [a]

127commaSep :: MonadicParsing m => m a -> m [a]

@@ -133,7 +132,7 @@ pClause = clause "executable" filename (\st v -> st { execout = Just v })

133 <|> clause "main" (fst <$> iName []) (\st v -> st { idris_main = Just v })

132 <|> clause "main" (fst <$> iName []) (\st v -> st { idris_main = Just v })

134 <|> clause "sourcedir" (fst <$> identifier) (\st v -> st { sourcedir = v })

133 <|> clause "sourcedir" (fst <$> identifier) (\st v -> st { sourcedir = v })

135 <|> clause "opts" (pureArgParser . words <$> P.stringLiteral) (\st v -> st { idris_opts = v ++ idris_opts st })

134 <|> clause "opts" (pureArgParser . words <$> P.stringLiteral) (\st v -> st { idris_opts = v ++ idris_opts st })

136− <|> clause "pkgs" (commaSep (pPkgName <* P.someSpace)) (\st ps ->

135+ <|> clause "pkgs" (commaSep (pPkgName <* someSpace')) (\st ps ->

137 let pkgs = pureArgParser $ concatMap (\x -> ["-p", show x]) ps

136 let pkgs = pureArgParser $ concatMap (\x -> ["-p", show x]) ps

138 in st { pkgdeps = ps `union` pkgdeps st

137 in st { pkgdeps = ps `union` pkgdeps st

139 , idris_opts = pkgs ++ idris_opts st })

138 , idris_opts = pkgs ++ idris_opts st })

src/Idris/Parser/Helpers.hs+6−3

@@ -61,8 +61,11 @@ instance {-# OVERLAPPING #-} P.DeltaParsing IdrisParser where

61 {-# INLINE restOfLine #-}

62#endif

64+someSpace' :: MonadicParsing m => m ()

65+someSpace' = many (simpleWhiteSpace <|> singleLineComment <|> multiLineComment) *> pure ()

66+

64instance {-# OVERLAPPING #-} P.TokenParsing IdrisParser where

67instance {-# OVERLAPPING #-} P.TokenParsing IdrisParser where

65− someSpace = many (simpleWhiteSpace <|> singleLineComment <|> multiLineComment) *> pure ()

68+ someSpace = someSpace'

66 token p = do s <- get

69 token p = do s <- get

67 (FC fn (sl, sc) _) <- getFC --TODO: Update after fixing getFC

70 (FC fn (sl, sc) _) <- getFC --TODO: Update after fixing getFC

68 -- See Issue #1594

71 -- See Issue #1594

@@ -206,7 +209,7 @@ docComment = do dc <- pushIndent *> docCommentLine

206 contents <- P.option "" (do first <- P.satisfy (\c -> not (isEol c || c == '@'))

209 contents <- P.option "" (do first <- P.satisfy (\c -> not (isEol c || c == '@'))

207 res <- many (P.satisfy (not . isEol))

210 res <- many (P.satisfy (not . isEol))

208 return $ first:res)

211 return $ first:res)

209− eol ; P.someSpace

212+ eol ; someSpace'

210 return contents)

213 return contents)

211 <?> ""

214 <?> ""

212

215

@@ -217,7 +220,7 @@ docComment = do dc <- pushIndent *> docCommentLine

217 n <- fst <$> name

220 n <- fst <$> name

218 many (P.satisfy isSpace)

221 many (P.satisfy isSpace)

219 docs <- many (P.satisfy (not . isEol))

222 docs <- many (P.satisfy (not . isEol))

220− eol ; P.someSpace

223+ eol ; someSpace'

221 return (n, docs)

224 return (n, docs)

222

225

223-- | Parses some white space

226-- | Parses some white space