# HG changeset patch
# User jwe
# Date 1061834192 0
# Node ID 1ccf6f8198f89e8a384dcc3ab06e71ebd66a7758
# Parent  f36a75f8decad086420176ea48602aab892b47ee
[project @ 2003-08-25 17:56:32 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* OPERATORS/op-str-s.cc, OPERATORS/op-str-m.cc: New files.
+	* Makefile.in (OP_XSRC): Add them to the list.
+
 2003-08-22  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* defaults.cc (maybe_add_or_del_packages): Use source_file instead
diff --git a/src/Makefile.in b/src/Makefile.in
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -100,7 +100,7 @@
 	op-fil-cs.cc op-fil-m.cc op-fil-s.cc op-fil-lis.cc \
 	op-fil-rec.cc op-fil-str.cc op-list.cc op-m-cm.cc op-m-cs.cc \
 	op-m-m.cc op-m-s.cc op-range.cc op-s-cm.cc op-s-cs.cc op-s-m.cc \
-	op-s-s.cc op-str-str.cc
+	op-s-s.cc op-str-m.cc op-str-s.cc op-str-str.cc
 
 OP_SRC := $(addprefix OPERATORS/, $(OP_XSRC))
 
diff --git a/src/OPERATORS/op-str-m.cc b/src/OPERATORS/op-str-m.cc
new file mode 100644
--- /dev/null
+++ b/src/OPERATORS/op-str-m.cc
@@ -0,0 +1,61 @@
+/*
+
+Copyright (C) 2003 John W. Eaton
+
+This file is part of Octave.
+
+Octave is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+Octave is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION)
+#pragma implementation
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gripes.h"
+#include "oct-obj.h"
+#include "ov.h"
+#include "ov-re-mat.h"
+#include "ov-str-mat.h"
+#include "ov-typeinfo.h"
+#include "ops.h"
+
+DEFASSIGNOP (assign, char_matrix_str, octave_matrix)
+{
+  CAST_BINOP_ARGS (octave_char_matrix_str&, const octave_matrix&);
+
+  octave_value tmp = v2.convert_to_str_internal (false, false);
+
+  if (! error_state)
+    v1.assign (idx, tmp.char_matrix_value ());
+
+  return octave_value ();
+}
+
+void
+install_str_m_ops (void)
+{
+  INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_matrix, assign);
+}
+
+/*
+;;; Local Variables: ***
+;;; mode: C++ ***
+;;; End: ***
+*/
diff --git a/src/OPERATORS/op-str-s.cc b/src/OPERATORS/op-str-s.cc
new file mode 100644
--- /dev/null
+++ b/src/OPERATORS/op-str-s.cc
@@ -0,0 +1,61 @@
+/*
+
+Copyright (C) 2003 John W. Eaton
+
+This file is part of Octave.
+
+Octave is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+Octave is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+#if defined (__GNUG__) && defined (USE_PRAGMA_INTERFACE_IMPLEMENTATION)
+#pragma implementation
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "gripes.h"
+#include "oct-obj.h"
+#include "ov.h"
+#include "ov-scalar.h"
+#include "ov-str-mat.h"
+#include "ov-typeinfo.h"
+#include "ops.h"
+
+DEFASSIGNOP (assign, char_matrix_str, octave_scalar)
+{
+  CAST_BINOP_ARGS (octave_char_matrix_str&, const octave_scalar&);
+
+  octave_value tmp = v2.convert_to_str_internal (false, false);
+
+  if (! error_state)
+    v1.assign (idx, tmp.char_matrix_value ());
+
+  return octave_value ();
+}
+
+void
+install_str_s_ops (void)
+{
+  INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_scalar, assign);
+}
+
+/*
+;;; Local Variables: ***
+;;; mode: C++ ***
+;;; End: ***
+*/