TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

import: opam: Report groups in syntax tree.

Browse source 
* guix/import/opam.scm (group-pat): Report in syntax tree.
(dependency->input, dependency->native-input, dependency->name):
consider the case of a group.
This commit is contained in:
Julien Lepiller 2020-10-02 00:27:24 +02:00
parent ad05537e32
commit a6816618fc
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
guix/import/opam.scm
View file

@ -75,8 +75,8 @@ (define-peg-pattern choice body
group-pat group-pat
conditional-value conditional-value
ground-value)) ground-value))
(define-peg-pattern group-pat body (define-peg-pattern group-pat all
(and ground-value (* SP) (ignore "&") (* SP) (and (or conditional-value ground-value) (* SP) (ignore "&") (* SP)
(or group-pat conditional-value ground-value))) (or group-pat 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 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 conditional-value all (and ground-value (* SP) condition))
@ -196,6 +196,7 @@ (define (dependency->input dependency)
(('string-pat str) str) (('string-pat str) str)
;; Arbitrary select the first dependency ;; Arbitrary select the first dependency
(('choice-pat choice ...) (dependency->input (car choice))) (('choice-pat choice ...) (dependency->input (car choice)))
(('group-pat val ...) (map dependency->input val))
(('conditional-value val condition) (('conditional-value val condition)
(if (native? condition) "" (dependency->input val))))) (if (native? condition) "" (dependency->input val)))))
@ -203,7 +204,8 @@ (define (dependency->native-input dependency)
(match dependency (match dependency
(('string-pat str) "") (('string-pat str) "")
;; Arbitrary select the first dependency ;; Arbitrary select the first dependency
(('choice-pat choice ...) (dependency->input (car choice))) (('choice-pat choice ...) (dependency->native-input (car choice)))
(('group-pat val ...) (map dependency->native-input val))
(('conditional-value val condition) (('conditional-value val condition)
(if (native? condition) (dependency->input val) "")))) (if (native? condition) (dependency->input val) ""))))
@ -211,7 +213,8 @@ (define (dependency->name dependency)
(match dependency (match dependency
(('string-pat str) str) (('string-pat str) str)
;; Arbitrary select the first dependency ;; Arbitrary select the first dependency
(('choice-pat choice ...) (dependency->input (car choice))) (('choice-pat choice ...) (dependency->name (car choice)))
(('group-pat val ...) (map dependency->name val))
(('conditional-value val condition) (('conditional-value val condition)
(dependency->name val)))) (dependency->name val))))
@ -263,7 +266,7 @@ (define* (opam->guix-package name #:key (repository (get-opam-repository)))
or #f on failure." or #f on failure."
(and-let* ((opam-file (opam-fetch name repository)) (and-let* ((opam-file (opam-fetch name repository))
(version (assoc-ref opam-file "version")) (version (assoc-ref opam-file "version"))
(opam-content (assoc-ref opam-file "metadata")) (opam-content (pk (assoc-ref opam-file "metadata")))
(url-dict (metadata-ref opam-content "url")) (url-dict (metadata-ref opam-content "url"))
(source-url (or (metadata-ref url-dict "src") (source-url (or (metadata-ref url-dict "src")
(metadata-ref url-dict "archive"))) (metadata-ref url-dict "archive")))