Merge branch 'master' of git:plt

This commit is contained in:
Robby Findler 2010-04-29 20:15:45 -05:00
commit 4671dc47f3
2 changed files with 7 additions and 5 deletions

View File

@ -339,7 +339,7 @@
(test (generate-term lang b 5) 43)
(test (generate-term lang (side-condition a (odd? (term a))) 5) 43)
(test (raised-exn-msg exn:fail:redex:generation-failure? (generate-term lang c 5))
#px"unable to generate pattern \\(side-condition a\\_1 #<syntax:.*\\/rg-test\\.ss:\\d+:\\d+>\\)")
#px"unable to generate pattern \\(side-condition a\\_1 #<syntax:.*\\/rg-test\\.(?:.+):\\d+:\\d+>\\)")
(test (let/ec k
(generate-term lang (number_1 (side-condition 7 (k (term number_1)))) 5))
'number_1)

View File

@ -644,15 +644,17 @@
(let ([sp (open-output-string)])
(parameterize ([current-output-port sp]
[current-traced-metafunctions 'all])
[current-traced-metafunctions 'all]
[print-as-quasiquote #f])
(term (f 1)))
(test (get-output-string sp) ">`(f 1)\n<0\n"))
(test (get-output-string sp) ">(f 1)\n<0\n"))
(let ([sp (open-output-string)])
(parameterize ([current-output-port sp]
[current-traced-metafunctions '(f)])
[current-traced-metafunctions '(f)]
[print-as-quasiquote #f])
(term (f 1)))
(test (get-output-string sp) ">`(f 1)\n<0\n")))
(test (get-output-string sp) ">(f 1)\n<0\n")))
(let ()
(define-language var-lang [(x y z w) variable])