Mercurial > octave-nkf
changeset 5265:86185152b7a4
[project @ 2005-04-05 13:28:49 by jwe]
| author | jwe |
|---|---|
| date | Tue, 05 Apr 2005 13:28:49 +0000 |
| parents | 95e054384359 |
| children | 3fe873712e07 |
| files | liboctave/Array.cc liboctave/ChangeLog src/ChangeLog src/pt-assign.cc |
| diffstat | 4 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array.cc Fri Apr 01 18:22:37 2005 +0000 +++ b/liboctave/Array.cc Tue Apr 05 13:28:49 2005 +0000 @@ -3124,7 +3124,7 @@ if (! final_lhs_dims.any_zero ()) { - int n = Array<LT>::get_size (frozen_len); + n = Array<LT>::get_size (frozen_len); Array<int> result_idx (lhs_dims_len, 0);
--- a/liboctave/ChangeLog Fri Apr 01 18:22:37 2005 +0000 +++ b/liboctave/ChangeLog Tue Apr 05 13:28:49 2005 +0000 @@ -1,3 +1,7 @@ +2005-04-05 John W. Eaton <jwe@octave.org> + + * Array.cc (assignN): Avoid shadowed declaration in previous change. + 2005-04-01 John W. Eaton <jwe@octave.org> * Array.cc (assignN): For A(IDX-LIST) = RHS with A previously
--- a/src/ChangeLog Fri Apr 01 18:22:37 2005 +0000 +++ b/src/ChangeLog Tue Apr 05 13:28:49 2005 +0000 @@ -1,3 +1,8 @@ +2005-04-05 John W. Eaton <jwe@octave.org> + + * pt-assign.cc (tree_multi_assignment::rvalue): + Allow assignments of the form [a,b,c] = x{:}. + 2005-03-30 John W. Eaton <jwe@octave.org> * mappers.cc (install_mapper_functions): Use std:: as needed.
--- a/src/pt-assign.cc Fri Apr 01 18:22:37 2005 +0000 +++ b/src/pt-assign.cc Tue Apr 05 13:28:49 2005 +0000 @@ -224,6 +224,18 @@ int n = rhs_val.length (); + if (n == 1) + { + octave_value tmp = rhs_val(0); + + if (tmp.is_cs_list ()) + { + rhs_val = tmp.list_value (); + + n = rhs_val.length (); + } + } + retval.resize (n, octave_value ()); for (tree_argument_list::iterator p = lhs->begin ();