diff --git a/collects/scribble/defreader.ss b/collects/scribble/defreader.ss index 7577e55263..fcc47bf393 100644 --- a/collects/scribble/defreader.ss +++ b/collects/scribble/defreader.ss @@ -10,7 +10,7 @@ (wrap inp (scribble:read-inside inp))) (define/kw (*read-syntax #:optional src [port (current-input-port)]) - (wrap port (scribble:read-inside-syntax src port))) + (wrap port (scribble:read-syntax-inside src port))) (define (wrap port body) (let* ([p-name (object-name port)] diff --git a/collects/scribble/doc.txt b/collects/scribble/doc.txt index 70a7e2f59b..8ba44442dd 100644 --- a/collects/scribble/doc.txt +++ b/collects/scribble/doc.txt @@ -643,7 +643,7 @@ constructing a reader table based on the current one, and using that in reading. > (read-inside [input-port]) -> (read-inside-syntax [source-name] [input-port]) +> (read-syntax-inside [source-name] [input-port]) These `-inside' variants parse as if starting inside a "@{...}", and they return a (syntactic) list. Useful for implementing languages diff --git a/collects/scribble/doc/reader.ss b/collects/scribble/doc/reader.ss index 72cb294362..e366750818 100644 --- a/collects/scribble/doc/reader.ss +++ b/collects/scribble/doc/reader.ss @@ -9,7 +9,7 @@ (wrap inp (scribble:read-inside inp))) (define (*read-syntax [src #f] [port (current-input-port)]) - (wrap port (scribble:read-inside-syntax src port))) + (wrap port (scribble:read-syntax-inside src port))) (define (wrap port body) (let* ([p-name (object-name port)] diff --git a/collects/scribble/reader.ss b/collects/scribble/reader.ss index d49dcf5c96..70c285f7bd 100644 --- a/collects/scribble/reader.ss +++ b/collects/scribble/reader.ss @@ -577,7 +577,7 @@ (syntax->datum (inside-dispatcher #f inp (object-name inp) line col pos))))) -(define (read-inside-syntax [src default-src] +(define (read-syntax-inside [src default-src] [inp (current-input-port)]) (let*-values ([(line col pos) (port-next-location inp)] [(inside-dispatcher) (make-default-at-dispatcher/inside)]) @@ -586,4 +586,4 @@ (provide (rename-out [*read read] [*read-syntax read-syntax]) - read-inside read-inside-syntax) + read-inside read-syntax-inside) diff --git a/collects/scribble/text.ss b/collects/scribble/text.ss index 3e03f73c39..f590c78916 100644 --- a/collects/scribble/text.ss +++ b/collects/scribble/text.ss @@ -36,7 +36,7 @@ ;; Utilities (require (prefix-in at: "reader.ss")) -(provide at:read-inside at:read-inside-syntax) +(provide at:read-inside at:read-syntax-inside) (provide include) (define-syntax (include stx) @@ -54,7 +54,7 @@ [dir dir]) #'(let ([contents (with-input-from-file (path->complete-path filename dir) - at:read-inside-syntax)]) + at:read-syntax-inside)]) (parameterize ([current-namespace ns]) (for ([expr (syntax->list contents)]) (show (eval expr)))))))])) diff --git a/collects/scribble/text/lang/reader.ss b/collects/scribble/text/lang/reader.ss index a5e9027e44..a0ca97184e 100644 --- a/collects/scribble/text/lang/reader.ss +++ b/collects/scribble/text/lang/reader.ss @@ -9,7 +9,7 @@ (wrap inp (at:read-inside inp))) (define (*read-syntax [src #f] [port (current-input-port)]) - (wrap port (at:read-inside-syntax src port))) + (wrap port (at:read-syntax-inside src port))) (define (wrap port body) (define (strip-leading-newlines stxs) diff --git a/collects/scribblings/scribble/docreader.scrbl b/collects/scribblings/scribble/docreader.scrbl index 244ff3eb92..00e779700c 100644 --- a/collects/scribblings/scribble/docreader.scrbl +++ b/collects/scribblings/scribble/docreader.scrbl @@ -7,6 +7,6 @@ @defmodulelang[scribble/doc]{The @schememodname[scribble/doc] language is the same as @schememodname[scribble/doclang], except that -@scheme[read-inside-syntax] is used to read the body of the module. In +@scheme[read-syntax-inside] is used to read the body of the module. In other words, the module body starts in Scribble ``text'' mode instead of S-expression mode.} diff --git a/collects/scribblings/scribble/preprocessor.scrbl b/collects/scribblings/scribble/preprocessor.scrbl index 7a0f49dfe2..c393f0b13d 100644 --- a/collects/scribblings/scribble/preprocessor.scrbl +++ b/collects/scribblings/scribble/preprocessor.scrbl @@ -11,7 +11,7 @@ changes that make it suitable as a preprocessor language: @itemize{ - @item{It uses @scheme[read-inside-syntax] to read the body of the + @item{It uses @scheme[read-syntax-inside] to read the body of the module, similar to @secref["docreader"].} @item{It has a custom printer (@scheme[current-print]) that displays diff --git a/collects/scribblings/scribble/reader.scrbl b/collects/scribblings/scribble/reader.scrbl index f70164b40b..65d676bb11 100644 --- a/collects/scribblings/scribble/reader.scrbl +++ b/collects/scribblings/scribble/reader.scrbl @@ -756,7 +756,7 @@ in reading. } @defproc[(read-inside [in input-port? (current-input-port)]) any]{} -@defproc[(read-inside-syntax [source-name any/c (object-name in)] +@defproc[(read-syntax-inside [source-name any/c (object-name in)] [in input-port? (current-input-port)]) (or/c syntax? eof-object?)]{ These @schemeid[-inside] variants parse as if starting inside a