Mercurial > octave

diff libinterp/parse-tree/pt-cbinop.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 89756f2f085b
children ef4d915df748
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-cbinop.h	Thu Jan 19 14:47:19 2017 -0500
+++ b/libinterp/parse-tree/pt-cbinop.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;
@@ -37,50 +35,60 @@
 #include "pt-binop.h"
 #include "symtab.h"
 
-// Binary expressions that can be reduced to compound operations
+namespace octave
+{
+  class tree_walker;
 
-class
-tree_compound_binary_expression : public tree_binary_expression
-{
-public:
+  // Binary expressions that can be reduced to compound operations
+
+  class tree_compound_binary_expression : public tree_binary_expression
+  {
+  public:
 
-  tree_compound_binary_expression (tree_expression *a, tree_expression *b,
-                                   int l, int c,
-                                   octave_value::binary_op t,
-                                   tree_expression *ca, tree_expression *cb,
-                                   octave_value::compound_binary_op ct)
-    : tree_binary_expression (a, b, l, c, t), op_lhs (ca), op_rhs (cb),
-      etype (ct) { }
+    tree_compound_binary_expression (tree_expression *a, tree_expression *b,
+                                     int l, int c,
+                                     octave_value::binary_op t,
+                                     tree_expression *ca, tree_expression *cb,
+                                     octave_value::compound_binary_op ct)
+      : tree_binary_expression (a, b, l, c, t), op_lhs (ca), op_rhs (cb),
+        etype (ct) { }
 
-  octave_value::compound_binary_op cop_type (void) const { return etype; }
+    octave_value::compound_binary_op cop_type (void) const { return etype; }
+
+    bool rvalue_ok (void) const { return true; }
 
-  bool rvalue_ok (void) const { return true; }
+    octave_value rvalue1 (int nargout = 1);
 
-  octave_value rvalue1 (int nargout = 1);
+    octave_value_list rvalue (int nargout);
 
-  octave_value_list rvalue (int nargout);
+  private:
 
-private:
+    tree_expression *op_lhs;
+    tree_expression *op_rhs;
+    octave_value::compound_binary_op etype;
 
-  tree_expression *op_lhs;
-  tree_expression *op_rhs;
-  octave_value::compound_binary_op etype;
+    // No copying!
+
+    tree_compound_binary_expression (const tree_compound_binary_expression&) = delete;
 
-  // No copying!
-
-  tree_compound_binary_expression (const tree_compound_binary_expression&) = delete;
+    tree_compound_binary_expression& operator =
+    (const tree_compound_binary_expression&) = delete;
+  };
 
-  tree_compound_binary_expression& operator =
-    (const tree_compound_binary_expression&) = delete;
-};
-
-// a "virtual constructor"
+  // a "virtual constructor"
 
-tree_binary_expression *
-maybe_compound_binary_expression (tree_expression *a, tree_expression *b,
-                                  int l = -1, int c = -1,
-                                  octave_value::binary_op t
-                                  = octave_value::unknown_binary_op);
+  tree_binary_expression *
+  maybe_compound_binary_expression (tree_expression *a, tree_expression *b,
+                                    int l = -1, int c = -1,
+                                    octave_value::binary_op t
+                                    = octave_value::unknown_binary_op);
+}
+
+#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS)
+
+OCTAVE_DEPRECATED ("use 'octave::tree_compound_binary_expression' instead")
+typedef octave::tree_compound_binary_expression tree_compound_binary_expression;
 
 #endif
 
+#endif