Updates requested in the PR.

Author: marek-trtik

src/java-class-info/java_class_info.cpp

@@ -110,14 +110,20 @@ int cmdline_optionst::doit()
   {
     if(!json_array_element.is_string())
     {
+      std::stringstream sstr;
+      sstr
+        << "Encountered a non-string element in the array of paths "
+        << "in the input JSON file.";
       msg.warning()
-        << "WARNING: Encountered a non-string element in the array of paths "
-        << "in the input JSON file. Skipping this record."
+        << "WARNING: "
+        << sstr.str()
+        << " Skipping this file."
         << messaget::eom;
+      errors.push_back(json_stringt(sstr.str()));
+      ret_code=-7;
       continue;
     }
 
-    jsont class_json;
     const std::string &class_file_pathname=json_array_element.value;
     if(!fileutl_file_exists(class_file_pathname))
     {
@@ -131,77 +137,28 @@ int cmdline_optionst::doit()
         << sstr.str()
         << " Skipping this file."
         << messaget::eom;
-      class_json=json_stringt(sstr.str());
+      errors.push_back(json_stringt(sstr.str()));
       ret_code=-7;
+      continue;
     }
-    else
-    {
-      try
-      {
-        java_bytecode_parse_treet parse_tree;
-        if(java_bytecode_parse(
-          class_file_pathname,
-          parse_tree,
-          ui_message_handler))
-        {
-          std::stringstream sstr;
-          sstr
-            << "The load of Java class file '"
-            << class_file_pathname
-            << "' specified in '"
-            << in_json_pathname
-            << "' has failed (by error return code from "
-            << "'java_bytecode_parse').";
-          msg.warning()
-            << "WARNING: "
-            << sstr.str()
-            << " Skipping this file."
-            << messaget::eom;
-          class_json=json_stringt(sstr.str());
-          ret_code=-7;
-        }
-        else
-        {
-          INVARIANT(parse_tree.loading_successful,
-            "False returned from 'java_bytecode_parse' should imply "
-            "'parse_tree.loading_successful' is True.");
 
-          json_objectt class_props;
-          {
-            class_props["name"]=
-              json_stringt(id2string(parse_tree.parsed_class.name));
-            class_props["extends"]=
-              json_stringt(id2string(parse_tree.parsed_class.extends));
-            {
-              json_arrayt interfaces;
-              for(auto const &interface : parse_tree.parsed_class.implements)
-                interfaces.push_back(json_stringt(id2string(interface)));
-              class_props["implements"]=interfaces;
-            }
-            class_props["is_abstract"]=jsont::json_boolean(
-              parse_tree.parsed_class.is_abstract);
-            class_props["is_public"]=jsont::json_boolean(
-              parse_tree.parsed_class.is_public);
-            class_props["is_private"]=jsont::json_boolean(
-              parse_tree.parsed_class.is_private);
-            class_props["is_protected"]=jsont::json_boolean(
-              parse_tree.parsed_class.is_protected);
-            class_props["is_enum"]=jsont::json_boolean(
-              parse_tree.parsed_class.is_enum);
-          }
-          class_json=class_props;
-        }
-      }
-      catch(...)
+    jsont class_json;
+    try
+    {
+      java_bytecode_parse_treet parse_tree;
+      if(java_bytecode_parse(
+        class_file_pathname,
+        parse_tree,
+        ui_message_handler))
       {
         std::stringstream sstr;
         sstr
           << "The load of Java class file '"
           << class_file_pathname
           << "' specified in '"
           << in_json_pathname
-          << "' has failed (by throwing an exception)."
-          << "";
+          << "' has failed (by error return code from "
+          << "'java_bytecode_parse').";
         msg.warning()
           << "WARNING: "
           << sstr.str()
@@ -210,6 +167,55 @@ int cmdline_optionst::doit()
         class_json=json_stringt(sstr.str());
         ret_code=-7;
       }
+      else
+      {
+        INVARIANT(parse_tree.loading_successful,
+          "False returned from 'java_bytecode_parse' should imply "
+          "'parse_tree.loading_successful' is True.");
+
+        json_objectt class_props;
+        {
+          class_props["name"]=
+            json_stringt(id2string(parse_tree.parsed_class.name));
+          class_props["extends"]=
+            json_stringt(id2string(parse_tree.parsed_class.extends));
+          {
+            json_arrayt interfaces;
+            for(auto const &interface : parse_tree.parsed_class.implements)
+              interfaces.push_back(json_stringt(id2string(interface)));
+            class_props["implements"]=interfaces;
+          }
+          class_props["is_abstract"]=jsont::json_boolean(
+            parse_tree.parsed_class.is_abstract);
+          class_props["is_public"]=jsont::json_boolean(
+            parse_tree.parsed_class.is_public);
+          class_props["is_private"]=jsont::json_boolean(
+            parse_tree.parsed_class.is_private);
+          class_props["is_protected"]=jsont::json_boolean(
+            parse_tree.parsed_class.is_protected);
+          class_props["is_enum"]=jsont::json_boolean(
+            parse_tree.parsed_class.is_enum);
+        }
+        class_json=class_props;
+      }
+    }
+    catch(...)
+    {
+      std::stringstream sstr;
+      sstr
+        << "The load of Java class file '"
+        << class_file_pathname
+        << "' specified in '"
+        << in_json_pathname
+        << "' has failed (by throwing an exception)."
+        << "";
+      msg.warning()
+        << "WARNING: "
+        << sstr.str()
+        << " Skipping this file."
+        << messaget::eom;
+      class_json=json_stringt(sstr.str());
+      ret_code=-7;
     }
     if(class_json.is_string())
       errors.push_back(class_json);