[bug#33811,5/5] import: opam: Parse comments.

Message ID 20181220110103.4219-5-julien@lepiller.eu
State Accepted
Commit f31ce9ecf1ecb4eeab4fc37792684b3fa03ec95f
Headers show
Series [bug#33811,1/5] gnu: Move coq packages from ocaml to coq. | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed
cbaines/applying patch fail Apply failed

Commit Message

Julien Lepiller Dec. 20, 2018, 11:01 a.m. UTC
* guix/import/opam.scm: Add comment support in parser.
---
 guix/import/opam.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch

diff --git a/guix/import/opam.scm b/guix/import/opam.scm
index b30d28561..c254db5f2 100644
--- a/guix/import/opam.scm
+++ b/guix/import/opam.scm
@@ -42,7 +42,8 @@ 
             %opam-updater))
 
 ;; Define a PEG parser for the opam format
-(define-peg-pattern SP none (or " " "\n"))
+(define-peg-pattern comment none (and "#" (* STRCHR) "\n"))
+(define-peg-pattern SP none (or " " "\n" comment))
 (define-peg-pattern SP2 body (or " " "\n"))
 (define-peg-pattern QUOTE none "\"")
 (define-peg-pattern QUOTE2 body "\"")