Mercurial > hg > octave-nkf

comparison src/pt-assign.cc @ 7389:4d0d6c357bc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2008-01-16 08:32:13 by jwe]
author jwe
date Wed, 16 Jan 2008 08:32:14 +0000
parents 745a8299c2b5
children 71f068b22fcc
comparison
equal deleted inserted replaced
7388:0e1ccfe1bf91 7389:4d0d6c357bc6
207 207
208 if (rhs_val.is_undefined ()) 208 if (rhs_val.is_undefined ())
209 { 209 {
210 error ("value on right hand side of assignment is undefined"); 210 error ("value on right hand side of assignment is undefined");
211 eval_error (); 211 eval_error ();
212 } 212 return retval;
213 else if (rhs_val.is_cs_list ())
214 {
215 error ("invalid assignment of comma-separated list");
216 eval_error ();
217 } 213 }
218 else 214 else
219 { 215 {
216 if (rhs_val.is_cs_list ())
217 {
218 octave_value_list lst = rhs_val.list_value ();
219
220 if (! lst.empty ())
221 rhs_val = lst(0);
222 else
223 {
224 error ("invalid number of elements on RHS of assignment");
225 eval_error ();
226 return retval;
227 }
228 }
229
220 octave_lvalue ult = lhs->lvalue (); 230 octave_lvalue ult = lhs->lvalue ();
221 231
222 if (error_state) 232 if (error_state)
223 eval_error (); 233 eval_error ();
224 else 234 else
383 { 393 {
384 octave_value tmp = rhs_val(0); 394 octave_value tmp = rhs_val(0);
385 395
386 if (tmp.is_cs_list ()) 396 if (tmp.is_cs_list ())
387 { 397 {
388 error ("invalid assignment of comma-separated list"); 398 rhs_val = tmp.list_value ();
389 eval_error (); 399 n = rhs_val.length ();
390 return retval;
391 } 400 }
392 } 401 }
393 402
394 retval.resize (n, octave_value ()); 403 retval.resize (n, octave_value ());
395 404