Ticket #1012: simplify-long-option-value-handling.patch

getopt-long.scm

@@ -434 +434 @@
           (else (error 'long-option-name 
                        "invalid list" lst)))))
 
-(define long-option-value-cs 
-  (char-set-union char-set:letter+digit 
-                  char-set:punctuation
-                  (char-set #\_ #\^ #\$ #\=)))
-
 (define (long-option-value lst)
   (if (null? lst) (list #f lst)
       (let loop ((lst lst)  (ax (list)))
@@ -447 +442 @@
               
               ((and (char? (car lst)) (car lst)) =>
                (lambda (c)
-                 (cond ((char=? c #\")
-                        (let quote-loop ((lst (cdr lst)) (ax ax))
-                          (if (null? lst) (error 'long-option-value
-                                                 "unclosed option value quotation")
-                              (if (char=? (car lst) #\")
-                                  (loop (cdr lst) ax)
-                                  (quote-loop (cdr lst) (cons (car lst) ax))))))
-
-                       ((char-set-contains? char-set:blank c)
-                        (list (list->string (reverse ax)) (cdr lst)))
-
-                       ((char-set-contains? long-option-value-cs c)
-                        (loop (cdr lst) (cons c ax)))
-
-                       (else  (error 'long-option-value 
-                                     "invalid option character" c)))))
+                 (loop (cdr lst) (cons c ax))))
               
               (else (error 'long-option-value 
                            "invalid list" lst))))))

tests/run.scm

@@ -134 +134 @@
   
   ))
 
-(define cmdline2 '("--meta-filter=\"Note=,Archive Name=Brown\""
+(define cmdline2 '("--meta-filter=Note=,Archive Name=Brown"
                    "-d" "data" "FormSubmit.html"))
-    
 
 (test-group "grammar2"
 
@@ -150 +149 @@
     
     )
 
+(test-group "nonalnum"
+
+    (define nonalnum-grammar
+      '((foo (value #t))))
+
+    (define nonalnum-cmdline
+      '("--foo=value contains non-alnum chars: !@#$%^&*()"))
+    
+    (define nonalnum-values
+      '((@)
+        (foo . "value contains non-alnum chars: !@#$%^&*()")))
+
+    (test
+     nonalnum-values
+     (getopt-long nonalnum-cmdline nonalnum-grammar)
+     )
+
+    )
+
 (test-group "uknown option"
 
     (test