From 3bcc3249e54de3f9e4cd434a26fd3e46f4f5ab63 Mon Sep 17 00:00:00 2001 From: Abdulaziz Ghuloum Date: Mon, 5 May 2008 03:52:08 -0400 Subject: [PATCH] Fixed another source of "annotations being revealed". This time, it's a reader bug of not inserting enough annotations for reader macro forms. --- scheme/ikarus.reader.ss | 10 +++++----- scheme/last-revision | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scheme/ikarus.reader.ss b/scheme/ikarus.reader.ss index a4c4204..19372fe 100644 --- a/scheme/ikarus.reader.ss +++ b/scheme/ikarus.reader.ss @@ -1266,11 +1266,11 @@ macro))] [else (parse-token p locs k t pos)]))) (let-values ([(expr expr^ locs k) (read-macro)]) - (let ([x (list expr)] [x^ (list expr^)]) - (values (cons macro x) - (cons (annotate-simple macro pos p) x^) - locs - (extend-k-pair x x^ expr '() k)))))] + (let ([d (list expr)] [d^ (list expr^)]) + (let ([x (cons macro d)] + [x^ (cons (annotate-simple macro pos p) d^)]) + (values x (annotate x x^ pos p) locs + (extend-k-pair d d^ expr '() k))))))] [(eq? (car t) 'mark) (let ([n (cdr t)]) (let-values ([(expr expr^ locs k) diff --git a/scheme/last-revision b/scheme/last-revision index 216fc43..30c63a2 100644 --- a/scheme/last-revision +++ b/scheme/last-revision @@ -1 +1 @@ -1467 +1468