X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=click.scm;h=6a2d25323113da8c030307ab52452aff4d6e0ef0;hb=27b4e1f5bfac39323bdff089aac094b8e98b0258;hp=afeb2f914fa1145ad0573108a18f37f9ae84b0f8;hpb=a2c12dede99c0d296194699e025a2e541c8a98a0;p=guile-click.git

diff --git a/click.scm b/click.scm
index afeb2f9..6a2d253 100644
--- a/click.scm
+++ b/click.scm
@@ -22,24 +22,16 @@
   #:use-module (click constant)
   #:use-module (click display)
   #:use-module (click util)
+  #:use-module (click value)
   #:export (command))
 
-(define (get-options-value options option-spec)
-  (cond ((null? option-spec)
-         '())
-        (else
-         (let* ((option (car option-spec))
-                (option-name (car option))
-                (default (option-default-value option)))
-           (cons (cons option-name (option-ref options option-name default))
-                 (get-options-value options (cdr option-spec)))))))
 
 (define (command option-spec procedure)
   (lambda (args)
     (with-fluids ((%program-name (car args)))
       (let* ((click-option-spec (append option-spec (list HELP_OPTION)))
-             (options (getopt-long args
-                                   (getopt-long-option-spec click-option-spec))))
-        (if (option-ref options 'help #f)
+             (values (getopt-long args
+                                  (getopt-long-option-spec click-option-spec))))
+        (if (option-ref values 'help #f)
             (display-help procedure click-option-spec)
-            (apply procedure (map cdr (get-options-value options option-spec))))))))
+            (apply procedure (map cdr (get-values option-spec values))))))))