# HG changeset patch # User jwe # Date 832805085 0 # Node ID 8b60a00802b9b3a25440e02a9d7d611f13932cac # Parent 22893e3c7fbf9550a3379d3a085f74b90b279c5b [project @ 1996-05-22 22:44:45 by jwe] diff --git a/src/pt-const.cc b/src/pt-const.cc --- 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;