Mercurial > octave

diff src/OPERATORS/op-str-s.cc @ 4915:c638c144d4da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-07-23 19:01:22 by jwe]
author jwe
date Fri, 23 Jul 2004 19:01:23 +0000
parents 1ccf6f8198f8
children e71be9c548f2
line wrap: on
line diff
--- a/src/OPERATORS/op-str-s.cc	Fri Jul 23 16:55:13 2004 +0000
+++ b/src/OPERATORS/op-str-s.cc	Fri Jul 23 19:01:23 2004 +0000
@@ -48,10 +48,37 @@
   return octave_value ();
 }
 
+DEFCATOP (str_s, char_matrix_str, scalar)
+{
+  CAST_BINOP_ARGS (const octave_char_matrix_str&,
+		   const octave_scalar&);
+
+  if (Vwarn_num_to_str)
+    gripe_implicit_conversion (v2.type_name (), v1.type_name ());
+
+  return octave_value (concat (v1.char_array_value (), v2.array_value (), 
+			       ra_idx), true);
+}
+
+DEFCATOP (s_str, scalar, char_matrix_str)
+{
+  CAST_BINOP_ARGS (const octave_scalar&,
+		   const octave_char_matrix_str&);
+
+  if (Vwarn_num_to_str)
+    gripe_implicit_conversion (v1.type_name (), v2.type_name ());
+
+  return octave_value (concat (v1.array_value (), v2.char_array_value (), 
+			       ra_idx), true);
+}
+
 void
 install_str_s_ops (void)
 {
   INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_scalar, assign);
+
+  INSTALL_CATOP (octave_char_matrix_str, octave_scalar, str_s);
+  INSTALL_CATOP (octave_scalar, octave_char_matrix_str, s_str);
 }
 
 /*