From b540cae4df8e76efb5750e1ac157c0295707809e Mon Sep 17 00:00:00 2001 From: Burke Fetscher Date: Tue, 18 Mar 2014 23:08:01 -0500 Subject: [PATCH] redex: fix rvm ordered generation in n benchmark --- .../redex/examples/benchmark/rvm/verification-14.rkt | 7 ++++--- .../redex/examples/benchmark/rvm/verification-15.rkt | 7 ++++--- .../redex/examples/benchmark/rvm/verification-3.rkt | 7 ++++--- .../redex/examples/benchmark/rvm/verification-4.rkt | 7 ++++--- .../redex/examples/benchmark/rvm/verification-5.rkt | 7 ++++--- .../redex/examples/benchmark/rvm/verification-base.rkt | 3 ++- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-14.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-14.rkt index 6492e16994..8ccbf29ca1 100644 --- a/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-14.rkt +++ b/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-14.rkt @@ -450,7 +450,8 @@ (regexp-match? #rx"domain" (exn-message exc))) - (printf "exception on ~s\n" e)) + (printf "exception on ~s\n~s\n" e + (exn-message exc))) #f)]) (run e '() 100)) [(cutoff) #t] @@ -477,6 +478,8 @@ (let ([index 0]) (λ () (begin0 + (generate-term bytecode e #:i-th index) + (set! index (add1 index)))))) (test-equal (bytecode-ok? @@ -484,7 +487,5 @@ (let-rec ((lam () (0) (application (loc-noclr 0)))) 'x))) #t) - (generate-term bytecode e #:i-th index) - (set! index (add1 index)))))) (define fixed '()) diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-15.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-15.rkt index a61bffbd4d..598c8b5052 100644 --- a/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-15.rkt +++ b/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-15.rkt @@ -447,7 +447,8 @@ (regexp-match? #rx"domain" (exn-message exc))) - (printf "exception on ~s\n" e)) + (printf "exception on ~s\n~s\n" e + (exn-message exc))) #f)]) (run e '() 100)) [(cutoff) #t] @@ -474,6 +475,8 @@ (let ([index 0]) (λ () (begin0 + (generate-term bytecode e #:i-th index) + (set! index (add1 index)))))) (test-equal (bytecode-ok? @@ -482,7 +485,5 @@ (application (case-lam (lam (ref) () (loc-box 0))) (loc-box 1))))) #t) - (generate-term bytecode e #:i-th index) - (set! index (add1 index)))))) (define fixed '()) diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-3.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-3.rkt index 94d71fdca8..8e9c31cf58 100644 --- a/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-3.rkt +++ b/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-3.rkt @@ -445,7 +445,8 @@ (regexp-match? #rx"domain" (exn-message exc))) - (printf "exception on ~s\n" e)) + (printf "exception on ~s\n~s\n" e + (exn-message exc))) #f)]) (run e '() 100)) [(cutoff) #t] @@ -472,6 +473,8 @@ (let ([index 0]) (λ () (begin0 + (generate-term bytecode e #:i-th index) + (set! index (add1 index)))))) (test-equal (bytecode-ok? @@ -480,7 +483,5 @@ 'x (install-value 0 'y (boxenv 0 'z)))) #t) - (generate-term bytecode e #:i-th index) - (set! index (add1 index)))))) (define fixed '()) diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-4.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-4.rkt index 5373c2d422..3c8dc169a4 100644 --- a/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-4.rkt +++ b/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-4.rkt @@ -446,7 +446,8 @@ (regexp-match? #rx"domain" (exn-message exc))) - (printf "exception on ~s\n" e)) + (printf "exception on ~s\n~s\n" e + (exn-message exc))) #f)]) (run e '() 100)) [(cutoff) #t] @@ -473,13 +474,13 @@ (let ([index 0]) (λ () (begin0 + (generate-term bytecode e #:i-th index) + (set! index (add1 index)))))) (test-equal (bytecode-ok? '(let-one 'x (branch #f (boxenv 0 'y) (loc-box 0)))) #t) - (generate-term bytecode e #:i-th index) - (set! index (add1 index)))))) (define fixed '()) diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-5.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-5.rkt index c3d1e513ff..f65144313a 100644 --- a/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-5.rkt +++ b/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-5.rkt @@ -446,7 +446,8 @@ (regexp-match? #rx"domain" (exn-message exc))) - (printf "exception on ~s\n" e)) + (printf "exception on ~s\n~s\n" e + (exn-message exc))) #f)]) (run e '() 100)) [(cutoff) #t] @@ -473,6 +474,8 @@ (let ([index 0]) (λ () (begin0 + (generate-term bytecode e #:i-th index) + (set! index (add1 index)))))) (test-equal (bytecode-ok? @@ -481,7 +484,5 @@ (let-rec ((lam () (0) 'x)) 'y) (loc-noclr 0)))) #t) - (generate-term bytecode e #:i-th index) - (set! index (add1 index)))))) (define fixed '()) diff --git a/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-base.rkt b/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-base.rkt index bb5c7a2244..861686bbdd 100644 --- a/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-base.rkt +++ b/pkgs/redex-pkgs/redex-examples/redex/examples/benchmark/rvm/verification-base.rkt @@ -445,7 +445,8 @@ (regexp-match? #rx"domain" (exn-message exc))) - (printf "exception on ~s\n" e)) + (printf "exception on ~s\n~s\n" e + (exn-message exc))) #f)]) (run e '() 100)) [(cutoff) #t]