Mercurial > octave

diff libinterp/octave-value/ov-class.cc @ 25337:3ff9192b676e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use auto keyword to declare iterator variables where possible * dialog.cc, files-dock-widget.cc, history-dock-widget.cc, file-editor.cc, octave-qt-link.cc, call-stack.cc, debug.cc, dynamic-ld.cc, fcn-info.cc, fcn-info.h, genprops.awk, graphics.cc, gtk-manager.cc, gtk-manager.h, hook-fcn.h, load-path.cc, load-save.cc, ls-mat5.cc, mex.cc, oct-map.cc, oct-stream.cc, octave-link.cc, regexp.cc, symscope.h, symtab.h, txt-eng.h, url-handle-manager.cc, variables.cc, ov-base.cc, ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-java.cc, ov-struct.cc, bp-table.cc, jit-ir.cc, jit-typeinfo.cc, pt-arg-list.cc, pt-arg-list.h, pt-array-list.cc, pt-check.cc, pt-classdef.cc, pt-decl.h, pt-eval.cc, pt-idx.cc, pt-jit.cc, pt-misc.cc, pt-pr-code.cc, pt-select.h, pt-stmt.h, caseless-str.h, lo-regexp.cc: Use auto keyword to declare iterator variables where possible. Style fixes.
author John W. Eaton <jwe@octave.org>
date Wed, 02 May 2018 01:36:20 -0400
parents 078b795c5219
children 416856765a55
line wrap: on
line diff
--- a/libinterp/octave-value/ov-class.cc	Wed May 02 00:30:00 2018 -0400
+++ b/libinterp/octave-value/ov-class.cc	Wed May 02 01:36:20 2018 -0400
@@ -282,7 +282,7 @@
 
   std::string nm = idx(0).xstring_value ("invalid index for class");
 
-  octave_map::const_iterator p = my_map.seek (nm);
+  auto p = my_map.seek (nm);
 
   if (p == my_map.end ())
     error ("class has no member '%s'", nm.c_str ());
@@ -387,7 +387,7 @@
           {
             if (type.length () > 1 && type[1] == '.')
               {
-                std::list<octave_value_list>::const_iterator p = idx.begin ();
+                auto p = idx.begin ();
                 octave_value_list key_idx = *++p;
 
                 Cell tmp = dotref (key_idx);
@@ -635,7 +635,7 @@
           {
             if (type.length () > 1 && type[1] == '.')
               {
-                std::list<octave_value_list>::const_iterator p = idx.begin ();
+                auto p = idx.begin ();
                 octave_value_list t_idx = *p;
 
                 octave_value_list key_idx = *++p;
@@ -689,7 +689,7 @@
             std::string next_type = type.substr (1);
 
             Cell tmpc (1, 1);
-            octave_map::iterator pkey = map.seek (key);
+            auto pkey = map.seek (key);
             if (pkey != map.end ())
               {
                 map.contents (pkey).make_unique ();
@@ -730,7 +730,7 @@
       {
         if (n > 1 && type[1] == '.')
           {
-            std::list<octave_value_list>::const_iterator p = idx.begin ();
+            auto p = idx.begin ();
             octave_value_list key_idx = *++p;
 
             assert (key_idx.length () == 1);
@@ -846,7 +846,7 @@
 
   size_t retval = 0;
 
-  for (octave_map::const_iterator it = map.begin (); it != map.end (); it++)
+  for (auto it = map.begin (); it != map.end (); it++)
     {
       std::string key = map.key (it);
 
@@ -896,7 +896,7 @@
     {
       for (auto& par : parent_list)
         {
-          octave_map::const_iterator smap = map.seek (par);
+          auto smap = map.seek (par);
 
           const Cell& tmp = map.contents (smap);
 
@@ -925,7 +925,7 @@
     {
       for (auto& par : parent_list)
         {
-          octave_map::iterator smap = map.seek (par);
+          auto smap = map.seek (par);
 
           Cell& tmp = map.contents (smap);
 
@@ -961,7 +961,7 @@
     {
       for (auto& par : parent_list)
         {
-          octave_map::const_iterator smap = map.seek (par);
+          auto smap = map.seek (par);
 
           const Cell& tmp = map.contents (smap);
 
@@ -1043,8 +1043,7 @@
 {
   bool retval = false;
 
-  octave_class::exemplar_const_iterator it
-    = octave_class::exemplar_map.find (c_name);
+  auto it = octave_class::exemplar_map.find (c_name);
 
   if (it != octave_class::exemplar_map.end ())
     retval = true;
@@ -1124,7 +1123,7 @@
   std::string dbgstr = "dork";
 
   // First, check to see if there might be an issue with inheritance.
-  for (octave_map::const_iterator it = map.begin (); it != map.end (); it++)
+  for (auto it = map.begin (); it != map.end (); it++)
     {
       std::string key = map.key (it);
       Cell        val = map.contents (it);
@@ -1142,8 +1141,7 @@
 
   if (might_have_inheritance)
     {
-      octave_class::exemplar_const_iterator it
-        = octave_class::exemplar_map.find (c_name);
+      auto it = octave_class::exemplar_map.find (c_name);
 
       if (it == octave_class::exemplar_map.end ())
         retval = false;
@@ -1187,7 +1185,7 @@
 
   os << "# length: " << m.nfields () << "\n";
 
-  octave_map::iterator i = m.begin ();
+  auto i = m.begin ();
   while (i != m.end ())
     {
       octave_value val = map.contents (i);
@@ -1293,7 +1291,7 @@
   int32_t len = m.nfields ();
   os.write (reinterpret_cast<char *> (&len), 4);
 
-  octave_map::iterator i = m.begin ();
+  auto i = m.begin ();
   while (i != m.end ())
     {
       octave_value val = map.contents (i);
@@ -1709,8 +1707,8 @@
     = obj.parent_class_name_list ();
   std::list<std::string> pnames = parents ();
 
-  std::list<std::string>::const_iterator p = obj_parents.begin ();
-  std::list<std::string>::const_iterator q = pnames.begin ();
+  auto p = obj_parents.begin ();
+  auto q = pnames.begin ();
 
   while (p != obj_parents.end ())
     {
@@ -1772,8 +1770,7 @@
           retval = octave_value (new octave_class (m, id, parents));
         }
 
-      octave_class::exemplar_const_iterator it
-        = octave_class::exemplar_map.find (id);
+      auto it = octave_class::exemplar_map.find (id);
 
       if (it == octave_class::exemplar_map.end ())
         octave_class::exemplar_map[id] = octave_class::exemplar_info (retval);