Mercurial > hg > octave-lyh
view libinterp/parse-tree/pt-exp.h @ 15954:46ca8488de92 classdef
Re-engineer tree_expression postfix handling to make it more flexible.
* libinterp/octave-value/ov-fcn.h (octave_function::is_postfix_index_handled):
New method.
* libinterp/parse-tree/oct-parse.yy
(make_index_expression, make_indirect_ref): Set expression postfix index type.
* libinterp/parse-tree/pt-exp.h (tree_expression::postfix_index): Remove field.
(tree_expression::postfix_index_type): New field.
(tree_expression::tree_expression): Initialize it.
(tree_expression::copy_base): Copy it.
(tree_expression::set_postfix_index, tree_expression::postfix_index): New
methods.
(tree_expression::mark_postfix_indexed): Remove method.
(tree_expression::is_postfix_indexed): Use postfix_index_type field.
* libinterp/parse-tree/pt-id.cc (tree_identifier::rvalue): Let the function
object determine whether it can handle the first postfix index and call
do_multi_index_op if it can't.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Tue, 15 Jan 2013 17:01:10 -0500 |
parents | fb9dffe5fbfb |
children | 3c265e4dba6d |
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_expr_h) #define octave_tree_expr_h 1 #include <string> #include <list> class octave_value; class octave_lvalue; #include "pt.h" #include "symtab.h" // A base class for expressions. class tree_expression : public tree { public: tree_expression (int l = -1, int c = -1) : tree (l, c), num_parens (0), postfix_index_type ('\0'), print_flag (false) { } virtual ~tree_expression (void) { } virtual bool has_magic_end (void) const = 0; virtual tree_expression *dup (symbol_table::scope_id, symbol_table::context_id context) const = 0; virtual bool is_constant (void) const { return false; } virtual bool is_matrix_constant (void) const { return false; } virtual bool is_identifier (void) const { return false; } virtual bool is_index_expression (void) const { return false; } virtual bool is_assignment_expression (void) const { return false; } virtual bool is_prefix_expression (void) const { return false; } virtual bool is_unary_expression (void) const { return false; } virtual bool is_binary_expression (void) const { return false; } virtual bool is_boolean_expression (void) const { return false; } virtual bool is_logically_true (const char *); virtual bool lvalue_ok (void) const { return false; } virtual bool rvalue_ok (void) const { return false; } virtual octave_value rvalue1 (int nargout = 1); virtual octave_value_list rvalue (int nargout); virtual octave_value_list rvalue (int nargout, const std::list<octave_lvalue> *lvalue_list); virtual octave_lvalue lvalue (void); int paren_count (void) const { return num_parens; } bool is_postfix_indexed (void) const { return (postfix_index_type != '\0'); } char postfix_index (void) const { return postfix_index_type; } // Check if the result of the expression should be printed. // Should normally be used in conjunction with // tree_evaluator::statement_printing_enabled. bool print_result (void) const { return print_flag; } virtual std::string oper (void) const { return "<unknown>"; } virtual std::string name (void) const { return "<unknown>"; } virtual std::string original_text (void) const; virtual void mark_braindead_shortcircuit (const std::string&) { } tree_expression *mark_in_parens (void) { num_parens++; return this; } tree_expression *set_postfix_index (char type) { postfix_index_type = type; return this; } tree_expression *set_print_flag (bool print) { print_flag = print; return this; } virtual void copy_base (const tree_expression& e) { num_parens = e.num_parens; postfix_index_type = e.postfix_index_type; print_flag = e.print_flag; } protected: // A count of the number of times this expression appears directly // inside a set of parentheses. // // (((e1)) + e2) ==> 2 for expression e1 // ==> 1 for expression ((e1)) + e2 // ==> 0 for expression e2 int num_parens; // The first index type associated with this expression. This field // is 0 (character '\0') if the expression has no associated index. // See the code in tree_identifier::rvalue for the rationale. char postfix_index_type; // Print result of rvalue for this expression? bool print_flag; private: // No copying! tree_expression (const tree_expression&); tree_expression& operator = (const tree_expression&); }; #endif