Mercurial > hg > octave-nkf

comparison libinterp/parse-tree/pt-arg-list.cc @ 20798:128414587af2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't print additional error message in argument list evaluation * pt-arg-list.cc (tree_argument_list::convert_to_const_vector): Don't call error for for failed argument evaluation.
author John W. Eaton <jwe@octave.org>
date Fri, 09 Oct 2015 16:52:49 -0400
parents 22618d5fb6ad
children
comparison
equal deleted inserted replaced
20797:22618d5fb6ad 20798:128414587af2
238 238
239 tree_expression *elt = *p++; 239 tree_expression *elt = *p++;
240 240
241 if (elt) 241 if (elt)
242 { 242 {
243 try 243 octave_value tmp = elt->rvalue1 ();
244 { 244
245 octave_value tmp = elt->rvalue1 (); 245 if (tmp.is_cs_list ())
246 246 args.push_back (tmp.list_value ());
247 if (tmp.is_cs_list ()) 247 else if (tmp.is_defined ())
248 args.push_back (tmp.list_value ()); 248 args.push_back (tmp);
249 else if (tmp.is_defined ())
250 args.push_back (tmp);
251 }
252 catch (const octave_execution_exception&)
253 {
254 args.clear ();
255
256 error ("evaluating argument list element number %d", k+1);
257 }
258 } 249 }
259 else 250 else
260 { 251 {
261 args.push_back (octave_value ()); 252 args.push_back (octave_value ());
262 break; 253 break;