diff libinterp/parse-tree/pt-walk.h @ 23075:4e3d47dc7e25

move parse tree classes inside octave namespace * lex.h, lex.ll, oct-parse.in.yy, parse.h, pt-all.h, pt-arg-list.cc, pt-arg-list.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt.cc, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.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.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, 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-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-stmt.cc, pt-stmt.h, pt-unop.cc, pt-unop.h, pt-walk.h, token.cc, token.h: Move classes and most functions inside octave namespace. Change all uses.
author John W. Eaton <jwe@octave.org>
date Thu, 19 Jan 2017 23:41:54 -0500
parents f75d289645ec
children ef4d915df748
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-walk.h	Thu Jan 19 14:47:19 2017 -0500
+++ b/libinterp/parse-tree/pt-walk.h	Thu Jan 19 23:41:54 2017 -0500
@@ -25,261 +25,270 @@
 
 #include "octave-config.h"
 
-class tree_anon_fcn_handle;
-class tree_argument_list;
-class tree_binary_expression;
-class tree_break_command;
-class tree_colon_expression;
-class tree_continue_command;
-class tree_global_command;
-class tree_persistent_command;
-class tree_decl_elt;
-class tree_decl_init_list;
-class tree_simple_for_command;
-class tree_complex_for_command;
 class octave_user_script;
 class octave_user_function;
-class tree_function_def;
-class tree_identifier;
-class tree_if_clause;
-class tree_if_command;
-class tree_if_command_list;
-class tree_switch_case;
-class tree_switch_case_list;
-class tree_switch_command;
-class tree_index_expression;
-class tree_matrix;
-class tree_cell;
-class tree_multi_assignment;
-class tree_no_op_command;
-class tree_constant;
-class tree_fcn_handle;
-class tree_funcall;
-class tree_parameter_list;
-class tree_postfix_expression;
-class tree_prefix_expression;
-class tree_return_command;
-class tree_return_list;
-class tree_simple_assignment;
-class tree_statement;
-class tree_statement_list;
-class tree_try_catch_command;
-class tree_unwind_protect_command;
-class tree_while_command;
-class tree_do_until_command;
 
