Mercurial > octave-nkf
changeset 6061:c968f4198067
[project @ 2006-10-18 20:57:04 by jwe]
| author | jwe |
|---|---|
| date | Wed, 18 Oct 2006 20:57:05 +0000 |
| parents | ced23ae2b5cc |
| children | a813714cb04b |
| files | ChangeLog aclocal.m4 configure.in liboctave/ChangeLog liboctave/lo-cieee.c src/ChangeLog src/pt-fcn-handle.cc |
| diffstat | 7 files changed, 52 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 18 02:56:54 2006 +0000 +++ b/ChangeLog Wed Oct 18 20:57:05 2006 +0000 @@ -1,7 +1,13 @@ +2006-10-17 John W. Eaton <jwe@octave.org> + + * configure.in: Check for _isnan, _finite, and _copysign. + 2006-10-17 Michael Goffioul <michael.goffioul@swing.be> - * (OCTAVE_CXX_PREPENDS_UNDERSCORE, OCTAVE_CXX_ABI): Use $ac_objext - instead of assuming .o. + * aclocal.m4 (OCTAVE_CXX_PREPENDS_UNDERSCORE, OCTAVE_CXX_ABI): Use + $ac_objext instead of assuming .o. + (OCTAVE_PROG_GNUPLOT): Handle *-*-msdos the same as *-*-cygwin* + and *-*-mingw32*. 2006-10-17 John W. Eaton <jwe@octave.org>
--- a/aclocal.m4 Wed Oct 18 02:56:54 2006 +0000 +++ b/aclocal.m4 Wed Oct 18 20:57:05 2006 +0000 @@ -478,7 +478,7 @@ dnl AC_DEFUN(OCTAVE_PROG_GNUPLOT, [ case "$canonical_host_type" in - *-*-cygwin*|*-*-mingw32*) + *-*-cygwin* | *-*-mingw32* | *-*-msdos) gp_names="pgnuplot pipe-gnuplot gnuplot" gp_default=pgnuplot ;;
--- a/configure.in Wed Oct 18 02:56:54 2006 +0000 +++ b/configure.in Wed Oct 18 20:57:05 2006 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.527 $) +AC_REVISION($Revision: 1.528 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -1452,6 +1452,7 @@ ;; *) AC_CHECK_FUNCS(finite isnan isinf copysign signbit) + AC_CHECK_FUNCS(_finite _isnan _copysign) AC_CHECK_DECLS(signbit, , , [#include <math.h>]) ;; esac
--- a/liboctave/ChangeLog Wed Oct 18 02:56:54 2006 +0000 +++ b/liboctave/ChangeLog Wed Oct 18 20:57:05 2006 +0000 @@ -1,5 +1,16 @@ +2006-10-17 John W. Eaton <jwe@octave.org> + + * lo-cieee.c: If isnan is not available but _isnan is, then define + isnan to be _isnan, and define HAVE_ISNAN. Likewise for _finite + and _copysign. + 2006-10-17 Michael Goffioul <michael.goffioul@swing.be> + * oct-syscalls.cc (syscalls::waitpid): Always declare and define retval. + + * liboctave/CMatrix.cc (ComplexMatrix::solve): Avoid infinite recursion. + * Index: liboctave/CSparse.cc (SparseComplexMatrix::insert): Likewise. + * oct-types.h.in: Include limits.h, for CHAR_BIT. 2006-10-13 Michael Goffioul <michael.goffioul@swing.be>
--- a/liboctave/lo-cieee.c Wed Oct 18 02:56:54 2006 +0000 +++ b/liboctave/lo-cieee.c Wed Oct 18 20:57:05 2006 +0000 @@ -48,6 +48,21 @@ #include "lo-ieee.h" +#if ! defined (HAVE_ISNAN) && defined (HAVE__ISNAN) +#define isnan _isnan +#define HAVE_ISNAN 1 +#endif + +#if ! defined (HAVE_FINITE) && defined (HAVE__FINITE) +#define finite _finite +#define HAVE_FINITE 1 +#endif + +#if ! defined (HAVE_COPYSIGN) && defined (HAVE__COPYSIGN) +#define copysign _copysign +#define HAVE_COPYSIGN 1 +#endif + #if defined (_AIX) && defined (__GNUG__) #undef finite #define finite(x) ((x) < DBL_MAX && (x) > -DBL_MAX) @@ -118,7 +133,7 @@ int lo_ieee_is_NA (double x) { -#if defined HAVE_ISNAN +#if defined (HAVE_ISNAN) lo_ieee_double t; t.value = x; return (isnan (x) && t.word[lo_ieee_lw] == LO_IEEE_NA_LW) ? 1 : 0;
--- a/src/ChangeLog Wed Oct 18 02:56:54 2006 +0000 +++ b/src/ChangeLog Wed Oct 18 20:57:05 2006 +0000 @@ -1,3 +1,8 @@ +2006-10-18 John W. Eaton <jwe@octave.org> + + * pt-fcn-handle.cc (tree_anon_fcn_handle::dup): + Correctly duplicate symbol table info. + 2006-10-17 Michael Goffioul <michael.goffioul@swing.be> * oct-map.h: Include <algorithm>.
--- a/src/pt-fcn-handle.cc Wed Oct 18 02:56:54 2006 +0000 +++ b/src/pt-fcn-handle.cc Wed Oct 18 20:57:05 2006 +0000 @@ -141,12 +141,16 @@ tree_expression * tree_anon_fcn_handle::dup (symbol_table *st) { + symbol_table *new_sym_tab = sym_tab ? sym_tab->dup () : 0; + + if (new_sym_tab) + new_sym_tab->inherit (st); + tree_anon_fcn_handle *new_afh - = new tree_anon_fcn_handle (param_list ? param_list->dup (st) : 0, - ret_list ? ret_list->dup (st) : 0, - cmd_list ? cmd_list->dup (st) : 0, - sym_tab ? sym_tab->dup () : 0, - line (), column ()); + = new tree_anon_fcn_handle (param_list ? param_list->dup (new_sym_tab) : 0, + ret_list ? ret_list->dup (new_sym_tab) : 0, + cmd_list ? cmd_list->dup (new_sym_tab) : 0, + new_sym_tab, line (), column ()); new_afh->copy_base (*this);