Mercurial > hg > octave-lyh

diff src/pt-colon.cc @ 8658:73c4516fae10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New evaluator and debugger derived from tree-walker class
author John W. Eaton <jwe@octave.org>
date Wed, 04 Feb 2009 00:47:53 -0500
parents d5e08881bba8
children 35cd375d4bb3
line wrap: on
line diff
--- a/src/pt-colon.cc
+++ b/src/pt-colon.cc
@@ -76,7 +76,7 @@
   if (nargout > 1)
     error ("invalid number of output arguments for colon expression");
   else
-    retval = rvalue ();
+    retval = rvalue1 (nargout);
 
   return retval;
 }
@@ -165,22 +165,20 @@
 }
 
 octave_value
-tree_colon_expression::rvalue (void)
+tree_colon_expression::rvalue1 (int)
 {
   octave_value retval;
 
-  MAYBE_DO_BREAKPOINT;
-  
   if (error_state || ! op_base || ! op_limit)
     return retval;
 
-  octave_value ov_base = op_base->rvalue ();
+  octave_value ov_base = op_base->rvalue1 ();
 
   if (error_state || ov_base.is_undefined ())
     eval_error ("invalid base value in colon expression");
   else
     {
-      octave_value ov_limit = op_limit->rvalue ();
+      octave_value ov_limit = op_limit->rvalue1 ();
 
       if (error_state || ov_limit.is_undefined ())
 	eval_error ("invalid limit value in colon expression");
@@ -190,7 +188,7 @@
 
 	  if (op_increment)
 	    {
-	      octave_value ov_increment = op_increment->rvalue ();
+	      octave_value ov_increment = op_increment->rvalue1 ();
 
 	      if (error_state || ov_increment.is_undefined ())
 		eval_error ("invalid increment value in colon expression");
@@ -228,7 +226,7 @@
 
 	  if (op_increment)
 	    {
-	      ov_increment = op_increment->rvalue ();
+	      ov_increment = op_increment->rvalue1 ();
 
 	      if (error_state || ov_increment.is_undefined ())
 		eval_error ("invalid increment value in colon expression");