diff options
author | Andy Wingo <wingo@pobox.com> | 2012-01-30 18:52:46 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-01-30 18:52:46 +0100 |
commit | 252acfe8e70ac4c7d325588ffea1905fcf6f86b2 (patch) | |
tree | e31cae9d145548b86cba6764d0943329a4ef64d1 /module/rnrs | |
parent | 855db1905d56efcdf91ae51a9e80990f79030eae (diff) | |
parent | 3d51e57cfb0404db568a6adfde2a346d3fd9907e (diff) | |
download | guile-252acfe8e70ac4c7d325588ffea1905fcf6f86b2.tar.gz |
Merge commit '3d51e57cfb0404db568a6adfde2a346d3fd9907e'
Conflicts:
libguile/foreign.c
libguile/hashtab.c
module/ice-9/psyntax-pp.scm
module/language/tree-il/compile-glil.scm
Diffstat (limited to 'module/rnrs')
-rw-r--r-- | module/rnrs/control.scm | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/module/rnrs/control.scm b/module/rnrs/control.scm index b81c1338a..25ffa3eec 100644 --- a/module/rnrs/control.scm +++ b/module/rnrs/control.scm @@ -1,6 +1,6 @@ ;;; control.scm --- The R6RS control structures library -;; Copyright (C) 2010 Free Software Foundation, Inc. +;; Copyright (C) 2010, 2012 Free Software Foundation, Inc. ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public @@ -19,14 +19,4 @@ (library (rnrs control (6)) (export when unless do case-lambda) - (import (only (guile) if not begin define-syntax syntax-rules do case-lambda)) - - (define-syntax when - (syntax-rules () - ((when test result1 result2 ...) - (if test (begin result1 result2 ...))))) - - (define-syntax unless - (syntax-rules () - ((unless test result1 result2 ...) - (if (not test) (begin result1 result2 ...)))))) + (import (only (guile) when unless do case-lambda))) |