# HG changeset patch # User John W. Eaton # Date 1216677329 14400 # Node ID 22a18f2061212e8b99f376900bcfcb03a4d8f652 # Parent a73b80cd1f10556e1e4641e5174aaf4ad60cfcb4 octave_class::subsasgn: only do internal magic if RHS is not an octave_class object diff -r a73b80cd1f10 -r 22a18f206121 src/ChangeLog --- a/src/ChangeLog Mon Jul 21 16:06:57 2008 -0400 +++ b/src/ChangeLog Mon Jul 21 17:55:29 2008 -0400 @@ -1,5 +1,8 @@ 2008-07-21 John W. Eaton + * ov-class.cc (octave_class::subsasgn): Only do internal magic if + rhs is not an octave_class object. + * OPERATORS/op-struct.cc: Define concatenation operators for struct/matrix concatenation (valid if matrix is empty). * OPERATORS/op-cell.cc (install_cell_ops): Likewise, for cells. diff -r a73b80cd1f10 -r 22a18f206121 src/ov-class.cc --- a/src/ov-class.cc Mon Jul 21 16:06:57 2008 -0400 +++ b/src/ov-class.cc Mon Jul 21 17:55:29 2008 -0400 @@ -319,7 +319,7 @@ { octave_value retval; - if (in_class_method ()) + if (in_class_method () && ! rhs.is_object ()) { // FIXME -- this block of code is the same as the body of // octave_struct::subsasgn. Maybe it could be shared instead of