Mercurial > octave-nkf
changeset 10293:ba373aea03d9
remove islist
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Wed, 10 Feb 2010 07:57:43 +0100 |
| parents | c1246f17119e |
| children | 816b91eebe79 |
| files | scripts/ChangeLog scripts/general/private/__isequal__.m src/ChangeLog src/data.cc src/oct-stream.cc src/ov-base.h src/ov.h |
| diffstat | 7 files changed, 14 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Wed Feb 10 07:33:20 2010 +0100 +++ b/scripts/ChangeLog Wed Feb 10 07:57:43 2010 +0100 @@ -1,3 +1,7 @@ +2010-02-10 Jaroslav Hajek <highegg@gmail.com> + + * general/private/__isequal__.m: Remove list-related stub. + 2010-02-09 John W. Eaton <jwe@octave.org> * image/imshow.m: Allow logical values for images.
--- a/scripts/general/private/__isequal__.m Wed Feb 10 07:33:20 2010 +0100 +++ b/scripts/general/private/__isequal__.m Wed Feb 10 07:57:43 2010 +0100 @@ -56,12 +56,6 @@ ## Generic tests. - ## Give an error for a list (that will make the code simpler and lists - ## are deprecated anyway. - if (islist (x)) - error ("__isequal__: list objects are deprecated and cannot be tested for equality here; use cell arrays instead"); - endif - ## All arguments must either be of the same class or they must be ## numeric values. t = (all (strcmp (class(x),
--- a/src/ChangeLog Wed Feb 10 07:33:20 2010 +0100 +++ b/src/ChangeLog Wed Feb 10 07:57:43 2010 +0100 @@ -1,3 +1,11 @@ +2010-02-10 Jaroslav Hajek <highegg@gmail.com> + + * ov-base.h (octave_base_value::is_list): Remove. + * ov.h (octave_value::is_list): Remove. + * data.cc (Fislist): Remove. + * oct-stream.cc (printf_value_cache::printf_value_cache): Don't call + is_list. + 2010-02-10 Jaroslav Hajek <highegg@gmail.com> * ov-str-mat.h (octave_char_matrix_str::is_real_type): Delete
--- a/src/data.cc Wed Feb 10 07:33:20 2010 +0100 +++ b/src/data.cc Wed Feb 10 07:57:43 2010 +0100 @@ -3327,22 +3327,6 @@ return retval; } -DEFUN (islist, args, , - "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} islist (@var{x})\n\ -Return nonzero if @var{x} is a list.\n\ -@end deftypefn") -{ - octave_value retval; - - if (args.length () == 1) - retval = args(0).is_list (); - else - print_usage (); - - return retval; -} - DEFUN (ismatrix, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} ismatrix (@var{a})\n\
--- a/src/oct-stream.cc Wed Feb 10 07:33:20 2010 +0100 +++ b/src/oct-stream.cc Wed Feb 10 07:57:43 2010 +0100 @@ -2387,8 +2387,7 @@ { octave_value val = values(i); - if (val.is_map () || val.is_cell () || val.is_object () - || val.is_list ()) + if (val.is_map () || val.is_cell () || val.is_object ()) { gripe_wrong_type_arg (who, val); break;
--- a/src/ov-base.h Wed Feb 10 07:33:20 2010 +0100 +++ b/src/ov-base.h Wed Feb 10 07:57:43 2010 +0100 @@ -352,8 +352,6 @@ virtual bool is_cs_list (void) const { return false; } - virtual bool is_list (void) const { return false; } - virtual bool is_magic_colon (void) const { return false; } virtual bool is_all_va_args (void) const { return false; }
--- a/src/ov.h Wed Feb 10 07:33:20 2010 +0100 +++ b/src/ov.h Wed Feb 10 07:57:43 2010 +0100 @@ -276,7 +276,7 @@ octave_value (const Range& r); octave_value (const Octave_map& m); octave_value (const Octave_map& m, const std::string& id); - octave_value (const octave_value_list& m, bool is_cs_list = false); + octave_value (const octave_value_list& m, bool = false); octave_value (octave_value::magic_colon); octave_value (octave_base_value *new_rep, bool borrow = false); @@ -537,9 +537,6 @@ bool is_cs_list (void) const { return rep->is_cs_list (); } - bool is_list (void) const - { return rep->is_list (); } - bool is_magic_colon (void) const { return rep->is_magic_colon (); }