octave: libinterp/parse-tree/pt-decl.cc annotate

annotate libinterp/parse-tree/pt-decl.cc @ 23470:a41fdb801db6

use mark_global and mark_persistent consistently * ls-hdf5.cc, ls-hdf5.h, ls-mat5.cc, ls-mat5.h, ls-oct-binary.cc, ls-oct-binary.h, ls-oct-text.cc, ls-oct-text.h, oct-parse.in.yy, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-id.h: Consistently use mark_global and mark_persistent instead of mark_as_global, mark_as_persistent, mark_static, or mark_as_static.

author	John W. Eaton <jwe@octave.org>
date	Thu, 04 May 2017 15:10:29 -0400
parents	2699c5974844
children	7308cdea0c2b

rev	line source
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	1 /*
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	2
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 1996-2017 John W. Eaton
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	4
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	6
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	8 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	9 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	10 (at your option) any later version.
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 GNU General Public License for more details.
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	16
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6215 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6215 diff changeset	19 <http://www.gnu.org/licenses/>.
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	20
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	21 */
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	24 # include "config.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	25 #endif
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	26
3156 a494f93e60ff [project @ 1998-02-20 07:47:48 by jwe] jwe parents: 3107 diff changeset	27 #include "defun.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	28 #include "error.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	29 #include "pt-cmd.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	30 #include "ov.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	31 #include "oct-lvalue.h"
7205 f3d508351e49 [project @ 2007-11-27 21:36:46 by jwe] jwe parents: 7017 diff changeset	32 #include "pt-bp.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	33 #include "pt-decl.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	34 #include "pt-exp.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	35 #include "pt-id.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	36 #include "pt-walk.h"
3156 a494f93e60ff [project @ 1998-02-20 07:47:48 by jwe] jwe parents: 3107 diff changeset	37 #include "utils.h"
a494f93e60ff [project @ 1998-02-20 07:47:48 by jwe] jwe parents: 3107 diff changeset	38 #include "variables.h"
a494f93e60ff [project @ 1998-02-20 07:47:48 by jwe] jwe parents: 3107 diff changeset	39
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	40 namespace octave
6215 516d3071b34c [project @ 2006-12-15 03:24:12 by jwe] jwe parents: 5861 diff changeset	41 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	42 // Declarations (global, static, etc.).
6215 516d3071b34c [project @ 2006-12-15 03:24:12 by jwe] jwe parents: 5861 diff changeset	43
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	44 tree_decl_elt::~tree_decl_elt (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	45 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	46 delete id;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	47 delete expr;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	48 }
6215 516d3071b34c [project @ 2006-12-15 03:24:12 by jwe] jwe parents: 5861 diff changeset	49
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	50 tree_decl_elt *
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	51 tree_decl_elt::dup (symbol_table::scope_id scope,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	52 symbol_table::context_id context) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	53 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	54 return new tree_decl_elt (id ? id->dup (scope, context) : 0,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	55 expr ? expr->dup (scope, context) : 0);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	56 }
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	57
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	58 // Initializer lists for declaration statements.
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	59
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	60 tree_decl_init_list *
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	61 tree_decl_init_list::dup (symbol_table::scope_id scope,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	62 symbol_table::context_id context) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	63 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	64 tree_decl_init_list *new_dil = new tree_decl_init_list ();
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	65
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23435 diff changeset	66 for (const tree_decl_elt elt : this)
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7336 diff changeset	67 new_dil->append (elt ? elt->dup (scope, context) : 0);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	68
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	69 return new_dil;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	70 }
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	71
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	72 // Declaration commands (global, static).
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	73
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	74 tree_decl_command::tree_decl_command (const std::string& n,
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	75 tree_decl_init_list *t, int l, int c)
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	76 : tree_command (l, c), cmd_name (n), init_list (t)
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	77 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	78 if (t)
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	79 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	80 if (cmd_name == "global")
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	81 mark_global ();
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	82 else if (cmd_name == "persistent")
23470 a41fdb801db6 use mark_global and mark_persistent consistently John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	83 mark_persistent ();
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	84 else
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	85 error ("tree_decl_command: unknown decl type: %s", cmd_name);
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	86 }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	87 }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	88
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	89 tree_decl_command::~tree_decl_command (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	90 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	91 delete init_list;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	92 }
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	93
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	94 tree_command *
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	95 tree_decl_command::dup (symbol_table::scope_id scope,
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	96 symbol_table::context_id context) const
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	97 {
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	98 tree_decl_init_list *new_init_list
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	99 = init_list ? init_list->dup (scope, context) : 0;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	100
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	101 return new tree_decl_command (name (), new_init_list, line (), column ());
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	102 }
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	103 }

Mercurial > octave

annotate libinterp/parse-tree/pt-decl.cc @ 23470:a41fdb801db6