Mercurial > octave
view libinterp/parse-tree/pt-misc.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 | 0a5b15007766 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 1994-2020 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // This file is part of Octave. // // Octave is free software: you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // Octave is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with Octave; see the file COPYING. If not, see // <https://www.gnu.org/licenses/>. // //////////////////////////////////////////////////////////////////////// #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include "pt-idx.h" #include "pt-misc.h" namespace octave { // Parameter lists. tree_parameter_list::~tree_parameter_list (void) { while (! empty ()) { auto p = begin (); delete *p; erase (p); } } void tree_parameter_list::mark_as_formal_parameters (void) { for (tree_decl_elt *elt : *this) elt->mark_as_formal_parameter (); } std::list<std::string> tree_parameter_list::variable_names (void) const { std::list<std::string> retval; for (tree_decl_elt *elt : *this) retval.push_back (elt->name ()); if (m_marked_for_varargs) retval.push_back (varargs_symbol_name ()); return retval; } tree_parameter_list * tree_parameter_list::dup (symbol_scope& scope) const { tree_parameter_list *new_list = new tree_parameter_list (m_in_or_out); new_list->m_marked_for_varargs = m_marked_for_varargs; for (const tree_decl_elt *elt : *this) new_list->append (elt->dup (scope)); return new_list; } }