# HG changeset patch
# User jwe
# Date 847003707 0
# Node ID 4516c3b75851f14b58f300c660b9c3547b2e8db0
# Parent  5edc0b8b05439d6f0bf4dc193fdc1912fa3bee89
[project @ 1996-11-03 06:48:26 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+Sun Nov  3 00:45:30 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* pt-pr-code.cc (tree_print_code::visit_constant): Check for
+	string before checking for char_matrix.
+
+	* ov-ch-mat.cc (octave_char_matrix::print): Supply correct number
+	of args to octave_print_internal().
+
 Sat Nov  2 20:44:55 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* file-io.cc (Ftmpnam): Rename from Foctave_temp_file_name.
diff --git a/src/ov-ch-mat.cc b/src/ov-ch-mat.cc
--- a/src/ov-ch-mat.cc
+++ b/src/ov-ch-mat.cc
@@ -91,7 +91,7 @@
 void
 octave_char_matrix::print (ostream& os)
 {
-  octave_print_internal (os, matrix, false, struct_indent);
+  octave_print_internal (os, matrix, false, false, struct_indent);
 }
 
 /*
diff --git a/src/pt-pr-code.cc b/src/pt-pr-code.cc
--- a/src/pt-pr-code.cc
+++ b/src/pt-pr-code.cc
@@ -559,6 +559,9 @@
   ::error ("visit_oct_obj: internal error");
 }
 
+// XXX FIXME XXX -- this should just call val.print_internal () or
+// something.  Checking the types here is a big no-no.
+
 void
 tree_print_code::visit_constant (tree_constant& val)
 {
@@ -604,14 +607,14 @@
     {
       octave_print_internal (os, val.complex_matrix_value (), 1);
     }
+  else if (val.is_string ())
+    {
+      octave_print_internal (os, val.all_strings (), 1, 1);
+    }
   else if (val.is_char_matrix ())
     {
       octave_print_internal (os, val.char_matrix_value (), 1);
     }
-  else if (val.is_string ())
-    {
-      octave_print_internal (os, val.all_strings (), 1, 1);
-    }
   else if (val.is_range ())
     {
       octave_print_internal (os, val.range_value (), 1);