[Guile-commits] GNU Guile branch, string_abstraction2, updated. b123b24a4695d42fa797cd6902f8866eac1659d5

[Michael Gran]

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=b123b24a4695d42fa797cd6902f8866eac1659d5

The branch, string_abstraction2 has been updated
       via  b123b24a4695d42fa797cd6902f8866eac1659d5 (commit)
       via  9bfb3f8ab6e6d1a134c7562f2bc25392c032653e (commit)
       via  f20946c01b53b8022e0044d1ada32e52faf3c577 (commit)
       via  7994186ddd09f140a00ef04891c966714a5f28e2 (commit)
       via  1ffb9fb19ccec5e96d762e073a9bbabbc41962e4 (commit)
       via  a3b9555bd2b58c62f0a1c8431f6d91703e43dbf8 (commit)
       via  de1bb55692fc9fc35748ba24da36ee3086068053 (commit)
      from  966640813a00a1cdbbea19918fcfd932edcbd59f (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 b123b24a4695d42fa797cd6902f8866eac1659d5
Author: Michael Gran <address@hidden>
Date:   Mon May 25 15:39:52 2009 -0700

    add new tests to Makefile.am
    
        * test-suite/Makefile.am : add encoding_*.tests

commit 9bfb3f8ab6e6d1a134c7562f2bc25392c032653e
Author: Michael Gran <address@hidden>
Date:   Mon May 25 15:37:24 2009 -0700

    rename encoding_*.test to encoding-*.test
    
        * test-suite/tests/encoding-escapes.test: renamed
        * test-suite/tests/encoding-iso88591.test: renamed
        * test-suite/tests/encoding-iso88597.test: renamed
        * test-suite/tests/encoding-utf8.test: renamed

commit f20946c01b53b8022e0044d1ada32e52faf3c577
Author: Michael Gran <address@hidden>
Date:   Mon May 25 15:33:17 2009 -0700

    fix broken tests: check locale encoding using u8 vectors
    
        * test-suite/tests/encoding_iso88597.test
            * test-suite/tests/encoding_utf8.test

commit 7994186ddd09f140a00ef04891c966714a5f28e2
Author: Michael Gran <address@hidden>
Date:   Mon May 25 15:21:17 2009 -0700

    declare encoding of test source files
    
        * test-suite/tests/i18n.test
        * test-suite/tests/srfi-35.test: these source
        code files are encoded in ISO-8859-1 and need
        a declaration for the reader.

commit 1ffb9fb19ccec5e96d762e073a9bbabbc41962e4
Author: Michael Gran <address@hidden>
Date:   Mon May 25 15:19:37 2009 -0700

    vm string loader should use internal encoding of strings
    
        * libguile/vm-i-loader.c: use the string chars
          directly instead of converting them to the locale.
          That conversion was a double conversion.

commit a3b9555bd2b58c62f0a1c8431f6d91703e43dbf8
Author: Michael Gran <address@hidden>
Date:   Mon May 25 15:17:37 2009 -0700

    workaround to make guile-readline buile
    
        * guile-readline/Makefile.am:
        * guile-readline/readline.c: add defines for unused variables

commit de1bb55692fc9fc35748ba24da36ee3086068053
Author: Michael Gran <address@hidden>
Date:   Mon May 25 15:12:27 2009 -0700

    revert scm_getc to be SCM_API
    
        * libguile/ports.h: make scm_getc external API so that
          guile-readline will build again

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

Summary of changes:
 guile-readline/Makefile.am                         |    4 ++--
 guile-readline/readline.c                          |    7 +++++++
 libguile/ports.h                                   |    2 +-
 libguile/vm-i-loader.c                             |    6 +++++-
 test-suite/Makefile.am                             |    4 ++++
 ...encoding_escapes.test => encoding-escapes.test} |    0 
 ...coding_iso88591.test => encoding-iso88591.test} |    0 
 ...coding_iso88597.test => encoding-iso88597.test} |   16 ++++++++--------
 .../{encoding_utf8.test => encoding-utf8.test}     |   16 ++++++++--------
 test-suite/tests/i18n.test                         |    1 +
 test-suite/tests/srfi-35.test                      |    2 ++
 11 files changed, 38 insertions(+), 20 deletions(-)
 rename test-suite/tests/{encoding_escapes.test => encoding-escapes.test} (100%)
 rename test-suite/tests/{encoding_iso88591.test => encoding-iso88591.test} 
