Mercurial > hg > octave-lyh
changeset 4271:be631c1720ea
[project @ 2003-01-03 19:36:04 by jwe]
author | jwe |
---|---|
date | Fri, 03 Jan 2003 19:36:04 +0000 |
parents | e7e10ce42860 |
children | fd406afe8a10 |
files | src/ChangeLog src/ov-base-mat.h src/ov-base-scalar.h src/ov-builtin.h src/ov-cell.h src/ov-list.h src/ov-mapper.h src/ov-range.h src/ov-struct.h src/ov-usr-fcn.h src/ov.cc src/ov.h src/pt-plot.cc |
diffstat | 13 files changed, 80 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2003-01-03 John W. Eaton <jwe@bevo.che.wisc.edu> + * pt-plot.cc (subplot::extract_plot_data): Call single_subsref, + not subsref. + * ov.h, ov.cc (single_subsref (const std::string&, const + octave_value_list&)): Rename from subsref. + * symtab.cc (symbol_table::rename): Explicitly convert C string to std::string so type of second arg of ?: matches third. (symbol_table::lookup): Likewise.
--- a/src/ov-base-mat.h +++ b/src/ov-base-mat.h @@ -69,6 +69,14 @@ octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx); + octave_value_list subsref (const std::string& type, + const std::list<octave_value_list>& idx, + int nargout) + { + panic_impossible (); + return octave_value_list (); + } + octave_value subsasgn (const std::string& type, const std::list<octave_value_list>& idx, const octave_value& rhs);
--- a/src/ov-base-scalar.h +++ b/src/ov-base-scalar.h @@ -62,6 +62,14 @@ octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx); + octave_value_list subsref (const std::string& type, + const std::list<octave_value_list>& idx, + int nargout) + { + panic_impossible (); + return octave_value_list (); + } + octave_value subsasgn (const std::string& type, const std::list<octave_value_list>& idx, const octave_value& rhs);
--- a/src/ov-builtin.h +++ b/src/ov-builtin.h @@ -50,6 +50,13 @@ ~octave_builtin (void) { } + octave_value subsref (const std::string& type, + const std::list<octave_value_list>& idx) + { + panic_impossible (); + return octave_value (); + } + octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout);
--- a/src/ov-cell.h +++ b/src/ov-cell.h @@ -76,6 +76,14 @@ octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx); + octave_value_list subsref (const std::string& type, + const std::list<octave_value_list>& idx, + int nargout) + { + panic_impossible (); + return octave_value_list (); + } + octave_value subsasgn (const std::string& type, const std::list<octave_value_list>& idx, const octave_value& rhs);
--- a/src/ov-list.h +++ b/src/ov-list.h @@ -67,6 +67,14 @@ octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx); + octave_value_list subsref (const std::string& type, + const std::list<octave_value_list>& idx, + int nargout) + { + panic_impossible (); + return octave_value_list (); + } + octave_value do_index_op (const octave_value_list& idx, int resize_ok); octave_value subsasgn (const std::string& type,
--- a/src/ov-mapper.h +++ b/src/ov-mapper.h @@ -66,6 +66,13 @@ octave_function *function_value (bool) { return this; } + octave_value subsref (const std::string& type, + const std::list<octave_value_list>& idx) + { + panic_impossible (); + return octave_value (); + } + octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout);
--- a/src/ov-range.h +++ b/src/ov-range.h @@ -88,6 +88,14 @@ octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx); + octave_value_list subsref (const std::string& type, + const std::list<octave_value_list>& idx, + int nargout) + { + panic_impossible (); + return octave_value_list (); + } + octave_value do_index_op (const octave_value_list& idx, int resize_ok); octave_value do_index_op (const octave_value_list& idx)
--- a/src/ov-struct.h +++ b/src/ov-struct.h @@ -72,6 +72,14 @@ octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx); + octave_value_list subsref (const std::string& type, + const std::list<octave_value_list>& idx, + int nargout) + { + panic_impossible (); + return octave_value_list (); + } + static octave_value numeric_conv (const octave_value_list& val, const std::string& type);
--- a/src/ov-usr-fcn.h +++ b/src/ov-usr-fcn.h @@ -143,6 +143,13 @@ } } + octave_value subsref (const std::string& type, + const std::list<octave_value_list>& idx) + { + panic_impossible (); + return octave_value (); + } + octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout);
--- a/src/ov.cc +++ b/src/ov.cc @@ -612,7 +612,8 @@ } octave_value -octave_value::subsref (const std::string& type, const octave_value_list& idx) +octave_value::single_subsref (const std::string& type, + const octave_value_list& idx) { std::list<octave_value_list> i;
--- a/src/ov.h +++ b/src/ov.h @@ -250,12 +250,13 @@ virtual octave_value *try_narrowing_conversion (void) { return rep->try_narrowing_conversion (); } + octave_value single_subsref (const std::string& type, + const octave_value_list& idx); + virtual octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx) { return rep->subsref (type, idx); } - octave_value subsref (const std::string& type, const octave_value_list& idx); - virtual octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout);