roptat pushed a commit to branch master
in repository guix.
commit fb1a9c11e5ec928704c98dd633301bbdd7f3e8f4
Author: Julien Lepiller <[email protected]>
AuthorDate: Tue Dec 21 02:52:34 2021 +0100
guix: maven: Fix java parser.
* guix/build/maven/java.scm (comment, comment-chr): Support more comment
styles.
---
guix/build/maven/java.scm | 9 ++++++---
1 file 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))
