Mercurial > octave

diff libinterp/parse-tree/pt-const.cc @ 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 3a2b891d0b33
children ef4d915df748
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-const.cc	Thu Jan 19 14:47:19 2017 -0500
+++ b/libinterp/parse-tree/pt-const.cc	Thu Jan 19 23:41:54 2017 -0500
@@ -32,57 +32,59 @@
 #include "pt-const.h"
 #include "pt-walk.h"
 
-// We are likely to have a lot of tree_constant objects to allocate,
-// so make the grow_size large.
-
-void
-tree_constant::print (std::ostream& os, bool pr_as_read_syntax,
-                      bool pr_orig_text)
-{
-  if (pr_orig_text && ! orig_text.empty ())
-    os << orig_text;
-  else
-    val.print (os, pr_as_read_syntax);
-}
-
-void
-tree_constant::print_raw (std::ostream& os, bool pr_as_read_syntax,
-                          bool pr_orig_text)
-{
-  if (pr_orig_text && ! orig_text.empty ())
-    os << orig_text;
-  else
-    val.print_raw (os, pr_as_read_syntax);
-}
-
-octave_value_list
-tree_constant::rvalue (int nargout)
+namespace octave
 {
-  octave_value_list retval;
-
-  if (nargout > 1)
-    error ("invalid number of output arguments for constant expression");
+  // We are likely to have a lot of tree_constant objects to allocate,
+  // so make the grow_size large.
 
-  retval = rvalue1 (nargout);
+  void
+  tree_constant::print (std::ostream& os, bool pr_as_read_syntax,
+                        bool pr_orig_text)
+  {
+    if (pr_orig_text && ! orig_text.empty ())
+      os << orig_text;
+    else
+      val.print (os, pr_as_read_syntax);
+  }
 
-  return retval;
-}
+  void
+  tree_constant::print_raw (std::ostream& os, bool pr_as_read_syntax,
+                            bool pr_orig_text)
+  {
+    if (pr_orig_text && ! orig_text.empty ())
+      os << orig_text;
+    else
+      val.print_raw (os, pr_as_read_syntax);
+  }
 
-tree_expression *
-tree_constant::dup (symbol_table::scope_id,
-                    symbol_table::context_id) const
-{
-  tree_constant *new_tc
-    = new tree_constant (val, orig_text, line (), column ());
+  octave_value_list
+  tree_constant::rvalue (int nargout)
+  {
+    octave_value_list retval;
 
-  new_tc->copy_base (*this);
+    if (nargout > 1)
+      error ("invalid number of output arguments for constant expression");
+
+    retval = rvalue1 (nargout);
+
+    return retval;
+  }
 
-  return new_tc;
-}
+  tree_expression *
+  tree_constant::dup (symbol_table::scope_id,
+                      symbol_table::context_id) const
+  {
+    tree_constant *new_tc
+      = new tree_constant (val, orig_text, line (), column ());
+
+    new_tc->copy_base (*this);
 
-void
-tree_constant::accept (tree_walker& tw)
-{
-  tw.visit_constant (*this);
+    return new_tc;
+  }
+
+  void
+  tree_constant::accept (tree_walker& tw)
+  {
+    tw.visit_constant (*this);
+  }
 }
-