Mercurial > hg > octave-lyh
changeset 6351:9b525feab43b
[project @ 2007-02-23 19:54:18 by jwe]
author | jwe |
---|---|
date | Fri, 23 Feb 2007 19:54:19 +0000 |
parents | d285f4ee2b0c |
children | a73ee9462a48 |
files | scripts/ChangeLog scripts/deprecated/Makefile.in scripts/statistics/distributions/Makefile.in src/ChangeLog src/ov-fcn-handle.cc src/variables.cc |
diffstat | 6 files changed, 23 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,11 @@ +2007-02-23 John W. Eaton <jwe@octave.org> + + * statistics/distributions/Makefile.in (SOURCES): Remove + pascal_cdf.m pascal_inv.m pascal_pdf.m pascal_rnd.m from the list. + + * deprecated/Makefile.in (SOURCES): Add pascal_cdf.m, + pascal_inv.m, pascal_pdf.m, and pascal_rnd.m to the list. + 2007-02-23 David Bateman <dbateman@free.fr> * statistics/distributions/discrete_rnd.m, @@ -10,7 +18,7 @@ statistics/distributions/unidinv.m, statistics/distributions/unidpdf.m, statistics/distributions/unidrnd.m: New functions based on - discrete_cdf, etc. + discrete_cdf, etc. * statistics/distributions/pascal_cdf.m, statistics/distributions/pascal_inv.m,
--- a/scripts/deprecated/Makefile.in +++ b/scripts/deprecated/Makefile.in @@ -32,7 +32,8 @@ is_list.m is_matrix.m is_scalar.m is_square.m is_stream.m \ is_struct.m is_symmetric.m is_vector.m isstr.m lognormal_cdf.m \ lognormal_inv.m lognormal_pdf.m lognormal_rnd.m normal_cdf.m \ - normal_inv.m normal_pdf.m normal_rnd.m poisson_cdf.m \ + normal_inv.m normal_pdf.m normal_rnd.m pascal_cdf.m \ + pascal_inv.m pascal_pdf.m pascal_rnd.m ppoisson_cdf.m \ poisson_inv.m poisson_pdf.m poisson_rnd.m setstr.m \ struct_contains.m struct_elements.m t_cdf.m t_inv.m t_pdf.m \ t_rnd.m uniform_cdf.m uniform_inv.m uniform_pdf.m uniform_rnd.m \
--- a/scripts/statistics/distributions/Makefile.in +++ b/scripts/statistics/distributions/Makefile.in @@ -32,8 +32,7 @@ laplace_inv.m laplace_pdf.m laplace_rnd.m logistic_cdf.m \ logistic_inv.m logistic_pdf.m logistic_rnd.m logncdf.m \ logninv.m lognpdf.m lognrnd.m normcdf.m norminv.m normpdf.m \ - normrnd.m pascal_cdf.m pascal_inv.m pascal_pdf.m pascal_rnd.m \ - poisscdf.m poissinv.m poisspdf.m poissrnd.m stdnormal_cdf.m \ + normrnd.m poisscdf.m poissinv.m poisspdf.m poissrnd.m stdnormal_cdf.m \ stdnormal_inv.m stdnormal_pdf.m stdnormal_rnd.m tcdf.m tinv.m \ tpdf.m trnd.m unifcdf.m unifinv.m unifpdf.m unifrnd.m wblcdf.m \ wblinv.m wblpdf.m wblrnd.m wienrnd.m
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2007-02-23 John W. Eaton <jwe@octave.org> + * variables.cc (lookup_function): Don't dereference NULL + curr_parent_fucntion pointer. + * ov-fcn-handle.cc (make_fcn_handle): Call lookup_function with + parent set to empty string if call_stack is empty. + * DLD-FUNCTIONS/dispatch.cc (Fbuiltin): Also adjust argument list in calls to functions that are not overloaded. Call lookup_by_name to find function instead of searching fbi_symtab
--- a/src/ov-fcn-handle.cc +++ b/src/ov-fcn-handle.cc @@ -614,7 +614,7 @@ octave_function *fcn = octave_call_stack::current (); - octave_value f = lookup_function (nm, fcn->name ()); + octave_value f = lookup_function (nm, fcn ? fcn->name () : std::string ()); if (f.is_function ()) retval = octave_value (new octave_fcn_handle (f, nm));
--- a/src/variables.cc +++ b/src/variables.cc @@ -1149,12 +1149,13 @@ if (! parent.empty ()) sr = fbi_sym_tab->lookup (parent + ":" + nm); - if (! sr || ! sr->is_function () && curr_parent_function) - sr = fbi_sym_tab->lookup (curr_parent_function->name () + ":" + nm); - if (! sr || ! sr->is_function ()) { - sr = fbi_sym_tab->lookup (nm, true); + if (curr_parent_function) + sr = fbi_sym_tab->lookup (curr_parent_function->name () + ":" + nm); + + if (! sr || ! sr->is_function ()) + sr = fbi_sym_tab->lookup (nm, true); if (sr && ! sr->is_function ()) load_fcn_from_file (sr, false);