scsh-conservatory
/
sunet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add a copy of the regexp definitions HEX and ESCAPED from structure 

url to resolve mutual dependency
This commit is contained in:
vibr 2005-04-15 15:34:48 +00:00
parent 184c284c4a
commit d174ad3954
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scheme/lib/uri.scm
View File

@ -15,6 +15,10 @@
;;; decode a URI ;;; decode a URI
;;; walk over string s and unescape all occurrences of RegExp 'escaped' (see url.scm). ;;; walk over string s and unescape all occurrences of RegExp 'escaped' (see url.scm).
;copy from url.scm:
(define hex (rx hex-digit))
(define escaped (rx (: "%" ,hex ,hex)))
;;; Remark: ;;; Remark:
;;; we assume no non-ASCII characters occur in the URI; therefore the ;;; we assume no non-ASCII characters occur in the URI; therefore the
;;; ascii table is used for conversion of the octet the hexnumber ;;; ascii table is used for conversion of the octet the hexnumber

5
scheme/packages.scm
View File

@ -463,7 +463,6 @@
(define-structure uri uri-interface (define-structure uri uri-interface
(open scheme-with-scsh (open scheme-with-scsh
(subset url (escaped))
ascii ascii
bitwise) bitwise)
(files (lib uri))) (files (lib uri)))
@ -724,11 +723,7 @@
(define-structure httpd-handler-lib httpd-handler-lib-interface (define-structure httpd-handler-lib httpd-handler-lib-interface
(open scheme-with-scsh (open scheme-with-scsh
format-net format-net
; sigevents
(subset srfi-13 (string-trim-both string-trim string-prefix? string-reverse string-contains string-take)) (subset srfi-13 (string-trim-both string-trim string-prefix? string-reverse string-contains string-take))
; let-opt ; :optional
; locks
; handle-fatal-error
sunet-utilities sunet-utilities
httpd-requests httpd-requests
httpd-responses httpd-responses