change from vector indices to map

Author: Matthias Güdemann

src/java_bytecode/jar_file.cpp

@@ -69,7 +69,6 @@ void jar_filet::open(
     std::size_t number_of_files=
       mz_zip_reader_get_num_files(&zip);
 
-    size_t filtered_index=0;
     for(std::size_t i=0; i<number_of_files; i++)
     {
       mz_uint filename_length=mz_zip_reader_get_filename(&zip, i, nullptr, 0);
@@ -89,9 +88,10 @@ void jar_filet::open(
         add_file|=set_matcher.find(file_name)!=set_matcher.end();
       if(add_file)
       {
-        index.push_back(file_name);
-        filtered_jar[filtered_index]=i;
-        filtered_index++;
+        if(has_suffix(file_name, ".class"))
+          status() << "read class file " << file_name
+                   << " from " << filename << eom;
+        filtered_jar[file_name]=i;
       }
       delete[] filename_char;
     }
@@ -131,16 +131,17 @@ Function: jar_filet::get_entry
 
 \*******************************************************************/
 
-std::string jar_filet::get_entry(std::size_t i)
+std::string jar_filet::get_entry(const irep_idt &name)
 {
   if(!mz_ok)
     return std::string("");
 
-  assert(i<index.size());
-
   std::string dest;
 
-  size_t real_index=filtered_jar[i];
+  auto entry=filtered_jar.find(name);
+  assert(entry!=filtered_jar.end());
+
+  size_t real_index=entry->second;
   mz_zip_archive_file_stat file_stat;
   memset(&file_stat, 0, sizeof(file_stat));
   mz_bool stat_ok=mz_zip_reader_file_stat(&zip, real_index, &file_stat);
@@ -173,24 +174,11 @@ Function: jar_filet::get_manifest
 
 jar_filet::manifestt jar_filet::get_manifest()
 {
-  std::size_t i=0;
-  bool found=false;
-
-  for(const auto &e : index)
-  {
-    if(e=="META-INF/MANIFEST.MF")
-    {
-      found=true;
-      break;
-    }
-
-    i++;
-  }
-
-  if(!found)
+  auto entry=filtered_jar.find("META-INF/MANIFEST.MF");
+  if(entry==filtered_jar.end())
     return manifestt();
 
-  std::string dest=get_entry(i);
+  std::string dest=get_entry(entry->first);
   std::istringstream in(dest);
 
   manifestt manifest;

src/java_bytecode/jar_file.h

@@ -30,13 +30,11 @@ class jar_filet:public messaget
   // Test for error; 'true' means we are good.
   explicit operator bool() const { return mz_ok; }
 
-  typedef std::vector<std::string> indext;
-  indext index;
   // map internal index to real index in jar central directory
-  typedef std::map<int, int> filtered_jart;
+  typedef std::map<irep_idt, size_t> filtered_jart;
   filtered_jart filtered_jar;
 
-  std::string get_entry(std::size_t i);
+  std::string get_entry(const irep_idt &);
 
   typedef std::map<std::string, std::string> manifestt;
   manifestt get_manifest();

src/java_bytecode/java_class_loader.cpp

@@ -98,7 +98,7 @@ java_bytecode_parse_treet &java_class_loadert::get_parse_tree(
       debug() << "Getting class `" << class_name << "' from JAR "
               << jf << eom;
 
-      std::string data=jar_pool(jf).get_entry(jm_it->second.index);
+      std::string data=jar_pool(jf).get_entry(jm_it->second.class_file_name);
 
       std::istringstream istream(data);
 
@@ -129,7 +129,7 @@ java_bytecode_parse_treet &java_class_loadert::get_parse_tree(
         debug() << "Getting class `" << class_name << "' from JAR "
                 << cp << eom;
 
-        std::string data=jar_pool(cp).get_entry(jm_it->second.index);
+        std::string data=jar_pool(cp).get_entry(jm_it->second.class_file_name);
 
         std::istringstream istream(data);
 
@@ -223,19 +223,18 @@ void java_class_loadert::read_jar_file(const irep_idt &file)
   debug() << "adding JAR file `" << file << "'" << eom;
 
   auto &jm=jar_map[file];
-  std::size_t number_of_files=jar_file.index.size();
 
-  for(std::size_t i=0; i<number_of_files; i++)
+  for(auto &jar_entry : jar_file.filtered_jar)
   {
-    std::string file_name=jar_file.index[i];
+    std::string file_name=id2string(jar_entry.first);
 
     // does it end on .class?
     if(has_suffix(file_name, ".class"))
     {
       irep_idt class_name=file_to_class_name(file_name);
 
       // record
-      jm.entries[class_name].index=i;
+      jm.entries[class_name].class_file_name=file_name;
     }
   }
 }

src/java_bytecode/java_class_loader.h

@@ -48,7 +48,7 @@ class java_class_loadert:public messaget
   public:
     struct entryt
     {
-      std::size_t index;
+      std::string class_file_name;
     };
 
     // class name to index map