commit bf2f956ba3c4b949b6c18755c1827c450641dae7 Author: Matt Housh <jaeger@crux.nu> Date: Fri Feb 16 10:59:33 2007 -0600 guile: added rational bugfix patch diff --git a/guile/.md5sum b/guile/.md5sum index 25e9bde..6ce4b57 100644 --- a/guile/.md5sum +++ b/guile/.md5sum @@ -1 +1,2 @@ +4b4a84960dd301576be6303ba46ff3e1 guile-1.8-rational.patch be792074780d597208a8cdfed976f559 guile-1.8.1.tar.gz diff --git a/guile/Pkgfile b/guile/Pkgfile index 187c05c..25543fd 100644 --- a/guile/Pkgfile +++ b/guile/Pkgfile @@ -5,16 +5,18 @@ name=guile version=1.8.1 -release=1 -source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz) +release=2 +source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz \ + $name-1.8-rational.patch) build() { - cd $name-$version - ./configure --prefix=/usr \ + cd $name-$version + patch -p0 -i $SRC/$name-1.8-rational.patch + ./configure --prefix=/usr \ --with-threads \ --with-modules \ --enable-deprecation=no - make - make DESTDIR=$PKG install - rm -rf $PKG/usr/share/info + make + make DESTDIR=$PKG install + rm -rf $PKG/usr/share/info } diff --git a/guile/guile-1.8-rational.patch b/guile/guile-1.8-rational.patch new file mode 100644 index 0000000..0f91593 --- /dev/null +++ b/guile/guile-1.8-rational.patch @@ -0,0 +1,135 @@ +2006-12-23 Han-Wen Nienhuys <hanwen@lilypond.org> + + * numbers.c (scm_i_fraction_reduce): move logic into + scm_i_make_ratio(), so fractions are only read. + scm_i_fraction_reduce() modifies a fraction when reading it. A + race condition might lead to fractions being corrupted by reading + them concurrently. + + Also, the REDUCED bit alters the SCM_CELL_TYPE(), making + comparisons between reduced and unreduced fractions go wrong. + + * numbers.h: remove SCM_FRACTION_SET_NUMERATOR, + SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT, + SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR, + SCM_FRACTION_REDUCED. + +Index: libguile/numbers.c +=================================================================== +RCS file: /cvsroot/guile/guile/guile-core/libguile/numbers.c,v +retrieving revision 1.285 +diff -p -u -u -r1.285 numbers.c +--- libguile/numbers.c 9 Oct 2006 23:17:30 -0000 1.285 ++++ libguile/numbers.c 23 Dec 2006 20:31:20 -0000 +@@ -452,28 +452,21 @@ scm_i_make_ratio (SCM numerator, SCM den + + /* No, it's a proper fraction. + */ +- return scm_double_cell (scm_tc16_fraction, +- SCM_UNPACK (numerator), +- SCM_UNPACK (denominator), 0); ++ { ++ SCM divisor = scm_gcd (numerator, denominator); ++ if (!(scm_is_eq (divisor, SCM_I_MAKINUM(1)))) ++ { ++ numerator = scm_divide (numerator, divisor); ++ denominator = scm_divide (denominator, divisor); ++ } ++ ++ return scm_double_cell (scm_tc16_fraction, ++ SCM_UNPACK (numerator), ++ SCM_UNPACK (denominator), 0); ++ } + } + #undef FUNC_NAME + +-static void scm_i_fraction_reduce (SCM z) +-{ +- if (!(SCM_FRACTION_REDUCED (z))) +- { +- SCM divisor; +- divisor = scm_gcd (SCM_FRACTION_NUMERATOR (z), SCM_FRACTION_DENOMINATOR (z)); +- if (!(scm_is_eq (divisor, SCM_I_MAKINUM(1)))) +- { +- /* is this safe? */ +- SCM_FRACTION_SET_NUMERATOR (z, scm_divide (SCM_FRACTION_NUMERATOR (z), divisor)); +- SCM_FRACTION_SET_DENOMINATOR (z, scm_divide (SCM_FRACTION_DENOMINATOR (z), divisor)); +- } +- SCM_FRACTION_REDUCED_SET (z); +- } +-} +- + double + scm_i_fraction2double (SCM z) + { +@@ -2387,7 +2380,6 @@ SCM_DEFINE (scm_number_to_string, "numbe + } + else if (SCM_FRACTIONP (n)) + { +- scm_i_fraction_reduce (n); + return scm_string_append (scm_list_3 (scm_number_to_string (SCM_FRACTION_NUMERATOR (n), radix), + scm_from_locale_string ("/"), + scm_number_to_string (SCM_FRACTION_DENOMINATOR (n), radix))); +@@ -2441,7 +2433,6 @@ int + scm_i_print_fraction (SCM sexp, SCM port, scm_print_state *pstate SCM_UNUSED) + { + SCM str; +- scm_i_fraction_reduce (sexp); + str = scm_number_to_string (sexp, SCM_UNDEFINED); + scm_lfwrite (scm_i_string_chars (str), scm_i_string_length (str), port); + scm_remember_upto_here_1 (str); +@@ -3109,8 +3100,6 @@ scm_complex_equalp (SCM x, SCM y) + SCM + scm_i_fraction_equalp (SCM x, SCM y) + { +- scm_i_fraction_reduce (x); +- scm_i_fraction_reduce (y); + if (scm_is_false (scm_equal_p (SCM_FRACTION_NUMERATOR (x), + SCM_FRACTION_NUMERATOR (y))) + || scm_is_false (scm_equal_p (SCM_FRACTION_DENOMINATOR (x), +@@ -5424,10 +5413,7 @@ scm_numerator (SCM z) + else if (SCM_BIGP (z)) + return z; + else if (SCM_FRACTIONP (z)) +- { +- scm_i_fraction_reduce (z); +- return SCM_FRACTION_NUMERATOR (z); +- } ++ return SCM_FRACTION_NUMERATOR (z); + else if (SCM_REALP (z)) + return scm_exact_to_inexact (scm_numerator (scm_inexact_to_exact (z))); + else +@@ -5446,10 +5432,7 @@ scm_denominator (SCM z) + else if (SCM_BIGP (z)) + return SCM_I_MAKINUM (1); + else if (SCM_FRACTIONP (z)) +- { +- scm_i_fraction_reduce (z); +- return SCM_FRACTION_DENOMINATOR (z); +- } ++ return SCM_FRACTION_DENOMINATOR (z); + else if (SCM_REALP (z)) + return scm_exact_to_inexact (scm_denominator (scm_inexact_to_exact (z))); + else +Index: libguile/numbers.h +=================================================================== +RCS file: /cvsroot/guile/guile/guile-core/libguile/numbers.h,v +retrieving revision 1.103 +diff -p -u -u -r1.103 numbers.h +--- libguile/numbers.h 9 Oct 2006 23:17:57 -0000 1.103 ++++ libguile/numbers.h 23 Dec 2006 20:31:21 -0000 +@@ -157,14 +157,6 @@ + #define SCM_FRACTIONP(x) (!SCM_IMP (x) && SCM_TYP16 (x) == scm_tc16_fraction) + #define SCM_FRACTION_NUMERATOR(x) (SCM_CELL_OBJECT_1 (x)) + #define SCM_FRACTION_DENOMINATOR(x) (SCM_CELL_OBJECT_2 (x)) +-#define SCM_FRACTION_SET_NUMERATOR(x, v) (SCM_SET_CELL_OBJECT_1 ((x), (v))) +-#define SCM_FRACTION_SET_DENOMINATOR(x, v) (SCM_SET_CELL_OBJECT_2 ((x), (v))) +- +- /* I think the left half word is free in the type, so I'll use bit 17 */ +-#define SCM_FRACTION_REDUCED_BIT 0x10000 +-#define SCM_FRACTION_REDUCED_SET(x) (SCM_SET_CELL_TYPE((x), (SCM_CELL_TYPE (x) | SCM_FRACTION_REDUCED_BIT))) +-#define SCM_FRACTION_REDUCED_CLEAR(x) (SCM_SET_CELL_TYPE((x), (SCM_CELL_TYPE (x) & ~SCM_FRACTION_REDUCED_BIT))) +-#define SCM_FRACTION_REDUCED(x) (0x10000 & SCM_CELL_TYPE (x)) + + +