Mercurial > octave
view libinterp/parse-tree/pt-fcn-handle.h @ 23600:db947ba52118
explicitly limit anonymous functions to a single expression
* ov-fcn-handle.cc (octave_fcn_handle::print_raw): Handle anonymous
function body as a single expression.
* parse.h, oct-parse.in.yy: Now expect 8 shift/reduce conflicts.
(expr_no_assign): New non-terminal.
(expression): Split into expr_no_assign and assign_expr.
(anon_fcn_handle): Define body as expr_no_assign instead of statement.
(base_parser::make_anon_fcn_handle): Handle body as a single
expression instead of statement.
* pt-eval.cc (tree_evaluator::visit_anon_fcn_handle): Handle body as a
single expression instead of statement.
* pt-fcn-handle.h, pt-fcn-handle.cc (class tree_anon_fcn_handle):
Handle body as a single expression. Eliminate return list.
* pt-pr-code.h, pt-pr-code.cc (tree_print_code::print_fcn_handle_body):
Handle anonymous function handle body as single expression.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 11 Jun 2017 16:37:26 -0400 |
parents | 5cb3a2bb5e1e |
children | 214cb58ccc1c |
line wrap: on
line source
/* Copyright (C) 2003-2017 John W. Eaton 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 <http://www.gnu.org/licenses/>. */ #if ! defined (octave_pt_fcn_handle_h) #define octave_pt_fcn_handle_h 1 #include "octave-config.h" #include <iosfwd> #include <string> #include "pt-bp.h" #include "pt-exp.h" #include "pt-misc.h" #include "pt-stmt.h" #include "pt-walk.h" #include "symtab.h" class octave_value_list; #include "ov.h" #include "ov-usr-fcn.h" #include "symtab.h" namespace octave { class tree_fcn_handle : public tree_expression { public: tree_fcn_handle (int l = -1, int c = -1) : tree_expression (l, c), nm () { } tree_fcn_handle (const std::string& n, int l = -1, int c = -1) : tree_expression (l, c), nm (n) { } // No copying! tree_fcn_handle (const tree_fcn_handle&) = delete; tree_fcn_handle& operator = (const tree_fcn_handle&) = delete; ~tree_fcn_handle (void) = default; bool has_magic_end (void) const { return false; } void print (std::ostream& os, bool pr_as_read_syntax = false, bool pr_orig_txt = true); void print_raw (std::ostream& os, bool pr_as_read_syntax = false, bool pr_orig_txt = true); std::string name (void) const { return nm; } bool rvalue_ok (void) const { return true; } tree_expression * dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw) { tw.visit_fcn_handle (*this); } private: // The name of this function handle. std::string nm; }; class tree_anon_fcn_handle : public tree_expression { public: tree_anon_fcn_handle (int l = -1, int c = -1) : tree_expression (l, c), m_parameter_list (0), m_expression (0), m_sid (-1), m_parent_sid (-1), m_file_name () { } tree_anon_fcn_handle (tree_parameter_list *pl, tree_expression *ex, symbol_table::scope_id sid, symbol_table::scope_id parent_sid, int l = -1, int c = -1) : tree_expression (l, c), m_parameter_list (pl), m_expression (ex), m_sid (sid), m_parent_sid (parent_sid), m_file_name () { } // No copying! tree_anon_fcn_handle (const tree_anon_fcn_handle&) = delete; tree_anon_fcn_handle& operator = (const tree_anon_fcn_handle&) = delete; ~tree_anon_fcn_handle (void); bool has_magic_end (void) const { return false; } bool rvalue_ok (void) const { return true; } tree_parameter_list * parameter_list (void) const { return m_parameter_list; } tree_expression * expression (void) const { return m_expression; } symbol_table::scope_id scope (void) const { return m_sid; } symbol_table::scope_id parent_scope (void) const { return m_parent_sid; } bool has_parent_scope (void) const { return m_parent_sid > 0; } tree_expression * dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw) { tw.visit_anon_fcn_handle (*this); } void stash_file_name (const std::string& file) { m_file_name = file; } std::string file_name (void) const { return m_file_name; } private: // Inputs parameters. tree_parameter_list *m_parameter_list; // Function body, limited to a single expression. tree_expression *m_expression; // Function scope. symbol_table::scope_id m_sid; // Parent scope, or -1 if none. symbol_table::scope_id m_parent_sid; // Filename where the handle was defined. std::string m_file_name; }; } #if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) OCTAVE_DEPRECATED ("use 'octave::tree_fcn_handle' instead") typedef octave::tree_fcn_handle tree_fcn_handle; OCTAVE_DEPRECATED ("use 'octave::tree_anon_fcn_handle' instead") typedef octave::tree_anon_fcn_handle tree_anon_fcn_handle; #endif #endif