--- a/libinterp/parse-tree/pt-bp.cc	Thu Jan 19 14:47:19 2017 -0500
+++ b/libinterp/parse-tree/pt-bp.cc	Thu Jan 19 23:41:54 2017 -0500
@@ -28,478 +28,480 @@
 #include "pager.h"
 #include "pt-all.h"
 
-// TRUE means SIGINT should put us in the debugger at the next
-// available breakpoint.
-bool octave_debug_on_interrupt_state = false;
-
-void
-tree_breakpoint::visit_while_command (tree_while_command& cmd)
-{
-  if (cmd.line () >= line)
-    take_action (cmd);
-
-  if (! found)
-    {
-      tree_statement_list *lst = cmd.body ();
-
-      if (lst)
-        lst->accept (*this);
-    }
-}
-
-void
-tree_breakpoint::visit_do_until_command (tree_do_until_command& cmd)
-{
-  if (! found)
-    {
-      tree_statement_list *lst = cmd.body ();
-
-      if (lst)
-        lst->accept (*this);
-
-      if (! found)
-        {
-          if (cmd.line () >= line)
-            take_action (cmd);
-        }
-    }
-}
-
-void
-tree_breakpoint::visit_argument_list (tree_argument_list&)
-{
-  panic_impossible ();
-}
-
-void
-tree_breakpoint::visit_binary_expression (tree_binary_expression&)
-{
-  panic_impossible ();
-}
-
-void
-tree_breakpoint::visit_break_command (tree_break_command& cmd)
-{
-  if (cmd.line () >= line)
-    take_action (cmd);
-}
-
-void
-tree_breakpoint::visit_colon_expression (tree_colon_expression&)
-{
-  panic_impossible ();
-}
-
-void
-tree_breakpoint::visit_continue_command (tree_continue_command& cmd)
-{
-  if (cmd.line () >= line)
-    take_action (cmd);
-}
-
-void
-tree_breakpoint::do_decl_command (tree_decl_command& cmd)
-{
-  if (cmd.line () >= line)
-    take_action (cmd);
-}
-
-void
-tree_breakpoint::visit_global_command (tree_global_command& cmd)
-{
-  do_decl_command (cmd);
-}
-
-void
-tree_breakpoint::visit_persistent_command (tree_persistent_command& cmd)
-{
-  do_decl_command (cmd);
-}
-
-void
-tree_breakpoint::visit_decl_elt (tree_decl_elt&)
-{
-  panic_impossible ();
-}
-
-void
-tree_breakpoint::visit_decl_init_list (tree_decl_init_list&)
-{
-  panic_impossible ();
-}
-
-void
-tree_breakpoint::visit_simple_for_command (tree_simple_for_command& cmd)
-{
-  if (cmd.line () >= line)
-    take_action (cmd);
-
-  if (! found)
-    {
-      tree_statement_list *lst = cmd.body ();
-
-      if (lst)
-        lst->accept (*this);
-    }
-}
-
-void
-tree_breakpoint::visit_complex_for_command (tree_complex_for_command& cmd)
+namespace octave
 {
-  if (cmd.line () >= line)
-    take_action (cmd);
+  // TRUE means SIGINT should put us in the debugger at the next
+  // available breakpoint.
+  bool octave_debug_on_interrupt_state = false;
+
+  void
+  tree_breakpoint::visit_while_command (tree_while_command& cmd)
+  {
+    if (cmd.line () >= line)
+      take_action (cmd);
 
-  if (! found)
-    {
-      tree_statement_list *lst = cmd.body ();
+    if (! found)
+      {
+        tree_statement_list *lst = cmd.body ();
 
-      if (lst)
-        lst->accept (*this);
-    }
-}
+        if (lst)
+          lst->accept (*this);
+      }
+  }
+
+  void
+  tree_breakpoint::visit_do_until_command (tree_do_until_command& cmd)
+  {
+    if (! found)
+      {
+        tree_statement_list *lst = cmd.body ();
 
-void
-tree_breakpoint::visit_octave_user_script (octave_user_script& fcn)
-{
-  tree_statement_list *cmd_list = fcn.body ();
+        if (lst)
+          lst->accept (*this);
+
+        if (! found)
+          {
+            if (cmd.line () >= line)
+              take_action (cmd);
+          }
+      }
+  }
 
-  if (cmd_list)
-    cmd_list->accept (*this);
-}
+  void
+  tree_breakpoint::visit_argument_list (tree_argument_list&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_octave_user_function (octave_user_function& fcn)
-{
-  tree_statement_list *cmd_list = fcn.body ();
+  void
+  tree_breakpoint::visit_binary_expression (tree_binary_expression&)
+  {
+    panic_impossible ();
+  }
+
+  void
+  tree_breakpoint::visit_break_command (tree_break_command& cmd)
+  {
+    if (cmd.line () >= line)
+      take_action (cmd);
+  }
 
-  if (cmd_list)
-    cmd_list->accept (*this);
-}
+  void
+  tree_breakpoint::visit_colon_expression (tree_colon_expression&)
+  {
+    panic_impossible ();
+  }
+
+  void
+  tree_breakpoint::visit_continue_command (tree_continue_command& cmd)
+  {
+    if (cmd.line () >= line)
+      take_action (cmd);
+  }
 
-void
-tree_breakpoint::visit_octave_user_function_header (octave_user_function&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::do_decl_command (tree_decl_command& cmd)
+  {
+    if (cmd.line () >= line)
+      take_action (cmd);
+  }
 
-void
-tree_breakpoint::visit_octave_user_function_trailer (octave_user_function&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_global_command (tree_global_command& cmd)
+  {
+    do_decl_command (cmd);
+  }
 
-void
-tree_breakpoint::visit_function_def (tree_function_def& fdef)
-{
-  octave_value fcn = fdef.function ();
+  void
+  tree_breakpoint::visit_persistent_command (tree_persistent_command& cmd)
+  {
+    do_decl_command (cmd);
+  }
 
-  octave_function *f = fcn.function_value ();
+  void
+  tree_breakpoint::visit_decl_elt (tree_decl_elt&)
+  {
+    panic_impossible ();
+  }
 
-  if (f)
-    f->accept (*this);
-}
+  void
+  tree_breakpoint::visit_decl_init_list (tree_decl_init_list&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_identifier (tree_identifier&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_simple_for_command (tree_simple_for_command& cmd)
+  {
+    if (cmd.line () >= line)
+      take_action (cmd);
+
+    if (! found)
+      {
+        tree_statement_list *lst = cmd.body ();
+
+        if (lst)
+          lst->accept (*this);
+      }
+  }
 
-void
-tree_breakpoint::visit_if_clause (tree_if_clause&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_complex_for_command (tree_complex_for_command& cmd)
+  {
+    if (cmd.line () >= line)
+      take_action (cmd);
+
+    if (! found)
+      {
+        tree_statement_list *lst = cmd.body ();
 
-void
-tree_breakpoint::visit_if_command (tree_if_command& cmd)
-{
-  tree_if_command_list *lst = cmd.cmd_list ();
+        if (lst)
+          lst->accept (*this);
+      }
+  }
+
+  void
+  tree_breakpoint::visit_octave_user_script (octave_user_script& fcn)
+  {
+    tree_statement_list *cmd_list = fcn.body ();
+
+    if (cmd_list)
+      cmd_list->accept (*this);
+  }
 
-  if (lst)
-    lst->accept (*this);
-}
+  void
+  tree_breakpoint::visit_octave_user_function (octave_user_function& fcn)
+  {
+    tree_statement_list *cmd_list = fcn.body ();
+
+    if (cmd_list)
+      cmd_list->accept (*this);
+  }
+
+  void
+  tree_breakpoint::visit_octave_user_function_header (octave_user_function&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_if_command_list (tree_if_command_list& lst)
-{
-  for (tree_if_clause* t : lst)
-    {
-      if (t->line () >= line)
-        take_action (*t);
+  void
+  tree_breakpoint::visit_octave_user_function_trailer (octave_user_function&)
+  {
+    panic_impossible ();
+  }
 
-      if (! found)
-        {
-          tree_statement_list *stmt_lst = t->commands ();
+  void
+  tree_breakpoint::visit_function_def (tree_function_def& fdef)
+  {
+    octave_value fcn = fdef.function ();
+
+    octave_function *f = fcn.function_value ();
+
+    if (f)
+      f->accept (*this);
+  }
 
-          if (stmt_lst)
-            stmt_lst->accept (*this);
-        }
+  void
+  tree_breakpoint::visit_identifier (tree_identifier&)
+  {
+    panic_impossible ();
+  }
+
+  void
+  tree_breakpoint::visit_if_clause (tree_if_clause&)
+  {
+    panic_impossible ();
+  }
 
-      if (found)
-        break;
-    }
-}
+  void
+  tree_breakpoint::visit_if_command (tree_if_command& cmd)
+  {
+    tree_if_command_list *lst = cmd.cmd_list ();
+
+    if (lst)
+      lst->accept (*this);
+  }
 
-void
-tree_breakpoint::visit_index_expression (tree_index_expression&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_if_command_list (tree_if_command_list& lst)
+  {
+    for (tree_if_clause* t : lst)
+      {
+        if (t->line () >= line)
+          take_action (*t);
+
+        if (! found)
+          {
+            tree_statement_list *stmt_lst = t->commands ();
 
-void
-tree_breakpoint::visit_matrix (tree_matrix&)
-{
-  panic_impossible ();
-}
+            if (stmt_lst)
+              stmt_lst->accept (*this);
+          }
+
+        if (found)
+          break;
+      }
+  }
+
+  void
+  tree_breakpoint::visit_index_expression (tree_index_expression&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_cell (tree_cell&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_matrix (tree_matrix&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_multi_assignment (tree_multi_assignment&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_cell (tree_cell&)
+  {
+    panic_impossible ();
+  }
+
+  void
+  tree_breakpoint::visit_multi_assignment (tree_multi_assignment&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_no_op_command (tree_no_op_command& cmd)
-{
-  if (cmd.is_end_of_fcn_or_script () && cmd.line () >= line)
-    take_action (cmd);
-}
+  void
+  tree_breakpoint::visit_no_op_command (tree_no_op_command& cmd)
+  {
+    if (cmd.is_end_of_fcn_or_script () && cmd.line () >= line)
+      take_action (cmd);
+  }
 
-void
-tree_breakpoint::visit_anon_fcn_handle (tree_anon_fcn_handle&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_anon_fcn_handle (tree_anon_fcn_handle&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_constant (tree_constant&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_constant (tree_constant&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_fcn_handle (tree_fcn_handle&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_fcn_handle (tree_fcn_handle&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_funcall (tree_funcall&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_funcall (tree_funcall&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_parameter_list (tree_parameter_list&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_parameter_list (tree_parameter_list&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_postfix_expression (tree_postfix_expression&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_postfix_expression (tree_postfix_expression&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_prefix_expression (tree_prefix_expression&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_prefix_expression (tree_prefix_expression&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_return_command (tree_return_command& cmd)
-{
-  if (cmd.line () >= line)
-    take_action (cmd);
-}
+  void
+  tree_breakpoint::visit_return_command (tree_return_command& cmd)
+  {
+    if (cmd.line () >= line)
+      take_action (cmd);
+  }
 
-void
-tree_breakpoint::visit_return_list (tree_return_list&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_return_list (tree_return_list&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_simple_assignment (tree_simple_assignment&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_simple_assignment (tree_simple_assignment&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_statement (tree_statement& stmt)
-{
-  if (stmt.is_command ())
-    {
-      tree_command *cmd = stmt.command ();
+  void
+  tree_breakpoint::visit_statement (tree_statement& stmt)
+  {
+    if (stmt.is_command ())
+      {
+        tree_command *cmd = stmt.command ();
 
-      cmd->accept (*this);
-    }
-  else
-    {
-      if (stmt.line () >= line)
-        take_action (stmt);
-    }
-}
+        cmd->accept (*this);
+      }
+    else
+      {
+        if (stmt.line () >= line)
+          take_action (stmt);
+      }
+  }
 
-// Called by
-//   tree_statement_list::set_breakpoint (int line, std::string& condition)
-// with <lst> consisting of a user function in which to set a breakpoint.
-void
-tree_breakpoint::visit_statement_list (tree_statement_list& lst)
-{
-  for (tree_statement* elt : lst)
-    {
-      if (elt)
-        {
-          elt->accept (*this);
+  // Called by
+  //   tree_statement_list::set_breakpoint (int line, std::string& condition)
+  // with <lst> consisting of a user function in which to set a breakpoint.
+  void
+  tree_breakpoint::visit_statement_list (tree_statement_list& lst)
+  {
+    for (tree_statement* elt : lst)
+      {
+        if (elt)
+          {
+            elt->accept (*this);
 
-          if (found)
-            break;
-        }
-    }
-}
+            if (found)
+              break;
+          }
+      }
+  }
 
-void
-tree_breakpoint::visit_switch_case (tree_switch_case&)
-{
-  panic_impossible ();
-}
+  void
+  tree_breakpoint::visit_switch_case (tree_switch_case&)
+  {
+    panic_impossible ();
+  }
 
-void
-tree_breakpoint::visit_switch_case_list (tree_switch_case_list& lst)
-{
-  for (tree_switch_case* t : lst)
-    {
-      if (t->line () >= line)
-        take_action (*t);
+  void
+  tree_breakpoint::visit_switch_case_list (tree_switch_case_list& lst)
+  {
+    for (tree_switch_case* t : lst)
+      {
+        if (t->line () >= line)
+          take_action (*t);
 
-      if (! found)
-        {
-          tree_statement_list *stmt_lst = t->commands ();
+        if (! found)
+          {
+            tree_statement_list *stmt_lst = t->commands ();
+
+            if (stmt_lst)
+              stmt_lst->accept (*this);
+          }
+
+        if (found)
+          break;
+      }
+  }
 
-          if (stmt_lst)
-            stmt_lst->accept (*this);
-        }
+  void
+  tree_breakpoint::visit_switch_command (tree_switch_command& cmd)
+  {
+    if (cmd.line () >= line)
+      take_action (cmd);
 
-      if (found)
-        break;
-    }
-}
+    if (! found)
+      {
+        tree_switch_case_list *lst = cmd.case_list ();
+
+        if (lst)
+          lst->accept (*this);
+      }
+  }
 
-void
-tree_breakpoint::visit_switch_command (tree_switch_command& cmd)
-{
-  if (cmd.line () >= line)
-    take_action (cmd);
+  void
+  tree_breakpoint::visit_try_catch_command (tree_try_catch_command& cmd)
+  {
+    tree_statement_list *try_code = cmd.body ();
+
+    if (try_code)
+      try_code->accept (*this);
+
+    if (! found)
+      {
+        tree_statement_list *catch_code = cmd.cleanup ();
 
-  if (! found)
-    {
-      tree_switch_case_list *lst = cmd.case_list ();
+        if (catch_code)
+          catch_code->accept (*this);
+      }
+  }
 
-      if (lst)
-        lst->accept (*this);
-    }
-}
+  void
+  tree_breakpoint::visit_unwind_protect_command (tree_unwind_protect_command& cmd)
+  {
+    tree_statement_list *body = cmd.body ();
+
+    if (body)
+      body->accept (*this);
+
+    if (! found)
+      {
+        tree_statement_list *cleanup = cmd.cleanup ();
 
-void
-tree_breakpoint::visit_try_catch_command (tree_try_catch_command& cmd)
-{
-  tree_statement_list *try_code = cmd.body ();
-
-  if (try_code)
-    try_code->accept (*this);
-
-  if (! found)
-    {
-      tree_statement_list *catch_code = cmd.cleanup ();
+        if (cleanup)
+          cleanup->accept (*this);
+      }
+  }
 
-      if (catch_code)
-        catch_code->accept (*this);
-    }
-}
-
-void
-tree_breakpoint::visit_unwind_protect_command (tree_unwind_protect_command& cmd)
-{
-  tree_statement_list *body = cmd.body ();
+  void
+  tree_breakpoint::take_action (tree& tr)
+  {
+    if (act == set)
+      {
+        tr.set_breakpoint (condition);
+        line = tr.line ();
+        found = true;
+      }
+    else if (act == clear)
+      {
+        if (tr.is_breakpoint ())
+          {
+            tr.delete_breakpoint ();
+            found = true;
+          }
+      }
+    else if (act == list)
+      {
+        if (tr.is_breakpoint ())
+          {
+            bp_list.append (octave_value (tr.line ()));
+            bp_cond_list.append (octave_value (tr.bp_cond ()));
+          }
+      }
+    else
+      panic_impossible ();
+  }
 
-  if (body)
-    body->accept (*this);
+  void
+  tree_breakpoint::take_action (tree_statement& stmt)
+  {
+    int lineno = stmt.line ();
 
-  if (! found)
-    {
-      tree_statement_list *cleanup = cmd.cleanup ();
-
-      if (cleanup)
-        cleanup->accept (*this);
-    }
+    if (act == set)
+      {
+        stmt.set_breakpoint (condition);
+        line = lineno;
+        found = true;
+      }
+    else if (act == clear)
+      {
+        if (stmt.is_breakpoint ())
+          {
+            stmt.delete_breakpoint ();
+            found = true;
+          }
+      }
+    else if (act == list)
+      {
+        if (stmt.is_breakpoint ())
+          {
+            bp_list.append (octave_value (lineno));
+            bp_cond_list.append (octave_value (stmt.bp_cond ()));
+          }
+      }
+    else
+      panic_impossible ();
+  }
 }
-
-void
-tree_breakpoint::take_action (tree& tr)
-{
-  if (act == set)
-    {
-      tr.set_breakpoint (condition);
-      line = tr.line ();
-      found = true;
-    }
-  else if (act == clear)
-    {
-      if (tr.is_breakpoint ())
-        {
-          tr.delete_breakpoint ();
-          found = true;
-        }
-    }
-  else if (act == list)
-    {
-      if (tr.is_breakpoint ())
-        {
-          bp_list.append (octave_value (tr.line ()));
-          bp_cond_list.append (octave_value (tr.bp_cond ()));
-        }
-    }
-  else
-    panic_impossible ();
-}
-
-void
-tree_breakpoint::take_action (tree_statement& stmt)
-{
-  int lineno = stmt.line ();
-
-  if (act == set)
-    {
-      stmt.set_breakpoint (condition);
-      line = lineno;
-      found = true;
-    }
-  else if (act == clear)
-    {
-      if (stmt.is_breakpoint ())
-        {
-          stmt.delete_breakpoint ();
-          found = true;
-        }
-    }
-  else if (act == list)
-    {
-      if (stmt.is_breakpoint ())
-        {
-          bp_list.append (octave_value (lineno));
-          bp_cond_list.append (octave_value (stmt.bp_cond ()));
-        }
-    }
-  else
-    panic_impossible ();
-}
-