Mercurial > octave

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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-jump.h	Thu Jan 19 14:47:19 2017 -0500
+++ b/libinterp/parse-tree/pt-jump.h	Thu Jan 19 23:41:54 2017 -0500
@@ -25,88 +25,100 @@
 
 #include "octave-config.h"
 
-class tree_walker;
-
 #include "pt-cmd.h"
 #include "symtab.h"
 
-// Break.
+namespace octave
+{
+  class tree_walker;
 
-class
-tree_break_command : public tree_command
-{
-public:
+  // Break.
+
+  class tree_break_command : public tree_command
+  {
+  public:
 
-  tree_break_command (int l = -1, int c = -1)
-    : tree_command (l, c) { }
+    tree_break_command (int l = -1, int c = -1)
+      : tree_command (l, c) { }
 
-  // No copying!
+    // No copying!
 
-  tree_break_command (const tree_break_command&) = delete;
+    tree_break_command (const tree_break_command&) = delete;
 
-  tree_break_command& operator = (const tree_break_command&) = delete;
+    tree_break_command& operator = (const tree_break_command&) = delete;
 
-  ~tree_break_command (void) = default;
+    ~tree_break_command (void) = default;
 
-  tree_command *dup (symbol_table::scope_id scope,
-                     symbol_table::context_id context) const;
+    tree_command *dup (symbol_table::scope_id scope,
+                       symbol_table::context_id context) const;
 
-  void accept (tree_walker& tw);
+    void accept (tree_walker& tw);
 
-  static int breaking;
-};
+    static int breaking;
+  };
 
-// Continue.
+  // Continue.
 
-class
-tree_continue_command : public tree_command
-{
-public:
+  class tree_continue_command : public tree_command
+  {
+  public:
 
-  tree_continue_command (int l = -1, int c = -1)
-    : tree_command (l, c) { }
+    tree_continue_command (int l = -1, int c = -1)
+      : tree_command (l, c) { }
 
-  // No copying!
+    // No copying!
+
+    tree_continue_command (const tree_continue_command&) = delete;
+
+    tree_continue_command& operator = (const tree_continue_command&) = delete;
 
-  tree_continue_command (const tree_continue_command&) = delete;
+    ~tree_continue_command (void) = default;
+
+    tree_command *dup (symbol_table::scope_id scope,
+                       symbol_table::context_id context) const;
 
-  tree_continue_command& operator = (const tree_continue_command&) = delete;
+    void accept (tree_walker& tw);
 
-  ~tree_continue_command (void) = default;
+    static int continuing;
+  };
 
-  tree_command *dup (symbol_table::scope_id scope,
-                     symbol_table::context_id context) const;
+  // Return.
 
-  void accept (tree_walker& tw);
+  class tree_return_command : public tree_command
+  {
+  public:
 
-  static int continuing;
-};
+    tree_return_command (int l = -1, int c = -1)
+      : tree_command (l, c) { }
 
-// Return.
+    // No copying!
+
+    tree_return_command (const tree_return_command&) = delete;
 
-class
-tree_return_command : public tree_command
-{
-public:
+    tree_return_command& operator = (const tree_return_command&) = delete;
+
+    ~tree_return_command (void) = default;
 
-  tree_return_command (int l = -1, int c = -1)
-    : tree_command (l, c) { }
+    tree_command *dup (symbol_table::scope_id scope,
+                       symbol_table::context_id context) const;
 
-  // No copying!
-
-  tree_return_command (const tree_return_command&) = delete;
+    void accept (tree_walker& tw);
 
-  tree_return_command& operator = (const tree_return_command&) = delete;
+    static int returning;
+  };
+}
 
-  ~tree_return_command (void) = default;
+#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS)
 
-  tree_command *dup (symbol_table::scope_id scope,
-                     symbol_table::context_id context) const;
+OCTAVE_DEPRECATED ("use 'octave::tree_break_command' instead")
+typedef octave::tree_break_command tree_break_command;
 
-  void accept (tree_walker& tw);
+OCTAVE_DEPRECATED ("use 'octave::tree_continue_command' instead")
+typedef octave::tree_continue_command tree_continue_command;
 
-  static int returning;
-};
+OCTAVE_DEPRECATED ("use 'octave::tree_return_command' instead")
+typedef octave::tree_return_command tree_return_command;
 
 #endif
 
+#endif