octave: libinterp/parse-tree/pt-pr-code.cc annotate

annotate libinterp/parse-tree/pt-pr-code.cc @ 28257:ae94e3fad6d4 stable

fix printing of functions with varargin/varargout (bug #58279) * pt-misc.h, pt-misc.cc (tree_parameter_list::m_in_or_out): New data member. (tree_parameter_list::varargs_symbol_name, tree_parameter_list::is_input_list, tree_parameter_list::is_output_list): New functions. (tree_parameter_list::variable_names): Also include varargin or varargout in the list. (tree_parameter_list::dup): Pass m_in_or_out to tree_parameter_list constructor. * oct-parse.yy (opt_param_list): Don't create tree_parameter_list object for empty lists that have no parens. (param_list1): Always create a tree_parameter_list object. * pt-pr-code.cc (tree_print_code::visit_octave_user_function_header): Don't print input/output parameter lists here. (tree_print_code::visit_anon_fcn_handle): Don't print parens for parameter list here. (tree_print_code::visit_parameter_list): Handle printing of all parts of parameter lists here, including parens or brackets. For output lists, skip brackets if there is a single element in the list, including varargout. * ov-fcn-handle.cc (octave_fcn_handle::print_raw): Don't print parens for parameter list here.

author	John W. Eaton <jwe@octave.org>
date	Fri, 01 May 2020 00:51:01 -0400
parents	3241ede9806c
children	08229481b65f

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 // Copyright (C) 1996-2020 The Octave Project Developers
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	27 # include "config.h"
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	28 #endif
ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	29
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	30 #include <cctype>
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	31
0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	32 #include "comment-list.h"
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	33 #include "error.h"
2969 1b47dd00a831 [project @ 1997-05-15 17:57:48 by jwe] jwe parents: 2961 diff changeset	34 #include "ov-usr-fcn.h"
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	35 #include "pr-output.h"
2988 daa1ed1f5462 [project @ 1997-05-16 07:23:15 by jwe] jwe parents: 2982 diff changeset	36 #include "pt-all.h"
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	37
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	38 namespace octave
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	39 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	40 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	41 tree_print_code::visit_anon_fcn_handle (tree_anon_fcn_handle& afh)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	42 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	43 indent ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	44
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	45 print_parens (afh, "(");
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	46
28257 ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	47 m_os << "@";
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	48
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	49 tree_parameter_list *param_list = afh.parameter_list ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	50
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	51 if (param_list)
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	52 param_list->accept (*this);
ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	53
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	54 print_fcn_handle_body (afh.expression ());
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	55
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	56 print_parens (afh, ")");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	57 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	58
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	59 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	60 tree_print_code::visit_argument_list (tree_argument_list& lst)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	61 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	62 auto p = lst.begin ();
23075 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 while (p != lst.end ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	65 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	66 tree_expression elt = p++;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	67
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	68 if (elt)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	69 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	70 elt->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	71
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	72 if (p != lst.end ())
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	73 m_os << ", ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	74 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	75 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	76 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	77
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	78 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	79 tree_print_code::visit_binary_expression (tree_binary_expression& expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	80 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	81 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	82
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	83 print_parens (expr, "(");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	84
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	85 tree_expression *op1 = expr.lhs ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	86
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	87 if (op1)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	88 op1->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	89
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	90 m_os << ' ' << expr.oper () << ' ';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	91
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	92 tree_expression *op2 = expr.rhs ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 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 if (op2)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	95 op2->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	96
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	97 print_parens (expr, ")");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	98 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	99
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	100 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	101 tree_print_code::visit_break_command (tree_break_command&)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	102 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	103 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	104
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	105 m_os << "break";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	106 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	107
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	108 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	109 tree_print_code::visit_colon_expression (tree_colon_expression& expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	110 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	111 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	112
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	113 print_parens (expr, "(");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	114
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	115 tree_expression *op1 = expr.base ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	116
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	117 if (op1)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	118 op1->accept (*this);
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	119
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	120 // Stupid syntax.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	121
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	122 tree_expression *op3 = expr.increment ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	123
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	124 if (op3)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	125 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	126 m_os << ':';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	127 op3->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	128 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	129
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	130 tree_expression *op2 = expr.limit ();
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	131
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	132 if (op2)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	133 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	134 m_os << ':';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	135 op2->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	136 }
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	137
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	138 print_parens (expr, ")");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	139 }
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 7715 diff changeset	140
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	141 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	142 tree_print_code::visit_continue_command (tree_continue_command&)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	143 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	144 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	145
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	146 m_os << "continue";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	147 }
7715 5b4d278ec828 parse scripts completely before executing John W. Eaton <jwe@octave.org> parents: 7017 diff changeset	148
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	149 void
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	150 tree_print_code::visit_decl_command (tree_decl_command& cmd)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	151 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	152 indent ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	153
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	154 m_os << cmd.name () << ' ';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	155
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	156 tree_decl_init_list *init_list = cmd.initializer_list ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	157
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	158 if (init_list)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	159 init_list->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	160 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	161
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	162 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	163 tree_print_code::visit_decl_init_list (tree_decl_init_list& lst)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	164 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	165 auto p = lst.begin ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	166
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	167 while (p != lst.end ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	168 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	169 tree_decl_elt elt = p++;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	170
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	171 if (elt)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	172 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	173 elt->accept (*this);
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	174
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	175 if (p != lst.end ())
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	176 m_os << ", ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	177 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	178 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	179 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	180
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	181 void
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	182 tree_print_code::visit_decl_elt (tree_decl_elt& cmd)
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	183 {
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	184 tree_identifier *id = cmd.ident ();
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	185
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	186 if (id)
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	187 id->accept (*this);
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	188
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	189 tree_expression *expr = cmd.expression ();
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	190
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	191 if (expr)
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	192 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	193 m_os << " = ";
23469 2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	194
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	195 expr->accept (*this);
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	196 }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	197 }
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	198
2699c5974844 handle global and persistent in tree_decl_command, not as separate classes John W. Eaton <jwe@octave.org> parents: 23449 diff changeset	199 void
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	200 tree_print_code::visit_simple_for_command (tree_simple_for_command& cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	201 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	202 print_comment_list (cmd.leading_comment ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	203
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	204 indent ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	205
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	206 m_os << (cmd.in_parallel () ? "parfor " : "for ");
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	207
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	208 tree_expression *lhs = cmd.left_hand_side ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	209
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	210 tree_expression *maxproc = cmd.maxproc_expr ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	211
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	212 if (maxproc)
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	213 m_os << '(';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	214
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	215 if (lhs)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	216 lhs->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	217
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	218 m_os << " = ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	219
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	220 tree_expression *expr = cmd.control_expr ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	221
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	222 if (expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	223 expr->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	224
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	225 if (maxproc)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	226 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	227 m_os << ", ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	228 maxproc->accept (*this);
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	229 m_os << ')';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	230 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	231
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	232 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	233
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	234 tree_statement_list *list = cmd.body ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	235
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	236 if (list)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	237 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	238 increment_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	239
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	240 list->accept (*this);
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	241
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	242 decrement_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	243 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	244
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	245 print_indented_comment (cmd.trailing_comment ());
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	246
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	247 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	248
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	249 m_os << (cmd.in_parallel () ? "endparfor" : "endfor");
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	250 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	251
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	252 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	253 tree_print_code::visit_complex_for_command (tree_complex_for_command& cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	254 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	255 print_comment_list (cmd.leading_comment ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	256
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	257 indent ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	258
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	259 m_os << "for [";
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	260 m_nesting.push ('[');
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	261
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	262 tree_argument_list *lhs = cmd.left_hand_side ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	263
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	264 if (lhs)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	265 lhs->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	266
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	267 m_nesting.pop ();
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	268 m_os << "] = ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	269
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	270 tree_expression *expr = cmd.control_expr ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	271
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	272 if (expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	273 expr->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	274
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	275 newline ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	276
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	277 tree_statement_list *list = cmd.body ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	278
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	279 if (list)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	280 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	281 increment_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	282
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	283 list->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	284
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	285 decrement_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	286 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	287
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	288 print_indented_comment (cmd.trailing_comment ());
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	289
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	290 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	291
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	292 m_os << "endfor";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	293 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	294
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	295 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	296 tree_print_code::visit_octave_user_script (octave_user_script& fcn)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	297 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	298 reset ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	299
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	300 tree_statement_list *cmd_list = fcn.body ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	301
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	302 if (cmd_list)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	303 cmd_list->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	304 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	305
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	306 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	307 tree_print_code::visit_octave_user_function (octave_user_function& fcn)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	308 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	309 reset ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	310
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	311 visit_octave_user_function_header (fcn);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	312
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	313 tree_statement_list *cmd_list = fcn.body ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	314
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	315 if (cmd_list)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	316 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	317 increment_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	318
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	319 cmd_list->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	320
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	321 // endfunction will decrement the indent level.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	322 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	323
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	324 visit_octave_user_function_trailer (fcn);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	325 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	326
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	327 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	328 tree_print_code::visit_octave_user_function_header (octave_user_function& fcn)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	329 {
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	330 comment_list *leading_comment = fcn.leading_comment ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	331
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	332 if (leading_comment)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	333 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	334 print_comment_list (leading_comment);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	335 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	336 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	337
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	338 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	339
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	340 m_os << "function ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	341
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	342 tree_parameter_list *ret_list = fcn.return_list ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	343
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	344 if (ret_list)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	345 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	346 ret_list->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	347
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	348 m_os << " = ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	349 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	350 std::string fcn_name = fcn.name ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	351
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	352 m_os << (fcn_name.empty () ? "(empty)" : fcn_name) << ' ';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	353
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	354 tree_parameter_list *param_list = fcn.parameter_list ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	355
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	356 if (param_list)
28257 ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	357 param_list->accept (*this);
4676 c0aa75a64635 [project @ 2003-12-16 16:47:52 by jwe] jwe parents: 4342 diff changeset	358
28257 ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	359 newline ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	360 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	361
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	362 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	363 tree_print_code::visit_octave_user_function_trailer (octave_user_function& fcn)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	364 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	365 print_indented_comment (fcn.trailing_comment ());
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	366
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	367 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	368 }
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3208 diff changeset	369
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	370 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	371 tree_print_code::visit_function_def (tree_function_def& fdef)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	372 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	373 indent ();
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3208 diff changeset	374
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	375 octave_value fcn = fdef.function ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	376
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	377 octave_function *f = fcn.function_value ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	378
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	379 if (f)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	380 f->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	381 }
2620 5c773d4745d6 [project @ 1997-01-23 16:26:25 by jwe] jwe parents: 2530 diff changeset	382
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	383 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	384 tree_print_code::visit_identifier (tree_identifier& id)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	385 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	386 indent ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	387
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	388 print_parens (id, "(");
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4219 diff changeset	389
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	390 std::string nm = id.name ();
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	391 m_os << (nm.empty () ? "(empty)" : nm);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	392
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	393 print_parens (id, ")");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	394 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	395
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	396 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	397 tree_print_code::visit_if_clause (tree_if_clause& cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	398 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	399 tree_expression *expr = cmd.condition ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	400
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	401 if (expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	402 expr->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	403
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	404 newline ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	405
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	406 tree_statement_list *list = cmd.commands ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	407
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	408 if (list)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	409 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	410 increment_indent_level ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	411
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	412 list->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	413
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	414 decrement_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	415 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	416 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	417
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	418 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	419 tree_print_code::visit_if_command (tree_if_command& cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	420 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	421 print_comment_list (cmd.leading_comment ());
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	422
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	423 indent ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	424
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	425 m_os << "if ";
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	426
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	427 tree_if_command_list *list = cmd.cmd_list ();
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	428
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	429 if (list)
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	430 list->accept (*this);
52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	431
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	432 print_indented_comment (cmd.trailing_comment ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	433
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	434 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	435
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	436 m_os << "endif";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	437 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	438
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	439 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	440 tree_print_code::visit_if_command_list (tree_if_command_list& lst)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	441 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	442 auto p = lst.begin ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	443
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	444 bool first_elt = true;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	445
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	446 while (p != lst.end ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	447 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	448 tree_if_clause elt = p++;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	449
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	450 if (elt)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	451 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	452 if (! first_elt)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	453 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	454 print_indented_comment (elt->leading_comment ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	455
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	456 indent ();
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	457
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	458 if (elt->is_else_clause ())
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	459 m_os << "else";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	460 else
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	461 m_os << "elseif ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	462 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	463
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	464 elt->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	465 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	466
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	467 first_elt = false;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	468 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	469 }
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	470
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	471 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	472 tree_print_code::visit_index_expression (tree_index_expression& expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	473 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	474 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	475
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	476 print_parens (expr, "(");
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	477
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	478 tree_expression *e = expr.expression ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	479
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	480 if (e)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	481 e->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	482
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	483 std::list<tree_argument_list *> arg_lists = expr.arg_lists ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	484 std::string type_tags = expr.type_tags ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	485 std::list<string_vector> arg_names = expr.arg_names ();
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	486
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	487 int n = type_tags.length ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	488
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	489 auto p_arg_lists = arg_lists.begin ();
3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	490 auto p_arg_names = arg_names.begin ();
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	491
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	492 for (int i = 0; i < n; i++)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	493 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	494 switch (type_tags[i])
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	495 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	496 case '(':
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	497 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	498 char nc = m_nesting.top ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	499 if ((nc == '[' \|\| nc == '{') && expr.paren_count () == 0)
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	500 m_os << '(';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	501 else
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	502 m_os << " (";
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	503 m_nesting.push ('(');
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	504
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	505 tree_argument_list l = p_arg_lists;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	506 if (l)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	507 l->accept (*this);
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	508
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	509 m_nesting.pop ();
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	510 m_os << ')';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	511 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	512 break;
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	513
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	514 case '{':
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	515 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	516 char nc = m_nesting.top ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	517 if ((nc == '[' \|\| nc == '{') && expr.paren_count () == 0)
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	518 m_os << '{';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	519 else
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	520 m_os << " {";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	521 // We only care about whitespace inside [] and {} when we
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	522 // are defining matrix and cell objects, not when indexing.
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	523 m_nesting.push ('(');
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	524
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	525 tree_argument_list l = p_arg_lists;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	526 if (l)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	527 l->accept (*this);
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	528
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	529 m_nesting.pop ();
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	530 m_os << '}';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	531 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	532 break;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	533
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	534 case '.':
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	535 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	536 string_vector nm = *p_arg_names;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	537 assert (nm.numel () == 1);
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	538 m_os << '.' << nm(0);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	539 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	540 break;
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	541
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	542 default:
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	543 panic_impossible ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	544 }
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	545
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	546 p_arg_lists++;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	547 p_arg_names++;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	548 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	549
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	550 print_parens (expr, ")");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	551 }
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2764 diff changeset	552
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	553 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	554 tree_print_code::visit_matrix (tree_matrix& lst)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	555 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	556 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	557
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	558 print_parens (lst, "(");
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	559
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	560 m_os << '[';
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	561 m_nesting.push ('[');
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	562
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	563 auto p = lst.begin ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	564
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	565 while (p != lst.end ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	566 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	567 tree_argument_list elt = p++;
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	568
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	569 if (elt)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	570 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	571 elt->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	572
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	573 if (p != lst.end ())
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	574 m_os << "; ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	575 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	576 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	577
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	578 m_nesting.pop ();
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	579 m_os << ']';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	580
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	581 print_parens (lst, ")");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	582 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	583
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	584 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	585 tree_print_code::visit_cell (tree_cell& lst)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	586 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	587 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	588
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	589 print_parens (lst, "(");
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	590
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	591 m_os << '{';
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	592 m_nesting.push ('{');
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	593
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	594 auto p = lst.begin ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	595
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	596 while (p != lst.end ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	597 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	598 tree_argument_list elt = p++;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	599
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	600 if (elt)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	601 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	602 elt->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	603
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	604 if (p != lst.end ())
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	605 m_os << "; ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	606 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	607 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	608
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	609 m_nesting.pop ();
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	610 m_os << '}';
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	611
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	612 print_parens (lst, ")");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	613 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	614
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	615 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	616 tree_print_code::visit_multi_assignment (tree_multi_assignment& expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	617 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	618 indent ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	619
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	620 print_parens (expr, "(");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	621
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	622 tree_argument_list *lhs = expr.left_hand_side ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	623
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	624 if (lhs)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	625 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	626 int len = lhs->length ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	627
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	628 if (len > 1)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	629 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	630 m_os << '[';
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	631 m_nesting.push ('[');
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	632 }
17249 923ce8b42db2 improve try-catch-statement to save exception to a variable (bug #33217) Stefan Mahr <dac922@gmx.de> parents: 15195 diff changeset	633
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	634 lhs->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	635
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	636 if (len > 1)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	637 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	638 m_nesting.pop ();
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	639 m_os << ']';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	640 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	641 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	642
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	643 m_os << ' ' << expr.oper () << ' ';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	644
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	645 tree_expression *rhs = expr.right_hand_side ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	646
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	647 if (rhs)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	648 rhs->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	649
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	650 print_parens (expr, ")");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	651 }
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	652
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	653 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	654 tree_print_code::visit_no_op_command (tree_no_op_command& cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	655 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	656 if (cmd.is_end_of_fcn_or_script () && m_curr_print_indent_level > 1)
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	657 decrement_indent_level ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	658
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	659 indent ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	660
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	661 m_os << cmd.original_command ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	662 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	663
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	664 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	665 tree_print_code::visit_constant (tree_constant& val)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	666 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	667 indent ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	668
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	669 print_parens (val, "(");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	670
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	671 val.print_raw (m_os, true, m_print_original_text);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	672
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	673 print_parens (val, ")");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	674 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	675
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	676 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	677 tree_print_code::visit_fcn_handle (tree_fcn_handle& fh)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	678 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	679 indent ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	680
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	681 print_parens (fh, "(");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	682
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	683 fh.print_raw (m_os, true, m_print_original_text);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	684
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	685 print_parens (fh, ")");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	686 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	687
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	688 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	689 tree_print_code::visit_parameter_list (tree_parameter_list& lst)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	690 {
28257 ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	691 bool is_input_list = lst.is_input_list ();
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	692
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	693 if (is_input_list)
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	694 {
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	695 m_os << '(';
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	696 m_nesting.push ('(');
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	697 }
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	698 else
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	699 {
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	700 int len = lst.length ();
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	701 if (lst.takes_varargs ())
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	702 len++;
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	703
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	704 if (len != 1)
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	705 {
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	706 m_os << '[';
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	707 m_nesting.push ('[');
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	708 }
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	709 }
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	710
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	711 auto p = lst.begin ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	712
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	713 while (p != lst.end ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	714 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	715 tree_decl_elt elt = p++;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	716
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	717 if (elt)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	718 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	719 elt->accept (*this);
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	720
25797 8644e7df7fc7 print and save anonymous functions with varargin correctly (bug #45972) Olaf Till <olaf.till@uni-jena.de> parents: 25438 diff changeset	721 if (p != lst.end () \|\| lst.takes_varargs ())
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	722 m_os << ", ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	723 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	724 }
25828 8b548f2f8086 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 25797 diff changeset	725
25797 8644e7df7fc7 print and save anonymous functions with varargin correctly (bug #45972) Olaf Till <olaf.till@uni-jena.de> parents: 25438 diff changeset	726 if (lst.takes_varargs ())
28257 ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	727 m_os << lst.varargs_symbol_name ();
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	728
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	729 if (is_input_list)
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	730 {
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	731 m_nesting.pop ();
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	732 m_os << ')';
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	733 }
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	734 else
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	735 {
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	736 int len = lst.length ();
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	737 if (lst.takes_varargs ())
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	738 len++;
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	739
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	740 if (len != 1)
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	741 {
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	742 m_nesting.pop ();
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	743 m_os << ']';
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	744 }
ae94e3fad6d4 fix printing of functions with varargin/varargout (bug #58279) John W. Eaton <jwe@octave.org> parents: 28256 diff changeset	745 }
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	746 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	747
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	748 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	749 tree_print_code::visit_postfix_expression (tree_postfix_expression& expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	750 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	751 indent ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	752
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	753 print_parens (expr, "(");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	754
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	755 tree_expression *e = expr.operand ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	756
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	757 if (e)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	758 e->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	759
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	760 m_os << expr.oper ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	761
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	762 print_parens (expr, ")");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	763 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	764
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	765 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	766 tree_print_code::visit_prefix_expression (tree_prefix_expression& expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	767 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	768 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	769
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	770 print_parens (expr, "(");
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	771
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	772 m_os << expr.oper ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	773
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	774 tree_expression *e = expr.operand ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	775
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	776 if (e)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	777 e->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	778
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	779 print_parens (expr, ")");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	780 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	781
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	782 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	783 tree_print_code::visit_return_command (tree_return_command&)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	784 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	785 indent ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	786
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	787 m_os << "return";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	788 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	789
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	790 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	791 tree_print_code::visit_simple_assignment (tree_simple_assignment& expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	792 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	793 indent ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	794
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	795 print_parens (expr, "(");
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	796
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	797 tree_expression *lhs = expr.left_hand_side ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	798
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	799 if (lhs)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	800 lhs->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	801
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	802 m_os << ' ' << expr.oper () << ' ';
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	803
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	804 tree_expression *rhs = expr.right_hand_side ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	805
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	806 if (rhs)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	807 rhs->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	808
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	809 print_parens (expr, ")");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	810 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	811
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	812 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	813 tree_print_code::visit_statement (tree_statement& stmt)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	814 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	815 print_comment_list (stmt.comment_text ());
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	816
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	817 tree_command *cmd = stmt.command ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	818
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	819 if (cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	820 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	821 cmd->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	822
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	823 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	824 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	825 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	826 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	827 tree_expression *expr = stmt.expression ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	828
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	829 if (expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	830 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	831 expr->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	832
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	833 if (! stmt.print_result ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	834 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	835 m_os << ';';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	836 newline (" ");
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	837 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	838 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	839 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	840 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	841 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	842 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	843
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	844 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	845 tree_print_code::visit_statement_list (tree_statement_list& lst)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	846 {
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	847 for (tree_statement *elt : lst)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	848 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	849 if (elt)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	850 elt->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	851 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	852 }
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	853
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	854 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	855 tree_print_code::visit_switch_case (tree_switch_case& cs)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	856 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	857 print_comment_list (cs.leading_comment ());
3484 8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3478 diff changeset	858
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	859 indent ();
3484 8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3478 diff changeset	860
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	861 if (cs.is_default_case ())
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	862 m_os << "otherwise";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	863 else
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	864 m_os << "case ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	865
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	866 tree_expression *label = cs.case_label ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	867
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	868 if (label)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	869 label->accept (*this);
3484 8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3478 diff changeset	870
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	871 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	872
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	873 tree_statement_list *list = cs.commands ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	874
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	875 if (list)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	876 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	877 increment_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	878
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	879 list->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	880
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	881 newline ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	882
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	883 decrement_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	884 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	885 }
3484 8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3478 diff changeset	886
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	887 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	888 tree_print_code::visit_switch_command (tree_switch_command& cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	889 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	890 print_comment_list (cmd.leading_comment ());
3484 8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3478 diff changeset	891
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	892 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	893
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	894 m_os << "switch ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	895
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	896 tree_expression *expr = cmd.switch_value ();
3484 8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3478 diff changeset	897
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	898 if (expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	899 expr->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	900
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	901 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	902
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	903 tree_switch_case_list *list = cmd.case_list ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	904
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	905 if (list)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	906 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	907 increment_indent_level ();
3484 8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3478 diff changeset	908
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	909 list->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	910
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	911 decrement_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	912 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	913
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	914 print_indented_comment (cmd.leading_comment ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	915
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	916 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	917
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	918 m_os << "endswitch";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	919 }
3484 8b1f46ac2b64 [project @ 2000-01-27 23:30:45 by jwe] jwe parents: 3478 diff changeset	920
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	921 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	922 tree_print_code::visit_try_catch_command (tree_try_catch_command& cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	923 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	924 print_comment_list (cmd.leading_comment ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	925
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	926 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	927
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	928 m_os << "try";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	929
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	930 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	931
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	932 tree_statement_list *try_code = cmd.body ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	933 tree_identifier *expr_id = cmd.identifier ();
11223 64e7538db12a fix printing of newlines for anonymous function handle bodies John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	934
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	935 if (try_code)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	936 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	937 increment_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	938
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	939 try_code->accept (*this);
11223 64e7538db12a fix printing of newlines for anonymous function handle bodies John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	940
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	941 decrement_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	942 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	943
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	944 print_indented_comment (cmd.middle_comment ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	945
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	946 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	947
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	948 m_os << "catch";
11223 64e7538db12a fix printing of newlines for anonymous function handle bodies John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	949
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	950 if (expr_id)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	951 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	952 m_os << ' ';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	953 expr_id->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	954 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	955
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	956 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	957
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	958 tree_statement_list *catch_code = cmd.cleanup ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	959
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	960 if (catch_code)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	961 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	962 increment_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	963
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	964 catch_code->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	965
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	966 decrement_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	967 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	968
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	969 print_indented_comment (cmd.trailing_comment ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	970
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	971 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	972
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	973 m_os << "end_try_catch";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	974 }
11223 64e7538db12a fix printing of newlines for anonymous function handle bodies John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	975
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	976 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	977 tree_print_code::visit_unwind_protect_command (tree_unwind_protect_command& cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	978 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	979 print_comment_list (cmd.leading_comment ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	980
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	981 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	982
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	983 m_os << "unwind_protect";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	984
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	985 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	986
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	987 tree_statement_list *unwind_protect_code = cmd.body ();
11223 64e7538db12a fix printing of newlines for anonymous function handle bodies John W. Eaton <jwe@octave.org> parents: 10315 diff changeset	988
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	989 if (unwind_protect_code)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	990 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	991 increment_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	992
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	993 unwind_protect_code->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	994
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	995 decrement_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	996 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	997
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	998 print_indented_comment (cmd.middle_comment ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	999
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1000 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1001
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1002 m_os << "unwind_protect_cleanup";
2900 5ed088015839 [project @ 1997-04-30 03:26:56 by jwe] jwe parents: 2891 diff changeset	1003
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1004 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1005
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1006 tree_statement_list *cleanup_code = cmd.cleanup ();
2900 5ed088015839 [project @ 1997-04-30 03:26:56 by jwe] jwe parents: 2891 diff changeset	1007
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1008 if (cleanup_code)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1009 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1010 increment_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1011
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1012 cleanup_code->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1013
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1014 decrement_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1015 }
4980 003bbf6c13d8 [project @ 2004-09-09 15:47:17 by jwe] jwe parents: 4748 diff changeset	1016
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1017 print_indented_comment (cmd.trailing_comment ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1018
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1019 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1020
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1021 m_os << "end_unwind_protect";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1022 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	1023
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1024 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1025 tree_print_code::visit_while_command (tree_while_command& cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1026 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1027 print_comment_list (cmd.leading_comment ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1028
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1029 indent ();
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	1030
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1031 m_os << "while ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1032
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1033 tree_expression *expr = cmd.condition ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1034
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1035 if (expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1036 expr->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1037
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1038 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1039
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1040 tree_statement_list *list = cmd.body ();
18268 7e297c293e4c Fix pretty printing with debug prompt (bug #41204). John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	1041
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1042 if (list)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1043 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1044 increment_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1045
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1046 list->accept (*this);
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	1047
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1048 decrement_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1049 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1050
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1051 print_indented_comment (cmd.trailing_comment ());
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	1052
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1053 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1054
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1055 m_os << "endwhile";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1056 }
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	1057
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1058 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1059 tree_print_code::visit_do_until_command (tree_do_until_command& cmd)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1060 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1061 print_comment_list (cmd.leading_comment ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1062
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1063 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1064
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1065 m_os << "do";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1066
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1067 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1068
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1069 tree_statement_list *list = cmd.body ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1070
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1071 if (list)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1072 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1073 increment_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1074
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1075 list->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1076
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1077 decrement_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1078 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1079
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1080 print_indented_comment (cmd.trailing_comment ());
2123 ee55d81f585a [project @ 1996-05-12 07:16:36 by jwe] jwe parents: diff changeset	1081
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1082 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1083
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1084 m_os << "until ";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1085
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1086 tree_expression *expr = cmd.condition ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1087
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1088 if (expr)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1089 expr->accept (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1090
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1091 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1092 }
2961 8a77d52c9d02 [project @ 1997-05-12 01:36:04 by jwe] jwe parents: 2960 diff changeset	1093
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1094 void
26686 581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1095 tree_print_code::visit_superclass_ref (tree_superclass_ref& scr)
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1096 {
26718 9b0335f4bc74 revise naming of the parts of a superclass reference John W. Eaton <jwe@octave.org> parents: 26686 diff changeset	1097 m_os << scr.method_name () << "@" << scr.class_name ();
26686 581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1098 }
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1099
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1100 void
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1101 tree_print_code::visit_metaclass_query (tree_metaclass_query& mcq)
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1102 {
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1103 m_os << "?" << mcq.class_name ();
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1104 }
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1105
581d01526b34 eliminate unnecessary tree_funcall class John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1106 void
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	1107 tree_print_code::print_fcn_handle_body (tree_expression *e)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1108 {
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	1109 if (e)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1110 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1111 m_suppress_newlines++;
23600 db947ba52118 explicitly limit anonymous functions to a single expression John W. Eaton <jwe@octave.org> parents: 23469 diff changeset	1112 e->accept (*this);
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1113 m_suppress_newlines--;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1114 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1115 }
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1116
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1117 // Each print_code() function should call this before printing anything.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1118
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1119 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1120 tree_print_code::indent (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1121 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1122 assert (m_curr_print_indent_level >= 0);
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1123
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1124 if (m_beginning_of_line)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1125 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1126 m_os << m_prefix;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1127
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1128 m_os << std::string (m_curr_print_indent_level, ' ');
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1129
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1130 m_beginning_of_line = false;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1131 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1132 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1133
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1134 // All print_code() functions should use this to print new lines.
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1135
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1136 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1137 tree_print_code::newline (const char *alt_txt)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1138 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1139 if (m_suppress_newlines)
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1140 m_os << alt_txt;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1141 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1142 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1143 // Print prefix for blank lines.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1144 indent ();
18268 7e297c293e4c Fix pretty printing with debug prompt (bug #41204). John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	1145
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1146 m_os << "\n";
18268 7e297c293e4c Fix pretty printing with debug prompt (bug #41204). John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	1147
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1148 m_beginning_of_line = true;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1149 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1150 }
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1151
27956 2310164737b3 fix many spelling errors (bug #57613) John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1152 // For resetting print_code state.
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1153
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1154 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1155 tree_print_code::reset (void)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1156 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1157 m_beginning_of_line = true;
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1158 m_curr_print_indent_level = 0;
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1159 while (m_nesting.top () != 'n')
7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1160 m_nesting.pop ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1161 }
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1162
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1163 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1164 tree_print_code::print_parens (const tree_expression& expr, const char *txt)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1165 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1166 int n = expr.paren_count ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1167
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1168 for (int i = 0; i < n; i++)
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1169 m_os << txt;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1170 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1171
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1172 void
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	1173 tree_print_code::print_comment_elt (const comment_elt& elt)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1174 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1175 bool printed_something = false;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1176
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1177 bool prev_char_was_newline = false;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1178
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1179 std::string comment = elt.text ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1180
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1181 size_t len = comment.length ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1182
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1183 size_t i = 0;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1184
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1185 while (i < len && comment[i++] == '\n')
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1186 ; // Skip leading new lines.
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1187 i--;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1188
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1189 while (i < len)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1190 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1191 char c = comment[i++];
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1192
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1193 if (c == '\n')
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1194 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1195 if (prev_char_was_newline)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1196 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1197 printed_something = true;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1198
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1199 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1200
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1201 m_os << "##";
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1202 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1203
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1204 newline ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1205
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1206 prev_char_was_newline = true;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1207 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1208 else
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1209 {
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1210 if (m_beginning_of_line)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1211 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1212 printed_something = true;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1213
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1214 indent ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1215
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1216 m_os << "##";
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1217
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1218 if (! (isspace (c) \|\| c == '!'))
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1219 m_os << ' ';
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1220 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1221
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1222 m_os << static_cast<char> (c);
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1223
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1224 prev_char_was_newline = false;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1225 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1226 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1227
24846 7620f1f5290d use m_ prefix for member variables in parse tree classes John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1228 if (printed_something && ! m_beginning_of_line)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1229 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1230 }
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1231
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1232 void
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	1233 tree_print_code::print_comment_list (comment_list *comment_list)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1234 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1235 if (comment_list)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1236 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	1237 auto p = comment_list->begin ();
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1238
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1239 while (p != comment_list->end ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1240 {
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	1241 comment_elt elt = *p++;
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1242
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1243 print_comment_elt (elt);
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1244
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1245 if (p != comment_list->end ())
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1246 newline ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1247 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1248 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1249 }
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1250
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1251 void
23750 ea879bc55272 move comment_list and comment_elt classes to octave namespace John W. Eaton <jwe@octave.org> parents: 23600 diff changeset	1252 tree_print_code::print_indented_comment (comment_list *comment_list)
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1253 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1254 increment_indent_level ();
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1255
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1256 print_comment_list (comment_list);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1257
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1258 decrement_indent_level ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22872 diff changeset	1259 }
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3523 diff changeset	1260 }

Mercurial > octave

annotate libinterp/parse-tree/pt-pr-code.cc @ 28257:ae94e3fad6d4 stable