From 1cf22896ce98ae95af9688a0ec8f2c5ecb4b0c04 Mon Sep 17 00:00:00 2001 From: Casey Klein Date: Mon, 26 Apr 2010 09:39:04 -0500 Subject: [PATCH 1/2] Further increases DrDr timeout for Redex tests --- collects/meta/props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collects/meta/props b/collects/meta/props index e132d697ac..566a661a0c 100644 --- a/collects/meta/props +++ b/collects/meta/props @@ -1097,7 +1097,7 @@ path/s is either such a string or a list of them. "collects/redex/tests/matcher-test.ss" drdr:command-line "mzc ~s" "collects/redex/tests/pict-test.ss" drdr:command-line "mzc ~s" "collects/redex/tests/rg-test.ss" drdr:command-line "mzc ~s" -"collects/redex/tests/run-tests.ss" drdr:command-line "mred-text ~s --examples --no-bitmaps" drdr:timeout 210 +"collects/redex/tests/run-tests.ss" drdr:command-line "mred-text ~s --examples --no-bitmaps" drdr:timeout 240 "collects/redex/tests/term-test.ss" drdr:command-line "mzc ~s" "collects/redex/tests/tl-test.ss" drdr:command-line "mzc ~s" "collects/repos-time-stamp" responsible (eli) From 8047e32662207ceddf9fb04dddd8d96c9ea00a17 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Mon, 26 Apr 2010 11:42:48 -0400 Subject: [PATCH 2/2] Treat static struct info as pattern constructor. --- collects/racket/match/parse.ss | 3 +++ collects/tests/match/examples.ss | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/collects/racket/match/parse.ss b/collects/racket/match/parse.ss index 0fbfc04b6a..54dc1b86b1 100644 --- a/collects/racket/match/parse.ss +++ b/collects/racket/match/parse.ss @@ -153,6 +153,9 @@ [(mcons e1 e2) (make-MPair (parse #'e1) (parse #'e2))] [(struct s pats) (parse-struct stx cert parse #'s #'pats)] + [(s . pats) + (struct-info? (syntax-local-value #'s (lambda () #f))) + (parse-struct stx cert parse #'s #'pats)] [(? p q1 qs ...) (make-And (cons (make-Pred (cert #'p)) (map parse (syntax->list #'(q1 qs ...)))))] diff --git a/collects/tests/match/examples.ss b/collects/tests/match/examples.ss index 2348230173..bbb4f1643f 100644 --- a/collects/tests/match/examples.ss +++ b/collects/tests/match/examples.ss @@ -113,6 +113,16 @@ [(box a) a] [(cons x y) (+ x y)] [_ 0]))) + + (comp + 6 + (let () + (match (make-X 1 2 3) + [(X a b c) (+ a b c)] + [(box a) a] + [(cons x y) (+ x y)] + [_ 0]))) + (comp 6