Mercurial > hg > octave-nkf
view libinterp/parse-tree/pt-loop.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 | ebb3ef964372 |
children | eb9b73ad403a 4197fc428c7d |
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_loop_h) #define octave_pt_loop_h 1 class octave_value; class octave_lvalue; class tree_argument_list; class tree_expression; class tree_statement_list; class tree_walker; #include "comment-list.h" #include "pt-cmd.h" #include "symtab.h" class jit_info; // While. class tree_while_command : public tree_command { public: tree_while_command (int l = -1, int c = -1) : tree_command (l, c), expr (0), list (0), lead_comm (0), trail_comm (0) #ifdef HAVE_LLVM , compiled (0) #endif { } tree_while_command (tree_expression *e, octave_comment_list *lc = 0, octave_comment_list *tc = 0, int l = -1, int c = -1) : tree_command (l, c), expr (e), list (0), lead_comm (lc), trail_comm (tc) #ifdef HAVE_LLVM , compiled (0) #endif { } tree_while_command (tree_expression *e, tree_statement_list *lst, octave_comment_list *lc = 0, octave_comment_list *tc = 0, int l = -1, int c = -1) : tree_command (l, c), expr (e), list (lst), lead_comm (lc), trail_comm (tc) #ifdef HAVE_LLVM , compiled (0) #endif { } ~tree_while_command (void); tree_expression *condition (void) { return expr; } tree_statement_list *body (void) { return list; } octave_comment_list *leading_comment (void) { return lead_comm; } octave_comment_list *trailing_comment (void) { return trail_comm; } tree_command *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); #ifdef HAVE_LLVM // some functions use by tree_jit jit_info *get_info (void) const { return compiled; } void stash_info (jit_info *jinfo) { compiled = jinfo; } #endif protected: // Expression to test. tree_expression *expr; // List of commands to execute. tree_statement_list *list; // Comment preceding WHILE token. octave_comment_list *lead_comm; // Comment preceding ENDWHILE token. octave_comment_list *trail_comm; private: #ifdef HAVE_LLVM // compiled version of the loop jit_info *compiled; #endif // No copying! tree_while_command (const tree_while_command&); tree_while_command& operator = (const tree_while_command&); }; // Do-Until. class tree_do_until_command : public tree_while_command { public: tree_do_until_command (int l = -1, int c = -1) : tree_while_command (l, c) { } tree_do_until_command (tree_expression *e, octave_comment_list *lc = 0, octave_comment_list *tc = 0, int l = -1, int c = -1) : tree_while_command (e, lc, tc, l, c) { } tree_do_until_command (tree_expression *e, tree_statement_list *lst, octave_comment_list *lc = 0, octave_comment_list *tc = 0, int l = -1, int c = -1) : tree_while_command (e, lst, lc, tc, l, c) { } ~tree_do_until_command (void) { } tree_command *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); private: // No copying! tree_do_until_command (const tree_do_until_command&); tree_do_until_command& operator = (const tree_do_until_command&); }; // For. class tree_simple_for_command : public tree_command { public: tree_simple_for_command (int l = -1, int c = -1) : tree_command (l, c), parallel (false), lhs (0), expr (0), maxproc (0), list (0), lead_comm (0), trail_comm (0) #ifdef HAVE_LLVM , compiled (0) #endif { } tree_simple_for_command (bool parallel_arg, tree_expression *le, tree_expression *re, tree_expression *maxproc_arg, tree_statement_list *lst, octave_comment_list *lc = 0, octave_comment_list *tc = 0, int l = -1, int c = -1) : tree_command (l, c), parallel (parallel_arg), lhs (le), expr (re), maxproc (maxproc_arg), list (lst), lead_comm (lc), trail_comm (tc) #ifdef HAVE_LLVM , compiled (0) #endif { } ~tree_simple_for_command (void); bool in_parallel (void) { return parallel; } tree_expression *left_hand_side (void) { return lhs; } tree_expression *control_expr (void) { return expr; } tree_expression *maxproc_expr (void) { return maxproc; } tree_statement_list *body (void) { return list; } octave_comment_list *leading_comment (void) { return lead_comm; } octave_comment_list *trailing_comment (void) { return trail_comm; } tree_command *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); #ifdef HAVE_LLVM // some functions use by tree_jit jit_info *get_info (void) const { return compiled; } void stash_info (jit_info *jinfo) { compiled = jinfo; } #endif private: // TRUE means operate in parallel (subject to the value of the // maxproc expression). bool parallel; // Expression to modify. tree_expression *lhs; // Expression to evaluate. tree_expression *expr; // Expression to tell how many processors should be used (only valid // if parallel is TRUE). tree_expression *maxproc; // List of commands to execute. tree_statement_list *list; // Comment preceding FOR token. octave_comment_list *lead_comm; // Comment preceding ENDFOR token. octave_comment_list *trail_comm; // compiled version of the loop jit_info *compiled; // No copying! tree_simple_for_command (const tree_simple_for_command&); tree_simple_for_command& operator = (const tree_simple_for_command&); }; class tree_complex_for_command : public tree_command { public: tree_complex_for_command (int l = -1, int c = -1) : tree_command (l, c), lhs (0), expr (0), list (0), lead_comm (0), trail_comm (0) { } tree_complex_for_command (tree_argument_list *le, tree_expression *re, tree_statement_list *lst, octave_comment_list *lc = 0, octave_comment_list *tc = 0, int l = -1, int c = -1) : tree_command (l, c), lhs (le), expr (re), list (lst), lead_comm (lc), trail_comm (tc) { } ~tree_complex_for_command (void); tree_argument_list *left_hand_side (void) { return lhs; } tree_expression *control_expr (void) { return expr; } tree_statement_list *body (void) { return list; } octave_comment_list *leading_comment (void) { return lead_comm; } octave_comment_list *trailing_comment (void) { return trail_comm; } tree_command *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); private: // Expression to modify. tree_argument_list *lhs; // Expression to evaluate. tree_expression *expr; // List of commands to execute. tree_statement_list *list; // Comment preceding FOR token. octave_comment_list *lead_comm; // Comment preceding ENDFOR token. octave_comment_list *trail_comm; // No copying! tree_complex_for_command (const tree_complex_for_command&); tree_complex_for_command& operator = (const tree_complex_for_command&); }; #endif