-class tree_classdef_attribute;
-class tree_classdef_attribute_list;
-class tree_classdef_superclass;
-class tree_classdef_superclass_list;
-class tree_classdef_property;
-class tree_classdef_property_list;
-class tree_classdef_properties_block;
-class tree_classdef_methods_list;
-class tree_classdef_methods_block;
-class tree_classdef_event;
-class tree_classdef_events_list;
-class tree_classdef_events_block;
-class tree_classdef_enum;
-class tree_classdef_enum_list;
-class tree_classdef_enum_block;
-class tree_classdef_body;
-class tree_classdef;
+namespace octave
+{
+  class tree_anon_fcn_handle;
+  class tree_argument_list;
+  class tree_binary_expression;
+  class tree_break_command;
+  class tree_colon_expression;
+  class tree_continue_command;
+  class tree_global_command;
+  class tree_persistent_command;
+  class tree_decl_elt;
+  class tree_decl_init_list;
+  class tree_simple_for_command;
+  class tree_complex_for_command;
+  class tree_function_def;
+  class tree_identifier;
+  class tree_if_clause;
+  class tree_if_command;
+  class tree_if_command_list;
+  class tree_switch_case;
+  class tree_switch_case_list;
+  class tree_switch_command;
+  class tree_index_expression;
+  class tree_matrix;
+  class tree_cell;
+  class tree_multi_assignment;
+  class tree_no_op_command;
+  class tree_constant;
+  class tree_fcn_handle;
+  class tree_funcall;
+  class tree_parameter_list;
+  class tree_postfix_expression;
+  class tree_prefix_expression;
+  class tree_return_command;
+  class tree_return_list;
+  class tree_simple_assignment;
+  class tree_statement;
+  class tree_statement_list;
+  class tree_try_catch_command;
+  class tree_unwind_protect_command;
+  class tree_while_command;
+  class tree_do_until_command;
 
-class
-tree_walker
-{
-protected:
-
-  tree_walker (void) { }
-
-  virtual ~tree_walker (void) = default;
-
-public:
-
-  // No copying!
+  class tree_classdef_attribute;
+  class tree_classdef_attribute_list;
+  class tree_classdef_superclass;
+  class tree_classdef_superclass_list;
+  class tree_classdef_property;
+  class tree_classdef_property_list;
+  class tree_classdef_properties_block;
+  class tree_classdef_methods_list;
+  class tree_classdef_methods_block;
+  class tree_classdef_event;
+  class tree_classdef_events_list;
+  class tree_classdef_events_block;
+  class tree_classdef_enum;
+  class tree_classdef_enum_list;
+  class tree_classdef_enum_block;
+  class tree_classdef_body;
+  class tree_classdef;
 
-  tree_walker (const tree_walker&) = delete;
+  class tree_walker
+  {
+  protected:
 
-  tree_walker& operator = (const tree_walker&) = delete;
+    tree_walker (void) { }
 
-  virtual void
-  visit_anon_fcn_handle (tree_anon_fcn_handle&) = 0;
+    virtual ~tree_walker (void) = default;
+
+  public:
 
-  virtual void
-  visit_argument_list (tree_argument_list&) = 0;
+    // No copying!
 
-  virtual void
-  visit_binary_expression (tree_binary_expression&) = 0;
+    tree_walker (const tree_walker&) = delete;
 
-  virtual void
-  visit_break_command (tree_break_command&) = 0;
+    tree_walker& operator = (const tree_walker&) = delete;
 
-  virtual void
-  visit_colon_expression (tree_colon_expression&) = 0;
+    virtual void
+    visit_anon_fcn_handle (tree_anon_fcn_handle&) = 0;
+
+    virtual void
+    visit_argument_list (tree_argument_list&) = 0;
 
-  virtual void
-  visit_continue_command (tree_continue_command&) = 0;
+    virtual void
+    visit_binary_expression (tree_binary_expression&) = 0;
 
-  virtual void
-  visit_global_command (tree_global_command&) = 0;
+    virtual void
+    visit_break_command (tree_break_command&) = 0;
 
-  virtual void
-  visit_persistent_command (tree_persistent_command&) = 0;
+    virtual void
+    visit_colon_expression (tree_colon_expression&) = 0;
 
-  virtual void
-  visit_decl_elt (tree_decl_elt&) = 0;
+    virtual void
+    visit_continue_command (tree_continue_command&) = 0;
 
-  virtual void
-  visit_decl_init_list (tree_decl_init_list&) = 0;
+    virtual void
+    visit_global_command (tree_global_command&) = 0;
+
+    virtual void
+    visit_persistent_command (tree_persistent_command&) = 0;
 
-  virtual void
-  visit_simple_for_command (tree_simple_for_command&) = 0;
+    virtual void
+    visit_decl_elt (tree_decl_elt&) = 0;
 
-  virtual void
-  visit_complex_for_command (tree_complex_for_command&) = 0;
+    virtual void
+    visit_decl_init_list (tree_decl_init_list&) = 0;
 
-  virtual void
-  visit_octave_user_script (octave_user_script&) = 0;
+    virtual void
+    visit_simple_for_command (tree_simple_for_command&) = 0;
 
-  virtual void
-  visit_octave_user_function (octave_user_function&) = 0;
+    virtual void
+    visit_complex_for_command (tree_complex_for_command&) = 0;
 
-  virtual void
-  visit_function_def (tree_function_def&) = 0;
+    virtual void
+    visit_octave_user_script (octave_user_script&) = 0;
 
-  virtual void
-  visit_identifier (tree_identifier&) = 0;
+    virtual void
+    visit_octave_user_function (octave_user_function&) = 0;
 
-  virtual void
-  visit_if_clause (tree_if_clause&) = 0;
+    virtual void
+    visit_function_def (tree_function_def&) = 0;
 
-  virtual void
-  visit_if_command (tree_if_command&) = 0;
+    virtual void
+    visit_identifier (tree_identifier&) = 0;
 
-  virtual void
-  visit_if_command_list (tree_if_command_list&) = 0;
+    virtual void
+    visit_if_clause (tree_if_clause&) = 0;
 
-  virtual void
-  visit_switch_case (tree_switch_case&) = 0;
+    virtual void
+    visit_if_command (tree_if_command&) = 0;
 
-  virtual void
-  visit_switch_case_list (tree_switch_case_list&) = 0;
+    virtual void
+    visit_if_command_list (tree_if_command_list&) = 0;
 
-  virtual void
-  visit_switch_command (tree_switch_command&) = 0;
+    virtual void
+    visit_switch_case (tree_switch_case&) = 0;
 
-  virtual void
-  visit_index_expression (tree_index_expression&) = 0;
+    virtual void
+    visit_switch_case_list (tree_switch_case_list&) = 0;
 
-  virtual void
-  visit_matrix (tree_matrix&) = 0;
+    virtual void
+    visit_switch_command (tree_switch_command&) = 0;
 
-  virtual void
-  visit_cell (tree_cell&) = 0;
+    virtual void
+    visit_index_expression (tree_index_expression&) = 0;
 
-  virtual void
-  visit_multi_assignment (tree_multi_assignment&) = 0;
+    virtual void
+    visit_matrix (tree_matrix&) = 0;
+
+    virtual void
+    visit_cell (tree_cell&) = 0;
 
-  virtual void
-  visit_no_op_command (tree_no_op_command&) = 0;
+    virtual void
+    visit_multi_assignment (tree_multi_assignment&) = 0;
 
-  virtual void
-  visit_constant (tree_constant&) = 0;
+    virtual void
+    visit_no_op_command (tree_no_op_command&) = 0;
 
-  virtual void
-  visit_fcn_handle (tree_fcn_handle&) = 0;
+    virtual void
+    visit_constant (tree_constant&) = 0;
 
-  virtual void
-  visit_funcall (tree_funcall&) = 0;
+    virtual void
+    visit_fcn_handle (tree_fcn_handle&) = 0;
 
-  virtual void
-  visit_parameter_list (tree_parameter_list&) = 0;
+    virtual void
+    visit_funcall (tree_funcall&) = 0;
 
-  virtual void
-  visit_postfix_expression (tree_postfix_expression&) = 0;
+    virtual void
+    visit_parameter_list (tree_parameter_list&) = 0;
 
-  virtual void
-  visit_prefix_expression (tree_prefix_expression&) = 0;
+    virtual void
+    visit_postfix_expression (tree_postfix_expression&) = 0;
 
-  virtual void
-  visit_return_command (tree_return_command&) = 0;
+    virtual void
+    visit_prefix_expression (tree_prefix_expression&) = 0;
 
-  virtual void
-  visit_return_list (tree_return_list&) = 0;
+    virtual void
+    visit_return_command (tree_return_command&) = 0;
 
-  virtual void
-  visit_simple_assignment (tree_simple_assignment&) = 0;
+    virtual void
+    visit_return_list (tree_return_list&) = 0;
+
+    virtual void
+    visit_simple_assignment (tree_simple_assignment&) = 0;
 
-  virtual void
-  visit_statement (tree_statement&) = 0;
+    virtual void
+    visit_statement (tree_statement&) = 0;
 
-  virtual void
-  visit_statement_list (tree_statement_list&) = 0;
+    virtual void
+    visit_statement_list (tree_statement_list&) = 0;
 
-  virtual void
-  visit_try_catch_command (tree_try_catch_command&) = 0;
+    virtual void
+    visit_try_catch_command (tree_try_catch_command&) = 0;
 
-  virtual void
-  visit_unwind_protect_command (tree_unwind_protect_command&) = 0;
+    virtual void
+    visit_unwind_protect_command (tree_unwind_protect_command&) = 0;
 
-  virtual void
-  visit_while_command (tree_while_command&) = 0;
+    virtual void
+    visit_while_command (tree_while_command&) = 0;
 
-  virtual void
-  visit_do_until_command (tree_do_until_command&) = 0;
+    virtual void
+    visit_do_until_command (tree_do_until_command&) = 0;
 
-  virtual void
-  visit_classdef_attribute (tree_classdef_attribute&) { } /* = 0; */
+    virtual void
+    visit_classdef_attribute (tree_classdef_attribute&) { } /* = 0; */
 
-  virtual void
-  visit_classdef_attribute_list (tree_classdef_attribute_list&) { } // = 0;
+    virtual void
+    visit_classdef_attribute_list (tree_classdef_attribute_list&) { } // = 0;
 
-  virtual void
-  visit_classdef_superclass (tree_classdef_superclass&) { } // = 0;
+    virtual void
+    visit_classdef_superclass (tree_classdef_superclass&) { } // = 0;
 
-  virtual void
-  visit_classdef_superclass_list (tree_classdef_superclass_list&) { } // = 0;
+    virtual void
+    visit_classdef_superclass_list (tree_classdef_superclass_list&) { } // = 0;
+
+    virtual void
+    visit_classdef_property (tree_classdef_property&) { } // = 0;
 
-  virtual void
-  visit_classdef_property (tree_classdef_property&) { } // = 0;
+    virtual void
+    visit_classdef_property_list (tree_classdef_property_list&) { } // = 0;
 
-  virtual void
-  visit_classdef_property_list (tree_classdef_property_list&) { } // = 0;
+    virtual void
+    visit_classdef_properties_block (tree_classdef_properties_block&) { } // = 0;
 
-  virtual void
-  visit_classdef_properties_block (tree_classdef_properties_block&) { } // = 0;
+    virtual void
+    visit_classdef_methods_list (tree_classdef_methods_list&) { } // = 0;
 
-  virtual void
-  visit_classdef_methods_list (tree_classdef_methods_list&) { } // = 0;
+    virtual void
+    visit_classdef_methods_block (tree_classdef_methods_block&) { } // = 0;
 
-  virtual void
-  visit_classdef_methods_block (tree_classdef_methods_block&) { } // = 0;
+    virtual void
+    visit_classdef_event (tree_classdef_event&) { } // = 0;
 
-  virtual void
-  visit_classdef_event (tree_classdef_event&) { } // = 0;
+    virtual void
+    visit_classdef_events_list (tree_classdef_events_list&) { } // = 0;
 
-  virtual void
-  visit_classdef_events_list (tree_classdef_events_list&) { } // = 0;
+    virtual void
+    visit_classdef_events_block (tree_classdef_events_block&) { } // = 0;
 
-  virtual void
-  visit_classdef_events_block (tree_classdef_events_block&) { } // = 0;
+    virtual void
+    visit_classdef_enum (tree_classdef_enum&) { } // = 0;
 
-  virtual void
-  visit_classdef_enum (tree_classdef_enum&) { } // = 0;
+    virtual void
+    visit_classdef_enum_list (tree_classdef_enum_list&) { } // = 0;
 
-  virtual void
-  visit_classdef_enum_list (tree_classdef_enum_list&) { } // = 0;
+    virtual void
+    visit_classdef_enum_block (tree_classdef_enum_block&) { } // = 0;
+
+    virtual void
+    visit_classdef_body (tree_classdef_body&) { } // = 0;
 
-  virtual void
-  visit_classdef_enum_block (tree_classdef_enum_block&) { } // = 0;
+    virtual void
+    visit_classdef (tree_classdef&) { } // = 0;
+  };
+}
 
-  virtual void
-  visit_classdef_body (tree_classdef_body&) { } // = 0;
+#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS)
 
-  virtual void
-  visit_classdef (tree_classdef&) { } // = 0;
-};
+OCTAVE_DEPRECATED ("use 'octave::tree_walker' instead")
+typedef octave::tree_walker tree_walker;
 
 #endif
 
+#endif