From b63aa6bbaca4dbd34aa14c4f2f75f890229930e2 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Sun, 17 Mar 2013 15:51:15 -0500 Subject: [PATCH] adjust commit 99ff0adbfda87791a99914b69caa0decef79cd04 to be more friendly to the test suites --- collects/redex/private/judgment-form.rkt | 7 ++++--- collects/redex/tests/syn-err-tests/judgment-holds.rktd | 2 +- collects/redex/tests/test-util.rkt | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/collects/redex/private/judgment-form.rkt b/collects/redex/private/judgment-form.rkt index 6226ef5439..516b5e97c2 100644 --- a/collects/redex/private/judgment-form.rkt +++ b/collects/redex/private/judgment-form.rkt @@ -21,7 +21,8 @@ racket/syntax syntax/id-table racket/list - syntax/parse)) + syntax/parse + syntax/stx)) (require (for-template "term.rkt")) @@ -720,9 +721,9 @@ (define-syntax (judgment-holds stx) (syntax-case stx () [(_ (jf-id . args)) - #'(#%expression (judgment-holds/derivation judgment-holds #f (jf-id . args)))] + #`(#%expression (judgment-holds/derivation judgment-holds #f #,(stx-car (stx-cdr stx))))] [(_ (jf-id . args) trm) - #'(#%expression (judgment-holds/derivation judgment-holds #f (jf-id . args) trm))])) + #`(#%expression (judgment-holds/derivation judgment-holds #f #,(stx-car (stx-cdr stx)) trm))])) (define-syntax (build-derivations stx) (syntax-case stx () diff --git a/collects/redex/tests/syn-err-tests/judgment-holds.rktd b/collects/redex/tests/syn-err-tests/judgment-holds.rktd index 8bb8391003..f73e0221d9 100644 --- a/collects/redex/tests/syn-err-tests/judgment-holds.rktd +++ b/collects/redex/tests/syn-err-tests/judgment-holds.rktd @@ -2,7 +2,7 @@ ([not-judgment-form junk]) (judgment-holds (not-judgment-form z (s z)))) -(#rx"a?: mode specifies a 1-ary relation but use supplied 2 terms" +(#rx"a[?]: mode specifies a 1-ary relation but use supplied 2 terms" ([bad-judgment (a? a q)]) ([name a?]) (let () diff --git a/collects/redex/tests/test-util.rkt b/collects/redex/tests/test-util.rkt index 903db2ab20..216b4dce30 100644 --- a/collects/redex/tests/test-util.rkt +++ b/collects/redex/tests/test-util.rkt @@ -60,7 +60,7 @@ (define ((exec-error-tests setup exec) path) (for ([test (read-tests (build-path this-dir path))]) - (exec-error-test test exec setup))) + (exec-error-test test exec setup))) (define exec-syntax-error-tests (exec-error-tests syntax-error-test-setup expand)) (define exec-runtime-error-tests