Mercurial > hg > octave-nkf

comparison libinterp/parse-tree/parse.h @ 17283:e6c0ac8ce5b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate parse conflicts introduced by changeset 923ce8b42db2 * oct-parse.in.yy (opt_identifier): Delete. (TRY): Simplify grammar. (octave_base_parser::make_try_command): Pass separator token instead of exception identifier. Handle exception identifier here based on context instead of in grammar rules. * parse.h (octave_base_parser::make_try_command): Fix decl. * try.tst: New tests.
author John W. Eaton <jwe@octave.org>
date Tue, 20 Aug 2013 06:42:54 -0400
parents 923ce8b42db2
children c702371ff6df efbe746f8fa8
comparison
equal deleted inserted replaced
17282:a69dd4b0e571 17283:e6c0ac8ce5b6
199 octave_comment_list *lc, octave_comment_list *mc); 199 octave_comment_list *lc, octave_comment_list *mc);
200 200
201 // Build a try-catch command. 201 // Build a try-catch command.
202 tree_command * 202 tree_command *
203 make_try_command (token *try_tok, tree_statement_list *body, 203 make_try_command (token *try_tok, tree_statement_list *body,
204 tree_statement_list *cleanup, tree_identifier *id, token *end_tok, 204 char catch_sep, tree_statement_list *cleanup,
205 octave_comment_list *lc, octave_comment_list *mc); 205 token *end_tok, octave_comment_list *lc,
206 octave_comment_list *mc);
206 207
207 // Build a while command. 208 // Build a while command.
208 tree_command * 209 tree_command *
209 make_while_command (token *while_tok, tree_expression *expr, 210 make_while_command (token *while_tok, tree_expression *expr,
210 tree_statement_list *body, token *end_tok, 211 tree_statement_list *body, token *end_tok,