[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/09: import: opam: Add more patterns to opam file parser.
From: |
guix-commits |
Subject: |
01/09: import: opam: Add more patterns to opam file parser. |
Date: |
Wed, 10 Apr 2019 15:40:07 -0400 (EDT) |
roptat pushed a commit to branch master
in repository guix.
commit 3e159dd0a46ba785f8a09bd86e6cacb5c1708bc9
Author: Julien Lepiller <address@hidden>
Date: Wed Apr 3 20:11:54 2019 +0200
import: opam: Add more patterns to opam file parser.
* guix/import/opam.scm: Add more patterns to peg parser.
(choice-pat choice condition-not condition-paren): New patterns.
(ground-value condition-content condition-var): Update patterns.
---
guix/import/opam.scm | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/guix/import/opam.scm b/guix/import/opam.scm
index 36028a0..b5069cd 100644
--- a/guix/import/opam.scm
+++ b/guix/import/opam.scm
@@ -58,7 +58,12 @@
(define-peg-pattern weird-record all (and key (* SP) dict))
(define-peg-pattern key body (+ (or (range #\a #\z) "-")))
(define-peg-pattern value body (and (or conditional-value ground-value
operator) (* SP)))
-(define-peg-pattern ground-value body (and (or multiline-string string-pat
list-pat var) (* SP)))
+(define-peg-pattern choice-pat all (and (ignore "(") (* SP) choice (* SP)
(ignore ")")))
+(define-peg-pattern choice body
+ (or (and (or conditional-value ground-value) (* SP) (ignore "|") (* SP)
choice)
+ conditional-value
+ ground-value))
+(define-peg-pattern ground-value body (and (or multiline-string string-pat
choice-pat list-pat var) (* SP)))
(define-peg-pattern conditional-value all (and ground-value (* SP) condition))
(define-peg-pattern string-pat all (and QUOTE (* STRCHR) QUOTE))
(define-peg-pattern list-pat all (and (ignore "[") (* SP) (* (and value (*
SP))) (ignore "]")))
@@ -80,7 +85,8 @@
(define-peg-pattern condition-form2 body
(and (* SP) (or condition-greater-or-equal
condition-greater
condition-lower-or-equal condition-lower
- condition-neq condition-eq
condition-content) (* SP)))
+ condition-neq condition-eq condition-not
+ condition-content) (* SP)))
;(define-peg-pattern condition-operator all (and (ignore operator) (* SP)
condition-string))
(define-peg-pattern condition-greater-or-equal all (and (ignore (and ">" "="))
(* SP) condition-string))
@@ -91,10 +97,12 @@
(define-peg-pattern condition-or all (and condition-form2 (* SP) (ignore "|")
(* SP) condition-form))
(define-peg-pattern condition-eq all (and (? condition-content) (* SP) (ignore
"=") (* SP) condition-content))
(define-peg-pattern condition-neq all (and (? condition-content) (* SP)
(ignore (and "!" "=")) (* SP) condition-content))
-(define-peg-pattern condition-content body (or condition-string condition-var))
+(define-peg-pattern condition-not all (and (ignore (and "!")) (* SP)
condition-content))
+(define-peg-pattern condition-content body (or condition-paren
condition-string condition-var))
(define-peg-pattern condition-content2 body (and condition-content (* SP)
(not-followed-by (or "&" "=" "!"))))
+(define-peg-pattern condition-paren body (and "(" condition-form ")"))
(define-peg-pattern condition-string all (and QUOTE (* STRCHR) QUOTE))
-(define-peg-pattern condition-var all (+ (or (range #\a #\z) "-")))
+(define-peg-pattern condition-var all (+ (or (range #\a #\z) "-" ":")))
(define (get-opam-repository)
"Update or fetch the latest version of the opam repository and return the
@@ -171,18 +179,24 @@ path to the repository."
(define (dependency->input dependency)
(match dependency
(('string-pat str) str)
+ ;; Arbitrary select the first dependency
+ (('choice-pat choice ...) (dependency->input (car choice)))
(('conditional-value val condition)
(if (native? condition) "" (dependency->input val)))))
(define (dependency->native-input dependency)
(match dependency
(('string-pat str) "")
+ ;; Arbitrary select the first dependency
+ (('choice-pat choice ...) (dependency->input (car choice)))
(('conditional-value val condition)
(if (native? condition) (dependency->input val) ""))))
(define (dependency->name dependency)
(match dependency
(('string-pat str) str)
+ ;; Arbitrary select the first dependency
+ (('choice-pat choice ...) (dependency->input (car choice)))
(('conditional-value val condition)
(dependency->name val))))
- branch master updated (81a9ab8 -> e9b86fa), guix-commits, 2019/04/10
- 05/09: gnu: Add ocaml-extlib., guix-commits, 2019/04/10
- 06/09: gnu: Add ocaml-cudf., guix-commits, 2019/04/10
- 03/09: gnu: Add ocaml-opam-file-format., guix-commits, 2019/04/10
- 09/09: gnu: opam: Unbundle dependencies., guix-commits, 2019/04/10
- 07/09: gnu: Add ocaml-mccs., guix-commits, 2019/04/10
- 02/09: import: opam: Use dune-build-system when possible., guix-commits, 2019/04/10
- 01/09: import: opam: Add more patterns to opam file parser.,
guix-commits <=
- 08/09: gnu: Add ocaml-dose3., guix-commits, 2019/04/10
- 04/09: gnu: ocaml-cmdliner: Update to 1.0.3., guix-commits, 2019/04/10