From 62a4d504c767c1ddf70c38b8d7a0d3dacbf4dc02 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Wed, 26 Feb 2014 08:38:19 -0800 Subject: [PATCH] simplify reader-base --- lang/reader-base.rkt | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lang/reader-base.rkt b/lang/reader-base.rkt index 92c4feb..5b13ca5 100644 --- a/lang/reader-base.rkt +++ b/lang/reader-base.rkt @@ -1,18 +1,19 @@ #lang racket/base -(require (only-in scribble/reader make-at-reader) - pollen/world) +(require (only-in scribble/reader make-at-reader) pollen/world) -(provide (all-defined-out) (all-from-out pollen/world)) +(provide make-reader-with-mode (all-from-out pollen/world)) -(define read-inner - (make-at-reader #:command-char EXPRESSION_DELIMITER #:syntax? #t #:inside? #t)) +(define read-inner (make-at-reader + #:command-char EXPRESSION_DELIMITER + #:syntax? #t + #:inside? #t)) -(define (make-pollen-read pollen-read-syntax-proc) +(define (make-custom-read custom-read-syntax-proc) (λ(p) (syntax->datum - (pollen-read-syntax-proc (object-name p) p)))) + (custom-read-syntax-proc (object-name p) p)))) -(define (make-pollen-read-syntax reader-mode) +(define (make-custom-read-syntax reader-mode) (λ (path-string p) (define file-contents (read-inner path-string p)) (datum->syntax file-contents @@ -24,6 +25,6 @@ (define-syntax-rule (make-reader-with-mode mode) (begin (define reader-mode mode) - (define pollen-read-syntax (make-pollen-read-syntax reader-mode)) - (define pollen-read (make-pollen-read pollen-read-syntax)) - (provide (rename-out [pollen-read read] [pollen-read-syntax read-syntax]) read-inner))) + (define custom-read-syntax (make-custom-read-syntax reader-mode)) + (define custom-read (make-custom-read custom-read-syntax)) + (provide (rename-out [custom-read read] [custom-read-syntax read-syntax]))))