Mercurial > hg > octave-lyh

diff src/pt-unop.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 3100283874d7
children 35cd375d4bb3
line wrap: on
line diff
--- a/src/pt-unop.cc
+++ b/src/pt-unop.cc
@@ -52,18 +52,16 @@
     error ("prefix operator `%s': invalid number of output arguments",
 	   oper () . c_str ());
   else
-    retval = rvalue ();
+    retval = rvalue1 (nargout);
 
   return retval;
 }
 
 octave_value
-tree_prefix_expression::rvalue (void)
+tree_prefix_expression::rvalue1 (int)
 {
   octave_value retval;
 
-  MAYBE_DO_BREAKPOINT;
-
   if (error_state)
     return retval;
 
@@ -71,7 +69,7 @@
     {
       if (etype == octave_value::op_incr || etype == octave_value::op_decr)
 	{
-	  op->rvalue ();
+	  op->rvalue1 ();
 
 	  if (! error_state)
 	    {
@@ -87,7 +85,7 @@
 	}
       else
 	{
-	  octave_value val = op->rvalue ();
+	  octave_value val = op->rvalue1 ();
 
 	  if (! error_state && val.is_defined ())
 	    {
@@ -132,18 +130,16 @@
     error ("postfix operator `%s': invalid number of output arguments",
 	   oper () . c_str ());
   else
-    retval = rvalue ();
+    retval = rvalue1 (nargout);
 
   return retval;
 }
 
 octave_value
-tree_postfix_expression::rvalue (void)
+tree_postfix_expression::rvalue1 (int)
 {
   octave_value retval;
 
-  MAYBE_DO_BREAKPOINT;
-
   if (error_state)
     return retval;
 
@@ -151,7 +147,7 @@
     {
       if (etype == octave_value::op_incr || etype == octave_value::op_decr)
 	{
-	  op->rvalue ();
+	  op->rvalue1 ();
 
 	  if (! error_state)
 	    {
@@ -167,7 +163,7 @@
 	}
       else
 	{
-	  octave_value val = op->rvalue ();
+	  octave_value val = op->rvalue1 ();
 
 	  if (! error_state && val.is_defined ())
 	    {