Mercurial > hg > octave-nkf
view libinterp/parse-tree/pt-binop.h @ 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 | d76f790b4eec |
children | 91cd85a75705 |
line wrap: on
line source
/* Copyright (C) 1996-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/>. */ #if !defined (octave_pt_binop_h) #define octave_pt_binop_h 1 #include <string> class tree_walker; class octave_value; class octave_value_list; class octave_lvalue; #include "ov.h" #include "pt-exp.h" #include "symtab.h" // Binary expressions. class tree_binary_expression : public tree_expression { public: tree_binary_expression (int l = -1, int c = -1, octave_value::binary_op t = octave_value::unknown_binary_op) : tree_expression (l, c), op_lhs (0), op_rhs (0), etype (t), eligible_for_braindead_shortcircuit (false), braindead_shortcircuit_warning_issued (false) { } tree_binary_expression (tree_expression *a, tree_expression *b, int l = -1, int c = -1, octave_value::binary_op t = octave_value::unknown_binary_op) : tree_expression (l, c), op_lhs (a), op_rhs (b), etype (t), eligible_for_braindead_shortcircuit (false), braindead_shortcircuit_warning_issued (false) { } ~tree_binary_expression (void) { delete op_lhs; delete op_rhs; } void mark_braindead_shortcircuit (void) { if (etype == octave_value::op_el_and || etype == octave_value::op_el_or) { eligible_for_braindead_shortcircuit = true; op_lhs->mark_braindead_shortcircuit (); op_rhs->mark_braindead_shortcircuit (); } } bool has_magic_end (void) const { return ((op_lhs && op_lhs->has_magic_end ()) || (op_rhs && op_rhs->has_magic_end ())); } bool is_binary_expression (void) const { return true; } bool rvalue_ok (void) const { return true; } octave_value rvalue1 (int nargout = 1); octave_value_list rvalue (int nargout); std::string oper (void) const; octave_value::binary_op op_type (void) const { return etype; } tree_expression *lhs (void) { return op_lhs; } tree_expression *rhs (void) { return op_rhs; } tree_expression *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); protected: // The operands for the expression. tree_expression *op_lhs; tree_expression *op_rhs; private: // The type of the expression. octave_value::binary_op etype; // TRUE if this is an | or & expression in the condition of an IF // or WHILE statement. bool eligible_for_braindead_shortcircuit; // TRUE if we have already issued a warning about short circuiting // for this operator. bool braindead_shortcircuit_warning_issued; void matlab_style_short_circuit_warning (const char *op); // No copying! tree_binary_expression (const tree_binary_expression&); tree_binary_expression& operator = (const tree_binary_expression&); }; // Boolean expressions. class tree_boolean_expression : public tree_binary_expression { public: enum type { unknown, bool_and, bool_or }; tree_boolean_expression (int l = -1, int c = -1, type t = unknown) : tree_binary_expression (l, c), etype (t) { } tree_boolean_expression (tree_expression *a, tree_expression *b, int l = -1, int c = -1, type t = unknown) : tree_binary_expression (a, b, l, c), etype (t) { } ~tree_boolean_expression (void) { } bool is_boolean_expression (void) const { return true; } bool rvalue_ok (void) const { return true; } octave_value rvalue1 (int nargout = 1); octave_value_list rvalue (int nargout); std::string oper (void) const; type op_type (void) const { return etype; } tree_expression *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; private: // The type of the expression. type etype; // No copying! tree_boolean_expression (const tree_boolean_expression&); tree_boolean_expression& operator = (const tree_boolean_expression&); }; #endif