Created basic class for creating new java instantiations of classes

Author: thk123

src/java_bytecode/Makefile

@@ -25,6 +25,7 @@ SRC = bytecode_info.cpp \
       java_string_library_preprocess.cpp \
       java_types.cpp \
       java_utils.cpp \
+      generate_java_generic_type.cpp \
       mz_zip_archive.cpp \
       select_pointer_type.cpp \
       # Empty last line

src/java_bytecode/generate_java_generic_type.cpp

@@ -0,0 +1,92 @@
+/*******************************************************************\
+
+ Module: MODULE NAME
+
+ Author: DiffBlue Limited. All rights reserved.
+
+\*******************************************************************/
+#include "generate_java_generic_type.h"
+#include <util/namespace.h>
+#include <java_bytecode/java_types.h>
+#include <java_bytecode/java_utils.h>
+
+#include <iostream>
+#include <sstream>
+
+generate_java_generic_typet::generate_java_generic_typet(
+  symbol_tablet &symbol_table,
+  message_handlert &message_handler):
+    symbol_table(symbol_table),
+    message_handler(message_handler)
+{}
+
+symbolt generate_java_generic_typet::operator()(
+  const java_type_with_generic_typet &existing_generic_type)
+{
+  namespacet ns(symbol_table);
+
+  const typet &pointer_subtype=ns.follow(existing_generic_type.subtype());
+
+  INVARIANT(
+    pointer_subtype.id()==ID_struct, "Only pointers to classes in java");
+
+  const java_class_typet &java_class=to_java_class_type(pointer_subtype);
+
+  java_class_typet replacement_type=java_class;
+  replacement_type.components().clear();
+
+  const irep_idt new_tag=build_generic_tag(existing_generic_type, java_class);
+  replacement_type.set_tag(new_tag);
+
+  for(const struct_union_typet::componentt &component_type :
+    java_class.components())
+  {
+    if(!is_java_generic_type(component_type.type()))
+    {
+      replacement_type.components().push_back(component_type);
+      continue;
+    }
+
+    INVARIANT(
+      existing_generic_type.type_parameters.size()==1,
+      "Must have a type parameter");
+
+    struct_union_typet::componentt replacement_comp=component_type;
+    replacement_comp.type()=existing_generic_type.type_parameters[0];
+
+    replacement_type.components().push_back(replacement_comp);
+
+  }
+  INVARIANT(
+    replacement_type.components().size()==java_class.components().size(),
+    "All components in the original class should be in the new class");
+
+  generate_class_stub(new_tag, symbol_table, message_handler);
+  INVARIANT(symbol_table.has_symbol("java::"+id2string(new_tag)), "New class not created");
+  return symbol_table.lookup("java::"+id2string(new_tag));
+}
+
+irep_idt generate_java_generic_typet::build_generic_tag(
+  const java_type_with_generic_typet &existing_generic_type,
+  const java_class_typet &original_class)
+{
+  std::ostringstream new_tag_buffer;
+  new_tag_buffer << original_class.get_tag();
+  new_tag_buffer << "<";
+  bool first=true;
+  for(const typet &param : existing_generic_type.type_parameters)
+  {
+    if(!first)
+      new_tag_buffer << ", ";
+    first=false;
+
+    INVARIANT(
+      is_java_inst_generic_type(param),
+      "Only create full concretized generic types");
+    new_tag_buffer << param.subtype().get(ID_identifier);
+  }
+
+  new_tag_buffer << ">";
+
+  return new_tag_buffer.str();
+}

src/java_bytecode/generate_java_generic_type.h

@@ -0,0 +1,36 @@
+/*******************************************************************\
+
+ Module: MODULE NAME
+
+ Author: DiffBlue Limited. All rights reserved.
+
+\*******************************************************************/
+#ifndef GENERATE_JAVA_GENERIC_TYPE_H
+#define GENERATE_JAVA_GENERIC_TYPE_H
+
+#include <util/message.h>
+#include <util/symbol_table.h>
+#include <util/std_types.h>
+#include <java_bytecode/java_types.h>
+
+class generate_java_generic_typet
+{
+public:
+  generate_java_generic_typet(
+    symbol_tablet &symbol_table,
+    message_handlert &message_handler);
+
+  symbolt operator()(
+    const java_type_with_generic_typet &existing_generic_type);
+private:
+  irep_idt build_generic_tag(
+    const java_type_with_generic_typet &existing_generic_type,
+    const java_class_typet &original_class);
+
+  symbol_tablet &symbol_table;
+
+  message_handlert &message_handler;
+
+};
+
+#endif // GENERATE_JAVA_GENERIC_TYPE_H

unit/java_bytecode/generate_java_generic_type.cpp

@@ -0,0 +1,50 @@
+/*******************************************************************\
+
+ Module: Unit tests for generating new type with generic parameters
+         substitued for concrete types
+
+ Author: DiffBlue Limited. All rights reserved.
+
+\*******************************************************************/
+
+#include <catch.hpp>
+
+#include <util/symbol_table.h>
+
+#include <java_bytecode/generate_java_generic_type.h>
+#include <java_bytecode/java_types.h>
+
+SCENARIO(
+  "generate_java_generic_type",
+  "[CORE][java_bytecode][generate_java_generic_type")
+{
+  GIVEN("A generic java type and a concrete substitution")
+  {
+    symbol_tablet symbol_table;
+
+
+    null_message_handlert message_handler;
+    generate_java_generic_typet type_generator(symbol_table, message_handler);
+
+
+    const reference_typet &boxed_integer_type=to_reference_type(java_type_from_string("Ljava/lang/Integer;"));
+
+    java_type_with_generic_typet generic_type;
+    generic_type.type_parameters.push_back(java_inst_generic_typet(boxed_integer_type));
+
+    struct_typet base_class;
+    base_class.components().push_back(struct_union_typet::componentt("a", java_generic_typet("T")));
+    base_class.set_tag("UserClass");
+
+    generic_type.subtype()=base_class;
+
+    const symbolt &new_symbol=type_generator(generic_type);
+    REQUIRE(new_symbol.is_type);
+
+
+
+    REQUIRE(new_symbol.base_name=="UserClass<Integer>");
+    REQUIRE(new_symbol.type.id()==ID_pointer);
+
+  }
+}