Mercurial > hg > octave-nkf

comparison libinterp/parse-tree/pt-arg-list.cc @ 20797:22618d5fb6ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate remaining uses of error_state in parse-tree files * oct-parse.in.yy, pt-arg-list.cc, pt-colon.cc: Eliminate all uses of error_state.
author John W. Eaton <jwe@octave.org>
date Fri, 09 Oct 2015 15:17:08 -0400
parents 7ac907da9fba
children 128414587af2
comparison
equal deleted inserted replaced
20796:e5f36a7854a5 20797:22618d5fb6ad
238 238
239 tree_expression *elt = *p++; 239 tree_expression *elt = *p++;
240 240
241 if (elt) 241 if (elt)
242 { 242 {
243 octave_value tmp = elt->rvalue1 (); 243 try
244
245 if (error_state)
246 { 244 {
247 error ("evaluating argument list element number %d", k+1); 245 octave_value tmp = elt->rvalue1 ();
248 args.clear (); 246
249 break;
250 }
251 else
252 {
253 if (tmp.is_cs_list ()) 247 if (tmp.is_cs_list ())
254 args.push_back (tmp.list_value ()); 248 args.push_back (tmp.list_value ());
255 else if (tmp.is_defined ()) 249 else if (tmp.is_defined ())
256 args.push_back (tmp); 250 args.push_back (tmp);
257 } 251 }
252 catch (const octave_execution_exception&)
253 {
254 args.clear ();
255
256 error ("evaluating argument list element number %d", k+1);
257 }
258 } 258 }
259 else 259 else
260 { 260 {
261 args.push_back (octave_value ()); 261 args.push_back (octave_value ());
262 break; 262 break;