diff --git a/collects/compiler/cm.rkt b/collects/compiler/cm.rkt index 53e44a32fa..c507351762 100644 --- a/collects/compiler/cm.rkt +++ b/collects/compiler/cm.rkt @@ -1,14 +1,14 @@ #lang scheme/base (require syntax/modcode syntax/modresolve + syntax/modread setup/main-collects unstable/file scheme/file scheme/list scheme/path racket/promise - openssl/sha1 - syntax/private/modread) + openssl/sha1) (provide make-compilation-manager-load/use-compiled-handler managed-compile-zo diff --git a/collects/syntax/modread.rkt b/collects/syntax/modread.rkt index 9c95c6a9a7..2a29d7bf90 100644 --- a/collects/syntax/modread.rkt +++ b/collects/syntax/modread.rkt @@ -1,11 +1,27 @@ (module modread mzscheme - (require racket/contract - "private/modread.rkt") + (require racket/contract) (provide with-module-reading-parameterization) (provide/contract [check-module-form ((or/c syntax? eof-object?) symbol? (or/c string? path? false/c) . -> . any)]) + (define (with-module-reading-parameterization thunk) + (parameterize ([read-case-sensitive #t] + [read-square-bracket-as-paren #t] + [read-curly-brace-as-paren #t] + [read-accept-box #t] + [read-accept-compiled #t] + [read-accept-bar-quote #t] + [read-accept-graph #t] + [read-decimal-as-inexact #t] + [read-accept-dot #t] + [read-accept-infix-dot #t] + [read-accept-quasiquote #t] + [read-accept-reader #t] + [read-accept-lang #t] + [current-readtable #f]) + (thunk))) + (define (raise-wrong-module-name filename expected-name name) (error 'load-handler "expected a `module' declaration for `~a' in ~s, found: ~a" diff --git a/collects/syntax/private/modread.rkt b/collects/syntax/private/modread.rkt deleted file mode 100644 index 749c1d3f66..0000000000 --- a/collects/syntax/private/modread.rkt +++ /dev/null @@ -1,20 +0,0 @@ -#lang racket/base - -(provide with-module-reading-parameterization) - -(define (with-module-reading-parameterization thunk) - (parameterize ([read-case-sensitive #t] - [read-square-bracket-as-paren #t] - [read-curly-brace-as-paren #t] - [read-accept-box #t] - [read-accept-compiled #t] - [read-accept-bar-quote #t] - [read-accept-graph #t] - [read-decimal-as-inexact #t] - [read-accept-dot #t] - [read-accept-infix-dot #t] - [read-accept-quasiquote #t] - [read-accept-reader #t] - [read-accept-lang #t] - [current-readtable #f]) - (thunk)))