From b786a49b5b931e82baf40500c17192592a8993c6 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Tue, 6 Nov 2012 15:41:50 -0500 Subject: [PATCH] `#lang racket' -> `#lang racket/base' conversions in frtime. --- collects/frtime/animation/graphics-sig.rkt | 3 ++- collects/frtime/animation/graphics-unit.rkt | 3 ++- collects/frtime/animation/graphics.rkt | 3 ++- collects/frtime/core/contract.rkt | 7 +++--- collects/frtime/core/dv.rkt | 6 +++-- collects/frtime/core/erl.rkt | 7 ++++-- collects/frtime/core/frp.rkt | 9 +++++-- collects/frtime/core/heap.rkt | 8 +++++-- collects/frtime/core/mailbox.rkt | 8 +++++-- collects/frtime/core/match.rkt | 2 +- collects/frtime/core/sema-mailbox.rkt | 8 +++++-- collects/frtime/develop-frtime.rkt | 26 +++++++++------------ collects/frtime/frlibs/date.rkt | 7 +++--- collects/frtime/opt/lowered-equivs.rkt | 4 ++-- 14 files changed, 62 insertions(+), 39 deletions(-) diff --git a/collects/frtime/animation/graphics-sig.rkt b/collects/frtime/animation/graphics-sig.rkt index d7cc99d319..20cb989db4 100644 --- a/collects/frtime/animation/graphics-sig.rkt +++ b/collects/frtime/animation/graphics-sig.rkt @@ -1,4 +1,5 @@ -#lang racket +#lang racket/base + (require racket/unit) (provide graphics^ graphics:posn-less^ graphics:posn^) diff --git a/collects/frtime/animation/graphics-unit.rkt b/collects/frtime/animation/graphics-unit.rkt index d7753a4cdd..d5839d0b18 100644 --- a/collects/frtime/animation/graphics-unit.rkt +++ b/collects/frtime/animation/graphics-unit.rkt @@ -1,4 +1,5 @@ -#lang racket +#lang racket/base + (require racket/unit mred/mred-sig "graphics-sig.rkt" diff --git a/collects/frtime/animation/graphics.rkt b/collects/frtime/animation/graphics.rkt index 89dc677b8e..0f61b8d078 100644 --- a/collects/frtime/animation/graphics.rkt +++ b/collects/frtime/animation/graphics.rkt @@ -1,4 +1,5 @@ -#lang racket +#lang racket/base + (require racket/unit mred/mred-sig mred diff --git a/collects/frtime/core/contract.rkt b/collects/frtime/core/contract.rkt index b97b17cd7c..3d97d9b3d6 100644 --- a/collects/frtime/core/contract.rkt +++ b/collects/frtime/core/contract.rkt @@ -1,8 +1,9 @@ -#lang racket +#lang racket/base + +#;(require (for-syntax racket/contract)) (define-syntax-rule (provide/contract* [id ctrct] ...) #;(provide/contract [id ctrct] ...) (provide id ...)) -(provide - provide/contract*) +(provide provide/contract*) diff --git a/collects/frtime/core/dv.rkt b/collects/frtime/core/dv.rkt index 4b9ba467b6..b80fa42fa1 100644 --- a/collects/frtime/core/dv.rkt +++ b/collects/frtime/core/dv.rkt @@ -1,5 +1,7 @@ -#lang racket -(require "contract.rkt") +#lang racket/base + +(require racket/match + "contract.rkt") (define-struct dv (vec-length next-avail-pos vec) #:mutable) diff --git a/collects/frtime/core/erl.rkt b/collects/frtime/core/erl.rkt index 2849650c2d..1496b4a97a 100644 --- a/collects/frtime/core/erl.rkt +++ b/collects/frtime/core/erl.rkt @@ -1,5 +1,8 @@ -#lang racket -(require "match.rkt" +#lang racket/base + +(require racket/bool + racket/match + "match.rkt" "contract.rkt" #;"sema-mailbox.rkt" "mailbox.rkt") diff --git a/collects/frtime/core/frp.rkt b/collects/frtime/core/frp.rkt index 39d1375db1..f9e126e848 100644 --- a/collects/frtime/core/frp.rkt +++ b/collects/frtime/core/frp.rkt @@ -1,5 +1,10 @@ -#lang racket -(require "contract.rkt" +#lang racket/base + +(require racket/function + racket/list + racket/match + racket/contract + "contract.rkt" "erl.rkt" "heap.rkt") diff --git a/collects/frtime/core/heap.rkt b/collects/frtime/core/heap.rkt index 0f23a7feb3..9ec64ba06e 100644 --- a/collects/frtime/core/heap.rkt +++ b/collects/frtime/core/heap.rkt @@ -1,5 +1,9 @@ -#lang racket -(require "dv.rkt" +#lang racket/base + +(require racket/bool + racket/match + racket/contract + "dv.rkt" "contract.rkt") (define-struct t (sorter equality data)) diff --git a/collects/frtime/core/mailbox.rkt b/collects/frtime/core/mailbox.rkt index 228fd94360..a22a6fb1ca 100644 --- a/collects/frtime/core/mailbox.rkt +++ b/collects/frtime/core/mailbox.rkt @@ -1,5 +1,9 @@ -#lang racket -(require "contract.rkt" +#lang racket/base + +(require racket/bool + racket/list + racket/match + "contract.rkt" "match.rkt" racket/async-channel) diff --git a/collects/frtime/core/match.rkt b/collects/frtime/core/match.rkt index a2b6d71741..ac3808c9d7 100644 --- a/collects/frtime/core/match.rkt +++ b/collects/frtime/core/match.rkt @@ -1,4 +1,4 @@ -#lang racket +#lang racket/base (define-struct a-match-fail ()) (define match-fail (make-a-match-fail)) diff --git a/collects/frtime/core/sema-mailbox.rkt b/collects/frtime/core/sema-mailbox.rkt index 44b1e72e75..d3d88e8f59 100644 --- a/collects/frtime/core/sema-mailbox.rkt +++ b/collects/frtime/core/sema-mailbox.rkt @@ -1,5 +1,9 @@ -#lang racket -(require "match.rkt" +#lang racket/base + +(require racket/list + racket/bool + racket/match + "match.rkt" "contract.rkt") (define (call-with-semaphore s thunk) diff --git a/collects/frtime/develop-frtime.rkt b/collects/frtime/develop-frtime.rkt index 25cce1fc7f..979e304dbb 100644 --- a/collects/frtime/develop-frtime.rkt +++ b/collects/frtime/develop-frtime.rkt @@ -1,6 +1,6 @@ -#lang racket -(require setup/link) +#lang racket/base +(require setup/link) #|Update this to point to your racket installation directory|# (define install-path "C:/Program Files/Racket/collects/frtime") @@ -9,20 +9,16 @@ (define dev-path "C:/Users/user/Documents/GitHub/racket/collects/frtime") #|Then call one of these functions to begin developing frtime, or to halt development.|# -(define start-developing-frtime - (lambda () - (start-developing-collection dev-path install-path))) +(define (start-developing-frtime) + (start-developing-collection dev-path install-path)) -(define stop-developing-frtime - (lambda () - (stop-developing-collection dev-path install-path))) +(define (stop-developing-frtime) + (stop-developing-collection dev-path install-path)) -(define start-developing-collection - (lambda (dev-coll-path install-coll-path) - (links install-coll-path #:remove? #t) - (links dev-coll-path))) +(define (start-developing-collection dev-coll-path install-coll-path) + (links install-coll-path #:remove? #t) + (links dev-coll-path)) -(define stop-developing-collection - (lambda (dev-coll-path install-coll-path) - (start-developing-collection install-coll-path dev-coll-path))) +(define (stop-developing-collection dev-coll-path install-coll-path) + (start-developing-collection install-coll-path dev-coll-path)) diff --git a/collects/frtime/frlibs/date.rkt b/collects/frtime/frlibs/date.rkt index 55fbcee54d..6cc4a870e0 100644 --- a/collects/frtime/frlibs/date.rkt +++ b/collects/frtime/frlibs/date.rkt @@ -1,6 +1,7 @@ -#lang racket -(require (rename-in (only-in frtime/frtime provide) - [provide frtime:provide])) +#lang racket/base + +(require racket/promise + (only-in frtime/frtime [provide frtime:provide])) (frtime:provide (lifted date->string date-display-format diff --git a/collects/frtime/opt/lowered-equivs.rkt b/collects/frtime/opt/lowered-equivs.rkt index 1702f2a97f..d017785393 100644 --- a/collects/frtime/opt/lowered-equivs.rkt +++ b/collects/frtime/opt/lowered-equivs.rkt @@ -1,10 +1,10 @@ ;; This module defines all the logic necessary for working with lowered ;; equivalents at the syntactic level. That is, it treats functions simply ;; as syntactic identifiers. -#lang racket +#lang racket/base + (provide (except-out (all-defined-out) module-identifier=?)) -(require (only-in srfi/1 any)) (define module-identifier=? free-identifier=?)