Mercurial > octave

diff libinterp/parse-tree/pt.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.cc	Thu Jan 19 14:47:19 2017 -0500
+++ b/libinterp/parse-tree/pt.cc	Thu Jan 19 23:41:54 2017 -0500
@@ -33,68 +33,70 @@
 #include "pt-pr-code.h"
 #include "unwind-prot.h"
 
-// Hide the details of the string buffer so that we are less likely to
-// create a memory leak.
-
-std::string
-tree::str_print_code (void)
+namespace octave
 {
-  std::ostringstream buf;
-
-  tree_print_code tpc (buf);
+  // Hide the details of the string buffer so that we are less likely to
+  // create a memory leak.
 
-  accept (tpc);
+  std::string
+  tree::str_print_code (void)
+  {
+    std::ostringstream buf;
 
-  std::string retval = buf.str ();
+    tree_print_code tpc (buf);
+
+    accept (tpc);
+
+    std::string retval = buf.str ();
 
-  return retval;
-}
+    return retval;
+  }
 
-// function from libinterp/parse-tree/oct-parse.cc, not listed in oct-parse.h
-octave_value_list eval_string (const std::string&, bool, int&, int);
-// Is the current breakpoint condition met?
-bool
-tree::meets_bp_condition () const
-{
-  bool retval;
-  if (bp == 0)
-    retval = false;
-  else if (bp->empty ())     // empty condition always met
-    retval = true;
-  else
-    {
-      int parse_status = 0;
+  // function from libinterp/parse-tree/oct-parse.cc, not listed in oct-parse.h
+  octave_value_list eval_string (const std::string&, bool, int&, int);
+  // Is the current breakpoint condition met?
+  bool
+  tree::meets_bp_condition () const
+  {
+    bool retval;
+    if (bp == 0)
+      retval = false;
+    else if (bp->empty ())     // empty condition always met
+      retval = true;
+    else
+      {
+        int parse_status = 0;
 
-      octave::unwind_protect frame;
-      frame.protect_var (buffer_error_messages);
-      frame.protect_var (Vdebug_on_error);
-      frame.protect_var (Vdebug_on_warning);
+        octave::unwind_protect frame;
+        frame.protect_var (buffer_error_messages);
+        frame.protect_var (Vdebug_on_error);
+        frame.protect_var (Vdebug_on_warning);
 
-      buffer_error_messages++;
-      Vdebug_on_error = false;
-      Vdebug_on_warning = false;
+        buffer_error_messages++;
+        Vdebug_on_error = false;
+        Vdebug_on_warning = false;
 
-      retval = true;                // default to stopping if any error
-      try
-        {
-          octave_value_list val = eval_string (*bp, 1, parse_status, 1);
-          if (parse_status == 0)
-            {
-              if (! val(0).is_scalar_type ())
-                warning ("Breakpoint condition must be a scalar, not size %s",
-                         val(0).dims ().str ('x').c_str ());
-              else
-                retval = val(0).bool_value ();
-            }
-          else
-            warning ("Error parsing breakpoint condition");
-        }
-      catch (const octave::execution_exception& e)
-        {
-          warning ("Error evaluating breakpoint condition:\n    %s",
-                   last_error_message ().c_str ());
-        }
-    }
-  return retval;
+        retval = true;                // default to stopping if any error
+        try
+          {
+            octave_value_list val = eval_string (*bp, 1, parse_status, 1);
+            if (parse_status == 0)
+              {
+                if (! val(0).is_scalar_type ())
+                  warning ("Breakpoint condition must be a scalar, not size %s",
+                           val(0).dims ().str ('x').c_str ());
+                else
+                  retval = val(0).bool_value ();
+              }
+            else
+              warning ("Error parsing breakpoint condition");
+          }
+        catch (const octave::execution_exception& e)
+          {
+            warning ("Error evaluating breakpoint condition:\n    %s",
+                     last_error_message ().c_str ());
+          }
+      }
+    return retval;
+  }
 }
-