Mercurial > octave-nkf

changeset 5050:d54d44f2f29a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-10-19 07:58:34 by jwe]
author jwe
date Tue, 19 Oct 2004 07:58:34 +0000
parents b65ec179786f
children cab27aa905c4
files src/ChangeLog src/symtab.cc
diffstat 2 files changed, 21 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Oct 18 17:47:15 2004 +0000
+++ b/src/ChangeLog	Tue Oct 19 07:58:34 2004 +0000
@@ -1,3 +1,8 @@
+2004-10-18  John W. Eaton  <jwe@octave.org>
+
+	* symtab.cc (symbol_record::dimensions_string_req_first_space,
+	symbol_record::make_dimensions_string): Use dims() for all objects.
+
 2004-10-18  Oyvind Kristiansen  <oyvinkri@stud.ntnu.no>
 
 	* symtab.cc (symbol_table::parse_whos_line_format): Handle
--- a/src/symtab.cc	Mon Oct 18 17:47:15 2004 +0000
+++ b/src/symtab.cc	Tue Oct 19 07:58:34 2004 +0000
@@ -425,23 +425,14 @@
 int
 symbol_record::dimensions_string_req_first_space (int print_dims) const
 {
-  long dim = 0;
   int first_param_space = 0;
 
   // Calculating dimensions.
 
   std::string dim_str = "";
   std::stringstream ss;
-  dim_vector dimensions;
-
-  if (is_variable ())
-    {
-      if (is_matrix_type ())
-        {
-	  dimensions = dims ();
-	  dim = dimensions.length ();
-	}
-    }
+  dim_vector dimensions = dims ();
+  long dim = dimensions.length ();
 
   first_param_space = (first_param_space >= 1 ? first_param_space : 1);
 
@@ -479,6 +470,8 @@
 //
 //   mat is a 12x3 matrix
 //            ^^^^ => 4 columns
+//
+// XXX FIXME XXX -- why not just use the dim_vector::str () method?
 
 int
 symbol_record::dimensions_string_req_total_space (int print_dims) const
@@ -494,26 +487,18 @@
 
 // Make the dimensions-string.  For example: mat is a 2x3 matrix.
 //                                                    ^^^
+//
+// XXX FIXME XXX -- why not just use the dim_vector::str () method?
 
 std::string
 symbol_record::make_dimensions_string (int print_dims) const
 {
-  long dim = 0;
-
   // Calculating dimensions.
 
   std::string dim_str = "";
   std::stringstream ss;
-  dim_vector dimensions;
-
-  if (is_variable ())
-    {
-      if (is_matrix_type ())
-        {
-	  dimensions = dims ();
-	  dim = dimensions.length ();
-	}
-    }
+  dim_vector dimensions = dims ();
+  long dim = dimensions.length ();
 
   // Preparing dimension string.
 
@@ -1456,14 +1441,14 @@
 	      total = param.parameter_length;
 	     
 	      for (j = 0; j < len; j++)
-	      {
-		int first1 = symbols(j)->dimensions_string_req_first_space (param.dimensions);
-		int total1 = symbols(j)->dimensions_string_req_total_space (param.dimensions);
-		int rest1 = total1 - first1;
-		rest = (rest1 > rest ? rest1 : rest);
-		first = (first1 > first ? first1 : first);
-		total = (total1 > total ? total1 : total);
-	      }
+		{
+		  int first1 = symbols(j)->dimensions_string_req_first_space (param.dimensions);
+		  int total1 = symbols(j)->dimensions_string_req_total_space (param.dimensions);
+		  int rest1 = total1 - first1;
+		  rest = (rest1 > rest ? rest1 : rest);
+		  first = (first1 > first ? first1 : first);
+		  total = (total1 > total ? total1 : total);
+		}
 
 	      if (param.modifier == 'c')
 	        {