From 463a34ec90c1e6a308481418bf091b7c548c4286 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Thu, 6 Oct 2011 18:18:23 -0400 Subject: [PATCH] Revert "Fixing racket/match by removing errorneous optimization with test that shows it is broken" This reverts commit 41307f13461bb61e48ee75c776e646212f1770fb. --- collects/racket/match/compiler.rkt | 3 +-- collects/tests/match/plt-match-tests.rkt | 16 ---------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/collects/racket/match/compiler.rkt b/collects/racket/match/compiler.rkt index 1300140ef0..0c54406f20 100644 --- a/collects/racket/match/compiler.rkt +++ b/collects/racket/match/compiler.rkt @@ -447,8 +447,7 @@ ;; and compile each block with a reference to its continuation [else (let*-values - (;; XXX This is broken. - #;[(rows vars) (reorder-columns rows vars)] + ([(rows vars) (reorder-columns rows vars)] [(fns) (let loop ([blocks (reverse (split-rows rows))] [esc esc] [acc null]) (if (null? blocks) diff --git a/collects/tests/match/plt-match-tests.rkt b/collects/tests/match/plt-match-tests.rkt index 053c7a2187..9a77411425 100644 --- a/collects/tests/match/plt-match-tests.rkt +++ b/collects/tests/match/plt-match-tests.rkt @@ -171,22 +171,6 @@ [_ #f]))) (test-case "app pattern" (check = 4 (match 3 [(app add1 y) y]))) - (test-case "app pattern (step 1)" - (check = 2 (match (list 1 3) - [(list 0 (app add1 y)) y] - [(list 1 (app sub1 y)) y]))) - (test-case "app pattern (step 2a)" - (check = 2 (match (cons 1 3) - [(cons 0 (app error y)) y] - [(cons 1 (app sub1 y)) y]))) - (test-case "app pattern (step 2a)" - (check = 2 (match (vector 1 3) - [(vector 0 (app error y)) y] - [(vector 1 (app sub1 y)) y]))) - (test-case "app pattern (step 2)" - (check = 2 (match (list 1 3) - [(list 0 (app error y)) y] - [(list 1 (app sub1 y)) y]))) (test-case "struct patterns" (let () (define-struct point (x y))