Merge branch 'master' into samth/new-logic2

This commit is contained in:
Sam Tobin-Hochstadt 2010-04-26 11:50:15 -04:00
commit 10c23b0002
3 changed files with 14 additions and 1 deletions

View File

@ -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)

View File

@ -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 ...)))))]

View File

@ -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