From 09404021e3195b9fc2cde8b5b3725db9a8fd61d7 Mon Sep 17 00:00:00 2001 From: David Smith Date: Sun, 16 Dec 2018 21:36:44 -0200 Subject: [PATCH 1/2] Allow ipkg sourcedir to have deep location https://github.com/idris-lang/Idris-dev/issues/4618 --- src/Idris/Package/Parser.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Idris/Package/Parser.hs b/src/Idris/Package/Parser.hs index 5a101c76f0..7c1ceb7c9a 100644 --- a/src/Idris/Package/Parser.hs +++ b/src/Idris/Package/Parser.hs @@ -122,7 +122,7 @@ pOptions = do pClause :: PParser () pClause = clause "executable" filename (\st v -> st { execout = Just v }) <|> clause "main" (iName []) (\st v -> st { idris_main = Just v }) - <|> clause "sourcedir" identifier (\st v -> st { sourcedir = v }) + <|> clause "sourcedir" stringLiteral (\st v -> st { sourcedir = v }) <|> clause "opts" pOptions (\st v -> st { idris_opts = v ++ idris_opts st }) <|> clause "pkgs" (commaSep (pPkgName <* someSpace)) (\st ps -> let pkgs = pureArgParser $ concatMap (\x -> ["-p", show x]) ps From 0e6d7edca20f08c0f8113aaee67cecbeeac92b42 Mon Sep 17 00:00:00 2001 From: David Smith Date: Tue, 18 Dec 2018 12:36:05 -0200 Subject: [PATCH 2/2] parse either identitfier or stringLiteral for ipkg sourcedir --- src/Idris/Package/Parser.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Idris/Package/Parser.hs b/src/Idris/Package/Parser.hs index 7c1ceb7c9a..4400abd30f 100644 --- a/src/Idris/Package/Parser.hs +++ b/src/Idris/Package/Parser.hs @@ -122,7 +122,7 @@ pOptions = do pClause :: PParser () pClause = clause "executable" filename (\st v -> st { execout = Just v }) <|> clause "main" (iName []) (\st v -> st { idris_main = Just v }) - <|> clause "sourcedir" stringLiteral (\st v -> st { sourcedir = v }) + <|> clause "sourcedir" (identifier <|> stringLiteral) (\st v -> st { sourcedir = v }) <|> clause "opts" pOptions (\st v -> st { idris_opts = v ++ idris_opts st }) <|> clause "pkgs" (commaSep (pPkgName <* someSpace)) (\st ps -> let pkgs = pureArgParser $ concatMap (\x -> ["-p", show x]) ps