Mercurial > octave-nkf

diff 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
line wrap: on
line diff
--- a/libinterp/parse-tree/parse.h	Mon Aug 19 22:24:05 2013 -0700
+++ b/libinterp/parse-tree/parse.h	Tue Aug 20 06:42:54 2013 -0400
@@ -201,8 +201,9 @@
   // Build a try-catch command.
   tree_command *
   make_try_command (token *try_tok, tree_statement_list *body,
-                    tree_statement_list *cleanup, tree_identifier *id, token *end_tok,
-                    octave_comment_list *lc, octave_comment_list *mc);
+                    char catch_sep, tree_statement_list *cleanup,
+                    token *end_tok, octave_comment_list *lc,
+                    octave_comment_list *mc);
 
   // Build a while command.
   tree_command *