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

fix handling of improper lists in the code macro

Browse Source 
svn: r4746
This commit is contained in:
Matthew Flatt 2006-11-02 03:16:19 +00:00
parent 0adaa9e162
commit 86f9de0b41
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
collects/texpict/code.ss
View File

@ -223,7 +223,7 @@
(define (comment-mode? mode)
(eq? mode 'comment))
(define-computed dot-p (tt " . "))
(define-computed dot-p (tt "."))
(define (mode-colorize mode type p)
(maybe-colorize
@ -367,7 +367,8 @@
(lambda (a b) (eq? (syntax-e a) (syntax-e b)))
[() (add-close (htl-append (get-open mode stx) (get-close mode stx))
closes)]
[code:blank (tt " ")]
[code:blank (add-close (tt " ")
closes)]
[$ (colorize-id "|" closes)]
[(quote x)
(memq 'quote (current-reader-forms))
@ -503,9 +504,23 @@
(identifier? stx)
(add-close (colorize-id (symbol->string (syntax-e stx)) mode) closes)]
[(a . b)
(code-hbl-append (mode-colorize mode #f open-paren-p) (loop #'a null mode)
(mode-colorize mode #f dot-p)
(loop #'b (cons (cons mode stx) closes) mode))]
;; Build a list that makes the "." explicit.
(let ([p (let loop ([a (syntax-e stx)])
(cond
[(pair? a) (cons (car a) (loop (cdr a)))]
[else (list (datum->syntax-object #f
(mode-colorize mode #f dot-p)
(list (syntax-source a)
(syntax-line a)
(- (syntax-column a) 2)
(- (syntax-position a) 2)
1))
a)]))])
(loop (datum->syntax-object stx
p
stx)
closes
mode))]
[else
(add-close (if (pict? (syntax-e stx))
(syntax-e stx)