annotate src/pt-all.h @ 15037:56b8eb7c9c04 classdef

improvements in parsing classdef * liboctave/base-list.h (octave_base_list::octave_base_list (void), octave_base_list::octave_base_list (const std::list<elt_type>&), octave_base_list::operator = (const octave_base_list&), octave_base_list::~octave_base_list (void)): Now public. * pt-classdef.h, pt-classdef.cc: New files. * src/Makefile.am (PT_INCLUDES): Add pt-classdef.h to the list. (PT_SRC): Add pt-classdef.cc to the list. * pt-all.h: Include pt-classdef.h. * ov.cc: Include ov-classdef.h. * ov-classdef.cc: Include pt-classdef.h. (cdef_class:make_meta_class): New method. (F__meta_get_class__): Delete. (F__superclass_reference__, F__meta_class_query__): New functions. * pt-id.h: Include oct-lvalue.h. * pt-walk.h (tree_walker::visit_classdef (tree_classdef&), tree_walker::visit_classdef_attribute (tree_classdef_attribute&), tree_walker::visit_classdef_attribute_list (tree_classdef_attribute_list&), tree_walker::visit_classdef_superclass (tree_classdef_superclass&), tree_walker::visit_classdef_superclass_list (tree_classdef_superclass_list&), tree_walker::visit_classdef_property (tree_classdef_property&), tree_walker::visit_classdef_property_list (tree_classdef_property_list&), tree_walker::visit_classdef_properties_block (tree_classdef_properties_block&), tree_walker::visit_classdef_methods_list (tree_classdef_methods_list&), tree_walker::visit_classdef_methods_block (tree_classdef_methods_block&), tree_walker::visit_classdef_event (tree_classdef_event&), tree_walker::visit_classdef_events_list (tree_classdef_events_list&), tree_walker::visit_classdef_events_block (tree_classdef_events_block&), tree_walker::visit_classdef_enum (tree_classdef_enum&), tree_walker::visit_classdef_enum_list (tree_classdef_enum_list&), tree_walker::visit_classdef_enum_block (tree_classdef_enum_block&), tree_walker::visit_classdef_body (tree_classdef_body&)): New virtual functions. * token.h, token.cc (token::sc::mr, token::sc::cr, token::sc::pr, token::mc::mr, token::mc::pr): Delete. (token::sc::method_name, token::sc::package_name, token::sc::class_name, token::mc::package_name, token::mc::class_name): New member variables. (token::method_rec, token::class_rec, token::package_rec, token::meta_class_rec, token::meta_package_rec): Delete. (token::superclass_method_name, token::superclass_package_name, token::superclass_class_name, token::meta_package_name, token::meta_class_name): New methods. (token::token (symbol_table::symbol_record*, int, int), token::token (symbol_table::symbol_record*, symbol_table::symbol_record*, int, int), token::token (symbol_table::symbol_record*, symbol_table::symbol_record*, symbol_table::symbol_record*, int, int)): Delete. (token::token (const std::string&, const std::string&, int, int), token::token (const std::string&, const std::string&, const std::string&, int, int)): New constructors. (token::scls_rec_token, token::meta_rec_token): Delete enum values. (token::scls_name_token, token::meta_rec_token): New enum values. (token::~token): Delete sc and mc struct memebers. * lex.ll, lex.h (lexical_feedback::parsing_classdef_get_method, lexical_feedback::parsing_classdef_set_method)): New data members. (lexical_feedback::lexical_feedback, lexical_feedback::init): Initialize new data members. (prep_lexer_for_classdef_file): New function. (CLASSDEF_FILE_BEGIN): New exclusive start state. (handle_superclass_identifier, handle_meta_identifier): Split identifier here and create token with character strings. (display_token): Handle CLASSDEF_FILE. (display_state): Handle CLASSDEF_FILE_BEGIN. * oct-parse.yy: Include ov-classdef.h and pt-funcall.h. (classdef_object): New static variable. (make_superclass_ref, make_meta_class_query, make_classdef, make_classdef_properties_block, make_classdef_methods_block, make_classdef_events_block, make_classdef_enum_block)): New functions. (dummy_type): Delete unused nonterminal type. (tok_type, tree_funcall_type, tree_function_def_type, tree_classdef_type, tree_classdef_attribute_type, tree_classdef_attribute_list_type, tree_classdef_superclass_type, tree_classdef_superclass_list_type, tree_classdef_body_type, tree_classdef_property_type, tree_classdef_property_list_type, tree_classdef_properties_block_type, tree_classdef_methods_list_type, tree_classdef_methods_block_type, tree_classdef_event_type, tree_classdef_events_list_type, tree_classdef_events_block_type, tree_classdef_enum_type, tree_classdef_enum_list_type, tree_classdef_enum_block_type): New types for nonterminals. (CLASSDEF): Declare to have a tok_val token value. (CLASSDEF_FILE): New token. (classdef_end, properties_beg, methods_beg, events_beg, enum_beg, classdef1): Delete nonterminals. (property_list): Rename from properties_list. (attr, class_event, class_enum, class_property, property_list, properties_block, methods_list, methods_block, opt_attr_list, attr_list, events_list, events_blcok, enum_list, enum_block, class_body, classdef): Declare with specific types. Create parse tree objects for these nonterminals. (classdef_file): New nonterminal. (parse_fcn_file): Handle classdef files. Don't treat classdef files as scripts. (command): Don't handle classdef here. (input): Accept classdef_file here. (fcn_name): If GET, set lexer_flags.parsing_classdef_get_method. If SET, set lexer_flags.parsing_classdef_set_method.
author John W. Eaton <jwe@octave.org>
date Fri, 27 Jul 2012 17:10:25 -0400
parents a820a990968e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3011
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
1 /*
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
2
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
3 Copyright (C) 1996-2012 John W. Eaton
3011
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
4
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
5 This file is part of Octave.
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
6
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5307
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5307
diff changeset
10 option) any later version.
3011
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
11
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
15 for more details.
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
16
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5307
diff changeset
18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5307
diff changeset
19 <http://www.gnu.org/licenses/>.
3011
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
20
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
21 */
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
22
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
23 #if !defined (octave_tree_all_h)
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
24 #define octave_tree_all_h 1
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
25
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
26 #include "pt.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
27 #include "pt-arg-list.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
28 #include "pt-assign.h"
3770
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe]
jwe
parents: 3351
diff changeset
29 #include "pt-bp.h"
3011
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
30 #include "pt-binop.h"
7800
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents: 7017
diff changeset
31 #include "pt-cbinop.h"
3011
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
32 #include "pt-check.h"
15037
56b8eb7c9c04 improvements in parsing classdef
John W. Eaton <jwe@octave.org>
parents: 15035
diff changeset
33 #include "pt-classdef.h"
3011
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
34 #include "pt-cmd.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
35 #include "pt-colon.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
36 #include "pt-const.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
37 #include "pt-decl.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
38 #include "pt-except.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
39 #include "pt-exp.h"
4342
813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe]
jwe
parents: 3930
diff changeset
40 #include "pt-fcn-handle.h"
15035
a820a990968e new tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
41 #include "pt-funcall.h"
3011
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
42 #include "pt-id.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
43 #include "pt-idx.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
44 #include "pt-jump.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
45 #include "pt-loop.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
46 #include "pt-mat.h"
3351
8623649c967c [project @ 1999-11-15 16:17:01 by jwe]
jwe
parents: 3011
diff changeset
47 #include "pt-cell.h"
3011
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
48 #include "pt-misc.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
49 #include "pt-pr-code.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
50 #include "pt-select.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
51 #include "pt-stmt.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
52 #include "pt-unop.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
53 #include "pt-pr-code.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
54 #include "pt-walk.h"
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
55
2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe]
jwe
parents:
diff changeset
56 #endif