From c176d6a5a5dd6856526868e59ae50597a75574af Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Thu, 24 May 2007 20:41:23 +0000 Subject: [PATCH] Remove superfluous pws references svn: r6277 --- collects/web-server/prototype-web-server/abort-resume.ss | 2 +- collects/web-server/prototype-web-server/lang.ss | 8 ++++---- collects/web-server/prototype-web-server/lang/defun.ss | 5 +---- .../web-server/prototype-web-server/lang/elim-callcc.ss | 9 ++------- .../web-server/prototype-web-server/lang/elim-letrec.ss | 6 ++---- collects/web-server/prototype-web-server/lang/util.ss | 8 ++------ .../prototype-web-server/newcont/examples/add-simple.ss | 3 +-- .../prototype-web-server/newcont/web-cell-component.ss | 1 - .../web-server/prototype-web-server/newcont/web-cells.ss | 2 +- .../web-server/prototype-web-server/newcont/web-param.ss | 2 +- collects/web-server/prototype-web-server/server.ss | 2 +- .../prototype-web-server/tests/test-normalizer.ss | 2 +- 12 files changed, 17 insertions(+), 33 deletions(-) diff --git a/collects/web-server/prototype-web-server/abort-resume.ss b/collects/web-server/prototype-web-server/abort-resume.ss index 887f28dd46..f0e0f87da3 100644 --- a/collects/web-server/prototype-web-server/abort-resume.ss +++ b/collects/web-server/prototype-web-server/abort-resume.ss @@ -2,7 +2,7 @@ (require "define-closure.ss" (lib "plt-match.ss") (lib "serialize.ss") - (lib "web-cells.ss" "web-server" "prototype-web-server" "newcont")) + "newcont/web-cells.ss") (provide ;; AUXILLIARIES diff --git a/collects/web-server/prototype-web-server/lang.ss b/collects/web-server/prototype-web-server/lang.ss index 3ee97214d0..381534512f 100644 --- a/collects/web-server/prototype-web-server/lang.ss +++ b/collects/web-server/prototype-web-server/lang.ss @@ -1,13 +1,13 @@ (module lang mzscheme (require-for-syntax (lib "etc.ss") - (lib "labels.ss" "web-server" "prototype-web-server") + "labels.ss" "lang/util.ss" "lang/elim-letrec.ss" "lang/anormal.ss" "lang/elim-callcc.ss" "lang/defun.ss") - (require (lib "abort-resume.ss" "web-server" "prototype-web-server")) - (require (only (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server") + (require "abort-resume.ss" + (only "persistent-web-interaction.ss" send/suspend/hidden send/suspend/url send/suspend/dispatch @@ -15,7 +15,7 @@ redirect/get start-servlet)) (provide (rename lang-module-begin #%module-begin)) - (provide (all-from (lib "abort-resume.ss" "web-server" "prototype-web-server")) + (provide (all-from "abort-resume.ss") (all-from-except mzscheme #%module-begin) send/suspend/hidden send/suspend/url diff --git a/collects/web-server/prototype-web-server/lang/defun.ss b/collects/web-server/prototype-web-server/lang/defun.ss index 6dd10413f9..2e3d4682c3 100644 --- a/collects/web-server/prototype-web-server/lang/defun.ss +++ b/collects/web-server/prototype-web-server/lang/defun.ss @@ -1,14 +1,11 @@ (module defun mzscheme (require-for-template mzscheme) (require (lib "kerncase.ss" "syntax") - #;(lib "etc.ss") (lib "list.ss") - (lib "toplevel.ss" "syntax") (lib "plt-match.ss") - (lib "stx.ss" "syntax") "util.ss" "freevars.ss" - (lib "closure.ss" "web-server" "prototype-web-server")) + "../closure.ss") (provide defun) ; make-new-clouse-label : (syntax -> syntax) syntax -> syntax diff --git a/collects/web-server/prototype-web-server/lang/elim-callcc.ss b/collects/web-server/prototype-web-server/lang/elim-callcc.ss index ee093c4d31..b43670ebaa 100644 --- a/collects/web-server/prototype-web-server/lang/elim-callcc.ss +++ b/collects/web-server/prototype-web-server/lang/elim-callcc.ss @@ -1,12 +1,7 @@ (module elim-callcc mzscheme - (require-for-template mzscheme) - (require-for-template (lib "abort-resume.ss" "web-server" "prototype-web-server")) + (require-for-template mzscheme + "../abort-resume.ss") (require (lib "kerncase.ss" "syntax") - #;(lib "etc.ss") - (lib "list.ss") - (lib "toplevel.ss" "syntax") - (lib "plt-match.ss") - (lib "stx.ss" "syntax") "util.ss") (provide elim-callcc) diff --git a/collects/web-server/prototype-web-server/lang/elim-letrec.ss b/collects/web-server/prototype-web-server/lang/elim-letrec.ss index 5f34b1ac17..031d0d2c0b 100644 --- a/collects/web-server/prototype-web-server/lang/elim-letrec.ss +++ b/collects/web-server/prototype-web-server/lang/elim-letrec.ss @@ -1,11 +1,9 @@ (module elim-letrec mzscheme - (require-for-template (lib "abort-resume.ss" "web-server" "prototype-web-server") - mzscheme) + (require-for-template mzscheme + "../abort-resume.ss") (require (lib "kerncase.ss" "syntax") (lib "etc.ss") (lib "list.ss") - (lib "toplevel.ss" "syntax") - (lib "stx.ss" "syntax") "util.ss") (provide (all-defined)) diff --git a/collects/web-server/prototype-web-server/lang/util.ss b/collects/web-server/prototype-web-server/lang/util.ss index bf61f2f949..b7b5a80542 100644 --- a/collects/web-server/prototype-web-server/lang/util.ss +++ b/collects/web-server/prototype-web-server/lang/util.ss @@ -1,11 +1,7 @@ (module util mzscheme - (require-for-template mzscheme - (lib "abort-resume.ss" "web-server" "prototype-web-server")) + (require-for-template mzscheme) (require (lib "kerncase.ss" "syntax") - (lib "etc.ss") - (lib "list.ss") - (lib "toplevel.ss" "syntax") - (lib "stx.ss" "syntax")) + (lib "list.ss")) (provide (all-defined)) (define current-code-labeling diff --git a/collects/web-server/prototype-web-server/newcont/examples/add-simple.ss b/collects/web-server/prototype-web-server/newcont/examples/add-simple.ss index 910344f20a..7fcff778cc 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/add-simple.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/add-simple.ss @@ -1,7 +1,6 @@ (module add-simple (lib "lang.ss" "web-server" "prototype-web-server") (require (lib "url.ss" "net") - (lib "servlet-helpers.ss" "web-server" "private") - (lib "web-param.ss" "web-server" "prototype-web-server" "newcont")) + (lib "servlet-helpers.ss" "web-server" "private")) (provide start) (define msg (make-web-parameter "unknown")) diff --git a/collects/web-server/prototype-web-server/newcont/web-cell-component.ss b/collects/web-server/prototype-web-server/newcont/web-cell-component.ss index cd8f381ad7..b023698a32 100644 --- a/collects/web-server/prototype-web-server/newcont/web-cell-component.ss +++ b/collects/web-server/prototype-web-server/newcont/web-cell-component.ss @@ -1,5 +1,4 @@ (module web-cell-component mzscheme - (require (lib "web-cells.ss" "web-server" "prototype-web-server" "newcont")) (provide define-component) (define-syntax define-component diff --git a/collects/web-server/prototype-web-server/newcont/web-cells.ss b/collects/web-server/prototype-web-server/newcont/web-cells.ss index aa48f7f393..a7a9e48a81 100644 --- a/collects/web-server/prototype-web-server/newcont/web-cells.ss +++ b/collects/web-server/prototype-web-server/newcont/web-cells.ss @@ -1,5 +1,5 @@ (module web-cells mzscheme - (require (lib "closure.ss" "web-server" "prototype-web-server") + (require "../closure.ss" (lib "serialize.ss") (lib "list.ss") (lib "plt-match.ss") diff --git a/collects/web-server/prototype-web-server/newcont/web-param.ss b/collects/web-server/prototype-web-server/newcont/web-param.ss index f64a772fa2..4a21c64303 100644 --- a/collects/web-server/prototype-web-server/newcont/web-param.ss +++ b/collects/web-server/prototype-web-server/newcont/web-param.ss @@ -1,5 +1,5 @@ (module web-param mzscheme - (require (lib "closure.ss" "web-server" "prototype-web-server") + (require "../closure.ss" (lib "list.ss")) (provide make-web-parameter next-web-parameter-id diff --git a/collects/web-server/prototype-web-server/server.ss b/collects/web-server/prototype-web-server/server.ss index 3ae0d5f628..a16a84aeef 100644 --- a/collects/web-server/prototype-web-server/server.ss +++ b/collects/web-server/prototype-web-server/server.ss @@ -15,7 +15,7 @@ abort/cc safe-call? the-cont-key) - (only (lib "persistent-web-interaction.ss" "web-server" "prototype-web-server") + (only "persistent-web-interaction.ss" start-servlet) (lib "web-cells.ss" "web-server" "prototype-web-server" "newcont") "xexpr-extras.ss" diff --git a/collects/web-server/prototype-web-server/tests/test-normalizer.ss b/collects/web-server/prototype-web-server/tests/test-normalizer.ss index c3fa793f86..5377c7c4eb 100644 --- a/collects/web-server/prototype-web-server/tests/test-normalizer.ss +++ b/collects/web-server/prototype-web-server/tests/test-normalizer.ss @@ -339,4 +339,4 @@ [(zero? (car l)) (k 0)] [else (* (car l) (cdr l))]))))) - #t))))))) + #t))))))) \ No newline at end of file