>From 8dba990d93e3c3181a84284830f7e9a0ca18e410 Mon Sep 17 00:00:00 2001 From: Evan Hanson Date: Tue, 28 May 2013 23:02:11 +1200 Subject: [PATCH 2/2] update syntax hygiene tests to account for R7RS exit specification This fixes a set of tests that relied on (exit #f) signaling an error, since pre-R7RS exit expected an integer argument whereas passing #f is now valid. --- tests/syntax-tests.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/syntax-tests.scm b/tests/syntax-tests.scm index 6da0277..2d96626 100644 --- a/tests/syntax-tests.scm +++ b/tests/syntax-tests.scm @@ -371,20 +371,20 @@ (lambda (x r c) (let ((body (cdr x))) `(,(r 'call/cc) - (,(r 'lambda) (exit) + (,(r 'lambda) (break) (,(r 'let) ,(r 'f) () ,@body (,(r 'f))))))))) (let ((n 10)) (loop (print* n " ") (set! n (sub1 n)) - (when (zero? n) (exit #f))) + (when (zero? n) (break #f))) (newline)) (define-syntax while0 (syntax-rules () ((_ t b ...) - (loop (if (not t) (exit #f)) + (loop (if (not t) (break #f)) b ...)))) (f (while0 #f (print "no."))) @@ -393,7 +393,7 @@ (er-macro-transformer (lambda (x r c) `(,(r 'loop) - (,(r 'if) (,(r 'not) ,(cadr x)) (exit #f)) + (,(r 'if) (,(r 'not) ,(cadr x)) (break #f)) ,@(cddr x))))) (let ((n 10)) @@ -420,11 +420,11 @@ (define-macro (loop . body) (let ((loop (gensym))) `(call/cc - (lambda (exit) + (lambda (break) (let ,loop () ,@body (,loop)))))) (let ((i 1)) - (loop (when (> i 10) (exit #f)) + (loop (when (> i 10) (break #f)) (print* i " ") (set! i (add1 i)))) (newline) @@ -571,20 +571,20 @@ (lambda (x i c) (let ((body (cdr x))) `(call/cc - (lambda (,(i 'exit)) + (lambda (,(i 'break)) (let f () ,@body (f)))))))) (let ((n 10)) (loop2 (print* n " ") (set! n (sub1 n)) - (when (zero? n) (exit #f))) + (when (zero? n) (break #f))) (newline)) (define-syntax while20 (syntax-rules () ((_ t b ...) - (loop2 (if (not t) (exit #f)) + (loop2 (if (not t) (break #f)) b ...)))) (f (while20 #f (print "no."))) @@ -593,7 +593,7 @@ (ir-macro-transformer (lambda (x i c) `(loop - (if (not ,(cadr x)) (,(i 'exit) #f)) + (if (not ,(cadr x)) (,(i 'break) #f)) ,@(cddr x))))) (let ((n 10)) -- 1.7.10.4