Mercurial > hg > octave-max
changeset 2463:4516c3b75851
[project @ 1996-11-03 06:48:26 by jwe]
| author | jwe |
|---|---|
| date | Sun, 03 Nov 1996 06:48:27 +0000 |
| parents | 5edc0b8b0543 |
| children | 76078d0868e9 |
| files | src/ChangeLog src/ov-ch-mat.cc src/pt-pr-code.cc |
| diffstat | 3 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +Sun Nov 3 00:45:30 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + + * pt-pr-code.cc (tree_print_code::visit_constant): Check for + string before checking for char_matrix. + + * ov-ch-mat.cc (octave_char_matrix::print): Supply correct number + of args to octave_print_internal(). + Sat Nov 2 20:44:55 1996 John W. Eaton <jwe@bevo.che.wisc.edu> * file-io.cc (Ftmpnam): Rename from Foctave_temp_file_name.
--- a/src/ov-ch-mat.cc +++ b/src/ov-ch-mat.cc @@ -91,7 +91,7 @@ void octave_char_matrix::print (ostream& os) { - octave_print_internal (os, matrix, false, struct_indent); + octave_print_internal (os, matrix, false, false, struct_indent); } /*
--- a/src/pt-pr-code.cc +++ b/src/pt-pr-code.cc @@ -559,6 +559,9 @@ ::error ("visit_oct_obj: internal error"); } +// XXX FIXME XXX -- this should just call val.print_internal () or +// something. Checking the types here is a big no-no. + void tree_print_code::visit_constant (tree_constant& val) { @@ -604,14 +607,14 @@ { octave_print_internal (os, val.complex_matrix_value (), 1); } + else if (val.is_string ()) + { + octave_print_internal (os, val.all_strings (), 1, 1); + } else if (val.is_char_matrix ()) { octave_print_internal (os, val.char_matrix_value (), 1); } - else if (val.is_string ()) - { - octave_print_internal (os, val.all_strings (), 1, 1); - } else if (val.is_range ()) { octave_print_internal (os, val.range_value (), 1);