[gentoo-commits] gentoo-x86 commit in dev-scheme/gauche/files: gauche-0.9.1-list-queue.diff gauche-0.9.1-bzip2-info.diff gauche-rpath.diff gauche-ext-ldflags.diff gauche-0.9.1-vminexact.diff gauche-0.9.1-number.diff gauche-xz-info.diff

[Akinori Hattori (hattya)]

hattya      11/05/18 14:11:11

  Added:                gauche-0.9.1-list-queue.diff
                        gauche-0.9.1-bzip2-info.diff gauche-rpath.diff
                        gauche-ext-ldflags.diff gauche-0.9.1-vminexact.diff
                        gauche-0.9.1-number.diff gauche-xz-info.diff
  Log:
  new upstream release.
  
  (Portage version: 2.1.9.42/cvs/Linux i686)

Revision  Changes    Path
1.1                  dev-scheme/gauche/files/gauche-0.9.1-list-queue.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-0.9.1-list-queue.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-0.9.1-list-queue.diff?rev=1.1&content-type=text/plain

Index: gauche-0.9.1-list-queue.diff
===================================================================
From 9dd79566fbff234f43cbc7b01078fd942f9fb31a Mon Sep 17 00:00:00 2001
From: Shiro Kawai <shiro@×××.org>
Date: Wed, 22 Dec 2010 08:55:00 +0000
Subject: fix list->queue bug


diff --git a/ext/util/queue.scm b/ext/util/queue.scm
index 0f35361..12eb88d 100644
--- a/ext/util/queue.scm
+++ b/ext/util/queue.scm
@@ -257,7 +257,7 @@
            (Q_LENGTH q) len)))
  )
 
