suzanne.soy/aful
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keep srclocs and cooperate with check-syntax more

Browse Source
This commit is contained in:
AlexKnauth 2015-04-24 15:16:21 -04:00
parent a93f583fc4
commit cc61c271da
1 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
afl/reader.rkt
View File

@ -13,8 +13,9 @@
(require racket/match (require racket/match
rackjure/threading rackjure/threading
(only-in racket/port input-port-append) racket/port
(only-in racket/list remove-duplicates append*) racket/list
syntax/srcloc
(for-meta -10 racket/base) (for-meta -10 racket/base)
(for-meta -9 racket/base) (for-meta -9 racket/base)
(for-meta -8 racket/base) (for-meta -8 racket/base)
@ -89,7 +90,7 @@
(define ((make-reader-proc [orig-rt (current-readtable)] #:arg-str [arg-str (current-arg-string)]) (define ((make-reader-proc [orig-rt (current-readtable)] #:arg-str [arg-str (current-arg-string)])
char in source line column pos) char in src ln col pos)
(parameterize ([current-arg-string arg-str]) (parameterize ([current-arg-string arg-str])
(define (unget-normal-read-syntax str src in) (define (unget-normal-read-syntax str src in)
(define rt (current-readtable)) (define rt (current-readtable))
@ -99,33 +100,55 @@
(and (equal? str (peek-string (string-length str) 0 in)) (and (equal? str (peek-string (string-length str) 0 in))
(read-string (string-length str) in))) (read-string (string-length str) in)))
(cond [(char=? char #\l) (cond [(char=? char #\l)
(cond [(peek/read? "ambda" in) (parse (read-syntax source in))] (cond [(peek/read? "ambda" in)
[else (unget-normal-read-syntax "#l" source in)])] (define stx (read-syntax src in))
(parse stx #:loc (srcloc src ln col pos (- (source-location-end stx) pos)))]
[else (unget-normal-read-syntax "#l" src in)])]
[(char=? char #\f) [(char=? char #\f)
(cond [(peek/read? "n" in) (parse (read-syntax source in))] (cond [(peek/read? "n" in)
[(peek/read? "unction" in) (parse (read-syntax source in))] (define stx (read-syntax src in))
[else (unget-normal-read-syntax "#f" source in)])] (parse stx #:loc (srcloc src ln col pos (- (source-location-end stx) pos)))]
[(char=? char #\λ) (parse (read-syntax source in))] [(peek/read? "unction" in)
(define stx (read-syntax src in))
(parse stx #:loc (srcloc src ln col pos (- (source-location-end stx) pos)))]
[else (unget-normal-read-syntax "#f" src in)])]
[(char=? char #\λ)
(define stx (read-syntax src in))
(parse stx #:loc (srcloc src ln col pos (- (source-location-end stx) pos)))]
;[else (unget-normal-read-syntax (string #\# char) source in)] ;[else (unget-normal-read-syntax (string #\# char) source in)]
[else (parse (read-syntax source in))] ;single letter e.g. #λ [else ;single letter e.g. #λ
(define stx (read-syntax src in))
(parse stx #:loc (srcloc src ln col pos (- (source-location-end stx) pos)))]
))) )))
(define (parse stx #:arg-str [arg-str (current-arg-string)]) (define (parse stx #:loc [loc stx] #:arg-str [arg-str (current-arg-string)])
(parameterize ([current-arg-string arg-str]) (parameterize ([current-arg-string arg-str])
(define (string->id stx . strs) (define (string->id stx . strs)
(datum->syntax stx (string->symbol (apply string-append strs)) stx)) (datum->syntax stx (string->symbol (apply string-append strs)) stx))
(define intro (make-syntax-introducer)) (define intro (make-syntax-introducer))
(define stx* (intro stx)) (define stx* (intro stx))
(with-syntax ([args (parse-args stx* #:arg-str arg-str)] (match-define (srcloc src ln col pos spn) (build-source-location loc))
(define stx-pos (syntax-position stx*))
(define loc-stx (build-source-location-syntax loc))
(define λ-loc
(update-source-location loc-stx
#:column (and col (+ col 1))
#:position (and pos (+ pos 1))
#:span (and stx-pos pos (max 0 (- stx-pos pos 1)))))
(with-syntax ([lambda (orig (syntax/loc λ-loc lambda))]
[args (parse-args stx* #:arg-str arg-str)]
[% (string->id stx* arg-str)] [% (string->id stx* arg-str)]
[%1 (string->id stx* arg-str "1")] [%1 (string->id stx* arg-str "1")]
[body stx*]) [body stx*])
(intro (intro
(syntax/loc stx (syntax/loc loc-stx
(lambda args (lambda args
(define-syntax % (make-rename-transformer #'%1)) (define-syntax % (make-rename-transformer #'%1))
body)))))) body))))))
(define (orig stx)
(syntax-property stx 'original-for-check-syntax #t))
(module+ test (module+ test
;; These test `parse`. See test.rkt for tests of readtable use per se. ;; These test `parse`. See test.rkt for tests of readtable use per se.
(define chk (compose1 syntax->datum parse)) (define chk (compose1 syntax->datum parse))