[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#52723] [PATCH 22/26] guix: maven: Fix java parser.
From: |
Julien Lepiller |
Subject: |
[bug#52723] [PATCH 22/26] guix: maven: Fix java parser. |
Date: |
Tue, 21 Dec 2021 23:45:06 +0100 |
* 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 @@ (define-peg-pattern import-pat all (and (ignore "import")
(* WS)
(? (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))
--
2.34.0
- [bug#52723] [PATCH 11/26] gnu: Add java-jvnet-parent-pom-3., (continued)
- [bug#52723] [PATCH 11/26] gnu: Add java-jvnet-parent-pom-3., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 13/26] gnu: java-eclipse-sisu-inject: Update to 0.3.5., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 12/26] gnu: java-jsr250: Use proper source., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 24/26] gnu: maven-wagon-provider-api: Update to 3.4.3., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 19/26] gnu: Add java-sonatype-aether-test-util-1.13., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 14/26] gnu: java-eclipse-sisu-plexus: Update to 0.3.5., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 15/26] gnu: maven-common-artifact-filters: Update to 3.2.0., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 18/26] gnu: Add java-sonatype-aether-spi-1.13., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 16/26] gnu: java-plexus-container-default-bootstrap: Update to 2.1.0., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 21/26] gnu: maven-dependency-tree: Update to 3.1.0., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 22/26] guix: maven: Fix java parser.,
Julien Lepiller <=
- [bug#52723] [PATCH 17/26] gnu: Add java-sonatype-aether-api-1.13., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 26/26] gnu: maven: Update to 3.8.4., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 25/26] gnu: Update maven-artifact-transfer to 0.13.1., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 10/26] gnu: java-plexus-sec-dispatcher: Update to 2.0., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 08/26] gnu: Add java-plexus-build-api., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 23/26] gnu: maven-enforcer-api: Update to 3.0.0., Julien Lepiller, 2021/12/21
- [bug#52723] [PATCH 20/26] gnu: Add java-sonatype-aether-util-1.13., Julien Lepiller, 2021/12/21