Mercurial > octave

changeset 21877:dc0347131364

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: More code cleanup for debug.cc and C++11. * debug.cc: Use is_empty in preference to "numel () == 0". Use 'auto' to simplify declarations.
author Rik <rik@octave.org>
date Sun, 12 Jun 2016 13:31:56 -0700
parents ef25c202bacc
children 67e51c889f34
files libinterp/corefcn/debug.cc
diffstat 1 files changed, 10 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/debug.cc	Sun Jun 12 10:54:42 2016 -0700
+++ b/libinterp/corefcn/debug.cc	Sun Jun 12 13:31:56 2016 -0700
@@ -489,7 +489,7 @@
   else
     {
       Array<octave_value> W = U.index (static_cast<octave_idx_type> (0));
-      if (W.numel () == 0 || W(0).length () == 0)
+      if (W.is_empty () || W(0).is_empty () == 0)
         Vdebug_on_error = 1;    // like "dbstop if error" with no identifier
       else if (! W(0).is_cell ())
         fail = true;
@@ -515,7 +515,7 @@
   else
     {
       Array<octave_value> W = U.index (static_cast<octave_idx_type> (0));
-      if (W.numel () == 0 || W(0).length () == 0)
+      if (W.is_empty () || W(0).is_empty ())
         Vdebug_on_caught = 1;    // like "dbstop if caught error" with no ID
       else if (! W(0).is_cell ())
         fail = true;
@@ -541,7 +541,7 @@
   else
     {
       Array<octave_value> W = U.index (static_cast<octave_idx_type> (0));
-      if (W.numel () == 0 || W(0).length () == 0)
+      if (W.is_empty () || W(0).is_empty ())
         Vdebug_on_warning = 1;    // like "dbstop if warning" with no identifier
       else if (! W(0).is_cell ())
         fail = true;
@@ -789,7 +789,7 @@
           results = cmds->list_breakpoints ();
 
           bp_set_iterator it = bp_set.find (fname);
-          if (results.length () == 0 && it != bp_set.end ())
+          if (results.empty () && it != bp_set.end ())
             bp_set.erase (it);
         }
 
@@ -832,8 +832,7 @@
 
       for (const auto& subf_nm : subfcn_names)
         {
-          std::map<std::string, octave_value>::const_iterator
-            q = subfcns.find (subf_nm);
+          const auto q = subfcns.find (subf_nm);
 
           if (q != subfcns.end ())
             {
@@ -924,7 +923,7 @@
 
   for (auto& bp_fname : tmp_bp_set)
     {
-      if (fname_list.length () == 0
+      if (fname_list.empty ()
           || do_find_bkpt_list (fname_list, bp_fname) != "")
         {
           octave_user_code *f = get_user_code (bp_fname);
@@ -950,8 +949,7 @@
 
               for (const auto& subfcn_nm : subf_nm)
                 {
-                  std::map<std::string, octave_value>::const_iterator
-                    q = subf.find (subfcn_nm);
+                  const auto q = subf.find (subfcn_nm);
 
                   if (q != subf.end ())
                     {
@@ -1444,11 +1442,10 @@
               octave_stdout << "breakpoint" << _s_ <<" in " << fnm_bp_p.first
                             << " at line" << _s_ << " ";
 
-              for (std::list<bp_type>::const_iterator j = m.begin ();
-                   j != m.end (); j++)
+              for (const auto& bp : m)
                 {
-                  if (j->cond == "")
-                    octave_stdout << j->line << " ";
+                  if (bp.cond == "")
+                    octave_stdout << bp.line << " ";
                 }
               octave_stdout << std::endl;
             }