Mercurial > octave-nkf

changeset 9716:d33a318c1de4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
partially revert 1be3c73ed7b5
author Jaroslav Hajek <highegg@gmail.com>
date Mon, 12 Oct 2009 14:31:18 +0200
parents 9f27172fbd1e
children 4fd71e875120
files src/ChangeLog src/pt-binop.cc src/pt-unop.cc
diffstat 3 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Oct 12 14:23:20 2009 +0200
+++ b/src/ChangeLog	Mon Oct 12 14:31:18 2009 +0200
@@ -1,3 +1,7 @@
+2009-10-12  Jaroslav Hajek  <highegg@gmail.com>
+
+	* pt-binop.cc, pt-unop.cc: Revert the effect of 1be3c73ed7b5.
+
 2009-10-12  Jaroslav Hajek  <highegg@gmail.com>
 
 	* DLD-FUNCTIONS/lu.cc (maybe_set_triangular): Remove.
--- a/src/pt-binop.cc	Mon Oct 12 14:23:20 2009 +0200
+++ b/src/pt-binop.cc	Mon Oct 12 14:31:18 2009 +0200
@@ -66,12 +66,7 @@
 
 	  if (! error_state && b.is_defined ())
 	    {
-              octave_value::assign_op aop = octave_value::binary_op_to_assign_op (etype);
-
-              if (aop == octave_value::unknown_assign_op)
-                retval = ::do_binary_op (etype, a, b);
-              else
-                retval = a.assign (aop, b);
+	      retval = ::do_binary_op (etype, a, b);
 
 	      if (error_state)
 		retval = octave_value ();
--- a/src/pt-unop.cc	Mon Oct 12 14:23:20 2009 +0200
+++ b/src/pt-unop.cc	Mon Oct 12 14:31:18 2009 +0200
@@ -89,7 +89,7 @@
 
 	  if (! error_state && val.is_defined ())
 	    {
-	      retval = val.do_non_const_unary_op (etype);
+	      retval = ::do_unary_op (etype, val);
 
 	      if (error_state)
 		retval = octave_value ();