Mercurial > octave

diff libinterp/parse-tree/pt-colon.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-colon.h	Thu Jan 19 14:47:19 2017 -0500
+++ b/libinterp/parse-tree/pt-colon.h	Thu Jan 19 23:41:54 2017 -0500
@@ -27,8 +27,6 @@
 
 #include <string>
 
-class tree_walker;
-
 class octave_value;
 class octave_value_list;
 class octave_lvalue;
@@ -36,83 +34,93 @@
 #include "pt-exp.h"
 #include "symtab.h"
 
-// Colon expressions.
-
-class
-tree_colon_expression : public tree_expression
+namespace octave
 {
-public:
-
-  tree_colon_expression (int l = -1, int c = -1)
-    : tree_expression (l, c), op_base (0), op_limit (0),
-      op_increment (0), save_base (false) { }
-
-  tree_colon_expression (tree_expression *e, int l = -1, int c = -1)
-    : tree_expression (l, c), op_base (e), op_limit (0),
-      op_increment (0), save_base (false) { }
+  class tree_walker;
 
-  tree_colon_expression (tree_expression *bas, tree_expression *lim,
-                         tree_expression *inc, int l = -1, int c = -1)
-    : tree_expression (l, c), op_base (bas), op_limit (lim),
-      op_increment (inc), save_base (false) { }
-
-  // No copying!
-
-  tree_colon_expression (const tree_colon_expression&) = delete;
-
-  tree_colon_expression& operator = (const tree_colon_expression&) = delete;
+  // Colon expressions.
 
-  ~tree_colon_expression (void)
-  {
-    if (! save_base)
-      delete op_base;
-
-    delete op_limit;
-    delete op_increment;
-  }
-
-  bool has_magic_end (void) const
+  class tree_colon_expression : public tree_expression
   {
-    return ((op_base && op_base->has_magic_end ())
-            || (op_limit && op_limit->has_magic_end ())
-            || (op_increment && op_increment->has_magic_end ()));
-  }
+  public:
+
+    tree_colon_expression (int l = -1, int c = -1)
+      : tree_expression (l, c), op_base (0), op_limit (0),
+        op_increment (0), save_base (false) { }
 
-  void preserve_base (void) { save_base = true; }
+    tree_colon_expression (tree_expression *e, int l = -1, int c = -1)
+      : tree_expression (l, c), op_base (e), op_limit (0),
+        op_increment (0), save_base (false) { }
 
-  tree_colon_expression *append (tree_expression *t);
+    tree_colon_expression (tree_expression *bas, tree_expression *lim,
+                           tree_expression *inc, int l = -1, int c = -1)
+      : tree_expression (l, c), op_base (bas), op_limit (lim),
+        op_increment (inc), save_base (false) { }
+
+    // No copying!
+
+    tree_colon_expression (const tree_colon_expression&) = delete;
 
-  bool rvalue_ok (void) const { return true; }
+    tree_colon_expression& operator = (const tree_colon_expression&) = delete;
 
-  octave_value rvalue1 (int nargout = 1);
+    ~tree_colon_expression (void)
+    {
+      if (! save_base)
+        delete op_base;
 
-  octave_value_list rvalue (int nargout);
+      delete op_limit;
+      delete op_increment;
+    }
 
-  void eval_error (const std::string& s) const;
+    bool has_magic_end (void) const
+    {
+      return ((op_base && op_base->has_magic_end ())
+              || (op_limit && op_limit->has_magic_end ())
+              || (op_increment && op_increment->has_magic_end ()));
+    }
 
-  tree_expression *base (void) { return op_base; }
+    void preserve_base (void) { save_base = true; }
 
-  tree_expression *limit (void) { return op_limit; }
+    tree_colon_expression *append (tree_expression *t);
+
+    bool rvalue_ok (void) const { return true; }
 
-  tree_expression *increment (void) { return op_increment; }
+    octave_value rvalue1 (int nargout = 1);
+
+    octave_value_list rvalue (int nargout);
 
-  int line (void) const;
-  int column (void) const;
+    void eval_error (const std::string& s) const;
+
+    tree_expression *base (void) { return op_base; }
 
-  tree_expression *dup (symbol_table::scope_id scope,
-                        symbol_table::context_id context) const;
+    tree_expression *limit (void) { return op_limit; }
+
+    tree_expression *increment (void) { return op_increment; }
+
+    int line (void) const;
+    int column (void) const;
 
-  void accept (tree_walker& tw);
+    tree_expression *dup (symbol_table::scope_id scope,
+                          symbol_table::context_id context) const;
 
-private:
+    void accept (tree_walker& tw);
+
+  private:
 
-  // The components of the expression.
-  tree_expression *op_base;
-  tree_expression *op_limit;
-  tree_expression *op_increment;
+    // The components of the expression.
+    tree_expression *op_base;
+    tree_expression *op_limit;
+    tree_expression *op_increment;
 
-  bool save_base;
-};
+    bool save_base;
+  };
+}
+
+#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS)
+
+OCTAVE_DEPRECATED ("use 'octave::tree_colon_expression' instead")
+typedef octave::tree_colon_expression tree_colon_expression;
 
 #endif
 
+#endif