From abf257418907c640699da123ff84ca49349caf9f Mon Sep 17 00:00:00 2001 From: Casey Klein Date: Sat, 20 Nov 2010 06:22:07 -0600 Subject: [PATCH] Fixes a bug introduces while updating to newer version of Redex --- collects/redex/examples/delim-cont/meta.rkt | 2 +- collects/redex/examples/delim-cont/test.rkt | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/collects/redex/examples/delim-cont/meta.rkt b/collects/redex/examples/delim-cont/meta.rkt index 84f947c4d1..fb817fac76 100644 --- a/collects/redex/examples/delim-cont/meta.rkt +++ b/collects/redex/examples/delim-cont/meta.rkt @@ -70,7 +70,7 @@ (define-metafunction grammar [(get-marks-core (in-hole hole hole) v e_2) e_2] [(get-marks-core (wcm (name w_1 ((v_4 v_5) ... (v_1 v_3) (v_6 v_7) ...)) E_1) v_1 e_2) (get-marks E_1 v_1 (cons v_3 e_2))] - [(get-marks-core (wcm w_1 E_1) v_1 e_2) (get-marks E_1 v_1 e_2) (side-condition (term (notInDom (v_1 w_1))))] + [(get-marks-core (wcm w_1 E_1) v_1 e_2) (get-marks E_1 v_1 e_2) (side-condition (term (notInDom v_1 w_1)))] [(get-marks-core (v ... E_1 e ...) v_1 e_2) (get-marks E_1 v_1 e_2)] [(get-marks-core (if E_1 e_1 e_3) v_1 e_2) (get-marks E_1 v_1 e_2)] [(get-marks-core (begin E_1 e) v_1 e_2) (get-marks E_1 v_1 e_2)] diff --git a/collects/redex/examples/delim-cont/test.rkt b/collects/redex/examples/delim-cont/test.rkt index 155bc2804d..d90bdcb2b2 100644 --- a/collects/redex/examples/delim-cont/test.rkt +++ b/collects/redex/examples/delim-cont/test.rkt @@ -383,7 +383,17 @@ (λ () (current-marks 1 0)) (λ () #t)))) (λ (x) x))) - '(<> () [] (list 2)))) + '(<> () [] (list 2))) + (test "wcm without key in continuation-marks context" + '(<> () + [] + (% 0 + (wcm ([1 2]) + ((λ (x) x) + (wcm ([3 4]) + (current-marks 3 0)))) + (λ (x) x))) + '(<> () [] (list 4)))) ;; R6RS dynamic-wind ----------------------------------------