Mercurial > hg > octave-terminal
changeset 2260:8b60a00802b9
[project @ 1996-05-22 22:44:45 by jwe]
author | jwe |
---|---|
date | Wed, 22 May 1996 22:44:45 +0000 |
parents | 22893e3c7fbf |
children | 1b6e1629fb91 |
files | src/pt-const.cc |
diffstat | 1 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/pt-const.cc +++ b/src/pt-const.cc @@ -2049,7 +2049,7 @@ if (flag) { - retval = *char_matrix; + retval = octave_value (*char_matrix, true); retval.force_numeric (force_string_conv); } else @@ -2430,12 +2430,20 @@ } } - octave_value tmp_a = a.make_numeric (); + int force = (a.is_string () && b.is_string () + && (t == tree_expression::cmp_lt + || t == tree_expression::cmp_le + || t == tree_expression::cmp_eq + || t == tree_expression::cmp_ge + || t == tree_expression::cmp_gt + || t == tree_expression::cmp_ne)); + + octave_value tmp_a = a.make_numeric (force); if (error_state) return retval; - octave_value tmp_b = b.make_numeric (); + octave_value tmp_b = b.make_numeric (force); if (error_state) return retval;