Improving warnings for unsupported signatures for generics cont.

Author: svorenova

src/java_bytecode/java_bytecode_convert_class.cpp

@@ -202,7 +202,7 @@ void java_bytecode_convert_classt::convert(const classt &c)
       }
       class_type=generic_class_type;
     }
-    catch(unsupported_java_class_signature_exceptiont &e)
+    catch(const unsupported_java_class_signature_exceptiont &e)
     {
       warning() << "Class: " << c.name
                 << "\n could not parse signature: " << c.signature.value()
@@ -255,7 +255,7 @@ void java_bytecode_convert_classt::convert(const classt &c)
           base, superclass_ref.value(), qualified_classname);
         class_type.add_base(generic_base);
       }
-      catch(unsupported_java_class_signature_exceptiont &e)
+      catch(const unsupported_java_class_signature_exceptiont &e)
       {
         warning() << "Superclass: " << c.extends << " of class: " << c.name
                   << "\n could not parse signature: " << superclass_ref.value()
@@ -295,7 +295,7 @@ void java_bytecode_convert_classt::convert(const classt &c)
           base, interface_ref.value(), qualified_classname);
         class_type.add_base(generic_base);
       }
-      catch(unsupported_java_class_signature_exceptiont &e)
+      catch(const unsupported_java_class_signature_exceptiont &e)
       {
         warning() << "Interface: " << interface << " of class: " << c.name
                   << "\n could not parse signature: " << interface_ref.value()

src/java_bytecode/java_bytecode_convert_method.cpp

@@ -287,17 +287,20 @@ code_typet member_type_lazy(
       else
       {
         message.warning() << "Method: " << class_name << "." << method_name
-          << "\n signature: " << signature.value() << "\n descriptor: "
-          << descriptor << "\n different number of parameters, reverting to "
-          "descriptor" << message.eom;
+                          << "\n signature: " << signature.value()
+                          << "\n descriptor: " << descriptor
+                          << "\n different number of parameters, reverting to "
+                             "descriptor"
+                          << message.eom;
       }
     }
-    catch(unsupported_java_class_signature_exceptiont &e)
+    catch(const unsupported_java_class_signature_exceptiont &e)
     {
       message.warning() << "Method: " << class_name << "." << method_name
-        << "\n could not parse signature: " << signature.value() << "\n "
-        << e.what() << "\n" << " reverting to descriptor: "
-        << descriptor << message.eom;
+                        << "\n could not parse signature: " << signature.value()
+                        << "\n " << e.what() << "\n"
+                        << " reverting to descriptor: " << descriptor
+                        << message.eom;
     }
   }
   return to_code_type(member_type_from_descriptor);