suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added the #:keep-going keyword argument to redex-check

Browse Source
This commit is contained in:
Robby Findler 2013-10-30 21:35:48 -05:00
parent 3ae298b145
commit 6b2ba3f95f
3 changed files with 61 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/redex-pkgs/redex-doc/redex/scribblings/ref.scrbl
View File

@ -1851,7 +1851,8 @@ repeating as necessary. The optional keyword argument @racket[retries-expr]
(code:line #:retries retries-expr) (code:line #:retries retries-expr)
(code:line #:print? print?-expr) (code:line #:print? print?-expr)
(code:line #:attempt-size attempt-size-expr) (code:line #:attempt-size attempt-size-expr)
(code:line #:prepare prepare-expr)]) (code:line #:prepare prepare-expr)
(code:line #:keep-going? keep-going?-expr)])
#:contracts ([property-expr any/c] #:contracts ([property-expr any/c]
[attempts-expr natural-number/c] [attempts-expr natural-number/c]
[relation-expr reduction-relation?] [relation-expr reduction-relation?]
@ -1909,6 +1910,11 @@ The @racket[#:retries] keyword behaves identically as in @racket[generate-term],
controlling the number of times the generation of any pattern will be controlling the number of times the generation of any pattern will be
reattempted. It can't be used together with @racket[#:satisfying]. reattempted. It can't be used together with @racket[#:satisfying].
If @racket[keep-going?-expr] produces any non-@racket[#f] value,
@racket[redex-check] will stop only when it hits the limit on the number of attempts
showing all of the errors it finds. This argument is allowed only when
@racket[print?-expr] is not @racket[#f].
When passed a metafunction or reduction relation via the optional @racket[#:source] When passed a metafunction or reduction relation via the optional @racket[#:source]
argument, @racket[redex-check] distributes its attempts across the left-hand sides argument, @racket[redex-check] distributes its attempts across the left-hand sides
of that metafunction/relation by using those patterns, rather than @racket[pattern], of that metafunction/relation by using those patterns, rather than @racket[pattern],

60
pkgs/redex-pkgs/redex-lib/redex/private/generate-term.rkt
View File

@ -78,6 +78,8 @@
(define-for-syntax attempt-size-keyword (define-for-syntax attempt-size-keyword
(list '#:attempt-size #'default-attempt-size (list '#:attempt-size #'default-attempt-size
(list #'attempt-size/c "#:attempt-size argument"))) (list #'attempt-size/c "#:attempt-size argument")))
(define-for-syntax keep-going-keyword
(list '#:keep-going? #'#f (list #'boolean? "#:keep-going? argument")))
(define-for-syntax (prepare-keyword lists?) (define-for-syntax (prepare-keyword lists?)
(list '#:prepare #f (list '#:prepare #f
(list (if lists? #'(-> list? list?) #'(-> any/c any/c)) (list (if lists? #'(-> list? list?) #'(-> any/c any/c))
@ -88,11 +90,13 @@
(define-syntax (redex-check stx) (define-syntax (redex-check stx)
(define valid-kws (define valid-kws
(cons '#:satisfying (map car (list attempts-keyword (list* '#:satisfying
(map car (list attempts-keyword
source-keyword source-keyword
retries-keyword retries-keyword
print?-keyword print?-keyword
attempt-size-keyword attempt-size-keyword
keep-going-keyword
(prepare-keyword #f))))) (prepare-keyword #f)))))
(define used-kws (define used-kws
(for/fold ([kws (set)]) (for/fold ([kws (set)])
@ -122,7 +126,7 @@
(define-struct gen-fail ()) (define-struct gen-fail ())
(define-for-syntax (redex-check/jf orig-stx form lang jf-id pats property kw-args) (define-for-syntax (redex-check/jf orig-stx form lang jf-id pats property kw-args)
(define-values (attempts-stx source-stx retries-stx print?-stx size-stx fix-stx) (define-values (attempts-stx source-stx retries-stx print?-stx size-stx fix-stx keep-going-stx)
(parse-redex-check-kw-args kw-args orig-stx form)) (parse-redex-check-kw-args kw-args orig-stx form))
(define nts (definition-nts lang orig-stx 'redex-check)) (define nts (definition-nts lang orig-stx 'redex-check))
(unless (judgment-form-id? jf-id) (unless (judgment-form-id? jf-id)
@ -155,10 +159,11 @@
[(and res (? values)) res] [(and res (? values)) res]
[else (gen-fail)]) [else (gen-fail)])
#f)) #f))
property #,attempts-stx 0 (and #,print?-stx show) #,fix-stx term-match))))))) property #,attempts-stx 0 (and #,print?-stx show) #,fix-stx term-match
#,keep-going-stx)))))))
(define-for-syntax (redex-check/mf orig-stx form lang mf-id args-stx res-stx property kw-args) (define-for-syntax (redex-check/mf orig-stx form lang mf-id args-stx res-stx property kw-args)
(define-values (attempts-stx source-stx retries-stx print?-stx size-stx fix-stx) (define-values (attempts-stx source-stx retries-stx print?-stx size-stx fix-stx keep-going-stx)
(parse-redex-check-kw-args kw-args orig-stx form)) (parse-redex-check-kw-args kw-args orig-stx form))
(define nts (definition-nts lang orig-stx 'redex-check)) (define nts (definition-nts lang orig-stx 'redex-check))
(define m (metafunc mf-id)) (define m (metafunc mf-id))
@ -191,7 +196,8 @@
[(and res (? values)) res] [(and res (? values)) res]
[else (gen-fail)]) [else (gen-fail)])
#f)) #f))
property #,attempts-stx 0 (and #,print?-stx show) #,fix-stx term-match))))))) property #,attempts-stx 0 (and #,print?-stx show) #,fix-stx term-match
#,keep-going-stx)))))))
(define-for-syntax (redex-check/pat orig-stx form lang pat property kw-args) (define-for-syntax (redex-check/pat orig-stx form lang pat property kw-args)
(with-syntax ([(syncheck-exp pattern (name ...) (name/ellipses ...)) (with-syntax ([(syncheck-exp pattern (name ...) (name/ellipses ...))
@ -199,7 +205,7 @@
lang lang
'redex-check #t pat)] 'redex-check #t pat)]
[show (show-message orig-stx)]) [show (show-message orig-stx)])
(define-values (attempts-stx source-stx retries-stx print?-stx size-stx fix-stx) (define-values (attempts-stx source-stx retries-stx print?-stx size-stx fix-stx keep-going-stx)
(parse-redex-check-kw-args kw-args orig-stx form)) (parse-redex-check-kw-args kw-args orig-stx form))
(with-syntax ([property #`(bind-prop (with-syntax ([property #`(bind-prop
(λ (bindings) (λ (bindings)
@ -210,6 +216,7 @@
[ret #,retries-stx] [ret #,retries-stx]
[print? #,print?-stx] [print? #,print?-stx]
[fix #,fix-stx] [fix #,fix-stx]
[keep-going? #,keep-going-stx]
[term-match (λ (generated) [term-match (λ (generated)
(cond [(test-match #,lang #,pat generated) => values] (cond [(test-match #,lang #,pat generated) => values]
[else (redex-error 'redex-check "~s does not match ~s" generated '#,pat)]))]) [else (redex-error 'redex-check "~s does not match ~s" generated '#,pat)]))])
@ -232,10 +239,12 @@
'redex-check 'redex-check
(and print? show) (and print? show)
fix fix
keep-going?
#:term-match term-match)) #:term-match term-match))
#`(check-one #`(check-one
#,(term-generator lang #'pattern 'redex-check) #,(term-generator lang #'pattern 'redex-check)
property att ret (and print? show) fix (and fix term-match))))))))) property att ret (and print? show) fix (and fix term-match)
keep-going?))))))))
(define-for-syntax (parse-redex-check-kw-args kw-args orig-stx form-name) (define-for-syntax (parse-redex-check-kw-args kw-args orig-stx form-name)
(apply values (apply values
@ -244,7 +253,8 @@
retries-keyword retries-keyword
print?-keyword print?-keyword
attempt-size-keyword attempt-size-keyword
(prepare-keyword #f)) (prepare-keyword #f)
keep-going-keyword)
kw-args kw-args
orig-stx orig-stx
(syntax-e form-name)))) (syntax-e form-name))))
@ -252,8 +262,8 @@
(define (format-attempts a) (define (format-attempts a)
(format "~a attempt~a" a (if (= 1 a) "" "s"))) (format "~a attempt~a" a (if (= 1 a) "" "s")))
(define (check-one generator property attempts retries show term-fix term-match) (define (check-one generator property attempts retries show term-fix term-match keep-going?)
(define c (check generator property attempts retries show (define c (check generator property attempts retries show keep-going?
#:term-fix term-fix #:term-fix term-fix
#:term-match term-match)) #:term-match term-match))
(cond (cond
@ -271,7 +281,7 @@
(define-struct term-prop (pred)) (define-struct term-prop (pred))
(define-struct bind-prop (pred)) (define-struct bind-prop (pred))
(define (check generator property attempts retries show (define (check generator property attempts retries show keep-going?
#:source [source #f] #:source [source #f]
#:term-fix [term-fix #f] #:term-fix [term-fix #f]
#:term-match [term-match #f] #:term-match [term-match #f]
@ -324,9 +334,11 @@
(format-attempts attempt) (format-attempts attempt)
(if source (format " with ~a" source) ""))) (if source (format " with ~a" source) "")))
(pretty-write term (current-output-port))) (pretty-write term (current-output-port)))
(make-counterexample term)])])]))) (if keep-going?
(loop (sub1 remaining))
(make-counterexample term))])])])))
(define (check-lhs-pats lang mf/rr prop attempts retries what show term-fix (define (check-lhs-pats lang mf/rr prop attempts retries what show term-fix keep-going?
#:term-match [term-match #f]) #:term-match [term-match #f])
(define lang-gen (compile lang what)) (define lang-gen (compile lang what))
(define-values (pats srcs skip-term?) (define-values (pats srcs skip-term?)
@ -360,24 +372,26 @@
attempts attempts
retries retries
show show
keep-going?
#:skip-term? skip-term? #:skip-term? skip-term?
#:source (car srcs) #:source (car srcs)
#:term-match term-match #:term-match term-match
#:term-fix term-fix))]) #:term-fix term-fix))])
(if (counterexample? c) (if (and (not keep-going?) (counterexample? c))
(unless show c) (unless show c)
(loop (cdr pats) (cdr srcs))))))) (loop (cdr pats) (cdr srcs)))))))
(define-syntax (check-metafunction stx) (define-syntax (check-metafunction stx)
(syntax-case stx () (syntax-case stx ()
[(form name property . kw-args) [(form name property . kw-args)
(let-values ([(attempts retries print? size fix) (let-values ([(attempts retries print? size fix keep-going?)
(apply values (apply values
(parse-kw-args (list attempts-keyword (parse-kw-args (list attempts-keyword
retries-keyword retries-keyword
print?-keyword print?-keyword
attempt-size-keyword attempt-size-keyword
(prepare-keyword #t)) (prepare-keyword #t)
keep-going-keyword)
(syntax kw-args) (syntax kw-args)
stx stx
(syntax-e #'form)))] (syntax-e #'form)))]
@ -395,7 +409,8 @@
ret ret
'check-metafunction 'check-metafunction
(and #,print? #,(show-message stx)) (and #,print? #,(show-message stx))
fix)))))])) fix
#,keep-going?)))))]))
(define (reduction-relation-srcs r) (define (reduction-relation-srcs r)
(map (λ (proc) (or (rewrite-proc-name proc) (map (λ (proc) (or (rewrite-proc-name proc)
@ -409,13 +424,14 @@
(define-syntax (check-reduction-relation stx) (define-syntax (check-reduction-relation stx)
(syntax-case stx () (syntax-case stx ()
[(form relation property . kw-args) [(form relation property . kw-args)
(let-values ([(attempts retries print? size fix) (let-values ([(attempts retries print? size fix keep-going?)
(apply values (apply values
(parse-kw-args (list attempts-keyword (parse-kw-args (list attempts-keyword
retries-keyword retries-keyword
print?-keyword print?-keyword
attempt-size-keyword attempt-size-keyword
(prepare-keyword #f)) (prepare-keyword #f)
keep-going-keyword)
(syntax kw-args) (syntax kw-args)
stx stx
(syntax-e #'form)))]) (syntax-e #'form)))])
@ -424,7 +440,8 @@
(let ([att #,attempts] (let ([att #,attempts]
[ret #,retries] [ret #,retries]
[rel #,(apply-contract #'reduction-relation? #'relation #f (syntax-e #'form))] [rel #,(apply-contract #'reduction-relation? #'relation #f (syntax-e #'form))]
[fix #,fix]) [fix #,fix]
[keep-going? #,keep-going?])
(check-lhs-pats (check-lhs-pats
(reduction-relation-lang rel) (reduction-relation-lang rel)
rel rel
@ -433,7 +450,8 @@
ret ret
'check-reduction-relation 'check-reduction-relation
(and #,print? #,(show-message stx)) (and #,print? #,(show-message stx))
fix)))))])) fix
keep-going?)))))]))
(define-syntax (generate-term stx) (define-syntax (generate-term stx)
(let ([l (cdr (syntax->list stx))]) (let ([l (cdr (syntax->list stx))])

10
pkgs/redex-pkgs/redex-test/redex/tests/rg-test.rkt
View File

@ -1373,6 +1373,16 @@
5) 5)
'((sum (s z) (s z)) = (s (s z))))) '((sum (s z) (s z)) = (s (s z)))))
(let ()
(define-language L)
(define tries 0)
(output
(λ ()
(redex-check L any
(begin (set! tries (+ tries 1)) #f)
#:attempts 10
#:keep-going? #t)))
(test tries 10))
;; redex-test-seed ;; redex-test-seed
(let ([seed 0]) (let ([seed 0])