Mercurial > hg > octave-nkf
view libinterp/parse-tree/pt-funcall.cc @ 18588:932aca9a7c57
Allow multi-level classdef package.
* lex.h (octave_base_lexer::fq_identifier_contains_keyword,
octave_base_lexer::handle_fq_identifier,
octave_base_lexer::enable_fq_identifier): New methods.
* lex.ll (octave_base_lexer::fq_identifier_contains_keyword,
octave_base_lexer::handle_fq_identifier,
octave_base_lexer::enable_fq_identifier): Likewise.
(FQ_IDENT_START, FQIDENT): New exclusive start condition and regex to
handle fully-qualified identifier.
(superclass reference rule, metaclass query rule): Use FQIDENT.
(octave_base_lexer::handle_superclass_identifier,
octave_base_lexer::handle_meta_identifier): Don't split package name.
* parse.h (octave_base_parser::make_superclass_ref,
octave_base_parser::make_meta_class_query): Remove package_nm argument.
* pt-classdef.h (tree_classdef_superclass::id,
tree_classdef_superclass::pkg): Removed members, replaced by cls_name.
(tree_classdef_superclass::~tree_classdef_superclass): Remove deletion
of removed members.
(tree_classdef_superclass::cls_name): New member.
(tree_classdef_superclass::tree_classdef_superclass): Initialize it.
(tree_classdef_superclass::ident, tree_classdef_superclass::package):
Removed methods.
(tree_classdef_superclass::class_name): New method.
* token.h (token::meta_name_token): Remove enum value.
(token(int, std::string, std::string, std::string, int, int)): Remove
constructor.
(token::superclass_package_name, token::meta_package_name,
token::meta_class_name): Remove methods.
(token::sc::package_nm, token::mc): Remove union members.
* token.cc
(token(int, std::string, std::string, std::string, int, int)): Remove
constructor.
(token::~token): Remove case of meta_name_token.
(token::superclass_package_name, token::meta_package_name,
token::meta_class_name): Remove methods.
* oct-parse.in.yy (FQ_IDENT): New terminal.
(superclass_identifier): Adapt to changes in class token and class
octave_base_parser.
(meta_identifier): Likewise.
(superclass_list): Add mid-rule to enable fully-qualified identifier.
(superclass): Use FQ_IDENT.
(octave_base_parser::make_superclass_ref,
octave_base_parser::make_meta_class_query): Remove package_nm argument.
* ov-classdef.cc (octave_classdef_superclass_ref::do_multi_index_op):
Adapt to removal of package_nm argument.
(F__meta_class_query__): Likewise.
(cdef_class::make_meta_class): Adapt to changes in class
tree_classdef_superclass.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Sat, 22 Feb 2014 19:56:17 -0500 |
parents | 9ca314e79956 |
children | bae00174787c |
line wrap: on
line source
/* Copyright (C) 2012-2013 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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "ov-fcn.h" #include "pt-funcall.h" #include "pt-walk.h" // Function call objects. void tree_funcall::print (std::ostream& os, bool pr_as_read_syntax, bool pr_orig_text) { print_raw (os, pr_as_read_syntax, pr_orig_text); } void tree_funcall::print_raw (std::ostream& os, bool pr_as_read_syntax, bool pr_orig_text) { if (pr_orig_text) { os << original_text (); } else { octave_function *fp = fcn.function_value (); std::string nm = fp ? fp->name () : std::string ("<invalid-function>"); os << nm << " ("; octave_idx_type len = args.length (); for (octave_idx_type i = 0; i < len; i++) { args(i).print_raw (os, pr_as_read_syntax); if (i < len - 1) os << ", "; } os << ")"; } } tree_funcall * tree_funcall::dup (symbol_table::scope_id, symbol_table::context_id context) const { tree_funcall *new_fc = new tree_funcall (fcn, args, line (), column ()); new_fc->copy_base (*new_fc); return new_fc; } void tree_funcall::accept (tree_walker& tw) { tw.visit_funcall (*this); } octave_value_list tree_funcall::rvalue (int nargout) { octave_value_list retval; retval = feval (fcn.function_value (), args, nargout); if (retval.length () == 1 && retval(0).is_function ()) { // The return object is a function. We may need to re-index it using the // same logic as for identifier. This is primarily used for superclass // references in classdef. octave_value val = retval(0); octave_function *f = val.function_value (true); if (f && ! (is_postfix_indexed () && f->is_postfix_index_handled (postfix_index ()))) { octave_value_list tmp_args; retval = val.do_multi_index_op (nargout, tmp_args); } } return retval; }