Refactor jar loading

Author: dcattaruzza

src/java_bytecode/java_class_loader.cpp

@@ -74,38 +74,50 @@ void java_class_loadert::set_java_cp_include_files(
   java_cp_include_files=_java_cp_include_files;
 }
 
-java_bytecode_parse_treet &java_class_loadert::get_parse_tree(
+/// Retrieves a class file from a jar and loads it into the tree
+bool java_class_loadert::get_class_file(
   java_class_loader_limitt &class_loader_limit,
-  const irep_idt &class_name)
+  const irep_idt &class_name,
+  const std::string &jar_file,
+  java_bytecode_parse_treet &parse_tree)
 {
-  java_bytecode_parse_treet &parse_tree=class_map[class_name];
+  const auto &jm=jar_map[jar_file];
 
-  // First check given JAR files
-  for(const auto &jf : jar_files)
+  auto jm_it=jm.entries.find(class_name);
+
+  if(jm_it!=jm.entries.end())
   {
-    read_jar_file(class_loader_limit, jf);
+    debug() << "Getting class `" << class_name << "' from JAR "
+            << jar_file << eom;
 
-    const auto &jm=jar_map[jf];
+    std::string data=jar_pool(class_loader_limit, jar_file)
+      .get_entry(jm_it->second.class_file_name);
 
-    auto jm_it=jm.entries.find(class_name);
+    std::istringstream istream(data);
 
-    if(jm_it!=jm.entries.end())
-    {
-      debug() << "Getting class `" << class_name << "' from JAR "
-              << jf << eom;
+    java_bytecode_parse(
+      istream,
+      parse_tree,
+      get_message_handler());
 
-      std::string data=jar_pool(class_loader_limit, jf)
-        .get_entry(jm_it->second.class_file_name);
+    return true;
+  }
+  return false;
+}
 
-      std::istringstream istream(data);
 
-      java_bytecode_parse(
-        istream,
-        parse_tree,
-        get_message_handler());
+java_bytecode_parse_treet &java_class_loadert::get_parse_tree(
+  java_class_loader_limitt &class_loader_limit,
+  const irep_idt &class_name)
+{
+  java_bytecode_parse_treet &parse_tree=class_map[class_name];
 
+  // First check given JAR files
+  for(const auto &jf : jar_files)
+  {
+    read_jar_file(class_loader_limit, jf);
+    if(get_class_file(class_loader_limit, class_name, jf, parse_tree))
       return parse_tree;
-    }
   }
 
   // See if we can find it in the class path
@@ -115,28 +127,8 @@ java_bytecode_parse_treet &java_class_loadert::get_parse_tree(
     if(has_suffix(cp, ".jar"))
     {
       read_jar_file(class_loader_limit, cp);
-
-      const auto &jm=jar_map[cp];
-
-      auto jm_it=jm.entries.find(class_name);
-
-      if(jm_it!=jm.entries.end())
-      {
-        debug() << "Getting class `" << class_name << "' from JAR "
-                << cp << eom;
-
-        std::string data=jar_pool(class_loader_limit, cp)
-          .get_entry(jm_it->second.class_file_name);
-
-        std::istringstream istream(data);
-
-        java_bytecode_parse(
-          istream,
-          parse_tree,
-          get_message_handler());
-
+      if(get_class_file(class_loader_limit, class_name, cp, parse_tree))
         return parse_tree;
-      }
     }
     else
     {

src/java_bytecode/java_class_loader.h

@@ -40,6 +40,14 @@ class java_class_loadert:public messaget
 
   void read_jar_file(java_class_loader_limitt &, const irep_idt &);
 
+  /// Attempts to load the class from the given jar.
+  /// Returns true if found and loaded
+  bool get_class_file(
+    java_class_loader_limitt &class_loader_limit,
+    const irep_idt &class_name,
+    const std::string &jar_file,
+    java_bytecode_parse_treet &parse_tree);
+
   /// Given a \p class_name (e.g. "java.lang.Thread") try to load the
   /// corresponding .class file by first scanning all .jar files whose
   /// pathname is stored in \ref jar_files, and if that doesn't work, then scan