projects
/
puri.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.5.7 - Avoid name collision with zacl and net.uri nickname
[puri.git]
/
src.lisp
diff --git
a/src.lisp
b/src.lisp
index ab13bad4a490d76a83fbe13d499e87eef7714d6a..ee5f5adc0b9dff8b9a91feb394c96abde2e14ed3 100644
(file)
--- a/
src.lisp
+++ b/
src.lisp
@@
-21,12
+21,10
@@
;; but without any warranty; without even the implied warranty of
;; merchantability or fitness for a particular purpose. See the GNU
;; Lesser General Public License for more details.
;; but without any warranty; without even the implied warranty of
;; merchantability or fitness for a particular purpose. See the GNU
;; Lesser General Public License for more details.
-;;
-;; $Id$
(defpackage #:puri
(:use #:cl)
(defpackage #:puri
(:use #:cl)
- #-
allegro
(:nicknames #:net.uri)
+ #-
(or allegro zacl)
(:nicknames #:net.uri)
(:export
#:uri ; the type and a function
#:uri-p
(:export
#:uri ; the type and a function
#:uri-p
@@
-355,13
+353,19
@@
;; Parsing
(defparameter *excluded-characters*
;; Parsing
(defparameter *excluded-characters*
- '(;; `delims' (except #\%, because it's handled specially):
+ (append
+ ;; exclude control characters
+ (loop for i from 0 to #x1f
+ collect (code-char i))
+ '(;; `delims' (except #\%, because it's handled specially):
#\< #\> #\" #\space #\#
#\< #\> #\" #\space #\#
+ #\Rubout ;; (code-char #x7f)
;; `unwise':
#\{ #\} #\| #\\ #\^ #\[ #\] #\`))
;; `unwise':
#\{ #\} #\| #\\ #\^ #\[ #\] #\`))
+ "Excluded charcters from RFC2369 (http://www.ietf.org/rfc/rfc2396.txt 2.4.3)")
(defun reserved-char-vector (chars &key except)
(defun reserved-char-vector (chars &key except)
- (do* ((a (make-array 12
7
:element-type 'bit :initial-element 0))
+ (do* ((a (make-array 12
8
:element-type 'bit :initial-element 0))
(chars chars (cdr chars))
(c (car chars) (car chars)))
((null chars) a)
(chars chars (cdr chars))
(c (car chars) (car chars)))
((null chars) a)
@@
-379,7
+383,7
@@
(defparameter *reserved-path-characters*
(reserved-char-vector
(append *excluded-characters*
(defparameter *reserved-path-characters*
(reserved-char-vector
(append *excluded-characters*
- '(#\;
+ '(#\;
#\%
;;;;The rfc says this should be here, but it doesn't make sense.
;; #\=
#\/ #\?))))
;;;;The rfc says this should be here, but it doesn't make sense.
;; #\=
#\/ #\?))))