diff libinterp/parse-tree/pt-classdef.cc @ 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 3a2b891d0b33
children ef4d915df748
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-classdef.cc	Thu Jan 19 14:47:19 2017 -0500
+++ b/libinterp/parse-tree/pt-classdef.cc	Thu Jan 19 23:41:54 2017 -0500
@@ -27,233 +27,235 @@
 #include "ov-classdef.h"
 #include "pt-classdef.h"
 
-// Classdef attribute
-
-void
-tree_classdef_attribute::accept (tree_walker& tw)
-{
-  tw.visit_classdef_attribute (*this);
-}
-
-// Classdef attribute_list
-
-tree_classdef_attribute_list::~tree_classdef_attribute_list (void)
-{
-  while (! empty ())
-    {
-      iterator p = begin ();
-      delete *p;
-      erase (p);
-    }
-}
-
-void
-tree_classdef_attribute_list::accept (tree_walker& tw)
-{
-  tw.visit_classdef_attribute_list (*this);
-}
-
-// Classdef superclass
-
-void
-tree_classdef_superclass::accept (tree_walker& tw)
-{
-  tw.visit_classdef_superclass (*this);
-}
-
-// Classdef superclass_list
-
-tree_classdef_superclass_list::~tree_classdef_superclass_list (void)
-{
-  while (! empty ())
-    {
-      iterator p = begin ();
-      delete *p;
-      erase (p);
-    }
-}
-
-void
-tree_classdef_superclass_list::accept (tree_walker& tw)
-{
-  tw.visit_classdef_superclass_list (*this);
-}
-
-// Classdef property
-
-void
-tree_classdef_property::accept (tree_walker& tw)
-{
-  tw.visit_classdef_property (*this);
-}
-
-// Classdef property_list
-
-tree_classdef_property_list::~tree_classdef_property_list (void)
-{
-  while (! empty ())
-    {
-      iterator p = begin ();
-      delete *p;
-      erase (p);
-    }
-}
-
-void
-tree_classdef_property_list::accept (tree_walker& tw)
-{
-  tw.visit_classdef_property_list (*this);
-}
-
-// Classdef properties_block
-
-void
-tree_classdef_properties_block::accept (tree_walker& tw)
-{
-  tw.visit_classdef_properties_block (*this);
-}
-
-// Classdef methods_list
-
-void
-tree_classdef_methods_list::accept (tree_walker& tw)
-{
-  tw.visit_classdef_methods_list (*this);
-}
-
-// Classdef methods_block
-
-void
-tree_classdef_methods_block::accept (tree_walker& tw)
-{
-  tw.visit_classdef_methods_block (*this);
-}
-
-// Classdef event
-
-void
-tree_classdef_event::accept (tree_walker& tw)
-{
-  tw.visit_classdef_event (*this);
-}
-
-// Classdef events_list
-
-tree_classdef_events_list::~tree_classdef_events_list (void)
+namespace octave
 {
-  while (! empty ())
-    {
-      iterator p = begin ();
-      delete *p;
-      erase (p);
-    }
-}
+  // Classdef attribute
+
+  void
+  tree_classdef_attribute::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_attribute (*this);
+  }
+
+  // Classdef attribute_list
+
+  tree_classdef_attribute_list::~tree_classdef_attribute_list (void)
+  {
+    while (! empty ())
+      {
+        iterator p = begin ();
+        delete *p;
+        erase (p);
+      }
+  }
+
+  void
+  tree_classdef_attribute_list::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_attribute_list (*this);
+  }
 
-void
-tree_classdef_events_list::accept (tree_walker& tw)
-{
-  tw.visit_classdef_events_list (*this);
-}
+  // Classdef superclass
 
-// Classdef events_block
+  void
+  tree_classdef_superclass::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_superclass (*this);
+  }
+
+  // Classdef superclass_list
 
-void
-tree_classdef_events_block::accept (tree_walker& tw)
-{
-  tw.visit_classdef_events_block (*this);
-}
+  tree_classdef_superclass_list::~tree_classdef_superclass_list (void)
+  {
+    while (! empty ())
+      {
+        iterator p = begin ();
+        delete *p;
+        erase (p);
+      }
+  }
 
-// Classdef enum
+  void
+  tree_classdef_superclass_list::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_superclass_list (*this);
+  }
+
+  // Classdef property
 
-void
-tree_classdef_enum::accept (tree_walker& tw)
-{
-  tw.visit_classdef_enum (*this);
-}
+  void
+  tree_classdef_property::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_property (*this);
+  }
+
+  // Classdef property_list
 
-// Classdef enum_list
+  tree_classdef_property_list::~tree_classdef_property_list (void)
+  {
+    while (! empty ())
+      {
+        iterator p = begin ();
+        delete *p;
+        erase (p);
+      }
+  }
+
+  void
+  tree_classdef_property_list::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_property_list (*this);
+  }
+
+  // Classdef properties_block
 
