Privitization

svn: r6312
This commit is contained in:
Jay McCarthy 2007-05-25 18:19:05 +00:00
parent 1fd0f5ea89
commit 98515e3062
18 changed files with 30 additions and 30 deletions

View File

@ -7,12 +7,12 @@
"lang/anormal.ss"
"lang/elim-callcc.ss"
"lang/defun.ss")
(require "abort-resume.ss"
"persistent-web-interaction.ss")
(require "private/abort-resume.ss"
"private/persistent-web-interaction.ss")
(provide (rename lang-module-begin #%module-begin))
(provide (all-from "abort-resume.ss")
(provide (all-from "private/abort-resume.ss")
(all-from-except mzscheme #%module-begin)
(all-from "persistent-web-interaction.ss"))
(all-from "private/persistent-web-interaction.ss"))
(define-syntax lang-module-begin
(make-lang-module-begin

View File

@ -5,7 +5,7 @@
(lib "plt-match.ss")
"util.ss"
"freevars.ss"
"../closure.ss")
"../private/closure.ss")
(provide defun)
; make-new-clouse-label : (syntax -> syntax) syntax -> syntax

View File

@ -1,6 +1,6 @@
(module elim-callcc mzscheme
(require-for-template mzscheme
"../abort-resume.ss")
"../private/abort-resume.ss")
(require (lib "kerncase.ss" "syntax")
"util.ss")
(provide elim-callcc)

View File

@ -1,6 +1,6 @@
(module elim-letrec mzscheme
(require-for-template mzscheme
"../abort-resume.ss")
"../private/abort-resume.ss")
(require (lib "kerncase.ss" "syntax")
(lib "etc.ss")
(lib "list.ss")

View File

@ -1,5 +1,5 @@
(module web-cells mzscheme
(require "../closure.ss"
(require "../private/closure.ss"
(lib "serialize.ss")
(lib "list.ss")
(lib "plt-match.ss")

View File

@ -1,5 +1,5 @@
(module web-param mzscheme
(require "../closure.ss"
(require "../private/closure.ss"
(lib "list.ss"))
(provide make-web-parameter
next-web-parameter-id

View File

@ -2,7 +2,7 @@
(require "define-closure.ss"
(lib "plt-match.ss")
(lib "serialize.ss")
"newcont/web-cells.ss")
"../newcont/web-cells.ss")
(provide
;; AUXILLIARIES

View File

@ -154,7 +154,7 @@
(map
(lambda (n-or-k)
(if (symbol? n-or-k)
`((lib "abort-resume.ss" "prototype-web-server") . ,n-or-k)
`((lib "abort-resume.ss" "web-server" "prototype-web-server" "private") . ,n-or-k)
(cons
mod-path
(string->symbol
@ -197,7 +197,7 @@
[(and (same-module? pth (caar mm))
(match-label (cdar mm)))
=> (lambda (lab) (cons lab (loop (cdr mm))))]
[(same-module? '(lib "abort-resume.ss" "web-server" "prototype-web-server") (caar mm))
[(same-module? '(lib "abort-resume.ss" "web-server" "prototype-web-server" "private") (caar mm))
(cons (cdar mm) (loop (cdr mm)))]
[else
(error "cannot construct abreviated module map" mod-map)])))

View File

@ -10,14 +10,14 @@
(lib "list.ss")
(lib "plt-match.ss")
(lib "dispatch.ss" "web-server" "dispatchers")
(lib "session.ss" "web-server" "prototype-web-server")
(only (lib "abort-resume.ss" "web-server" "prototype-web-server")
(lib "session.ss" "web-server" "prototype-web-server" "private")
(only (lib "abort-resume.ss" "web-server" "prototype-web-server" "private")
run-start)
(only "persistent-web-interaction.ss"
(only "private/persistent-web-interaction.ss"
start-servlet)
(lib "web-cells.ss" "web-server" "prototype-web-server" "newcont")
"xexpr-extras.ss"
"utils.ss")
"private/utils.ss")
(provide make)
@ -52,8 +52,8 @@
#:to-be-copied-module-specs
'(mzscheme
(lib "web-cells.ss" "web-server" "prototype-web-server" "newcont")
(lib "abort-resume.ss" "web-server" "prototype-web-server")
(lib "session.ss" "web-server" "prototype-web-server")
(lib "abort-resume.ss" "web-server" "prototype-web-server" "private")
(lib "session.ss" "web-server" "prototype-web-server" "private")
(lib "request.ss" "web-server" "private"))))
(define/kw (make #:key

View File

@ -1,5 +1,5 @@
(module add01 mzscheme
(require (lib "session.ss" "web-server" "prototype-web-server")
(require (lib "session.ss" "web-server" "prototype-web-server" "private")
(lib "request-structs.ss" "web-server")
(lib "url.ss" "net"))
(provide start)

View File

@ -3,7 +3,7 @@
(require (planet "test.ss" ("schematics" "schemeunit.plt" 2))
(lib "serialize.ss")
(lib "match.ss")
"../define-closure.ss")
"../private/define-closure.ss")
(define-closure id (x) () x)

View File

@ -1,5 +1,5 @@
(module stuff-url-tests mzscheme
(require (lib "stuff-url.ss" "web-server" "prototype-web-server")
(require (lib "stuff-url.ss" "web-server" "prototype-web-server" "private")
(planet "test.ss" ("schematics" "schemeunit.plt" 2))
(planet "util.ss" ("schematics" "schemeunit.plt" 2))
(lib "url.ss" "net")
@ -7,7 +7,7 @@
(lib "file.ss")
"util.ss")
(require/expose (lib "stuff-url.ss" "web-server" "prototype-web-server")
(require/expose (lib "stuff-url.ss" "web-server" "prototype-web-server" "private")
(same-module? url-parts recover-serial))
(provide stuff-url-suite)
@ -39,17 +39,17 @@
"Test same-module?"
(check-true
(same-module? `(file ,(path->string (build-absolute-path (find-collects-dir) "web-server" "prototype-web-server" "abort-resume.ss")))
'(lib "abort-resume.ss" "web-server" "prototype-web-server")))
(same-module? `(file ,(path->string (build-absolute-path (find-collects-dir) "web-server" "prototype-web-server" "private" "abort-resume.ss")))
'(lib "abort-resume.ss" "web-server" "prototype-web-server" "private")))
(check-true
(same-module? `(file ,(path->string (build-absolute-path (current-directory) "../abort-resume.ss")))
'(lib "abort-resume.ss" "web-server" "prototype-web-server")))
(same-module? `(file ,(path->string (build-absolute-path (current-directory) "../private/abort-resume.ss")))
'(lib "abort-resume.ss" "web-server" "prototype-web-server" "private")))
(check-true
(same-module?
'(lib "abort-resume.ss" "web-server" "prototype-web-server")
'(lib "./abort-resume.ss" "web-server" "prototype-web-server"))))
'(lib "abort-resume.ss" "web-server" "prototype-web-server" "private")
'(lib "./abort-resume.ss" "web-server" "prototype-web-server" "private"))))
(test-case
"compose url-parts and recover-serial (1)"

View File

@ -16,7 +16,7 @@
[(_ (module m-id . rest))
#'(let ([ns (make-namespace)])
(parameterize ([current-namespace ns])
(eval '(require (lib "abort-resume.ss" "web-server" "prototype-web-server")
(eval '(require (lib "abort-resume.ss" "web-server" "prototype-web-server" "private")
(lib "serialize.ss")))
(eval '(module m-id . rest))
(eval '(require m-id)))
@ -32,7 +32,7 @@
(define (make-eval/mod-path pth)
(let ([ns (make-namespace)])
(parameterize ([current-namespace ns])
(eval `(require (lib "abort-resume.ss" "web-server" "prototype-web-server")
(eval `(require (lib "abort-resume.ss" "web-server" "prototype-web-server" "private")
(lib "serialize.ss")
(file ,pth))))
(values (go ns)