From 29348092abbb9666b351e6a131f9d91cad7939b5 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 9 Apr 2007 09:59:56 +0000 Subject: [PATCH] fix new xform macro handling svn: r5904 --- collects/compiler/private/xform.ss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/collects/compiler/private/xform.ss b/collects/compiler/private/xform.ss index 16e00410f2..1ecc544968 100644 --- a/collects/compiler/private/xform.ss +++ b/collects/compiler/private/xform.ss @@ -1470,7 +1470,8 @@ (define (start-skip? e) (and (pair? e) - (eq? START_XFORM_SKIP (tok-n (car e))))) + (or (eq? START_XFORM_SKIP (tok-n (car e))) + (eq? 'XFORM_START_SKIP (tok-n (car e)))))) (define (end-skip? e) (and (pair? e) @@ -2649,9 +2650,9 @@ (live-var-info-num-noreturn-calls live-vars) (live-var-info-num-empty-calls live-vars) (live-var-info-nonempty-calls? live-vars)))] - [(eq? (tok-n (caar body)) START_XFORM_SKIP) + [(memq (tok-n (caar body)) '(START_XFORM_SKIP XFORM_START_SKIP)) (let skip-loop ([body (cdr body)]) - (let*-values ([(end?) (eq? (tok-n (caar body)) END_XFORM_SKIP)] + (let*-values ([(end?) (memq (tok-n (caar body)) '(END_XFORM_SKIP XFORM_START_SKIP))] [(rest live-vars) ((if end? loop skip-loop)