From 1bf54b06ee509da0a2a86650994b66eb3956f435 Mon Sep 17 00:00:00 2001 From: Asumu Takikawa Date: Thu, 24 Jul 2014 10:25:02 -0400 Subject: [PATCH] Revert label phase check, do correct thing Thanks to Matthew for advice --- .../racket-pkgs/racket-test/tests/syntax/flatten-begin.rkt | 3 ++- racket/collects/syntax/flatten-begin.rkt | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/racket-pkgs/racket-test/tests/syntax/flatten-begin.rkt b/pkgs/racket-pkgs/racket-test/tests/syntax/flatten-begin.rkt index 58e2007867..8221cdabf5 100644 --- a/pkgs/racket-pkgs/racket-test/tests/syntax/flatten-begin.rkt +++ b/pkgs/racket-pkgs/racket-test/tests/syntax/flatten-begin.rkt @@ -4,7 +4,8 @@ (require rackunit rackunit/text-ui - syntax/flatten-begin) + syntax/flatten-begin + (for-meta -2 (only-in racket/base begin))) (define-binary-check (check-equal-datum? actual expected) (check-equal? (map syntax->datum actual) diff --git a/racket/collects/syntax/flatten-begin.rkt b/racket/collects/syntax/flatten-begin.rkt index 8a4bb499c4..8ab5a936b2 100644 --- a/racket/collects/syntax/flatten-begin.rkt +++ b/racket/collects/syntax/flatten-begin.rkt @@ -1,4 +1,7 @@ #lang racket/base + +(require (for-template racket/base)) + (provide flatten-begin flatten-all-begins) @@ -20,7 +23,7 @@ (unless (and (pair? val) (not (null? val)) (identifier? (car val)) - (free-identifier=? (car val) #'begin #f #f)) + (free-identifier=? (car val) #'begin)) (raise-syntax-error #f "not a begin expression" @@ -29,6 +32,6 @@ (define lst (syntax->list stx)) (if (and lst (not (null? lst)) - (free-identifier=? (car lst) #'begin #f #f)) + (free-identifier=? (car lst) #'begin)) (apply append (map loop (cdr lst))) (list (syntax-track-origin stx orig-stx #'begin)))))