(100%)
 rename test-suite/tests/{encoding_iso88597.test => encoding-iso88597.test} 
(90%)
 rename test-suite/tests/{encoding_utf8.test => encoding-utf8.test} (85%)

diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am
index 94e6f97..337bc53 100644
--- a/guile-readline/Makefile.am
+++ b/guile-readline/Makefile.am
@@ -27,13 +27,13 @@ DEFS = @DEFS@ @EXTRA_DEFS@
 ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
 ## building.  Also look for Gnulib headers in `lib'.
 INCLUDES = -I. -I.. -I$(srcdir)/..                     \
-          -I$(top_srcdir)/lib -I$(top_builddir)/lib
+          -I$(top_srcdir)/lib -I$(top_builddir)/lib -I../lib
 
 GUILE_SNARF = ../libguile/guile-snarf
 
 lib_LTLIBRARIES = address@hidden@.la
 
address@hidden@_la_SOURCES = readline.c
address@hidden@_la_SOURCES = readline.c 
 address@hidden@_la_LIBADD =    \
    ../libguile/libguile.la ../lib/libgnu.la
 address@hidden@_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@ 
-export-dynamic -no-undefined
diff --git a/guile-readline/readline.c b/guile-readline/readline.c
index 58599ca..a884538 100644
--- a/guile-readline/readline.c
+++ b/guile-readline/readline.c
@@ -25,6 +25,12 @@
 /* Include private, configure generated header (i.e. config.h). */
 #include "guile-readline-config.h"
 
+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+# define _UNUSED_PARAMETER_ __attribute__ ((__unused__))
+#else
+# define _UNUSED_PARAMETER_
+#endif
+
 #ifdef HAVE_RL_GETC_FUNCTION
 #include "libguile.h"
 #include "libguile/iselect.h"
@@ -43,6 +49,7 @@
 #include <signal.h>
 
 #include "libguile/validate.h"
