Mercurial > hg > octave-nkf

diff src/pt-mat.cc @ 9389:0f85d9564057

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix result class calculation in pt-mat.cc
author Jaroslav Hajek <highegg@gmail.com>
date Wed, 24 Jun 2009 18:51:33 +0200
parents 53364bb317d4
children 1fddcf651559
line wrap: on
line diff
--- a/src/pt-mat.cc
+++ b/src/pt-mat.cc
@@ -68,14 +68,14 @@
 	all_sq_str (false), all_dq_str (false),
 	some_str (false), all_real (false), all_cmplx (false),
 	all_mt (true), any_sparse (false), any_class (false),
-	class_nm (octave_base_value::static_class_name ()), ok (false)
+	class_nm (), ok (false)
     { }
 
     tm_row_const_rep (const tree_argument_list& row)
       : count (1), dv (0, 0), all_str (false), all_sq_str (false),
 	some_str (false), all_real (false), all_cmplx (false),
 	all_mt (true), any_sparse (false), any_class (false),
-	class_nm (octave_base_value::static_class_name ()), ok (false)
+	class_nm (), ok (false)
     { init (row); }
 
     ~tm_row_const_rep (void) { }
@@ -195,8 +195,10 @@
 
   if (c1 == c2)
     retval = c1;
-  else if (c1 == retval)
+  else if (c1.empty ())
     retval = c2;
+  else if (c2.empty ())
+    retval = c1;
   else
     {
       bool c1_is_int = (c1 == "int8" || c1 == "uint8"
@@ -448,7 +450,7 @@
     : dv (0, 0), all_str (false), all_sq_str (false), all_dq_str (false),
       some_str (false), all_real (false), all_cmplx (false),
       all_mt (true), any_sparse (false), any_class (false),
-      class_nm (octave_base_value::static_class_name ()), ok (false)
+      class_nm (), ok (false)
   { init (tm); }
 
   ~tm_const (void) { }