nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

import: hackage: Imporve parsing of tests. 

* guix/import/cabal.scm (lex-word): Add support for tests with no spaces.
  (impl): Rewrite.
This commit is contained in:
Federico Beffa 2015-11-11 11:22:42 +01:00
parent 7716f55c83
commit 9be54eb1b1
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
guix/import/cabal.scm
View File

@ -30,6 +30,7 @@
#:use-module (srfi srfi-9 gnu)
#:use-module (system base lalr)
#:use-module (rnrs enums)
#:use-module (guix utils)
#:export (read-cabal
eval-cabal
@ -496,7 +497,7 @@ location."
(define (lex-word port loc)
"Process tokens which can be recognized by reading the next word form PORT.
LOC is the current port location."
(let* ((w (read-delimited " ()\t\n" port 'peek)))
(let* ((w (read-delimited " <>=()\t\n" port 'peek)))
(cond ((is-if w) (lex-if loc))
((is-test w port) (lex-test w loc))
((is-true w) (lex-true loc))
@ -696,9 +697,16 @@ the ordering operation and the version."
((spec-name spec-op spec-ver)
(comp-spec-name+op+version haskell)))
(if (and spec-ver comp-ver)
(eval-string
(string-append "(string" spec-op " \"" comp-name "\""
" \"" spec-name "-" spec-ver "\")"))
(cond
((not (string= spec-name comp-name)) #f)
((string= spec-op "==") (string= spec-ver comp-ver))
((string= spec-op ">=") (version>=? comp-ver spec-ver))
((string= spec-op ">") (version>? comp-ver spec-ver))
((string= spec-op "<=") (not (version>? comp-ver spec-ver)))
((string= spec-op "<") (not (version>=? comp-ver spec-ver)))
(else
(raise (condition
(&message (message "Failed to evaluate 'impl' test."))))))
(string-match spec-name comp-name))))
(define (cabal-flags)