projects
/
getopt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apply patches from Daniel Janus
[getopt.git]
/
main.lisp
diff --git
a/main.lisp
b/main.lisp
index 311b73bf6960fb2aafb3aabc2a2471ec1b840e40..b64ade2e9660278079120c64aa0530e34e0ca97b 100644
(file)
--- a/
main.lisp
+++ b/
main.lisp
@@
-28,7
+28,7
@@
(and (> (length arg) 2)
(char= #\- (schar arg 0))
(char= #\- (schar arg 1))
(and (> (length arg) 2)
(char= #\- (schar arg 0))
(char= #\- (schar arg 1))
- (char/= #\- (schar arg
3
))))
+ (char/= #\- (schar arg
2
))))
(defun decompose-arg (arg option-type)
"Returns base-name,argument"
(defun decompose-arg (arg option-type)
"Returns base-name,argument"
@@
-120,11
+120,12
@@
opts is a list of option lists. The fields of the list are
((null argument)
(if (and (eq :required (second option-list)) (null (cdr pos)))
(push base-name errors)
((null argument)
(if (and (eq :required (second option-list)) (null (cdr pos)))
(push base-name errors)
- (if (or (is-short-option (second pos))
+ (if (or (eq :none (second option-list))
+ (is-short-option (second pos))
(is-long-option (second pos)))
(if (eq :required (second option-list))
(push base-name errors)
(is-long-option (second pos)))
(if (eq :required (second option-list))
(push base-name errors)
- (push (cons base-name (third option-list)) out-
arg
s))
+ (push (cons base-name (third option-list)) out-
opt
s))
(progn
(push (cons base-name (second pos)) out-opts)
(setq pos (cdr pos))))))))
(progn
(push (cons base-name (second pos)) out-opts)
(setq pos (cdr pos))))))))