Mercurial > hg > octave-lyh
view libinterp/parse-tree/pt-arg-list.h @ 16360:11115c237231
recognize variables when parsing (bug #38576)
* lex.h, lex.ll (lexical_feedback::mark_as_variable,
lexical_feedback::maybe_mark_previous_token_as_variable,
lexical_feedback::mark_as_variables, octave_lexer::is_variable):
New fucntions.
("="): Call maybe_mark_previous_toke_as_variable.
(handle_identifier): Don't tag variables as possible commands.
(param_list): Mark names in list as variables.
(octave_base_parser::validate_matrix_for_assignment): Likewise.
* pt-arg-list.h, pt-arg-list.cc (tree_argument_list::variable_names):
New function.
* pt-misc.h, pt-misc.cc (tree_parameter_list::variable_names):
New function.
* token.h, token.cc (token::symbol_name, token::is_symbol):
New functions.
* test/bug-38576.tst: New file.
* test/Makefile.am (FCN_FILES): Add bug-38576.tst to the list.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 23 Mar 2013 15:02:29 -0400 |
parents | 3389152014ca |
children |
line wrap: on
line source
/* Copyright (C) 1996-2012 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_tree_arg_list_h) #define octave_tree_arg_list_h 1 #include <list> class octave_value_list; class octave_lvalue; class tree_expression; class tree_walker; #include "str-vec.h" #include "base-list.h" #include "symtab.h" // Argument lists. Used to hold the list of expressions that are the // arguments in a function call or index expression. class tree_argument_list : public octave_base_list<tree_expression *> { public: typedef tree_expression* element_type; tree_argument_list (void) : list_includes_magic_end (false), list_includes_magic_tilde (false), simple_assign_lhs (false) { } tree_argument_list (tree_expression *t) : list_includes_magic_end (false), list_includes_magic_tilde (false), simple_assign_lhs (false) { append (t); } ~tree_argument_list (void); bool has_magic_end (void) const; bool has_magic_tilde (void) const { return list_includes_magic_tilde; } tree_expression *remove_front (void) { iterator p = begin (); tree_expression *retval = *p; erase (p); return retval; } void append (const element_type& s); void mark_as_simple_assign_lhs (void) { simple_assign_lhs = true; } bool is_simple_assign_lhs (void) { return simple_assign_lhs; } bool all_elements_are_constant (void) const; bool is_valid_lvalue_list (void) const; octave_value_list convert_to_const_vector (const octave_value *object = 0); std::list<octave_lvalue> lvalue_list (void); string_vector get_arg_names (void) const; std::list<std::string> variable_names (void) const; tree_argument_list *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); private: bool list_includes_magic_end; bool list_includes_magic_tilde; bool simple_assign_lhs; // No copying! tree_argument_list (const tree_argument_list&); tree_argument_list& operator = (const tree_argument_list&); }; #endif