expr2ct::convert_function now has variant with operands only

Author: Daniel Kroening

src/ansi-c/expr2c.cpp

@@ -1225,19 +1225,30 @@ std::string expr2ct::convert_function(
   const exprt &src,
   const std::string &name,
   unsigned precedence)
+{
+  return convert_function(src.operands(), name, precedence);
+}
+
+std::string expr2ct::convert_function(
+  const exprt::operandst &ops,
+  const std::string &name,
+  unsigned precedence)
 {
   std::string dest=name;
   dest+='(';
+  bool first = true;
 
-  forall_operands(it, src)
+  for(const auto &op : ops)
   {
     unsigned p;
-    std::string op=convert_with_precedence(*it, p);
+    const std::string op_str=convert_with_precedence(op, p);
 
-    if(it!=src.operands().begin())
+    if(first)
+      first=false;
+    else
       dest+=", ";
 
-    dest+=op;
+    dest+=op_str;
   }
 
   dest+=')';
@@ -2958,7 +2969,7 @@ std::string expr2ct::convert_code(
   if(statement=="set_may" ||
      statement=="set_must")
     return
-      indent_str(indent)+convert_function(src, id2string(statement), 16)+";";
+      indent_str(indent)+convert_function(src.operands(), id2string(statement), 16)+";";
 
   unsigned precedence;
   return convert_norep(src, precedence);

src/ansi-c/expr2c_class.h

@@ -169,7 +169,13 @@ class expr2ct
     unsigned precedence);
 
   std::string convert_function(
-    const exprt &src, const std::string &symbol,
+    const exprt::operandst &ops,
+    const std::string &symbol,
+    unsigned precedence);
+
+  std::string convert_function(
+    const exprt &src,
+    const std::string &symbol,
     unsigned precedence);
 
   std::string convert_complex(