Mercurial > octave-nkf
diff libinterp/parse-tree/pt-mat.cc @ 19435:9035a36736af
maint: Periodic merge of gui-release to default.
author | Rik <rik@octave.org> |
---|---|
date | Mon, 15 Dec 2014 21:01:45 -0800 |
parents | 68116bea38ba 2304ddfd736f |
children | 4197fc428c7d |
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-mat.cc Sat Dec 13 18:41:03 2014 -0800 +++ b/libinterp/parse-tree/pt-mat.cc Mon Dec 15 21:01:45 2014 -0800 @@ -32,6 +32,7 @@ #include "data.h" #include "defun.h" #include "error.h" +#include "gripes.h" #include "oct-obj.h" #include "pt-arg-list.h" #include "pt-bp.h" @@ -936,6 +937,7 @@ { octave_value retval = Matrix (); + bool all_strings_p = false; bool all_sq_strings_p = false; bool all_dq_strings_p = false; bool all_empty_p = false; @@ -949,6 +951,7 @@ if (tmp && ! tmp.empty ()) { dim_vector dv = tmp.dims (); + all_strings_p = tmp.all_strings_p (); all_sq_strings_p = tmp.all_sq_strings_p (); all_dq_strings_p = tmp.all_dq_strings_p (); all_empty_p = tmp.all_empty_p (); @@ -993,7 +996,11 @@ { char type = all_dq_strings_p ? '"' : '\''; - maybe_warn_string_concat (all_dq_strings_p, all_sq_strings_p); + if (! all_strings_p) + gripe_implicit_conversion ("Octave:num-to-str", + "numeric", result_type); + else + maybe_warn_string_concat (all_dq_strings_p, all_sq_strings_p); charNDArray result (dv, Vstring_fill_char);