Fix linter warnings

Author: peterschrammel

src/goto-programs/graphml_witness.cpp

@@ -81,10 +81,11 @@ std::string graphml_witnesst::convert_assign_rec(
     forall_operands(it, assign.rhs())
     {
       index_exprt index(
-          assign.lhs(),
-          from_integer(i++, signedbv_typet(config.ansi_c.pointer_width)),
-          type.subtype());
-      if(!result.empty()) result+=' ';
+        assign.lhs(),
+        from_integer(i++, signedbv_typet(config.ansi_c.pointer_width)),
+        type.subtype());
+      if(!result.empty())
+        result+=' ';
       result+=convert_assign_rec(identifier, code_assignt(index, *it));
     }
   }
@@ -128,10 +129,11 @@ std::string graphml_witnesst::convert_assign_rec(
       assert(it!=assign.rhs().operands().end());
 
       member_exprt member(
-          assign.lhs(),
-          comp.get_name(),
-          it->type());
-      if(!result.empty()) result+=' ';
+        assign.lhs(),
+        comp.get_name(),
+        it->type());
+      if(!result.empty())
+        result+=' ';
       result+=convert_assign_rec(identifier, code_assignt(member, *it));
       ++it;
 
@@ -181,7 +183,7 @@ void graphml_witnesst::operator()(const goto_tracet &goto_trace)
   for(goto_tracet::stepst::const_iterator
       it=goto_trace.steps.begin();
       it!=goto_trace.steps.end();
-      it++) //we cannot replace this by a ranged for
+      it++) // we cannot replace this by a ranged for
   {
     const source_locationt &source_location=it->pc->source_location;
 
@@ -248,10 +250,11 @@ void graphml_witnesst::operator()(const goto_tracet &goto_trace)
     goto_tracet::stepst::const_iterator next=it;
     for(++next;
         next!=goto_trace.steps.end() &&
-        (step_to_node[next->step_nr]==sink ||
-         it->pc==next->pc);
+        (step_to_node[next->step_nr]==sink || it->pc==next->pc);
         ++next)
-      ;
+    {
+      // advance
+    }
     const std::size_t to=
       next==goto_trace.steps.end()?
       sink:step_to_node[next->step_nr];
@@ -345,7 +348,8 @@ void graphml_witnesst::operator()(const goto_tracet &goto_trace)
     case goto_trace_stept::DEAD:
     case goto_trace_stept::CONSTRAINT:
     case goto_trace_stept::NONE:
-        ; /* ignore */
+      // ignore
+      break;
     }
 
     it=next;
@@ -381,7 +385,7 @@ void graphml_witnesst::operator()(const symex_target_equationt &equation)
   for(symex_target_equationt::SSA_stepst::const_iterator
       it=equation.SSA_steps.begin();
       it!=equation.SSA_steps.end();
-      it++, step_nr++) //we cannot replace this by a ranged for
+      it++, step_nr++) // we cannot replace this by a ranged for
   {
     const source_locationt &source_location=it->source.pc->source_location;
 
@@ -442,10 +446,11 @@ void graphml_witnesst::operator()(const symex_target_equationt &equation)
     std::size_t next_step_nr=step_nr;
     for(++next, ++next_step_nr;
         next!=equation.SSA_steps.end() &&
-        (step_to_node[next_step_nr]==sink ||
-         it->source.pc==next->source.pc);
+        (step_to_node[next_step_nr]==sink || it->source.pc==next->source.pc);
         ++next, ++next_step_nr)
-      ;
+    {
+      // advance
+    }
     const std::size_t to=
       next==equation.SSA_steps.end()?
       sink:step_to_node[next_step_nr];
@@ -514,10 +519,11 @@ void graphml_witnesst::operator()(const symex_target_equationt &equation)
     case goto_trace_stept::DEAD:
     case goto_trace_stept::CONSTRAINT:
     case goto_trace_stept::NONE:
-        ; /* ignore */
+      // ignore
+      break;
     }
 
-    it=next; 
+    it=next;
     step_nr=next_step_nr;
   }
 }

src/goto-programs/graphml_witness.h

@@ -39,7 +39,6 @@ class graphml_witnesst
   std::string convert_assign_rec(
     const irep_idt &identifier,
     const code_assignt &assign);
-
 };
 
 #endif // CPROVER_GOTO_PROGRAMS_GRAPHML_WITNESS_H

src/xmllang/graphml.cpp

@@ -282,8 +282,12 @@ Function: write_graphml
 bool write_graphml(const graphmlt &src, std::ostream &os)
 {
   xmlt graphml("graphml");
-  graphml.set_attribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
-  graphml.set_attribute("xmlns", "http://graphml.graphdrawing.org/xmlns");
+  graphml.set_attribute(
+    "xmlns:xsi",
+    "http://www.w3.org/2001/XMLSchema-instance");
+  graphml.set_attribute(
+    "xmlns",
+    "http://graphml.graphdrawing.org/xmlns");
 
   // <key attr.name="originFileName" attr.type="string" for="edge"
   //      id="originfile">
@@ -311,7 +315,7 @@ bool write_graphml(const graphmlt &src, std::ostream &os)
     key.set_attribute("id", "invariant");
   }
 
-  //<key attr.name="invariant.scope" attr.type="string" for="node"
+  // <key attr.name="invariant.scope" attr.type="string" for="node"
   //     id="invariant.scope"/>
   {
     xmlt &key=graphml.new_element("key");

src/xmllang/graphml.h

@@ -37,7 +37,7 @@ struct xml_graph_nodet:public graph_nodet<xml_edget>
   std::string invariant_scope;
 };
 
-class graphmlt : public graph<xml_graph_nodet>
+class graphmlt:public graph<xml_graph_nodet>
 {
 public:
   inline bool has_node(const std::string &node_name) const