take comments into account

Author: Matthias Güdemann

src/java_bytecode/jar_file.cpp

@@ -8,11 +8,11 @@ Author: Daniel Kroening, [email protected]
 
 #include <cstring>
 #include <cassert>
-#include <json/json_parser.h>
 #include <unordered_set>
-#include "jar_file.h"
+
+#include <json/json_parser.h>
 #include <util/suffix.h>
-#include <iostream>
+#include "jar_file.h"
 /*******************************************************************\
 
 Function: jar_filet::open
@@ -54,9 +54,11 @@ void jar_filet::open(
            get_message_handler(),
            json_cp_config))
         throw "cannot read JSON input configuration for JAR loading";
-      assert(json_cp_config.is_object() && "JSON has wrong format");
+      if(!json_cp_config.is_object())
+        throw "the JSON file has a wrong format";
       jsont include_files=json_cp_config["classFiles"];
-      assert(include_files.is_array() && "JSON has wrong format");
+      if(!include_files.is_array())
+        throw "the JSON file has a wrong format";
       for(const jsont &file_entry : include_files.array)
       {
         assert(file_entry.is_string());
@@ -84,7 +86,7 @@ void jar_filet::open(
         add_file|=std::regex_match(file_name, string_matcher, regex_matcher);
       // load .class file only if it is in the match set
       else
-        add_file|=set_matcher.count(file_name)>0;
+        add_file|=set_matcher.find(file_name)!=set_matcher.end();
       if(add_file)
       {
         index.push_back(file_name);

src/java_bytecode/jar_file.h

@@ -22,14 +22,13 @@ class jar_filet:public messaget
 {
 public:
   jar_filet():mz_ok(false) { }
-  inline explicit jar_filet(const std::string &file_name) { }
 
   ~jar_filet();
 
   void open(std::string &java_cp_include_files, const std::string &);
 
   // Test for error; 'true' means we are good.
-  inline explicit operator bool() const { return mz_ok; }
+  explicit operator bool() const { return mz_ok; }
 
   typedef std::vector<std::string> indext;
   indext index;
@@ -45,8 +44,6 @@ class jar_filet:public messaget
 protected:
   mz_zip_archive zip;
   bool mz_ok;
-  std::string matcher;
-  std::map<int, int> index_map;
 };
 
 class jar_poolt:public messaget
@@ -56,9 +53,11 @@ class jar_poolt:public messaget
   {
     java_cp_include_files=_java_cp_include_files;
   }
+
   jar_filet &operator()(const std::string &file_name)
   {
-    assert(!java_cp_include_files.empty() && "class regexp cannot be empty");
+    if(java_cp_include_files.empty())
+      throw "class regexp cannot be empty";
     file_mapt::iterator it=file_map.find(file_name);
     if(it==file_map.end())
     {

src/java_bytecode/java_bytecode_language.cpp

@@ -56,29 +56,36 @@ void java_bytecode_languaget::get_language_options(const cmdlinet &cmd)
     lazy_methods_mode=LAZY_METHODS_MODE_CONTEXT_INSENSITIVE;
   else
     lazy_methods_mode=LAZY_METHODS_MODE_EAGER;
+
   if(cmd.isset("java-cp-include-files"))
-    java_cp_include_files=cmd.get_value("java-cp-include-files");
-  else
-    java_cp_include_files=".*";
-  // load file list from JSON file
-  if(java_cp_include_files[0]=='@')
   {
-    jsont json_cp_config;
-    if(parse_json(
-         java_cp_include_files.substr(1),
-         get_message_handler(),
-         json_cp_config))
-      throw "cannot read JSON input configuration for JAR loading";
-    assert(json_cp_config.is_object() && "JSON has wrong format");
-    jsont include_files=json_cp_config["jar"];
-    assert(include_files.is_array() && "JSON has wrong format");
-    // add jars from JSON config file to classpath
-    for(const jsont &file_entry : include_files.array)
+    java_cp_include_files=cmd.get_value("java-cp-include-files");
+    // load file list from JSON file
+    if(java_cp_include_files[0]=='@')
     {
-      assert(file_entry.is_string() && has_suffix(file_entry.value, ".jar"));
-      config.java.classpath.push_back(file_entry.value);
+      jsont json_cp_config;
+      if(parse_json(
+           java_cp_include_files.substr(1),
+           get_message_handler(),
+           json_cp_config))
+        throw "cannot read JSON input configuration for JAR loading";
+
+      if(!json_cp_config.is_object())
+        throw "the JSON file has a wrong format";
+      jsont include_files=json_cp_config["jar"];
+      if(!include_files.is_array())
+         throw "the JSON file has a wrong format";
+
+      // add jars from JSON config file to classpath
+      for(const jsont &file_entry : include_files.array)
+      {
+        assert(file_entry.is_string() && has_suffix(file_entry.value, ".jar"));
+        config.java.classpath.push_back(file_entry.value);
+      }
     }
   }
+  else
+    java_cp_include_files=".*";
 }
 
 /*******************************************************************\

src/java_bytecode/java_class_loader.h

@@ -20,6 +20,7 @@ class java_class_loadert:public messaget
 {
 public:
   java_bytecode_parse_treet &operator()(const irep_idt &);
+
   void set_java_cp_include_files(std::string &java_cp_include_files)
   {
     jar_pool.set_java_cp_include_files(java_cp_include_files);