+#include "libguile/ports.h"
 #include "guile-readline/readline.h"
 
 scm_t_option scm_readline_opts[] = {
diff --git a/libguile/ports.h b/libguile/ports.h
index 3cb139c..322757d 100644
--- a/libguile/ports.h
+++ b/libguile/ports.h
@@ -268,7 +268,7 @@ SCM_API SCM scm_eof_object_p (SCM x);
 SCM_API SCM scm_force_output (SCM port);
 SCM_API SCM scm_flush_all_ports (void);
 SCM_API SCM scm_read_char (SCM port);
-SCM_INTERNAL scm_t_wchar scm_getc (SCM port);
+SCM_API scm_t_wchar scm_getc (SCM port);
 SCM_API size_t scm_c_read (SCM port, void *buffer, size_t size);
 SCM_API void scm_c_write (SCM port, const void *buffer, size_t size);
 SCM_API void scm_lfwrite (const char *ptr, size_t size, SCM port);
diff --git a/libguile/vm-i-loader.c b/libguile/vm-i-loader.c
index 515001d..25ea7a6 100644
--- a/libguile/vm-i-loader.c
+++ b/libguile/vm-i-loader.c
@@ -70,9 +70,13 @@ VM_DEFINE_LOADER (61, load_number, "load-number")
 VM_DEFINE_LOADER (62, load_string, "load-string")
 {
   size_t len;
+  SCM str;
+  char *buf;
   FETCH_LENGTH (len);
   SYNC_REGISTER ();
-  PUSH (scm_from_locale_stringn ((char *)ip, len));
+  str = scm_i_make_string(len, &buf);
+  memcpy (buf, (char *)ip, len);
+  PUSH (str);
   /* Was: scm_makfromstr (ip, len, 0) */
   ip += len;
   NEXT;
diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 3854d4a..4e60dc5 100644
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -32,6 +32,10 @@ SCM_TESTS = tests/alist.test                 \
            tests/continuations.test            \
            tests/elisp.test                    \
            tests/environments.test             \
+           tests/encoding-iso88591.test        \
+            tests/encoding-iso88597.test        \
+            tests/encoding-utf8.test            \
+            tests/encoding-escapes.test         \
            tests/eval.test                     \
            tests/exceptions.test               \
            tests/filesys.test                  \
diff --git a/test-suite/tests/encoding_escapes.test 
b/test-suite/tests/encoding-escapes.test
similarity index 100%
rename from test-suite/tests/encoding_escapes.test
rename to test-suite/tests/encoding-escapes.test
diff --git a/test-suite/tests/encoding_iso88591.test 
b/test-suite/tests/encoding-iso88591.test
similarity index 100%
rename from test-suite/tests/encoding_iso88591.test
rename to test-suite/tests/encoding-iso88591.test
diff --git a/test-suite/tests/encoding_iso88597.test 
b/test-suite/tests/encoding-iso88597.test
similarity index 90%
rename from test-suite/tests/encoding_iso88597.test
rename to test-suite/tests/encoding-iso88597.test
index 6395815..8885c32 100644
--- a/test-suite/tests/encoding_iso88597.test
+++ b/test-suite/tests/encoding-iso88597.test
@@ -90,15 +90,15 @@
  "display"
  
  (pass-if "s1"
-         (list= eqv? (list #xd0 #xe5 #xf1 #xdf)
-                (map char->integer 
-                     (string->list (with-output-to-string (lambda() 
-                                                            (display s1)))))))
+         (list= eqv? 
+                (list #xd0 #xe5 #xf1 #xdf)
+                (u8vector->list (with-output-to-locale-u8vector (lambda() 
+                                                                  (display 
s1))))))
  (pass-if "s2"
-         (list= eqv? (list #xf4 #xe7 #xf2)
-                (map char->integer 
-                     (string->list (with-output-to-string (lambda() 
-                                                            (display s2))))))))
+         (list= eqv? 
+                (list #xf4 #xe7 #xf2)
+                (u8vector->list (with-output-to-locale-u8vector (lambda() 
+                                                                  (display 
s2)))))))
 
 (with-test-prefix
  "symbols == strings"
diff --git a/test-suite/tests/encoding_utf8.test 
b/test-suite/tests/encoding-utf8.test
similarity index 85%
rename from test-suite/tests/encoding_utf8.test
rename to test-suite/tests/encoding-utf8.test
index 2b43874..2189061 100644
--- a/test-suite/tests/encoding_utf8.test
+++ b/test-suite/tests/encoding-utf8.test
@@ -89,15 +89,15 @@
  "display"
  
  (pass-if "s1"
-          (list= eqv? (list #xc3 #xba #x6c #x74 #x69 #x6d #x61)
-                 (map char->integer
-                      (string->list (with-output-to-string (lambda()
-                                                             (display s1)))))))
+          (list= eqv? 
+                (list #xc3 #xba #x6c #x74 #x69 #x6d #x61)
+                (u8vector->list (with-output-to-locale-u8vector (lambda()
+                                                                  (display 
s1))))))
  (pass-if "s2"
-          (list= eqv? (list #x63 #xc3 #xa9 #x64 #x75 #x6c #x61)
-                 (map char->integer
-                      (string->list (with-output-to-string (lambda()
-                                                             (display 
s2))))))))
+          (list= eqv? 
+                (list #x63 #xc3 #xa9 #x64 #x75 #x6c #x61)
+                (u8vector->list (with-output-to-locale-u8vector (lambda()
+                                                                  (display 
s2)))))))
 
 (with-test-prefix
  "symbols == strings"
diff --git a/test-suite/tests/i18n.test b/test-suite/tests/i18n.test
index 97e70d2..1f8d406 100644
--- a/test-suite/tests/i18n.test
+++ b/test-suite/tests/i18n.test
@@ -1,4 +1,5 @@
 ;;;; i18n.test --- Exercise the i18n API.
+(setencoding "ISO-8859-1")
 ;;;;
 ;;;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 ;;;; Ludovic Courtès
diff --git a/test-suite/tests/srfi-35.test b/test-suite/tests/srfi-35.test
index 83efd61..8431844 100644
--- a/test-suite/tests/srfi-35.test
+++ b/test-suite/tests/srfi-35.test
@@ -1,4 +1,5 @@
 ;;;; srfi-35.test --- Test suite for SRFI-35               -*- Scheme -*-
+(setencoding "ISO-8859-1")
 ;;;; Ludovic Courtès <address@hidden>
 ;;;;
 ;;;;   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
@@ -18,6 +19,7 @@
 ;;;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;;;; Boston, MA 02110-1301 USA
 
+(setbinary)
 (define-module (test-srfi-35)
   :use-module (test-suite lib)
   :use-module (srfi srfi-35))


hooks/post-receive
-- 
GNU Guile