Mercurial > octave
diff libinterp/parse-tree/pt-classdef.h @ 26686:581d01526b34
eliminate unnecessary tree_funcall class
The tree_funcall class was only used to handled generated calls to
internal functions used by classdef superclass reference and metaclass
query operations. This change replaces those function calls by
something more direct.
* pt-classdef.h, pt-classdef.cc (tree_superclass_ref,
tree_metaclass_query): New classes.
* pt-walk.h (tree_walker::visit_tree_funcall): Delete. Update all
derived classes.
(tree_walker::visit_superclass_ref,
tree_walker::visit_metaclass_query): New virtual functions.
* pt-pr-code.h, pt-pr-code.cc (tree_print_code::visit
(tree_print_code::visit_superclass_ref,
tree_print_code::visit_metaclass_query):
Correctly print these parse tree elements.
* oct-parse.yy (superclass_identifier, meta_identifier): Use new
tree_superclass_ref tree_metaclass_query classes instead of
tree_funcall to represent these language elements.
* lex.ll (base_lexer::handle_superclass_identifier): Attempt to make
intent of code clearer. Save line and column info in token.
* pt-eval.h, pt-eval.cc (tree_evaluator::visit_funcall): Delete.
(tree_evaluator::visit_superclass_ref,
tree_evaluator::visit_metaclass_query): New functions. Handle
superclass reference and metaclass query operations more directly.
* ov-classdef.h, ov-classdef.cc (F__superclass_reference__,
F__meta_class_query__): Delete.
(class octave_classdef_superclass_ref): Work directly with
method or object and class names as strings instead of octave_value
objects.
(octave_classdef::superclass_ref, octave_classdef::metaclass_query):
New static functions.
* token.h, token.cc: Attempt to use clearer names for superclass
reference tokens.
* pt-funcall.h, pt-funcall.cc: Delete.
* libinterp/parse-tree/module.mk: Update.
* pt-all.h: Update.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 07 Feb 2019 00:03:55 +0000 |
| parents | 00f796120a6d |
| children | 9b0335f4bc74 |
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-classdef.h Wed Feb 06 15:02:37 2019 -0800 +++ b/libinterp/parse-tree/pt-classdef.h Thu Feb 07 00:03:55 2019 +0000 @@ -41,6 +41,78 @@ { class interpreter; + class tree_superclass_ref : public tree_expression + { + public: + + tree_superclass_ref (void) = delete; + + tree_superclass_ref (const std::string& meth_or_obj, + const std::string& cls, int l = -1, int c = -1) + : tree_expression (l, c), m_method_or_object_name (meth_or_obj), + m_class_name (cls) + { } + + // No copying! + + tree_superclass_ref (const tree_superclass_ref&) = delete; + + tree_superclass_ref& operator = (const tree_superclass_ref&) = delete; + + std::string method_or_object_name (void) const + { + return m_method_or_object_name; + } + + std::string class_name (void) const { return m_class_name; } + + bool has_magic_end (void) const { return false; } + + tree_superclass_ref * dup (symbol_scope& scope) const; + + void accept (tree_walker& tw) + { + tw.visit_superclass_ref (*this); + } + + private: + + std::string m_method_or_object_name; + std::string m_class_name; + }; + + class tree_metaclass_query : public tree_expression + { + public: + + tree_metaclass_query (void) = delete; + + tree_metaclass_query (const std::string& cls, int l = -1, int c = -1) + : tree_expression (l, c), m_class_name (cls) + { } + + // No copying! + + tree_metaclass_query (const tree_metaclass_query&) = delete; + + tree_metaclass_query& operator = (const tree_metaclass_query&) = delete; + + std::string class_name (void) const { return m_class_name; } + + bool has_magic_end (void) const { return false; } + + tree_metaclass_query * dup (symbol_scope& scope) const; + + void accept (tree_walker& tw) + { + tw.visit_metaclass_query (*this); + } + + private: + + std::string m_class_name; + }; + class tree_classdef_attribute { public: