Mercurial > octave-nkf
diff src/OPERATORS/op-str-s.cc @ 5533:667ad2becb63
[project @ 2005-11-10 21:40:48 by jwe]
| author | jwe |
|---|---|
| date | Thu, 10 Nov 2005 21:40:49 +0000 |
| parents | 4c8a2e4e0717 |
| children | 93c65f2a5668 |
line wrap: on
line diff
--- a/src/OPERATORS/op-str-s.cc Mon Nov 07 20:15:39 2005 +0000 +++ b/src/OPERATORS/op-str-s.cc Thu Nov 10 21:40:49 2005 +0000 @@ -47,29 +47,9 @@ return octave_value (); } -DEFCATOP (str_s, char_matrix_str, scalar) -{ - CAST_BINOP_ARGS (octave_char_matrix_str&, const octave_scalar&); - - if (Vwarn_num_to_str) - gripe_implicit_conversion (v2.type_name (), v1.type_name ()); - - return octave_value (v1.char_array_value (). concat (v2.array_value (), - ra_idx), - true, a1.is_sq_string () ? '\'' : '"'); -} +DEFNDCHARCATOP_FN (str_s, char_matrix_str, scalar, concat) -DEFCATOP (s_str, scalar, char_matrix_str) -{ - CAST_BINOP_ARGS (octave_scalar&, const octave_char_matrix_str&); - - if (Vwarn_num_to_str) - gripe_implicit_conversion (v1.type_name (), v2.type_name ()); - - return octave_value (v1.array_value (). concat (v2.char_array_value (), - ra_idx), - true, a2.is_sq_string () ? '\'' : '"'); -} +DEFNDCHARCATOP_FN (s_str, scalar, char_matrix_str, concat) void install_str_s_ops (void)