From 04600dfa2830fbff868331d79f9f0c6e8203c78c Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Thu, 25 Jun 2009 19:25:39 +0000 Subject: [PATCH] Renaming mzscheme-... to lang-... svn: r15273 --- collects/frtime/frp-snip.ss | 2 +- collects/frtime/frtime-lang-only.ss | 7 ++----- collects/frtime/frtime-opt.ss | 4 ++-- collects/frtime/frtime.ss | 7 ++----- collects/frtime/{mzscheme-core.ss => lang-core.ss} | 2 +- collects/frtime/{mzscheme-utils.ss => lang-utils.ss} | 4 ++-- collects/frtime/lang.ss | 7 ++----- collects/frtime/reactive.ss | 6 ++---- 8 files changed, 14 insertions(+), 25 deletions(-) rename collects/frtime/{mzscheme-core.ss => lang-core.ss} (99%) rename collects/frtime/{mzscheme-utils.ss => lang-utils.ss} (99%) diff --git a/collects/frtime/frp-snip.ss b/collects/frtime/frp-snip.ss index 8cf7b49029..e384bb32e8 100644 --- a/collects/frtime/frp-snip.ss +++ b/collects/frtime/frp-snip.ss @@ -10,7 +10,7 @@ frtime/core/frp (all-except frtime/lang-ext undefined?) - (only frtime/mzscheme-core any-nested-reactivity? raise-reactivity) + (only frtime/lang-core any-nested-reactivity? raise-reactivity) ;; MrEd require (all-except mred send-event)) diff --git a/collects/frtime/frtime-lang-only.ss b/collects/frtime/frtime-lang-only.ss index 62bee08aef..87838e979f 100644 --- a/collects/frtime/frtime-lang-only.ss +++ b/collects/frtime/frtime-lang-only.ss @@ -1,4 +1,4 @@ -(module frtime-lang-only "mzscheme-utils.ss" +(module frtime-lang-only "lang-utils.ss" (require frtime/lang-ext) (require (as-is:unchecked frtime/core/frp event-set? signal-value)) @@ -12,9 +12,6 @@ (or (undefined? v) (pred v)))) - - ;(provide-for-syntax (rename frtime/mzscheme-utils syntax->list syntax->list)) - (provide value-nowable? behaviorof - (all-from "mzscheme-utils.ss") + (all-from "lang-utils.ss") (all-from-except frtime/lang-ext lift))) diff --git a/collects/frtime/frtime-opt.ss b/collects/frtime/frtime-opt.ss index f6497d2e9a..723f77efe9 100644 --- a/collects/frtime/frtime-opt.ss +++ b/collects/frtime/frtime-opt.ss @@ -13,8 +13,8 @@ (require-for-syntax mzlib/list) (require (only frtime/core/frp super-lift undefined undefined?)) (require (rename frtime/lang-ext frtime:lift lift) - (rename frtime/mzscheme-core frtime:if if) - (only frtime/mzscheme-core frp:copy-list)) + (rename frtime/lang-core frtime:if if) + (only frtime/lang-core frp:copy-list)) ; (require mzlib/unit mzlib/unitsig) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/collects/frtime/frtime.ss b/collects/frtime/frtime.ss index 0501b96836..c9e5aa2bfd 100644 --- a/collects/frtime/frtime.ss +++ b/collects/frtime/frtime.ss @@ -1,4 +1,4 @@ -(module frtime "mzscheme-utils.ss" +(module frtime "lang-utils.ss" (require (all-except "lang-ext.ss" lift deep-value-now)) (require "frp-snip.ss") (require (as-is:unchecked frtime/core/frp @@ -13,10 +13,7 @@ (or (undefined? v) (pred v)))) - - ;(provide-for-syntax (rename frtime/mzscheme-utils syntax->list syntax->list)) - (provide value-nowable? behaviorof (all-from "lang-ext.ss") - (all-from "mzscheme-utils.ss") + (all-from "lang-utils.ss") (all-from "frp-snip.ss"))) diff --git a/collects/frtime/mzscheme-core.ss b/collects/frtime/lang-core.ss similarity index 99% rename from collects/frtime/mzscheme-core.ss rename to collects/frtime/lang-core.ss index 612c695375..c7564fd858 100644 --- a/collects/frtime/mzscheme-core.ss +++ b/collects/frtime/lang-core.ss @@ -1,4 +1,4 @@ -(module mzscheme-core mzscheme +(module lang-core mzscheme (require-for-syntax frtime/struct mzlib/list) (require mzlib/list frtime/core/frp diff --git a/collects/frtime/mzscheme-utils.ss b/collects/frtime/lang-utils.ss similarity index 99% rename from collects/frtime/mzscheme-utils.ss rename to collects/frtime/lang-utils.ss index 667cfb5462..c4c918d966 100644 --- a/collects/frtime/mzscheme-utils.ss +++ b/collects/frtime/lang-utils.ss @@ -1,4 +1,4 @@ -(module mzscheme-utils "mzscheme-core.ss" +(module lang-utils "lang-core.ss" (require (all-except mzscheme module @@ -380,6 +380,6 @@ ) ; from core - (provide (all-from "mzscheme-core.ss")) + (provide (all-from "lang-core.ss")) ) diff --git a/collects/frtime/lang.ss b/collects/frtime/lang.ss index a26b644a5b..0a8cda79e9 100644 --- a/collects/frtime/lang.ss +++ b/collects/frtime/lang.ss @@ -1,4 +1,4 @@ -(module lang frtime/mzscheme-utils +(module lang frtime/lang-utils (require frtime/lang-ext) (require (as-is:unchecked frtime/core/frp event-set? signal-value)) @@ -12,9 +12,6 @@ (or (undefined? v) (pred v)))) - - ;(provide-for-syntax (rename frtime/mzscheme-utils syntax->list syntax->list)) - (provide value-nowable? behaviorof - (all-from frtime/mzscheme-utils) + (all-from frtime/lang-utils) (all-from-except frtime/lang-ext lift))) diff --git a/collects/frtime/reactive.ss b/collects/frtime/reactive.ss index 3bda144ec0..91e713e4e8 100644 --- a/collects/frtime/reactive.ss +++ b/collects/frtime/reactive.ss @@ -1,4 +1,4 @@ -(module reactive "mzscheme-utils.ss" +(module reactive frtime/lang-utils (require "lang-ext.ss") (require "frp-snip.ss") (require frtime/list) @@ -17,11 +17,9 @@ (or (undefined? v) (pred v)))) - ;(provide-for-syntax (rename frtime/mzscheme-utils syntax->list syntax->list)) - (provide value-nowable? behaviorof (all-from frtime/list) (all-from frtime/etc) - (all-from "mzscheme-utils.ss") + (all-from frtime/lang-utils) (all-from-except "lang-ext.ss" lift) (all-from "frp-snip.ss")))