[Guile-commits] GNU Guile branch, master, updated. release_1-9-2-162-geebff6d

[Andy Wingo]

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

The branch, master has been updated
       via  eebff6d7f1055bb59fbad24c23f8db8ce14391d5 (commit)
      from  56664c089cc6115dcfd38518e7e6c76cfd10b3b1 (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 eebff6d7f1055bb59fbad24c23f8db8ce14391d5
Author: Andy Wingo <address@hidden>
Date:   Sun Sep 6 14:13:48 2009 +0200

    fix compile-time bug compiling (+ "foo" " bar")
    
    * module/language/tree-il/primitives.scm (+, -): Avoid calling exact? on
      non-numeric args.

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

Summary of changes:
 module/language/tree-il/primitives.scm |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/language/tree-il/primitives.scm 
b/module/language/tree-il/primitives.scm
index 955c7bf..98633f0 100644
--- a/module/language/tree-il/primitives.scm
+++ b/module/language/tree-il/primitives.scm
@@ -208,11 +208,11 @@
   (x) x
   (x y) (if (and (const? y)
                  (let ((y (const-exp y)))
-                   (and (exact? y) (= y 1))))
+                   (and (number? y) (exact? y) (= y 1))))
             (1+ x)
             (if (and (const? x)
                      (let ((x (const-exp x)))
-                       (and (exact? x) (= x 1))))
+                       (and (number? y) (exact? x) (= x 1))))
                 (1+ y)
                 (+ x y)))
   (x y z . rest) (+ x (+ y z . rest)))
@@ -226,7 +226,7 @@
   (x) (- 0 x)
   (x y) (if (and (const? y)
                  (let ((y (const-exp y)))
-                   (and (exact? y) (= y 1))))
+                   (and (number? y) (exact? y) (= y 1))))
             (1- x)
             (- x y))
   (x y z . rest) (- x (+ y z . rest)))


hooks/post-receive
-- 
GNU Guile