-tree_classdef_enum_list::~tree_classdef_enum_list (void)
-{
-  while (! empty ())
-    {
-      iterator p = begin ();
-      delete *p;
-      erase (p);
-    }
-}
+  void
+  tree_classdef_properties_block::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_properties_block (*this);
+  }
+
+  // Classdef methods_list
+
+  void
+  tree_classdef_methods_list::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_methods_list (*this);
+  }
+
+  // Classdef methods_block
 
-void
-tree_classdef_enum_list::accept (tree_walker& tw)
-{
-  tw.visit_classdef_enum_list (*this);
-}
+  void
+  tree_classdef_methods_block::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_methods_block (*this);
+  }
 
-// Classdef enum_block
+  // Classdef event
 
-void
-tree_classdef_enum_block::accept (tree_walker& tw)
-{
-  tw.visit_classdef_enum_block (*this);
-}
+  void
+  tree_classdef_event::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_event (*this);
+  }
 
-// Classdef body
+  // Classdef events_list
 
-tree_classdef_body::~tree_classdef_body (void)
-{
-  while (! properties_lst.empty ())
-    {
-      properties_list_iterator p = properties_lst.begin ();
-      delete *p;
-      properties_lst.erase (p);
-    }
+  tree_classdef_events_list::~tree_classdef_events_list (void)
+  {
+    while (! empty ())
+      {
+        iterator p = begin ();
+        delete *p;
+        erase (p);
+      }
+  }
+
+  void
+  tree_classdef_events_list::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_events_list (*this);
+  }
+
+  // Classdef events_block
+
+  void
+  tree_classdef_events_block::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_events_block (*this);
+  }
+
+  // Classdef enum
 
-  while (! methods_lst.empty ())
-    {
-      methods_list_iterator p = methods_lst.begin ();
-      delete *p;
-      methods_lst.erase (p);
-    }
+  void
+  tree_classdef_enum::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_enum (*this);
+  }
+
+  // Classdef enum_list
 
-  while (! events_lst.empty ())
-    {
-      events_list_iterator p = events_lst.begin ();
-      delete *p;
-      events_lst.erase (p);
-    }
+  tree_classdef_enum_list::~tree_classdef_enum_list (void)
+  {
+    while (! empty ())
+      {
+        iterator p = begin ();
+        delete *p;
+        erase (p);
+      }
+  }
+
+  void
+  tree_classdef_enum_list::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_enum_list (*this);
+  }
+
+  // Classdef enum_block
+
+  void
+  tree_classdef_enum_block::accept (tree_walker& tw)
+  {
+    tw.visit_classdef_enum_block (*this);
+  }
 
-  while (! enum_lst.empty ())
-    {
-      enum_list_iterator p = enum_lst.begin ();
-      delete *p;
-      enum_lst.erase (p);
-    }
-}
+  // Classdef body
+
+  tree_classdef_body::~tree_classdef_body (void)
+  {
+    while (! properties_lst.empty ())
+      {
+        properties_list_iterator p = properties_lst.begin ();
+        delete *p;
+        properties_lst.erase (p);
+      }
 
-// Classdef
+    while (! methods_lst.empty ())
+      {
+        methods_list_iterator p = methods_lst.begin ();
+        delete *p;
+        methods_lst.erase (p);
+      }
 
-octave_function*
-tree_classdef::make_meta_class (bool is_at_folder)
-{
-  cdef_class cls = cdef_class::make_meta_class (this, is_at_folder);
-
-  if (cls.ok ())
-    return cls.get_constructor_function ();
+    while (! events_lst.empty ())
+      {
+        events_list_iterator p = events_lst.begin ();
+        delete *p;
+        events_lst.erase (p);
+      }
 
-  return 0;
-}
+    while (! enum_lst.empty ())
+      {
+        enum_list_iterator p = enum_lst.begin ();
+        delete *p;
+        enum_lst.erase (p);
+      }
+  }
+
+  // Classdef
+
+  octave_function*
+  tree_classdef::make_meta_class (bool is_at_folder)
+  {
+    cdef_class cls = cdef_class::make_meta_class (this, is_at_folder);
+
+    if (cls.ok ())
+      return cls.get_constructor_function ();
 
-tree_classdef *
-tree_classdef::dup (symbol_table::scope_id,
-                    symbol_table::context_id) const
-{
-  // FIXME
-  return 0;
+    return 0;
+  }
+
+  tree_classdef *
+  tree_classdef::dup (symbol_table::scope_id,
+                      symbol_table::context_id) const
+  {
+    // FIXME
+    return 0;
+  }
+
+  void
+  tree_classdef::accept (tree_walker& tw)
+  {
+    tw.visit_classdef (*this);
+  }
 }
-
-void
-tree_classdef::accept (tree_walker& tw)
-{
-  tw.visit_classdef (*this);
-}
-