Mercurial > octave

changeset 634:e04527366917

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1994-08-22 23:44:52 by jwe]
author jwe
date Mon, 22 Aug 1994 23:44:52 +0000
parents 39b315350976
children 5338832d2cf6
files src/data.cc
diffstat 1 files changed, 10 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/data.cc	Mon Aug 22 23:40:47 1994 +0000
+++ b/src/data.cc	Mon Aug 22 23:44:52 1994 +0000
@@ -280,21 +280,19 @@
 get_dimensions (const tree_constant& a, const char *warn_for,
 		int& nr, int& nc)
 {
-  tree_constant tmpa = a;
-
-  if (tmpa.is_scalar_type ())
+  if (a.is_scalar_type ())
     {
-      double tmp = tmpa.double_value ();
+      double tmp = a.double_value ();
       nr = nc = NINT (tmp);
     }
   else
     {
-      nr = tmpa.rows ();
-      nc = tmpa.columns ();
+      nr = a.rows ();
+      nc = a.columns ();
 
       if ((nr == 1 && nc == 2) || (nr == 2 && nc == 1))
 	{
-	  ColumnVector v = tmpa.vector_value ();
+	  ColumnVector v = a.vector_value ();
 
 	  if (error_state)
 	    return;
@@ -313,18 +311,13 @@
 get_dimensions (const tree_constant& a, const tree_constant& b,
 		const char *warn_for, int& nr, int& nc)
 {
-  tree_constant tmpa = a;
-  tree_constant tmpb = b;
+  nr = NINT (a.double_value ());
+  nc = NINT (b.double_value ());
 
-  if (tmpa.is_scalar_type () && tmpb.is_scalar_type ())
-    {
-      nr = NINT (tmpa.double_value ());
-      nc = NINT (tmpb.double_value ());
-
-      check_dimensions (nr, nc, warn_for); // May set error_state.
-    }
+  if (error_state)
+    error ("%s: expecting two scalar arguments", warn_for);
   else
-    error ("%s: expecting two scalar arguments", warn_for);
+    check_dimensions (nr, nc, warn_for); // May set error_state.
 }
 
 static tree_constant