From 351e3a7b17f72eb8edb7e2a38bf71383b4f95f8e Mon Sep 17 00:00:00 2001
From: Owen Jones <owen.jones@diffblue.com>
Date: Mon, 15 May 2017 09:20:37 +0100
Subject: [PATCH] Rename convert to convert_with_precedence

It is bad style to have an interface method the same name as an
internal method with a different signature. Then on overriding one of
these methods the compiler only finds the overloaded one with the wrong
signature, doesn't look up the base class and fails.

We fix this problem by renaming the protected method. This simplifies
the code in all derived classes.
---
 src/ansi-c/expr2c.cpp           | 118 ++++++++++++++++----------------
 src/ansi-c/expr2c_class.h       |   3 +-
 src/cpp/expr2cpp.cpp            |   7 +-
 src/java_bytecode/expr2java.cpp |  12 ++--
 src/java_bytecode/expr2java.h   |   6 +-
 5 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/src/ansi-c/expr2c.cpp b/src/ansi-c/expr2c.cpp
index 44c2f1c5794..cc631e12da2 100644
--- a/src/ansi-c/expr2c.cpp
+++ b/src/ansi-c/expr2c.cpp
@@ -874,16 +874,16 @@ std::string expr2ct::convert_typecast(
 
   if(to_type.id()==ID_c_bool &&
      from_type.id()==ID_bool)
-    return convert(src.op(), precedence);
+    return convert_with_precedence(src.op(), precedence);
 
   if(to_type.id()==ID_bool &&
      from_type.id()==ID_c_bool)
-    return convert(src.op(), precedence);
+    return convert_with_precedence(src.op(), precedence);
 
   std::string dest="("+convert(src.type())+")";
 
   unsigned p;
-  std::string tmp=convert(src.op(), p);
+  std::string tmp=convert_with_precedence(src.op(), p);
 
   if(precedence>p)
     dest+='(';
@@ -922,9 +922,9 @@ std::string expr2ct::convert_trinary(
 
   unsigned p0, p1, p2;
 
-  std::string s_op0=convert(op0, p0);
-  std::string s_op1=convert(op1, p1);
-  std::string s_op2=convert(op2, p2);
+  std::string s_op0=convert_with_precedence(op0, p0);
+  std::string s_op1=convert_with_precedence(op1, p1);
+  std::string s_op2=convert_with_precedence(op2, p2);
 
   std::string dest;
 
@@ -979,8 +979,8 @@ std::string expr2ct::convert_quantifier(
 
   unsigned p0, p1;
 
-  std::string op0=convert(src.op0(), p0);
-  std::string op1=convert(src.op1(), p1);
+  std::string op0=convert_with_precedence(src.op0(), p0);
+  std::string op1=convert_with_precedence(src.op1(), p1);
 
   std::string dest=symbol+" { ";
   dest+=convert(src.op0().type());
@@ -1011,7 +1011,7 @@ std::string expr2ct::convert_with(
     return convert_norep(src, precedence);
 
   unsigned p0;
-  std::string op0=convert(src.op0(), p0);
+  std::string op0=convert_with_precedence(src.op0(), p0);
 
   std::string dest;
 
@@ -1057,9 +1057,9 @@ std::string expr2ct::convert_with(
       p1=10;
     }
     else
-      op1=convert(src.operands()[i], p1);
+      op1=convert_with_precedence(src.operands()[i], p1);
 
-    op2=convert(src.operands()[i+1], p2);
+    op2=convert_with_precedence(src.operands()[i+1], p2);
 
     dest+=op1;
     dest+=":=";
@@ -1098,8 +1098,8 @@ std::string expr2ct::convert_update(
   std::string op0, op1, op2;
   unsigned p0, p2;
 
-  op0=convert(src.op0(), p0);
-  op2=convert(src.op2(), p2);
+  op0=convert_with_precedence(src.op0(), p0);
+  op2=convert_with_precedence(src.op2(), p2);
 
   if(precedence>p0)
     dest+='(';
@@ -1153,7 +1153,7 @@ std::string expr2ct::convert_cond(
   forall_operands(it, src)
   {
     unsigned p;
-    std::string op=convert(*it, p);
+    std::string op=convert_with_precedence(*it, p);
 
     if(condition)
       dest+="  ";
@@ -1210,7 +1210,7 @@ std::string expr2ct::convert_binary(
     }
 
     unsigned p;
-    std::string op=convert(*it, p);
+    std::string op=convert_with_precedence(*it, p);
 
     // In pointer arithmetic, x+(y-z) is unfortunately
     // not the same as (x+y)-z, even though + and -
@@ -1255,7 +1255,7 @@ std::string expr2ct::convert_unary(
     return convert_norep(src, precedence);
 
   unsigned p;
-  std::string op=convert(src.op0(), p);
+  std::string op=convert_with_precedence(src.op0(), p);
 
   std::string dest=symbol;
   if(precedence>=p ||
@@ -1289,7 +1289,7 @@ std::string expr2ct::convert_pointer_object_has_type(
     return convert_norep(src, precedence);
 
   unsigned p0;
-  std::string op0=convert(src.op0(), p0);
+  std::string op0=convert_with_precedence(src.op0(), p0);
 
   std::string dest="POINTER_OBJECT_HAS_TYPE";
   dest+='(';
@@ -1321,7 +1321,7 @@ std::string expr2ct::convert_malloc(
     return convert_norep(src, precedence);
 
   unsigned p0;
-  std::string op0=convert(src.op0(), p0);
+  std::string op0=convert_with_precedence(src.op0(), p0);
 
   std::string dest="MALLOC";
   dest+='(';
@@ -1470,7 +1470,7 @@ std::string expr2ct::convert_function(
   forall_operands(it, src)
   {
     unsigned p;
-    std::string op=convert(*it, p);
+    std::string op=convert_with_precedence(*it, p);
 
     if(it!=src.operands().begin())
       dest+=", ";
@@ -1503,12 +1503,12 @@ std::string expr2ct::convert_comma(
     return convert_norep(src, precedence);
 
   unsigned p0;
-  std::string op0=convert(src.op0(), p0);
+  std::string op0=convert_with_precedence(src.op0(), p0);
   if(*op0.rbegin()==';')
     op0.resize(op0.size()-1);
 
   unsigned p1;
-  std::string op1=convert(src.op1(), p1);
+  std::string op1=convert_with_precedence(src.op1(), p1);
   if(*op1.rbegin()==';')
     op1.resize(op1.size()-1);
 
@@ -1541,7 +1541,7 @@ std::string expr2ct::convert_complex(
   {
     // This is believed to be gcc only; check if this is sensible
     // in MSC mode.
-    return convert(src.op1(), precedence)+"i";
+    return convert_with_precedence(src.op1(), precedence)+"i";
   }
 
   // ISO C11 offers:
@@ -1569,7 +1569,7 @@ std::string expr2ct::convert_complex(
   forall_operands(it, src)
   {
     unsigned p;
-    std::string op=convert(*it, p);
+    std::string op=convert_with_precedence(*it, p);
 
     if(it!=src.operands().begin())
       dest+=", ";
@@ -1624,10 +1624,10 @@ std::string expr2ct::convert_byte_extract(
     return convert_norep(src, precedence);
 
   unsigned p0;
-  std::string op0=convert(src.op0(), p0);
+  std::string op0=convert_with_precedence(src.op0(), p0);
 
   unsigned p1;
-  std::string op1=convert(src.op1(), p1);
+  std::string op1=convert_with_precedence(src.op1(), p1);
 
   std::string dest=src.id_string();
   dest+='(';
@@ -1661,13 +1661,13 @@ std::string expr2ct::convert_byte_update(
     return convert_norep(src, precedence);
 
   unsigned p0;
-  std::string op0=convert(src.op0(), p0);
+  std::string op0=convert_with_precedence(src.op0(), p0);
 
   unsigned p1;
-  std::string op1=convert(src.op1(), p1);
+  std::string op1=convert_with_precedence(src.op1(), p1);
 
   unsigned p2;
-  std::string op2=convert(src.op2(), p2);
+  std::string op2=convert_with_precedence(src.op2(), p2);
 
   std::string dest=src.id_string();
   dest+='(';
@@ -1704,7 +1704,7 @@ std::string expr2ct::convert_unary_post(
     return convert_norep(src, precedence);
 
   unsigned p;
-  std::string op=convert(src.op0(), p);
+  std::string op=convert_with_precedence(src.op0(), p);
 
   std::string dest;
   if(precedence>p)
@@ -1737,7 +1737,7 @@ std::string expr2ct::convert_index(
     return convert_norep(src, precedence);
 
   unsigned p;
-  std::string op=convert(src.op0(), p);
+  std::string op=convert_with_precedence(src.op0(), p);
 
   std::string dest;
   if(precedence>p)
@@ -1781,7 +1781,7 @@ std::string expr2ct::convert_pointer_arithmetic(
 
   dest+=", ";
 
-  op=convert(src.op0(), p);
+  op=convert_with_precedence(src.op0(), p);
   if(precedence>p)
     dest+='(';
   dest+=op;
@@ -1790,7 +1790,7 @@ std::string expr2ct::convert_pointer_arithmetic(
 
   dest+=", ";
 
-  op=convert(src.op1(), p);
+  op=convert_with_precedence(src.op1(), p);
   if(precedence>p)
     dest+='(';
   dest+=op;
@@ -1830,7 +1830,7 @@ std::string expr2ct::convert_pointer_difference(
 
   dest+=", ";
 
-  op=convert(src.op0(), p);
+  op=convert_with_precedence(src.op0(), p);
   if(precedence>p)
     dest+='(';
   dest+=op;
@@ -1839,7 +1839,7 @@ std::string expr2ct::convert_pointer_difference(
 
   dest+=", ";
 
-  op=convert(src.op1(), p);
+  op=convert_with_precedence(src.op1(), p);
   if(precedence>p)
     dest+='(';
   dest+=op;
@@ -1920,7 +1920,7 @@ std::string expr2ct::convert_member(
   if(src.op0().id()==ID_dereference &&
      src.operands().size()==1)
   {
-    std::string op=convert(src.op0().op0(), p);
+    std::string op=convert_with_precedence(src.op0().op0(), p);
 
     if(precedence>p || src.op0().op0().id()==ID_typecast)
       dest+='(';
@@ -1932,7 +1932,7 @@ std::string expr2ct::convert_member(
   }
   else
   {
-    std::string op=convert(src.op0(), p);
+    std::string op=convert_with_precedence(src.op0(), p);
 
     if(precedence>p || src.op0().id()==ID_typecast)
       dest+='(';
@@ -2483,7 +2483,7 @@ std::string expr2ct::convert_constant(
           return convert_norep(src, precedence);
       }
       else
-        return convert(src.op0(), precedence);
+        return convert_with_precedence(src.op0(), precedence);
     }
   }
   else if(type.id()==ID_string)
@@ -2974,7 +2974,7 @@ std::string expr2ct::convert_function_application(
 
   {
     unsigned p;
-    std::string function_str=convert(src.function(), p);
+    std::string function_str=convert_with_precedence(src.function(), p);
     dest+=function_str;
   }
 
@@ -2983,7 +2983,7 @@ std::string expr2ct::convert_function_application(
   forall_expr(it, src.arguments())
   {
     unsigned p;
-    std::string arg_str=convert(*it, p);
+    std::string arg_str=convert_with_precedence(*it, p);
 
     if(it!=src.arguments().begin())
       dest+=", ";
@@ -3016,7 +3016,7 @@ std::string expr2ct::convert_side_effect_expr_function_call(
 
   {
     unsigned p;
-    std::string function_str=convert(src.function(), p);
+    std::string function_str=convert_with_precedence(src.function(), p);
     dest+=function_str;
   }
 
@@ -3025,7 +3025,7 @@ std::string expr2ct::convert_side_effect_expr_function_call(
   forall_expr(it, src.arguments())
   {
     unsigned p;
-    std::string arg_str=convert(*it, p);
+    std::string arg_str=convert_with_precedence(*it, p);
 
     if(it!=src.arguments().begin())
       dest+=", ";
@@ -3069,7 +3069,7 @@ std::string expr2ct::convert_overflow(
   forall_operands(it, src)
   {
     unsigned p;
-    std::string arg_str=convert(*it, p);
+    std::string arg_str=convert_with_precedence(*it, p);
 
     dest+=", ";
     // TODO: ggf. Klammern je nach p
@@ -3979,7 +3979,7 @@ std::string expr2ct::convert_code_function_call(
   if(src.lhs().is_not_nil())
   {
     unsigned p;
-    std::string lhs_str=convert(src.lhs(), p);
+    std::string lhs_str=convert_with_precedence(src.lhs(), p);
 
     // TODO: ggf. Klammern je nach p
     dest+=lhs_str;
@@ -3988,7 +3988,7 @@ std::string expr2ct::convert_code_function_call(
 
   {
     unsigned p;
-    std::string function_str=convert(src.function(), p);
+    std::string function_str=convert_with_precedence(src.function(), p);
     dest+=function_str;
   }
 
@@ -3999,7 +3999,7 @@ std::string expr2ct::convert_code_function_call(
   forall_expr(it, arguments)
   {
     unsigned p;
-    std::string arg_str=convert(*it, p);
+    std::string arg_str=convert_with_precedence(*it, p);
 
     if(it!=arguments.begin())
       dest+=", ";
@@ -4033,7 +4033,7 @@ std::string expr2ct::convert_code_printf(
   forall_operands(it, src)
   {
     unsigned p;
-    std::string arg_str=convert(*it, p);
+    std::string arg_str=convert_with_precedence(*it, p);
 
     if(it!=src.operands().begin())
       dest+=", ";
@@ -4109,7 +4109,7 @@ std::string expr2ct::convert_code_input(
   forall_operands(it, src)
   {
     unsigned p;
-    std::string arg_str=convert(*it, p);
+    std::string arg_str=convert_with_precedence(*it, p);
 
     if(it!=src.operands().begin())
       dest+=", ";
@@ -4143,7 +4143,7 @@ std::string expr2ct::convert_code_output(
   forall_operands(it, src)
   {
     unsigned p;
-    std::string arg_str=convert(*it, p);
+    std::string arg_str=convert_with_precedence(*it, p);
 
     if(it!=src.operands().begin())
       dest+=", ";
@@ -4176,7 +4176,7 @@ std::string expr2ct::convert_code_array_set(
   forall_operands(it, src)
   {
     unsigned p;
-    std::string arg_str=convert(*it, p);
+    std::string arg_str=convert_with_precedence(*it, p);
 
     if(it!=src.operands().begin())
       dest+=", ";
@@ -4210,7 +4210,7 @@ std::string expr2ct::convert_code_array_copy(
   forall_operands(it, src)
   {
     unsigned p;
-    std::string arg_str=convert(*it, p);
+    std::string arg_str=convert_with_precedence(*it, p);
 
     if(it!=src.operands().begin())
       dest+=", ";
@@ -4436,9 +4436,9 @@ std::string expr2ct::convert_extractbit(
   if(src.operands().size()!=2)
     return convert_norep(src, precedence);
 
-  std::string dest=convert(src.op0(), precedence);
+  std::string dest=convert_with_precedence(src.op0(), precedence);
   dest+='[';
-  dest+=convert(src.op1(), precedence);
+  dest+=convert_with_precedence(src.op1(), precedence);
   dest+=']';
 
   return dest;
@@ -4463,11 +4463,11 @@ std::string expr2ct::convert_extractbits(
   if(src.operands().size()!=3)
     return convert_norep(src, precedence);
 
-  std::string dest=convert(src.op0(), precedence);
+  std::string dest=convert_with_precedence(src.op0(), precedence);
   dest+='[';
-  dest+=convert(src.op1(), precedence);
+  dest+=convert_with_precedence(src.op1(), precedence);
   dest+=", ";
-  dest+=convert(src.op2(), precedence);
+  dest+=convert_with_precedence(src.op2(), precedence);
   dest+=']';
 
   return dest;
@@ -4511,7 +4511,7 @@ Function: expr2ct::convert
 
 \*******************************************************************/
 
-std::string expr2ct::convert(
+std::string expr2ct::convert_with_precedence(
   const exprt &src,
   unsigned &precedence)
 {
@@ -4550,7 +4550,7 @@ std::string expr2ct::convert(
     std::string dest="FLOAT_TYPECAST(";
 
     unsigned p0;
-    std::string tmp0=convert(src.op0(), p0);
+    std::string tmp0=convert_with_precedence(src.op0(), p0);
 
     if(p0<=1)
       dest+='(';
@@ -4564,7 +4564,7 @@ std::string expr2ct::convert(
     dest+=", ";
 
     unsigned p1;
-    std::string tmp1=convert(src.op1(), p1);
+    std::string tmp1=convert_with_precedence(src.op1(), p1);
 
     if(p1<=1)
       dest+='(';
@@ -5030,7 +5030,7 @@ Function: expr2ct::convert
 std::string expr2ct::convert(const exprt &src)
 {
   unsigned precedence;
-  return convert(src, precedence);
+  return convert_with_precedence(src, precedence);
 }
 
 /*******************************************************************\
diff --git a/src/ansi-c/expr2c_class.h b/src/ansi-c/expr2c_class.h
index b0647fb7fbb..771f936afb8 100644
--- a/src/ansi-c/expr2c_class.h
+++ b/src/ansi-c/expr2c_class.h
@@ -205,7 +205,8 @@ class expr2ct
   std::string convert_code_array_set(const codet &src, unsigned indent);
   std::string convert_code_array_copy(const codet &src, unsigned indent);
 
-  virtual std::string convert(const exprt &src, unsigned &precedence);
+  virtual std::string convert_with_precedence(
+    const exprt &src, unsigned &precedence);
 
   // NOLINTNEXTLINE(whitespace/line_length)
   std::string convert_function_application(const function_application_exprt &src, unsigned &precedence);
diff --git a/src/cpp/expr2cpp.cpp b/src/cpp/expr2cpp.cpp
index 052483a06f0..33f9c90f974 100644
--- a/src/cpp/expr2cpp.cpp
+++ b/src/cpp/expr2cpp.cpp
@@ -37,7 +37,8 @@ class expr2cppt:public expr2ct
   }
 
 protected:
-  std::string convert(const exprt &src, unsigned &precedence) override;
+  std::string convert_with_precedence(
+    const exprt &src, unsigned &precedence) override;
   std::string convert_cpp_this(const exprt &src, unsigned precedence);
   std::string convert_cpp_new(const exprt &src, unsigned precedence);
   std::string convert_extractbit(const exprt &src, unsigned precedence);
@@ -529,7 +530,7 @@ Function: expr2cppt::convert
 
 \*******************************************************************/
 
-std::string expr2cppt::convert(
+std::string expr2cppt::convert_with_precedence(
   const exprt &src,
   unsigned &precedence)
 {
@@ -557,7 +558,7 @@ std::string expr2cppt::convert(
   else if(src.id()=="pod_constructor")
     return "pod_constructor";
   else
-    return expr2ct::convert(src, precedence);
+    return expr2ct::convert_with_precedence(src, precedence);
 }
 
 /*******************************************************************\
diff --git a/src/java_bytecode/expr2java.cpp b/src/java_bytecode/expr2java.cpp
index 5f07b5850fb..e5a1d921bfa 100644
--- a/src/java_bytecode/expr2java.cpp
+++ b/src/java_bytecode/expr2java.cpp
@@ -48,7 +48,7 @@ std::string expr2javat::convert_code_function_call(
   if(src.lhs().is_not_nil())
   {
     unsigned p;
-    std::string lhs_str=convert(src.lhs(), p);
+    std::string lhs_str=convert_with_precedence(src.lhs(), p);
 
     dest+=lhs_str;
     dest+='=';
@@ -63,14 +63,14 @@ std::string expr2javat::convert_code_function_call(
   if(has_this)
   {
     unsigned p;
-    std::string this_str=convert(src.arguments()[0], p);
+    std::string this_str=convert_with_precedence(src.arguments()[0], p);
     dest+=this_str;
     dest+=" . "; // extra spaces for readability
   }
 
   {
     unsigned p;
-    std::string function_str=convert(src.function(), p);
+    std::string function_str=convert_with_precedence(src.function(), p);
     dest+=function_str;
   }
 
@@ -88,7 +88,7 @@ std::string expr2javat::convert_code_function_call(
     else
     {
       unsigned p;
-      std::string arg_str=convert(*it, p);
+      std::string arg_str=convert_with_precedence(*it, p);
 
       if(first)
         first=false;
@@ -484,7 +484,7 @@ Function: expr2javat::convert
 
 \*******************************************************************/
 
-std::string expr2javat::convert(
+std::string expr2javat::convert_with_precedence(
   const exprt &src,
   unsigned &precedence)
 {
@@ -516,7 +516,7 @@ std::string expr2javat::convert(
   else if(src.id()==ID_constant)
     return convert_constant(to_constant_expr(src), precedence=16);
   else
-    return expr2ct::convert(src, precedence);
+    return expr2ct::convert_with_precedence(src, precedence);
 }
 
 /*******************************************************************\
diff --git a/src/java_bytecode/expr2java.h b/src/java_bytecode/expr2java.h
index 151c8d95816..4df0d240cf9 100644
--- a/src/java_bytecode/expr2java.h
+++ b/src/java_bytecode/expr2java.h
@@ -16,11 +16,9 @@ class expr2javat:public expr2ct
 {
 public:
   explicit expr2javat(const namespacet &_ns):expr2ct(_ns) { }
-
-  using expr2ct::convert;
-
 protected:
-  virtual std::string convert(const exprt &src, unsigned &precedence);
+  virtual std::string convert_with_precedence(
+    const exprt &src, unsigned &precedence);
   virtual std::string convert_java_this(const exprt &src, unsigned precedence);
   virtual std::string convert_java_instanceof(
     const exprt &src,