Revert "Fix bound-identifier=? to compare binding names, not just symbolic names."

[bpt/guile.git] / test-suite / tests / srfi-17.test

diff --git a/test-suite/tests/srfi-17.test b/test-suite/tests/srfi-17.test
index 1a62681..8c4f0fc 100644 (file)
--- a/test-suite/tests/srfi-17.test
+++ b/test-suite/tests/srfi-17.test
@@ -1,25 +1,25 @@
 ;;;; srfi-17.test --- test suite for Guile's SRFI-17 functions. -*- scheme -*-
 ;;;;
-;;;; Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+;;;; Copyright (C) 2001, 2003, 2005, 2006, 2010 Free Software Foundation, Inc.
 ;;;; 
-;;;; This program is free software; you can redistribute it and/or modify
-;;;; it under the terms of the GNU General Public License as published by
-;;;; the Free Software Foundation; either version 2, or (at your option)
-;;;; any later version.
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 3 of the License, or (at your option) any later version.
 ;;;; 
-;;;; This program is distributed in the hope that it will be useful,
+;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;;; Lesser General Public License for more details.
 ;;;; 
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with this software; see the file COPYING.  If not, write to
-;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;;;; Boston, MA 02111-1307 USA
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 (define-module (test-suite test-srfi-17)
-  :use-module (test-suite lib)
-  :use-module (srfi srfi-17))
+  #:use-module (ice-9 regex)
+  #:use-module (test-suite lib)
+  #:use-module (srfi srfi-17))
 
 
 (pass-if "cond-expand srfi-17"
@@ -32,6 +32,13 @@
 
 (with-test-prefix "car"
 
+  ;; this test failed in guile 1.8.1 and 1.6.8 and earlier, since `define'
+  ;; didn't set a name on a procedure-with-setter
+  (pass-if "procedure-name"
+    (if (memq 'procnames (debug-options)) ;; enabled by default
+       (eq? 'car (procedure-name car))
+       (throw 'unsupported)))
+
   (pass-if "set! (car x)"
     (let ((lst (list 1)))
       (set! (car lst) 2)
@@ -41,6 +48,26 @@
 ;; set!
 ;;
 
+(define %some-variable #f)
+
+(define exception:bad-quote
+  '(quote . "bad syntax"))
+
+;; (put 'pass-if-syntax-error 'scheme-indent-function 1)
+(define-syntax pass-if-syntax-error
+  (syntax-rules ()
+    ((_ name pat exp)
+     (pass-if name
+       (catch 'syntax-error
+         (lambda () exp (error "expected uri-error exception"))
+         (lambda (k who what where form . maybe-subform)
+           (if (if (pair? pat)
+                   (and (eq? who (car pat))
+                        (string-match (cdr pat) what))
+                   (string-match pat what))
+               #t
+               (error "unexpected syntax-error exception" what pat))))))))
+
 (with-test-prefix "set!"
 
   (with-test-prefix "target is not procedure with setter"
@@ -49,9 +76,22 @@
       exception:wrong-type-arg
       (set! (symbol->string 'x) 1))
 
-    (pass-if-exception "(set! '#f 1)"
-      exception:bad-variable
-      (eval '(set! '#f 1) (interaction-environment)))))
+    (pass-if-syntax-error "(set! '#f 1)"
+      exception:bad-quote
+      (eval '(set! '#f 1) (interaction-environment))))
+
+  (with-test-prefix "target uses macro"
+
+    (pass-if "(set! (@@ ...) 1)"
+      (eval '(set! (@@ (test-suite test-srfi-17) %some-variable) 1)
+            (interaction-environment))
+      (equal? %some-variable 1))
+
+    ;; The `(quote x)' below used to be memoized as an infinite list before
+    ;; Guile 1.8.3.
+    (pass-if-syntax-error "(set! 'x 1)"
+      exception:bad-quote
+      (eval '(set! 'x 1) (interaction-environment)))))
 
 ;;
 ;; setter