From d174ad39547ff4fe6f251982ac199c3cb66c8e88 Mon Sep 17 00:00:00 2001 From: vibr Date: Fri, 15 Apr 2005 15:34:48 +0000 Subject: [PATCH] add a copy of the regexp definitions HEX and ESCAPED from structure url to resolve mutual dependency --- scheme/lib/uri.scm | 4 ++++ scheme/packages.scm | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scheme/lib/uri.scm b/scheme/lib/uri.scm index fcd0442..d80f72d 100644 --- a/scheme/lib/uri.scm +++ b/scheme/lib/uri.scm @@ -15,6 +15,10 @@ ;;; decode a URI ;;; 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: ;;; we assume no non-ASCII characters occur in the URI; therefore the ;;; ascii table is used for conversion of the octet the hexnumber diff --git a/scheme/packages.scm b/scheme/packages.scm index 03fd089..cfc2c14 100644 --- a/scheme/packages.scm +++ b/scheme/packages.scm @@ -463,7 +463,6 @@ (define-structure uri uri-interface (open scheme-with-scsh - (subset url (escaped)) ascii bitwise) (files (lib uri))) @@ -724,11 +723,7 @@ (define-structure httpd-handler-lib httpd-handler-lib-interface (open scheme-with-scsh format-net -; sigevents (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 httpd-requests httpd-responses