diff options
| author | Marius Bakke <marius@gnu.org> | 2022-02-13 14:24:53 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-02-13 14:24:53 +0100 |
| commit | 76b6bbdf232b4b82cdd23cfe0d81331a4fd2edec (patch) | |
| tree | 0e6a57ba08b9c6f9f5cbcdc5b5d9daeea91e428d /guix/build/maven/java.scm | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
| parent | e8af2ea63a7f497b8f8e19e206645109c0646e72 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/build/maven/java.scm')
| -rw-r--r-- | guix/build/maven/java.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/guix/build/maven/java.scm b/guix/build/maven/java.scm index daa4c88045..f8c8e5745d 100644 --- a/guix/build/maven/java.scm +++ b/guix/build/maven/java.scm @@ -31,11 +31,14 @@ (? (and (ignore "static") (* WS))) package-name (* WS) (ignore ";"))) -(define-peg-pattern comment all (and (? (and annotation-pat (* WS))) (ignore "/*") - comment-part)) +(define-peg-pattern comment all (or + (and (? (and annotation-pat (* WS))) (ignore "/*") + comment-part) + (and (ignore "//") (* (or "\t" (range #\ #\xffff))) + (or (ignore "\n") (ignore "\r")) (* WS)))) (define-peg-pattern comment-part body (or (ignore (and (* "*") "/")) (and (* "*") (+ comment-chr) comment-part))) -(define-peg-pattern comment-chr body (or "\t" "\n" (range #\ #\)) (range #\+ #\xffff))) +(define-peg-pattern comment-chr body (or "\t" "\n" "\r" (range #\ #\)) (range #\+ #\xffff))) (define-peg-pattern inline-comment none (and (ignore "//") (* inline-comment-chr) (ignore "\n"))) (define-peg-pattern inline-comment-chr body (range #\ #\xffff)) |