diff options
Diffstat (limited to 'module/server')
| -rw-r--r-- | module/server/macro.scm | 6 | ||||
| -rw-r--r-- | module/server/test.scm | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/module/server/macro.scm b/module/server/macro.scm index f920a663..71452d0f 100644 --- a/module/server/macro.scm +++ b/module/server/macro.scm @@ -52,7 +52,7 @@ (define-macro (make-routes . routes) - `(lambda (request body . state) + `(lambda* (request body #:optional state) (let ((r:method (request-method request)) (r:uri (request-uri request)) (r:version (request-version request)) @@ -81,5 +81,5 @@ (when (memv 'application/x-www-form-urlencoded (or (assoc-ref r:headers 'content-type) '())) (parse-query (uri-decode (bytevector->string body "UTF-8"))))))))) - (lambda (a b . new-state) - (values a b (if (null? new-state) state (car new-state))))))))) + (lambda* (a b #:optional new-state) + (values a b (or new-state state)))))))) diff --git a/module/server/test.scm b/module/server/test.scm index f28b1152..d33be67f 100644 --- a/module/server/test.scm +++ b/module/server/test.scm @@ -15,7 +15,9 @@ (srfi srfi-88) (sxml simple) - (ice-9 ftw)) + (ice-9 ftw) + (ice-9 rdelim) + ) (define (form-page name) `(div @@ -68,8 +70,7 @@ (GET "/ls/:file" (file) (return '((content-type text/plain)) - (call-with-input-file (string-append "./" file) - (@ (ice-9 rdelim) read-string)))))) + (call-with-input-file file read-string))))) (run-server routes 'http '() "Default Name") |