Mercurial > hg > octave-nkf

diff libinterp/parse-tree/oct-parse.yy @ 16136:ed36d5543b27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't declare octave_parser member functions static * parse.h (class octave_parser): Don't declare new member functions as static. * oct-parse.yy (octave_parser::make_unwind_command, octave_parser::make_try_command): Rename cleanup arg to cleanup_stmts.
author John W. Eaton <jwe@octave.org>
date Wed, 27 Feb 2013 11:14:44 -0500
parents ec9c6222ef5a
children 284e2ca86ef7
line wrap: on
line diff
--- a/libinterp/parse-tree/oct-parse.yy
+++ b/libinterp/parse-tree/oct-parse.yy
@@ -2187,7 +2187,7 @@
 tree_command *
 octave_parser::make_unwind_command (token *unwind_tok,
                                     tree_statement_list *body,
-                                    tree_statement_list *cleanup,
+                                    tree_statement_list *cleanup_stmts,
                                     token *end_tok,
                                     octave_comment_list *lc,
                                     octave_comment_list *mc)
@@ -2201,7 +2201,7 @@
       int l = unwind_tok->line ();
       int c = unwind_tok->column ();
 
-      retval = new tree_unwind_protect_command (body, cleanup,
+      retval = new tree_unwind_protect_command (body, cleanup_stmts,
                                                 lc, mc, tc, l, c);
     }
 
@@ -2212,7 +2212,8 @@
 
 tree_command *
 octave_parser::make_try_command (token *try_tok, tree_statement_list *body,
-                                 tree_statement_list *cleanup, token *end_tok,
+                                 tree_statement_list *cleanup_stmts,
+                                 token *end_tok,
                                  octave_comment_list *lc,
                                  octave_comment_list *mc)
 {
@@ -2225,7 +2226,7 @@
       int l = try_tok->line ();
       int c = try_tok->column ();
 
-      retval = new tree_try_catch_command (body, cleanup,
+      retval = new tree_try_catch_command (body, cleanup_stmts,
                                            lc, mc, tc, l, c);
     }