Adding conversions for wild cards

Need to check all these are actually required after the other fixes

Author: thk123

src/java_bytecode/java_types.cpp

@@ -392,6 +392,41 @@ typet java_type_from_string(
     }
   case '*':
   {
+#ifdef DEBUG
+    std::cout << class_name << std::endl;
+#endif
+    // parse name of type variable
+    INVARIANT(src[src.size()-1]==';', "Generic type name must end on ';'.");
+    PRECONDITION(!class_name.empty());
+//    INVARIANT(
+//      src.substr(1, src.size()-2)=="*",
+//      "Wildcard types do not have a name");
+    irep_idt type_var_name(class_name+"::*");
+    return java_generic_parametert(
+      type_var_name,
+      java_type_from_string("Ljava/lang/Object;").subtype());
+  }
+  case '+':
+  {
+#ifdef DEBUG
+    std::cout << class_name << std::endl;
+#endif
+    // parse name of type variable
+    INVARIANT(src[src.size()-1]==';', "Generic type name must end on ';'.");
+    PRECONDITION(!class_name.empty());
+//    INVARIANT(
+//      src.substr(1, src.size()-2)=="*",
+//      "Wildcard types do not have a name");
+    irep_idt type_var_name(class_name+"::*");
+    return java_generic_parametert(
+      type_var_name,
+      java_type_from_string("Ljava/lang/Object;").subtype());
+  }
+  case '-':
+  {
+#ifdef DEBUG
+    std::cout << class_name << std::endl;
+#endif
     // parse name of type variable
     INVARIANT(src[src.size()-1]==';', "Generic type name must end on ';'.");
     PRECONDITION(!class_name.empty());