octave-nkf: src/pt-exp.cc comparison

[project @ 1997-02-08 23:47:34 by jwe]

comparison

equal deleted inserted replaced

-:9ccca1037db3
+:02f298ddf9f6
 tree_simple_assignment_expression::left_hand_side_id (void)
 {
 return lhs->ident ();
 }
-// ??? FIXME ??? -- should this return the value of the RHS instead?
 // ??? FIXME ??? -- should octave_variable_reference::assign return
 // the right thing for us to return?
 octave_value
 tree_simple_assignment_expression::eval (bool print)
 {
 assert (etype == tree_expression::assignment);
 octave_value retval;
+octave_value lhs_val;
 if (error_state)
 return retval;
 if (rhs)
 {
 octave_value rhs_val = rhs->eval (false);
 if (error_state)
 	{
 	  eval_error ();
 	}
 else if (rhs_val.is_undefined ())
 			  ult.assign (args, rhs_val);
 			  if (error_state)
 			    eval_error ();
 			  else
-			    retval = ult.value ();
+			    {
+			      lhs_val = ult.value ();
+			      retval = rhs_val;
+			    }
 			}
 		      else
 			error ("??? invalid index list ???");
 		    }
 		}
 	      else
 		{
 		  ult.assign (rhs_val);
-		  retval = ult.value ();
+		  lhs_val = ult.value ();
+		  retval = rhs_val;
 		}
 	    }
 	}
 }
-if (! error_state && print && retval.is_defined ())
+// Return value is RHS value, but the value we print is the complete
-retval.print_with_name (lhs->name ());
+// LHS value so that expressions like x(2) = 2 (for x previously
+// undefined) print b = [ 0; 2 ], which is more Matlab-like.
+if (! error_state && print && lhs_val.is_defined ())
+lhs_val.print_with_name (lhs->name ());
 return retval;
 }
 void

Mercurial > hg > octave-nkf