Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
	GUILE-VERSION
	test-suite/tests/srfi-4.test

test-suite/tests/modules.test

@@ -290,6 +290,10 @@
            (import2 (make-module))
            (handler-invoked? #f)
            (handler (lambda (module name int1 val1 int2 val2 var val)
+                      ;; We expect both VAR and VAL to be #f, as there
+                      ;; is no previous binding for 'imported in M.
+                      (if var (error "unexpected var" var))
+                      (if val (error "unexpected val" val))
                       (set! handler-invoked? #t)
                       ;; Keep the first binding.
                       (or var (module-local-variable int1 name)))))

test-suite/tests/reader.test

@@ -428,6 +428,7 @@
 
 (with-test-prefix "#{}#"
   (pass-if (equal? (read-string "#{}#") '#{}#))
+  (pass-if (not (equal? (read-string "(a #{.}# b)") '(a . b))))
   (pass-if (equal? (read-string "#{a}#") 'a))
   (pass-if (equal? (read-string "#{a b}#") '#{a b}#))
   (pass-if-exception "#{" exception:eof-in-symbol

test-suite/tests/srfi-4.test

@@ -436,7 +436,26 @@
             (make-c32vector 4 7)))
 
   (pass-if "+inf.0, -inf.0, +nan.0 in c32vector"
-    (c32vector? #c32(+inf.0 -inf.0 +nan.0))))
+    (c32vector? #c32(+inf.0 -inf.0 +nan.0)))
+
+  (pass-if "generalized-vector-ref"
+    (let ((v (c32vector 1+1i)))
+      (= (c32vector-ref v 0)
+         (generalized-vector-ref v 0))))
+
+  (pass-if "generalized-vector-set!"
+    (let ((x 1+1i)
+          (v (c32vector 0)))
+      (generalized-vector-set! v 0 x)
+      (= x (generalized-vector-ref v 0))))
+
+  (pass-if-exception "generalized-vector-ref, out-of-range"
+    exception:out-of-range
+    (generalized-vector-ref (c32vector 1.0) 1))
+
+  (pass-if-exception "generalized-vector-set!, out-of-range"
+    exception:out-of-range
+    (generalized-vector-set! (c32vector 1.0) 1 2.0)))
 
 (with-test-prefix "c64 vectors"
 
@@ -476,4 +495,23 @@
             (make-c64vector 4 7)))
 
   (pass-if "+inf.0, -inf.0, +nan.0 in c64vector"
-    (c64vector? #c64(+inf.0 -inf.0 +nan.0))))
+    (c64vector? #c64(+inf.0 -inf.0 +nan.0)))
+
+  (pass-if "generalized-vector-ref"
+    (let ((v (c64vector 1+1i)))
+      (= (c64vector-ref v 0)
+         (generalized-vector-ref v 0))))
+
+  (pass-if "generalized-vector-set!"
+    (let ((x 1+1i)
+          (v (c64vector 0)))
+      (generalized-vector-set! v 0 x)
+      (= x (generalized-vector-ref v 0))))
+
+  (pass-if-exception "generalized-vector-ref, out-of-range"
+    exception:out-of-range
+    (generalized-vector-ref (c64vector 1.0) 1))
+
+  (pass-if-exception "generalized-vector-set!, out-of-range"
+    exception:out-of-range
+    (generalized-vector-set! (c64vector 1.0) 1 2.0)))

test-suite/tests/web-request.test

@@ -47,6 +47,10 @@ Accept-Language: en-gb, en;q=0.9\r
         (set! r (read-request (open-input-string example-1)))
         (request? r)))
     
+    (pass-if (equal?
+              (request-host (build-request (string->uri "http://www.gnu.org/")))
+              '("www.gnu.org" . #f)))
+    
     (pass-if (equal? (request-method r) 'GET))
     
     (pass-if (equal? (request-uri r) (build-uri 'http #:path "/qux")))