[Guile-commits] GNU Guile branch, master, updated. release_1-9-11-175-gbd2057f

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=bd2057ff19943a9768170bcb323cdaef00480af3

The branch, master has been updated
       via  bd2057ff19943a9768170bcb323cdaef00480af3 (commit)
       via  410f2f0ddc647d2a12eeb90985721e93bfedbf72 (commit)
       via  7614c983a56a30f2cda3e014840524ac7030e6d9 (commit)
      from  080391439568fa3b27283c266ed4b47fa635620f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bd2057ff19943a9768170bcb323cdaef00480af3
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jul 13 00:02:54 2010 +0200

    Have `benchmark-guile' honor the current $GUILE_LOAD_PATH.
    
    * benchmark-guile.in (GUILE_LOAD_PATH): Extend the current value instead
      of overwriting it completely.

commit 410f2f0ddc647d2a12eeb90985721e93bfedbf72
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jul 13 00:01:43 2010 +0200

    Add missing benchmark files to the distribution.
    
    * benchmark-suite/Makefile.am (SCM_BENCHMARKS): Add
      `benchmarks/chars.bm' and `benchmarks/srfi-13.bm'.

commit 7614c983a56a30f2cda3e014840524ac7030e6d9
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jul 12 17:31:38 2010 +0200

    Fix type-checking in the optimized path of `string=?'.
    
    * libguile/srfi-13.c (scm_string_eq): Properly type-check S1 and S2.
    
    * test-suite/tests/strings.test ("string=?")["1st argument EOF", "2nd
      argument EOF"]: New tests exposing the problem.

-----------------------------------------------------------------------

Summary of changes:
 benchmark-guile.in            |    2 +-
 benchmark-suite/Makefile.am   |    2 ++
 libguile/srfi-13.c            |    3 ++-
 test-suite/tests/strings.test |   12 ++++++++++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/benchmark-guile.in b/benchmark-guile.in
index 34f9c06..572e008 100644
--- a/benchmark-guile.in
+++ b/benchmark-guile.in
@@ -24,7 +24,7 @@ else
     guile=${top_builddir}/meta/guile
 fi
 
-GUILE_LOAD_PATH=$BENCHMARK_SUITE_DIR
+GUILE_LOAD_PATH="$BENCHMARK_SUITE_DIR${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH"
 export GUILE_LOAD_PATH
 
 if [ -f "$guile" -a -x "$guile" ] ; then
diff --git a/benchmark-suite/Makefile.am b/benchmark-suite/Makefile.am
index 583519a..d99e457 100644
--- a/benchmark-suite/Makefile.am
+++ b/benchmark-suite/Makefile.am
@@ -1,9 +1,11 @@
 SCM_BENCHMARKS = benchmarks/0-reference.bm             \
                 benchmarks/bytevectors.bm              \
+                benchmarks/chars.bm                    \
                 benchmarks/continuations.bm            \
                  benchmarks/if.bm                      \
                  benchmarks/logand.bm                  \
                 benchmarks/read.bm                     \
+                benchmarks/srfi-13.bm                  \
                 benchmarks/structs.bm                  \
                 benchmarks/subr.bm                     \
                 benchmarks/uniform-vector-read.bm      \
diff --git a/libguile/srfi-13.c b/libguile/srfi-13.c
index eec2961..e9bf94e 100644
--- a/libguile/srfi-13.c
+++ b/libguile/srfi-13.c
@@ -1168,7 +1168,8 @@ SCM_DEFINE (scm_string_eq, "string=", 2, 4, 0,
            "value otherwise.")
 #define FUNC_NAME s_scm_string_eq
 {
-  if (SCM_LIKELY (scm_i_is_narrow_string (s1) == scm_i_is_narrow_string (s2)
+  if (SCM_LIKELY (scm_is_string (s1) && scm_is_string (s2) &&
+                 scm_i_is_narrow_string (s1) == scm_i_is_narrow_string (s2)
                  && SCM_UNBNDP (start1) && SCM_UNBNDP (end1)
                  && SCM_UNBNDP (start2) && SCM_UNBNDP (end2)))
     {
diff --git a/test-suite/tests/strings.test b/test-suite/tests/strings.test
index e04c026..fa8e6e1 100644
--- a/test-suite/tests/strings.test
+++ b/test-suite/tests/strings.test
@@ -1,7 +1,7 @@
 ;;;; strings.test --- test suite for Guile's string functions    -*- scheme -*-
 ;;;; Jim Blandy <address@hidden> --- August 1999
 ;;;;
-;;;; Copyright (C) 1999, 2001, 2004, 2005, 2006, 2008, 2009 Free Software 
Foundation, Inc.
+;;;; Copyright (C) 1999, 2001, 2004, 2005, 2006, 2008, 2009, 2010 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
@@ -279,7 +279,15 @@
 
     (pass-if-exception "2nd argument symbol"
       exception:wrong-type-arg
-      (string=? "a" 'b))))
+      (string=? "a" 'b))
+
+    (pass-if-exception "1st argument EOF"
+      exception:wrong-type-arg
+      (string=? (with-input-from-string "" read) "b"))
+
+    (pass-if-exception "2nd argument EOF"
+      exception:wrong-type-arg
+      (string=? "a" (with-input-from-string "" read)))))
 
 ;;
 ;; string<?


hooks/post-receive
-- 
GNU Guile