mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00
Code Activity

remove duplicate when/unless definitions

Browse source 
* module/rnrs/control.scm:
* module/sxml/ssax.scm:
* test-suite/lalr/common-test.scm: Remove local `when'/`unless'
  definitions.
This commit is contained in:
Andy Wingo 2012-01-20 21:16:50 +01:00
parent 9accf3d98f
commit fb01fd8772
3 changed files with 3 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
module/rnrs/control.scm
View file

@ -1,6 +1,6 @@
;;; control.scm --- The R6RS control structures library ;;; 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 ;; This library is free software; you can redistribute it and/or
;; modify it under the terms of the GNU Lesser General Public ;; modify it under the terms of the GNU Lesser General Public
@ -19,14 +19,4 @@
(library (rnrs control (6)) (library (rnrs control (6))
(export when unless do case-lambda) (export when unless do case-lambda)
(import (only (guile) if not begin define-syntax syntax-rules do case-lambda)) (import (only (guile) when unless 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 ...))))))

9
module/sxml/ssax.scm
View file

@ -1,6 +1,6 @@
;;;; (sxml ssax) -- the SSAX parser ;;;; (sxml ssax) -- the SSAX parser
;;;; ;;;;
;;;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. ;;;; Copyright (C) 2009, 2010,2012 Free Software Foundation, Inc.
;;;; Modified 2004 by Andy Wingo <wingo at pobox dot com>. ;;;; Modified 2004 by Andy Wingo <wingo at pobox dot com>.
;;;; Written 2001,2002,2003,2004 by Oleg Kiselyov <oleg at pobox dot com> as SSAX.scm. ;;;; Written 2001,2002,2003,2004 by Oleg Kiselyov <oleg at pobox dot com> as SSAX.scm.
;;;; ;;;;
@ -209,13 +209,6 @@ string @var{str}, which will then be parsed."
(set! ssax:predefined-parsed-entities (set! ssax:predefined-parsed-entities
(acons entity str ssax:predefined-parsed-entities))) (acons entity str ssax:predefined-parsed-entities)))
;; if condition is true, execute stmts in turn and return the result of
;; the last statement otherwise, return #f
(define-syntax when
(syntax-rules ()
((when condition . stmts)
(and condition (begin . stmts)))))
;; Execute a sequence of forms and return the result of the _first_ one. ;; Execute a sequence of forms and return the result of the _first_ one.
;; Like PROG1 in Lisp. Typically used to evaluate one or more forms with ;; Like PROG1 in Lisp. Typically used to evaluate one or more forms with
;; side effects and return a value that must be computed before some or ;; side effects and return a value that must be computed before some or

7
test-suite/lalr/common-test.scm
View file

@ -8,13 +8,6 @@
(define *error* '()) (define *error* '())
(define-syntax when
(syntax-rules ()
((_ ?expr ?body ...)
(if ?expr
(let () ?body ...)
#f))))
(define-syntax check (define-syntax check
(syntax-rules (=>) (syntax-rules (=>)
((_ ?expr => ?expected-result) ((_ ?expr => ?expected-result)