From ad3ee8686396cc58ce3af2db6f549a247f25d5c9 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Tue, 5 Oct 2010 08:28:17 -0400 Subject: [PATCH] Switch to racket/base, and other racketizations. --- collects/errortrace/errortrace-lib.rkt | 20 ++++++------ collects/errortrace/errortrace.rkt | 44 +++++++++++++------------- collects/errortrace/lang/body.rkt | 6 ++-- collects/errortrace/lang/reader.rkt | 2 +- collects/errortrace/main.rkt | 7 ++-- collects/errortrace/stacktrace.rkt | 8 ++--- collects/errortrace/zo-compile.rkt | 6 +--- 7 files changed, 44 insertions(+), 49 deletions(-) diff --git a/collects/errortrace/errortrace-lib.rkt b/collects/errortrace/errortrace-lib.rkt index aa96b70deb..5bb4dcb934 100644 --- a/collects/errortrace/errortrace-lib.rkt +++ b/collects/errortrace/errortrace-lib.rkt @@ -1,15 +1,15 @@ -#lang scheme/base +#lang racket/base ;; Poor man's stack-trace-on-exceptions/profiler. ;; See manual for information. -(require "stacktrace.ss" - "errortrace-key.ss" - scheme/contract - scheme/unit - scheme/runtime-path - (for-template scheme/base) - (for-syntax scheme/base)) +(require "stacktrace.rkt" + "errortrace-key.rkt" + racket/contract + racket/unit + racket/runtime-path + (for-template racket/base) + (for-syntax racket/base)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Test coverage run-time support @@ -195,7 +195,7 @@ ;; Stacktrace instrumenter (define-runtime-path key-syntax - '(lib "errortrace-key-syntax.ss" "errortrace")) + '(lib "errortrace-key-syntax.rkt" "errortrace")) (define dynamic-errortrace-key (dynamic-require key-syntax 'errortrace-key-syntax)) @@ -436,7 +436,7 @@ (define (make-errortrace-compile-handler) (let ([orig (current-compile)] [reg (namespace-module-registry (current-namespace))]) - (namespace-attach-module (namespace-anchor->namespace orig-namespace) 'scheme/base) + (namespace-attach-module (namespace-anchor->namespace orig-namespace) 'racket/base) (namespace-attach-module (namespace-anchor->namespace orig-namespace) 'errortrace/errortrace-key) (lambda (e immediate-eval?) (orig diff --git a/collects/errortrace/errortrace.rkt b/collects/errortrace/errortrace.rkt index b6e353910b..16ef85e020 100644 --- a/collects/errortrace/errortrace.rkt +++ b/collects/errortrace/errortrace.rkt @@ -1,32 +1,32 @@ +#lang racket/base ;; Poor man's stack-trace-on-exceptions/profiler. ;; See manual for information. -(module errortrace mzscheme - (require "errortrace-lib.ss") +(require "errortrace-lib.rkt") - (provide print-error-trace - error-context-display-depth +(provide print-error-trace + error-context-display-depth - instrumenting-enabled + instrumenting-enabled - profiling-enabled - profiling-record-enabled - profile-paths-enabled - get-profile-results - output-profile-results - clear-profile-results + profiling-enabled + profiling-record-enabled + profile-paths-enabled + get-profile-results + output-profile-results + clear-profile-results - execute-counts-enabled - get-execute-counts - annotate-executed-file + execute-counts-enabled + get-execute-counts + annotate-executed-file - coverage-counts-enabled - get-coverage - test-coverage-info - annotate-covered-file) + coverage-counts-enabled + get-coverage + test-coverage-info + annotate-covered-file) - (current-compile errortrace-compile-handler) - (error-display-handler errortrace-error-display-handler) - (use-compiled-file-paths (cons (build-path "compiled" "errortrace") - (use-compiled-file-paths)))) +(current-compile errortrace-compile-handler) +(error-display-handler errortrace-error-display-handler) +(use-compiled-file-paths (cons (build-path "compiled" "errortrace") + (use-compiled-file-paths))) diff --git a/collects/errortrace/lang/body.rkt b/collects/errortrace/lang/body.rkt index 48cfe9b78f..a794663681 100644 --- a/collects/errortrace/lang/body.rkt +++ b/collects/errortrace/lang/body.rkt @@ -1,7 +1,7 @@ -#lang scheme/base -(require (for-syntax scheme/base +#lang racket/base +(require (for-syntax racket/base syntax/strip-context - "../errortrace-lib.ss")) + "../errortrace-lib.rkt")) (provide (rename-out [module-begin #%module-begin])) diff --git a/collects/errortrace/lang/reader.rkt b/collects/errortrace/lang/reader.rkt index b0f8dc71fd..cedd1093e0 100644 --- a/collects/errortrace/lang/reader.rkt +++ b/collects/errortrace/lang/reader.rkt @@ -1,4 +1,4 @@ -(module reader scheme/base +(module reader racket/base (require syntax/module-reader) (provide (rename-out [et-read read] diff --git a/collects/errortrace/main.rkt b/collects/errortrace/main.rkt index c9ee0387db..4146da10a6 100644 --- a/collects/errortrace/main.rkt +++ b/collects/errortrace/main.rkt @@ -1,4 +1,3 @@ - -(module main scheme/base - (require "errortrace.ss") - (provide (all-from-out "errortrace.ss"))) +#lang racket/base +(require "errortrace.rkt") +(provide (all-from-out "errortrace.rkt")) diff --git a/collects/errortrace/stacktrace.rkt b/collects/errortrace/stacktrace.rkt index 6876aeeb0b..af4976ac04 100644 --- a/collects/errortrace/stacktrace.rkt +++ b/collects/errortrace/stacktrace.rkt @@ -1,9 +1,9 @@ -#lang scheme/base -(require scheme/unit +#lang racket/base +(require racket/unit syntax/kerncase syntax/stx - (for-template scheme/base) - (for-syntax scheme/base)) ; for matching + (for-template racket/base) + (for-syntax racket/base)) ; for matching (provide stacktrace@ stacktrace^ stacktrace-imports^) (define-signature stacktrace-imports^ diff --git a/collects/errortrace/zo-compile.rkt b/collects/errortrace/zo-compile.rkt index 0ef5cf4997..58ccfbc19b 100644 --- a/collects/errortrace/zo-compile.rkt +++ b/collects/errortrace/zo-compile.rkt @@ -1,6 +1,5 @@ - (module zo-compile mzscheme - (require "errortrace-lib.ss") + (require "errortrace-lib.rkt") (provide zo-compile) @@ -10,6 +9,3 @@ (if (null? (use-compiled-file-paths)) (orig stx immediate-eval?) (orig (errortrace-annotate stx) immediate-eval?)))))) - - -