introduce ranged for

Author: Daniel Kroening

jbmc/src/java_bytecode/java_bytecode_parse_tree.cpp

@@ -23,10 +23,8 @@ void java_bytecode_parse_treet::output(std::ostream &out) const
   parsed_class.output(out);
 
   out << "Class references:\n";
-  for(class_refst::const_iterator it=class_refs.begin();
-      it!=class_refs.end();
-      it++)
-    out << "  " << *it << '\n';
+  for(const auto &class_ref : class_refs)
+    out << "  " << class_ref << '\n';
 }
 
 void java_bytecode_parse_treet::classt::output(std::ostream &out) const
@@ -42,23 +40,13 @@ void java_bytecode_parse_treet::classt::output(std::ostream &out) const
     out << " extends " << super_class;
   out << " {" << '\n';
 
-  for(fieldst::const_iterator
-      it=fields.begin();
-      it!=fields.end();
-      it++)
-  {
-    it->output(out);
-  }
+  for(const auto &field : fields)
+    field.output(out);
 
   out << '\n';
 
-  for(methodst::const_iterator
-      it=methods.begin();
-      it!=methods.end();
-      it++)
-  {
-    it->output(out);
-  }
+  for(const auto &method : methods)
+    method.output(out);
 
   out << '}' << '\n';
   out << '\n';
@@ -175,16 +163,18 @@ void java_bytecode_parse_treet::methodt::output(std::ostream &out) const
     out << "    " << i.address << ": ";
     out << i.statement;
 
-    for(std::vector<exprt>::const_iterator
-        a_it=i.args.begin(); a_it!=i.args.end(); a_it++)
+    bool first = true;
+    for(const auto &arg : i.args)
     {
-      if(a_it!=i.args.begin())
+      if(first)
+        first = false;
+      else
         out << ',';
-      #if 0
-      out << ' ' << from_expr(*a_it);
-      #else
-      out << ' ' << expr2java(*a_it, ns);
-      #endif
+#if 0
+      out << ' ' << from_expr(arg);
+#else
+      out << ' ' << expr2java(arg, ns);
+#endif
     }
 
     out << '\n';