From 59a4e56df559e2e3af23e43a8e87497dd499e217 Mon Sep 17 00:00:00 2001
From: Alex Shinn <alexshinn@gmail.com>
Date: Fri, 3 Apr 2015 14:11:33 +0900
Subject: [PATCH] Fixing error messages for unknown options.

---
 lib/chibi/app.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/chibi/app.scm b/lib/chibi/app.scm
index 477ed868..08c1ed4a 100644
--- a/lib/chibi/app.scm
+++ b/lib/chibi/app.scm
@@ -72,7 +72,8 @@
                `(not ,x))
               (else (lp (cdr ls))))))))
   (define (parse-long-option str args fail)
-    (let* ((str+val (string-split str #\= 2))
+    (let* ((fail-args (cons (string-append "--" str) args))
+           (str+val (string-split str #\= 2))
            (str (car str+val))
            (args (if (pair? (cdr str+val)) (cons (cadr str+val) args) args))
            (strs (string-split str #\.))
@@ -82,11 +83,11 @@
        ((not spec)
         ;; check for 'no' prefix on boolean
         (if (not (string-prefix? "no" str))
-            (fail prefix conf-spec (car args) args "unknown option")
+            (fail prefix conf-spec (car fail-args) fail-args "unknown option")
             (let ((res (parse-long-option (substring str 2) args (lambda args #f))))
               (cond
                ((not res)
-                (fail prefix conf-spec (car args) args "unknown option"))
+                (fail prefix conf-spec (car fail-args) fail-args "unknown option"))
                ((not (boolean? (cdar res)))
                 (error "'no' prefix only valid on boolean options"))
                (else
@@ -96,19 +97,20 @@
        ((and (eq? 'boolean (cadr spec)) (null? (cdr str+val)))
         (cons (cons (append prefix (list (car spec))) #t) args))
        ((null? args)
-        (fail prefix conf-spec (car args) args "missing argument to option"))
+        (fail prefix conf-spec (car fail-args) fail-args "missing argument to option"))
        (else
         (let ((val+err (parse-value (cadr spec) (car args))))
           (if (cadr val+err)
-              (fail prefix conf-spec (car args) args (cadr val+err))
+              (fail prefix conf-spec (car fail-args) fail-args (cadr val+err))
               (cons (cons (append prefix syms) (car val+err))
                     (cdr args))))))))
   (define (parse-short-option str args fail)
     (let* ((ch (string-ref str 0))
-           (x (lookup-short-option ch conf-spec)))
+           (x (lookup-short-option ch conf-spec))
+           (fail-args (cons (string-append "-" str) args)))
       (cond
        ((not x)
-        (fail prefix conf-spec (car args) args "unknown option"))
+        (fail prefix conf-spec (car fail-args) fail-args "unknown option"))
        ((and (pair? x) (eq? 'not (car x)))
         (cons (cons (append prefix (list (car (cadr x)))) #f)
               (if (= 1 (string-length str))
@@ -126,7 +128,7 @@
               (cons (cons (append prefix (list (car x))) (car val+err))
                     args))))
        ((null? args)
-        (fail prefix conf-spec (car args) args "missing argument to option"))
+        (fail prefix conf-spec (car fail-args) fail-args "missing argument to option"))
        (else
         (cons (cons (append prefix (list (car x))) (car args)) (cdr args))))))
   (if (eqv? #\- (string-ref (car args) 1))
@@ -167,8 +169,8 @@
         ((@)
          (let* ((new-opt-spec (cadr (car spec)))
                 (new-fail
-                 (lambda (new-prefix new-spec opt args reason)
-                   (parse-option (prev-prefix prefix) opt-spec args fail)))
+                 (lambda (new-prefix new-spec new-opt new-args reason)
+                   (parse-options (prev-prefix prefix) opt-spec new-args fail)))
                 (cfg+args (parse-options prefix new-opt-spec args new-fail))
                 (config (conf-append (car cfg+args) config))
                 (args (cdr cfg+args)))