From ef18c5ac86d71f00e3a25556649c0f859d7b9739 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Thu, 24 May 2007 20:25:40 +0000 Subject: [PATCH] Rename newcont to lang svn: r6276 --- .../{newcont/newcont.ss => lang.ss} | 14 +++++++------- .../{newcont => lang}/anormal.ss | 2 +- .../{newcont => lang}/defun.ss | 2 +- .../{newcont => lang}/elim-callcc.ss | 5 +++-- .../{newcont => lang}/elim-letrec.ss | 2 +- .../{newcont => lang}/freevars.ss | 2 +- .../prototype-web-server/{newcont => lang}/util.ss | 5 +++-- .../newcont/examples/add-param.ss | 2 +- .../newcont/examples/add-simple.ss | 2 +- .../prototype-web-server/newcont/examples/add.ss | 2 +- .../prototype-web-server/newcont/examples/temp.ss | 2 +- .../newcont/examples/wc-comp.ss | 2 +- .../newcont/examples/wc-fake.ss | 2 +- .../prototype-web-server/newcont/examples/wc.ss | 2 +- 14 files changed, 24 insertions(+), 22 deletions(-) rename collects/web-server/prototype-web-server/{newcont/newcont.ss => lang.ss} (79%) rename collects/web-server/prototype-web-server/{newcont => lang}/anormal.ss (99%) rename collects/web-server/prototype-web-server/{newcont => lang}/defun.ss (99%) rename collects/web-server/prototype-web-server/{newcont => lang}/elim-callcc.ss (98%) rename collects/web-server/prototype-web-server/{newcont => lang}/elim-letrec.ss (99%) rename collects/web-server/prototype-web-server/{newcont => lang}/freevars.ss (99%) rename collects/web-server/prototype-web-server/{newcont => lang}/util.ss (98%) diff --git a/collects/web-server/prototype-web-server/newcont/newcont.ss b/collects/web-server/prototype-web-server/lang.ss similarity index 79% rename from collects/web-server/prototype-web-server/newcont/newcont.ss rename to collects/web-server/prototype-web-server/lang.ss index 67d2c70c2f..3ee97214d0 100644 --- a/collects/web-server/prototype-web-server/newcont/newcont.ss +++ b/collects/web-server/prototype-web-server/lang.ss @@ -1,11 +1,11 @@ -(module newcont mzscheme +(module lang mzscheme (require-for-syntax (lib "etc.ss") (lib "labels.ss" "web-server" "prototype-web-server") - "util.ss" - "elim-letrec.ss" - "anormal.ss" - "elim-callcc.ss" - "defun.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") send/suspend/hidden @@ -32,4 +32,4 @@ (compose #;(lambda (stx) (values stx empty)) defun elim-callcc - (make-anormal-term elim-letrec-term))))))) + (make-anormal-term elim-letrec-term))))))) \ No newline at end of file diff --git a/collects/web-server/prototype-web-server/newcont/anormal.ss b/collects/web-server/prototype-web-server/lang/anormal.ss similarity index 99% rename from collects/web-server/prototype-web-server/newcont/anormal.ss rename to collects/web-server/prototype-web-server/lang/anormal.ss index 34671e75b5..8e72e81e31 100644 --- a/collects/web-server/prototype-web-server/newcont/anormal.ss +++ b/collects/web-server/prototype-web-server/lang/anormal.ss @@ -177,4 +177,4 @@ re)) fe)])) - anormal-term)) + anormal-term)) \ No newline at end of file diff --git a/collects/web-server/prototype-web-server/newcont/defun.ss b/collects/web-server/prototype-web-server/lang/defun.ss similarity index 99% rename from collects/web-server/prototype-web-server/newcont/defun.ss rename to collects/web-server/prototype-web-server/lang/defun.ss index b4d32110a6..6dd10413f9 100644 --- a/collects/web-server/prototype-web-server/newcont/defun.ss +++ b/collects/web-server/prototype-web-server/lang/defun.ss @@ -152,4 +152,4 @@ (values (reverse nstxs) defs)]))) (define defun* (lift-defun defun)) - (define defun** (lift-defun (lambda (stx) (defun* (syntax->list stx)))))) + (define defun** (lift-defun (lambda (stx) (defun* (syntax->list stx)))))) \ No newline at end of file diff --git a/collects/web-server/prototype-web-server/newcont/elim-callcc.ss b/collects/web-server/prototype-web-server/lang/elim-callcc.ss similarity index 98% rename from collects/web-server/prototype-web-server/newcont/elim-callcc.ss rename to collects/web-server/prototype-web-server/lang/elim-callcc.ss index b06314f172..ee093c4d31 100644 --- a/collects/web-server/prototype-web-server/newcont/elim-callcc.ss +++ b/collects/web-server/prototype-web-server/lang/elim-callcc.ss @@ -170,5 +170,6 @@ [(#%variable-reference . v) stx] [id (identifier? #'id) - stx] - [_ (raise-syntax-error 'elim-callcc "Dropped through:" stx)]))) + stx] + [_ + (raise-syntax-error 'elim-callcc "Dropped through:" stx)]))) \ No newline at end of file diff --git a/collects/web-server/prototype-web-server/newcont/elim-letrec.ss b/collects/web-server/prototype-web-server/lang/elim-letrec.ss similarity index 99% rename from collects/web-server/prototype-web-server/newcont/elim-letrec.ss rename to collects/web-server/prototype-web-server/lang/elim-letrec.ss index d7c66d87a3..5f34b1ac17 100644 --- a/collects/web-server/prototype-web-server/newcont/elim-letrec.ss +++ b/collects/web-server/prototype-web-server/lang/elim-letrec.ss @@ -136,4 +136,4 @@ [_ (raise-syntax-error 'elim-letrec "Dropped through:" stx)])) - (define elim-letrec-term (elim-letrec empty))) + (define elim-letrec-term (elim-letrec empty))) \ No newline at end of file diff --git a/collects/web-server/prototype-web-server/newcont/freevars.ss b/collects/web-server/prototype-web-server/lang/freevars.ss similarity index 99% rename from collects/web-server/prototype-web-server/newcont/freevars.ss rename to collects/web-server/prototype-web-server/lang/freevars.ss index 2df37c16f2..ab66eb8e45 100644 --- a/collects/web-server/prototype-web-server/newcont/freevars.ss +++ b/collects/web-server/prototype-web-server/lang/freevars.ss @@ -135,4 +135,4 @@ [(bound-identifier=? (car s) elt) (cdr s)] ;; if we maintain the no-dupe invariant then we don't need to recur [else (cons (car s) - (sans (cdr s) elt))]))) + (sans (cdr s) elt))]))) \ No newline at end of file diff --git a/collects/web-server/prototype-web-server/newcont/util.ss b/collects/web-server/prototype-web-server/lang/util.ss similarity index 98% rename from collects/web-server/prototype-web-server/newcont/util.ss rename to collects/web-server/prototype-web-server/lang/util.ss index 6780aabbdf..bf61f2f949 100644 --- a/collects/web-server/prototype-web-server/newcont/util.ss +++ b/collects/web-server/prototype-web-server/lang/util.ss @@ -189,5 +189,6 @@ [(#%variable-reference . v) stx] [id (identifier? #'id) - stx] - [_ (raise-syntax-error 'kerncase "Dropped through:" stx)]))) + stx] + [_ + (raise-syntax-error 'kerncase "Dropped through:" stx)]))) \ No newline at end of file diff --git a/collects/web-server/prototype-web-server/newcont/examples/add-param.ss b/collects/web-server/prototype-web-server/newcont/examples/add-param.ss index e75730d5d1..4fb3acdb8a 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/add-param.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/add-param.ss @@ -1,4 +1,4 @@ -(module add-param (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") +(module add-param (lib "lang.ss" "web-server" "prototype-web-server") (require (lib "url.ss" "net") (lib "servlet-helpers.ss" "web-server" "private")) (provide start) 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 3bae9c658d..910344f20a 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,4 +1,4 @@ -(module add-simple (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") +(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")) diff --git a/collects/web-server/prototype-web-server/newcont/examples/add.ss b/collects/web-server/prototype-web-server/newcont/examples/add.ss index ce0666403f..ae80d87d5a 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/add.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/add.ss @@ -1,4 +1,4 @@ -(module add (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") +(module add (lib "lang.ss" "web-server" "prototype-web-server") (require (lib "url.ss" "net") (lib "servlet-helpers.ss" "web-server" "private")) (provide start) diff --git a/collects/web-server/prototype-web-server/newcont/examples/temp.ss b/collects/web-server/prototype-web-server/newcont/examples/temp.ss index ee74d8ae89..ca9552603f 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/temp.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/temp.ss @@ -1,4 +1,4 @@ -(module temp (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") +(module temp (lib "lang.ss" "web-server" "prototype-web-server") (provide start) (define msg (make-parameter "unknown")) diff --git a/collects/web-server/prototype-web-server/newcont/examples/wc-comp.ss b/collects/web-server/prototype-web-server/newcont/examples/wc-comp.ss index b6a0a3bb72..dd2b4e0dc0 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/wc-comp.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/wc-comp.ss @@ -1,4 +1,4 @@ -(module wc-comp (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") +(module wc-comp (lib "lang.ss" "web-server" "prototype-web-server") (require (lib "web-cells.ss" "web-server" "prototype-web-server" "newcont") (lib "web-cell-component.ss" "web-server" "prototype-web-server" "newcont") (lib "url.ss" "net")) diff --git a/collects/web-server/prototype-web-server/newcont/examples/wc-fake.ss b/collects/web-server/prototype-web-server/newcont/examples/wc-fake.ss index dfad273882..3e29e74e73 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/wc-fake.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/wc-fake.ss @@ -1,4 +1,4 @@ -(module wc-fake (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") +(module wc-fake (lib "lang.ss" "web-server" "prototype-web-server") (require (lib "url.ss" "net")) (provide start) diff --git a/collects/web-server/prototype-web-server/newcont/examples/wc.ss b/collects/web-server/prototype-web-server/newcont/examples/wc.ss index fcedd9c6ff..bc535fe615 100644 --- a/collects/web-server/prototype-web-server/newcont/examples/wc.ss +++ b/collects/web-server/prototype-web-server/newcont/examples/wc.ss @@ -1,4 +1,4 @@ -(module wc (lib "newcont.ss" "web-server" "prototype-web-server" "newcont") +(module wc (lib "lang.ss" "web-server" "prototype-web-server") (require (lib "web-cells.ss" "web-server" "prototype-web-server" "newcont") (lib "url.ss" "net")) (provide start)