comparison src/OPERATORS/op-str-m.cc @ 5073:e71be9c548f2

[project @ 2004-11-09 18:31:25 by jwe]
author jwe
date Tue, 09 Nov 2004 18:31:26 +0000
parents c638c144d4da
children 57077d0ddc8e
comparison
equal deleted inserted replaced
5072:97b62f0c1bee 5073:e71be9c548f2
48 return octave_value (); 48 return octave_value ();
49 } 49 }
50 50
51 DEFCATOP (str_m, char_matrix_str, matrix) 51 DEFCATOP (str_m, char_matrix_str, matrix)
52 { 52 {
53 CAST_BINOP_ARGS (const octave_char_matrix_str&, 53 CAST_BINOP_ARGS (octave_char_matrix_str&, const octave_matrix&);
54 const octave_matrix&);
55 54
56 if (Vwarn_num_to_str) 55 if (Vwarn_num_to_str)
57 gripe_implicit_conversion (v2.type_name (), v1.type_name ()); 56 gripe_implicit_conversion (v2.type_name (), v1.type_name ());
58 57
59 return octave_value (concat (v1.char_array_value (), v2.array_value (), 58 return octave_value (v1.char_array_value (). concat (v2.array_value (),
60 ra_idx), true); 59 ra_idx), true);
61 } 60 }
62 61
63 DEFCATOP (m_str, matrix, char_matrix_str) 62 DEFCATOP (m_str, matrix, char_matrix_str)
64 { 63 {
65 CAST_BINOP_ARGS (const octave_matrix&, 64 CAST_BINOP_ARGS (octave_matrix&, const octave_char_matrix_str&);
66 const octave_char_matrix_str&);
67 65
68 if (Vwarn_num_to_str) 66 if (Vwarn_num_to_str)
69 gripe_implicit_conversion (v1.type_name (), v2.type_name ()); 67 gripe_implicit_conversion (v1.type_name (), v2.type_name ());
70 68
71 return octave_value (concat (v1.array_value (), v2.char_array_value (), 69 return octave_value (v1.array_value (). concat (v2.char_array_value (),
72 ra_idx), true); 70 ra_idx), true);
73 } 71 }
74 72
75 void 73 void
76 install_str_m_ops (void) 74 install_str_m_ops (void)