-(define (list->queue lis :optional (class <queue>) :rest (initargs '()))
+(define (list->queue lis :optional (class <queue>) :rest initargs)
   (rlet1 q (apply make class initargs)
     (%queue-set-content! q (list-copy lis))))
 
-- 
1.7.3.4




1.1                  dev-scheme/gauche/files/gauche-0.9.1-bzip2-info.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-0.9.1-bzip2-info.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-0.9.1-bzip2-info.diff?rev=1.1&content-type=text/plain

Index: gauche-0.9.1-bzip2-info.diff
===================================================================
From 49401e54747a1eb3e6d0ad684b01fb289f4fcce0 Mon Sep 17 00:00:00 2001
From: Shiro Kawai <shiro@×××.org>
Date: Fri, 18 Feb 2011 23:28:47 +0000
Subject: support bzip2-ed info


diff --git a/lib/gauche/interactive/info.scm b/lib/gauche/interactive/info.scm
index fa27a5a..926473c 100644
--- a/lib/gauche/interactive/info.scm
+++ b/lib/gauche/interactive/info.scm
@@ -83,7 +83,8 @@
                             :paths paths
                             :pred (lambda (p)
                                     (or (file-is-readable? p)
-                                        (file-is-readable? #`",|p|.gz"))))
+                                        (file-is-readable? #`",|p|.gz")
+                                        (file-is-readable? #`",|p|.bz2"))))
         (errorf "couldn't find info file ~s in paths: ~s" *info-file* paths))
     ))
 
diff --git a/lib/text/info.scm b/lib/text/info.scm
index 4fdc8f5..b433d66 100644
--- a/lib/text/info.scm
+++ b/lib/text/info.scm
@@ -62,25 +62,27 @@
 
 ;; Find gunzip location
 (define gunzip (find-file-in-paths "gunzip"))
+(define bzip2  (find-file-in-paths "bzip2"))
 
 ;; Read an info file FILE, and returns a list of strings splitted by ^_ (#\x1f)
-;; If FILE is not found, look for gzipped one (FILE.gz) and decompress it.
+;; If FILE is not found, look for compressed one.
 (define (read-info-file-split file opts)
   (define (with-input-from-info thunk)
-    (cond ((file-exists? file)
-           (with-input-from-file file thunk))
-          ((file-exists? #`",|file|.gz")
-           (with-input-from-process #`",gunzip -c ,file" thunk))
-          (else
-           (error "can't find info file" file))))
+    (cond [(file-exists? file)
+           (with-input-from-file file thunk)]
+          [(and gunzip (file-exists? #`",|file|.gz"))
+           (with-input-from-process #`",gunzip -c ,file" thunk)]
+          [(and bzip2 (file-exists? #`",|file|.bz2"))
+           (with-input-from-process #`",bzip2 -c -d ,|file|.bz2" thunk)]
+          [else (error "can't find info file" file)]))
   (with-input-from-info
    (lambda ()
-     (let loop ((c (skip-while (char-set-complement #[\x1f])))
-                (r '()))
+     (let loop ([c (skip-while (char-set-complement #[\x1f]))]
+                [r '()])
        (if (eof-object? c)
          (reverse! r)
-         (let* ((head (next-token #[\x1f\n] '(#[\x1f\n] *eof*)))
-                (body (next-token #[\n] '(#[\x1f] *eof*))))
+         (let* ([head (next-token #[\x1f\n] '(#[\x1f\n] *eof*))]
+                [body (next-token #[\n] '(#[\x1f] *eof*))])
            (loop (read-char) (acons head body r)))))))
   )
 
-- 
1.7.3.4




1.1                  dev-scheme/gauche/files/gauche-rpath.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-rpath.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-rpath.diff?rev=1.1&content-type=text/plain

Index: gauche-rpath.diff
===================================================================
--- Gauche-0.9.1.orig/configure.ac
+++ Gauche-0.9.1/configure.ac
@@ -709,7 +709,6 @@
   fi
   if test "$RPATH_FLAG" != ""; then
     RPATH_TMP=$RPATH_FLAG'`pwd`'
-    RPATH_REAL=$RPATH_FLAG'$(LIB_INSTALL_DIR)'
   fi
 fi
 AC_SUBST(RPATH_FLAG)



1.1                  dev-scheme/gauche/files/gauche-ext-ldflags.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-ext-ldflags.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-ext-ldflags.diff?rev=1.1&content-type=text/plain

Index: gauche-ext-ldflags.diff
===================================================================
--- Gauche-0.9.1.orig/ext/Makefile.ext.in
+++ Gauche-0.9.1/ext/Makefile.ext.in
@@ -22,7 +22,7 @@
 LIBS         = $(XLIBS) @LIBS@ 
 CFLAGS       = @CFLAGS@ @SHLIB_SO_CFLAGS@ $(XCFLAGS)
 CPPFLAGS     = @CPPFLAGS@ $(XCPPFLAGS)
-LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @SHLIB_SO_LDFLAGS@
+LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @LDFLAGS@ @SHLIB_SO_LDFLAGS@
 
 # These are set by configure
 DEFS     = @DEFS@



1.1                  dev-scheme/gauche/files/gauche-0.9.1-vminexact.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-0.9.1-vminexact.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-0.9.1-vminexact.diff?rev=1.1&content-type=text/plain

Index: gauche-0.9.1-vminexact.diff
===================================================================
From e1139a7ea5fea68520f3b41904bf60093cd6ba1a Mon Sep 17 00:00:00 2001
From: Shiro Kawai <shiro@×××.org>
Date: Sun, 27 Feb 2011 11:33:42 +0000
Subject: fixed binary compatibility of Scm_VMExactToInexact


diff --git a/src/gauche/number.h b/src/gauche/number.h
index b85b72d..f08e631 100644
--- a/src/gauche/number.h
+++ b/src/gauche/number.h
@@ -319,7 +319,8 @@ SCM_EXTERN void   Scm_SetDefaultEndian(ScmObj endian);
 SCM_EXTERN ScmObj Scm_VMNegate(ScmObj obj);
 SCM_EXTERN ScmObj Scm_VMReciprocal(ScmObj obj);
 SCM_EXTERN ScmObj Scm_VMReciprocalInexact(ScmObj obj);
-SCM_EXTERN ScmObj Scm_VMInexact(ScmObj obj);
+SCM_EXTERN ScmObj Scm_VMExactToInexact(ScmObj obj); /* during 0.9 for backward compatibility */
+#define Scm_VMInexact Scm_VMExactToInexact          /* on 1.0, shorter name will be a real name */
 SCM_EXTERN ScmObj Scm_VMAbs(ScmObj obj);
 SCM_EXTERN ScmObj Scm_VMAdd(ScmObj arg1, ScmObj arg2);
 SCM_EXTERN ScmObj Scm_VMSub(ScmObj arg1, ScmObj arg2);
-- 
1.7.3.4




1.1                  dev-scheme/gauche/files/gauche-0.9.1-number.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-0.9.1-number.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-0.9.1-number.diff?rev=1.1&content-type=text/plain

Index: gauche-0.9.1-number.diff
===================================================================
From da6fc0f158fa9c76e5df675f57b57aa8c7a4b1b7 Mon Sep 17 00:00:00 2001
From: Shiro Kawai <shiro@×××.org>
Date: Wed, 2 Feb 2011 14:35:21 +0000
Subject: correct error estimation of floating point number reader


diff --git a/src/number.c b/src/number.c
index 9a7d8f8..d121edd 100644
--- a/src/number.c
+++ b/src/number.c
@@ -3543,6 +3543,7 @@ static double algorithmR(ScmObj f, int e, double z)
         case -1: /* d2 < y */
             if (Scm_NumCmp(m, SCM_2_52) == 0
                 && sign_d < 0
+                && k > -1074
                 && Scm_NumCmp(Scm_Ash(d2, 1), y) > 0) {
                 goto prevfloat;
             } else {
diff --git a/test/number.scm b/test/number.scm
index d397630..eb6d7eb 100644
--- a/test/number.scm
+++ b/test/number.scm
@@ -270,6 +270,12 @@
 (test* "flonum reader (minimum denormalized number -5.0e-324)" #t
        (let1 x (- (expt 2.0 -1074))
          (= x (string->number (number->string x)))))
+
+;; This hanged in 0.9.1.  See Jens Thiele's message in gauche-devel
+;; in Feb. 2011.
+(test* "flonum reader (minimum normalized number)" #t
+       (= (expt 2.0 (- 52 1074))
+          (string->number "2.2250738585072012e-308")))
        
 
 (test* "padding" '(10.0 #t) (flonum-test '1#))
-- 
1.7.3.4




1.1                  dev-scheme/gauche/files/gauche-xz-info.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-xz-info.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/gauche/files/gauche-xz-info.diff?rev=1.1&content-type=text/plain

Index: gauche-xz-info.diff
===================================================================
--- Gauche-0.9.1.orig/lib/gauche/interactive/info.scm
+++ Gauche-0.9.1/lib/gauche/interactive/info.scm
@@ -84,7 +84,8 @@
                             :pred (lambda (p)
                                     (or (file-is-readable? p)
                                         (file-is-readable? #`",|p|.gz")
-                                        (file-is-readable? #`",|p|.bz2"))))
+                                        (file-is-readable? #`",|p|.bz2")
+                                        (file-is-readable? #`",|p|.xz"))))
         (errorf "couldn't find info file ~s in paths: ~s" *info-file* paths))
     ))
 
--- Gauche-0.9.1.orig/lib/text/info.scm
+++ Gauche-0.9.1/lib/text/info.scm
@@ -63,6 +63,7 @@
 ;; Find gunzip location
 (define gunzip (find-file-in-paths "gunzip"))
 (define bzip2  (find-file-in-paths "bzip2"))
+(define xz     (find-file-in-paths "xz"))
 
 ;; Read an info file FILE, and returns a list of strings splitted by ^_ (#\x1f)
 ;; If FILE is not found, look for compressed one.
@@ -74,6 +75,8 @@
            (with-input-from-process #`",gunzip -c ,file" thunk)]
           [(and bzip2 (file-exists? #`",|file|.bz2"))
            (with-input-from-process #`",bzip2 -c -d ,|file|.bz2" thunk)]
+          [(and xz (file-exists? #`",|file|.xz"))
+           (with-input-from-process #`",xz -c -d ,|file|.xz" thunk)]
           [else (error "can't find info file" file)]))
   (with-input-from-info
    (lambda ()