diff options
author | Andy Wingo <wingo@pobox.com> | 2012-03-02 17:20:47 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-03-02 17:20:47 +0100 |
commit | d489998364e5f20e81cf7cf12998e694626d2f6f (patch) | |
tree | f097df9ac80e73111bd8d34686643b06e33c8924 /module/srfi | |
parent | 79eb47ea47650ef42c545931726277a7118a0210 (diff) | |
parent | eebcacf41c4fe58ad8c9388d516a99f59212b223 (diff) | |
download | guile-d489998364e5f20e81cf7cf12998e694626d2f6f.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
There are a some failures currently:
FAIL: tree-il.test: warnings: format: non-literal format string with forward declaration
ERROR: srfi-18.test: current-exception-handler: current handler returned at top level - arguments: ((wrong-type-arg "car" "Wrong type argument in position ~A (expecting ~A): ~S" (1 "pair" #<unspecified>) (#<unspecified>)))
ERROR: srfi-18.test: current-exception-handler: multiple levels of handler nesting - arguments: ((wrong-type-arg "car" "Wrong type argument in position ~A (expecting ~A): ~S" (1 "pair" #<unspecified>) (#<unspecified>)))
ERROR: srfi-18.test: current-exception-handler: exception handler installation is thread-safe - arguments: ((wrong-type-arg "car" "Wrong type argument in position ~A (expecting ~A): ~S" (1 "pair" #<unspecified>) (#<unspecified>)))
Conflicts:
module/language/tree-il/peval.scm
module/language/tree-il/primitives.scm
test-suite/tests/tree-il.test
Diffstat (limited to 'module/srfi')
-rw-r--r-- | module/srfi/srfi-4.scm | 6 | ||||
-rw-r--r-- | module/srfi/srfi-4/gnu.scm | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/module/srfi/srfi-4.scm b/module/srfi/srfi-4.scm index 818ae7a73..43f5ef68f 100644 --- a/module/srfi/srfi-4.scm +++ b/module/srfi/srfi-4.scm @@ -1,6 +1,7 @@ ;;; srfi-4.scm --- Homogeneous Numeric Vector Datatypes -;; Copyright (C) 2001, 2002, 2004, 2006, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2004, 2006, 2009, 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 @@ -79,7 +80,8 @@ (apply make-srfi-4-vector ',tag len fill)) (define (,(symbol-append tag 'vector-length) v) (let ((len (* (uniform-vector-length v) - (/ ,size (uniform-vector-element-size v))))) + (uniform-vector-element-size v) + (/ ,size)))) (if (integer? len) len (error "fractional length" v ',tag ,size)))) diff --git a/module/srfi/srfi-4/gnu.scm b/module/srfi/srfi-4/gnu.scm index ac22809ea..39d6350e7 100644 --- a/module/srfi/srfi-4/gnu.scm +++ b/module/srfi/srfi-4/gnu.scm @@ -1,6 +1,6 @@ ;;; Extensions to SRFI-4 -;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 2009, 2010, 2011, 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 @@ -52,7 +52,8 @@ (apply make-srfi-4-vector ',tag len fill)) (define (,(symbol-append tag 'vector-length) v) (let ((len (* (uniform-vector-length v) - (/ ,size (uniform-vector-element-size v))))) + (uniform-vector-element-size v) + (/ ,size)))) (if (integer? len) len (error "fractional length" v ',tag ,size)))) |