Mercurial > octave
diff libinterp/parse-tree/pt-select.h @ 23435:c452180ab672
begin refactoring parse tree evaluator
* libinterp/parse-tree/pt-tm-const.cc,
libinterp/parse-tree/pt-tm-const.h:
New files, extracted from pt-mat.h and pt-mat.cc.
* libinterp/parse-tree/module.mk: Update.
* interpreter.cc, ov-class.cc, ov-classdef.cc, ov-classdef.h,
ov-fcn-handle.cc, ov-fcn-handle.h, ov-usr-fcn.cc, oct-parse.in.yy,
pt-arg-list.cc, pt-arg-list.h, pt-array-list.h, pt-assign.cc,
pt-assign.h, pt-binop.cc, pt-binop.h, pt-cbinop.cc, pt-cbinop.h,
pt-cell.cc, pt-cell.h, pt-classdef.cc, pt-classdef.h, pt-cmd.cc,
pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h,
pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc,
pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h,
pt-funcall.cc, pt-funcall.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h,
pt-jit.cc, pt-jump.cc, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc,
pt-mat.h, pt-misc.cc, pt-misc.h, pt-select.cc, pt-select.h,
pt-stmt.cc, pt-stmt.h, pt-unop.cc, pt-unop.h:
Use tree_evaluator class to walk the parse tree instead of rvalue
methods in the parse tree classes. Maintain a stack in the evaluator
class to accumulate results.
Pass pointer to evaluator to function objects and other classes as
needed for evaluation.
This is a work in progress that is not yet complete. The ultimate
goal is to move all evaluation into the tree_evaluator class instead
of spreading that work among many different classes. The global
pointer to the current evaluator should also be eliminated.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 21 Apr 2017 18:07:40 -0400 |
| parents | 092078913d54 |
| children | cd4e1ee28716 |
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-select.h Mon Apr 24 21:03:38 2017 -0700 +++ b/libinterp/parse-tree/pt-select.h Fri Apr 21 18:07:40 2017 -0400 @@ -28,6 +28,7 @@ #include "base-list.h" #include "comment-list.h" #include "pt-cmd.h" +#include "pt-walk.h" #include "symtab.h" namespace octave @@ -35,8 +36,6 @@ class tree_expression; class tree_statement_list; - class tree_walker; - // If. class tree_if_clause : public tree @@ -74,7 +73,10 @@ tree_if_clause *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; - void accept (tree_walker& tw); + void accept (tree_walker& tw) + { + tw.visit_if_clause (*this); + } private: @@ -115,7 +117,10 @@ tree_if_command_list *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; - void accept (tree_walker& tw); + void accept (tree_walker& tw) + { + tw.visit_if_command_list (*this); + } }; class tree_if_command : public tree_command @@ -146,7 +151,10 @@ tree_command *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; - void accept (tree_walker& tw); + void accept (tree_walker& tw) + { + tw.visit_if_command (*this); + } private: @@ -188,8 +196,6 @@ bool is_default_case (void) { return ! label; } - bool label_matches (const octave_value& val); - tree_expression *case_label (void) { return label; } tree_statement_list *commands (void) { return list; } @@ -199,7 +205,10 @@ tree_switch_case *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; - void accept (tree_walker& tw); + void accept (tree_walker& tw) + { + tw.visit_switch_case (*this); + } private: @@ -240,7 +249,10 @@ tree_switch_case_list *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; - void accept (tree_walker& tw); + void accept (tree_walker& tw) + { + tw.visit_switch_case_list (*this); + } }; class tree_switch_command : public tree_command @@ -276,7 +288,10 @@ tree_command *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; - void accept (tree_walker& tw); + void accept (tree_walker& tw) + { + tw.visit_switch_command (*this); + } private: