Merge pull request #3601 from tautschnig/json-api

Equip json_arrayt and json_objectt with a full API to enable hiding [blocks: #3602]

Author: Joel Allred

jbmc/src/java_bytecode/java_bytecode_language.cpp

@@ -161,7 +161,7 @@ void java_bytecode_languaget::set_language_options(const optionst &options)
         throw "the JSON file has a wrong format";
 
       // add jars from JSON config file to classpath
-      for(const jsont &file_entry : include_files.array)
+      for(const jsont &file_entry : to_json_array(include_files))
       {
         DATA_INVARIANT(
           file_entry.is_string() && has_suffix(file_entry.value, ".jar"),

jbmc/src/java_bytecode/java_class_loader_limit.cpp

@@ -74,7 +74,7 @@ void java_class_loader_limitt::setup_class_load_limit(
     jsont include_files=json_cp_config["classFiles"];
     if(!include_files.is_null() && !include_files.is_array())
       throw "the JSON file has a wrong format";
-    for(const jsont &file_entry : include_files.array)
+    for(const jsont &file_entry : to_json_array(include_files))
     {
       assert(file_entry.is_string());
       set_matcher.insert(file_entry.value);

src/goto-analyzer/taint_analysis.cpp

@@ -358,7 +358,7 @@ bool taint_analysist::operator()(
           json["file"] = json_stringt(i_it->source_location.get_file());
           json["line"]=
             json_numbert(id2string(i_it->source_location.get_line()));
-          json_result.array.push_back(json);
+          json_result.push_back(json);
         }
         else
         {

src/goto-analyzer/taint_parser.cpp

@@ -40,28 +40,25 @@ bool taint_parser(
     return true;
   }
 
-  for(jsont::arrayt::const_iterator
-      it=json.array.begin();
-      it!=json.array.end();
-      it++)
+  for(const auto &taint_spec : to_json_array(json))
   {
-    if(!it->is_object())
+    if(!taint_spec.is_object())
     {
       messaget message(message_handler);
       message.error() << "expecting an array of objects "
-                      << "in the taint file, but got "
-                      << *it << messaget::eom;
+                      << "in the taint file, but got " << taint_spec
+                      << messaget::eom;
       return true;
     }
 
     taint_parse_treet::rulet rule;
 
-    const std::string kind=(*it)["kind"].value;
-    const std::string function=(*it)["function"].value;
-    const std::string where=(*it)["where"].value;
-    const std::string taint=(*it)["taint"].value;
-    const std::string message=(*it)["message"].value;
-    const std::string id=(*it)["id"].value;
+    const std::string kind = taint_spec["kind"].value;
+    const std::string function = taint_spec["function"].value;
+    const std::string where = taint_spec["where"].value;
+    const std::string taint = taint_spec["taint"].value;
+    const std::string message = taint_spec["message"].value;
+    const std::string id = taint_spec["id"].value;
 
     if(kind=="source")
       rule.kind=taint_parse_treet::rulet::SOURCE;

src/goto-analyzer/unreachable_instructions.cpp

@@ -197,7 +197,7 @@ void unreachable_instructions(
     }
   }
 
-  if(json && !json_result.array.empty())
+  if(json && !json_result.empty())
     os << json_result << '\n';
 }
 
@@ -239,7 +239,7 @@ bool static_unreachable_instructions(
     }
   }
 
-  if(options.get_bool_option("json") && !json_result.array.empty())
+  if(options.get_bool_option("json") && !json_result.empty())
     out << json_result << '\n';
   else if(options.get_bool_option("xml"))
     out << xml_result << '\n';
@@ -369,7 +369,7 @@ static void list_functions(
     }
   }
 
-  if(options.get_bool_option("json") && !json_result.array.empty())
+  if(options.get_bool_option("json") && !json_result.empty())
     os << json_result << '\n';
   else if(options.get_bool_option("xml"))
     os << xml_result << '\n';

src/goto-cc/linker_script_merge.cpp

@@ -400,7 +400,7 @@ int linker_script_merget::ls_data2instructions(
 {
   goto_programt::instructionst initialize_instructions=gp.instructions;
   std::map<irep_idt, std::size_t> truncated_symbols;
-  for(auto &d : data["regions"].array)
+  for(auto &d : to_json_array(data["regions"]))
   {
     bool has_end=d["has-end-symbol"].is_true();
 
@@ -446,11 +446,13 @@ int linker_script_merget::ls_data2instructions(
 
     // Since the value of the pointer will be a random CBMC address, write a
     // note about the real address in the object file
-    auto it=std::find_if(data["addresses"].array.begin(),
-                         data["addresses"].array.end(),
-                         [&d](const jsont &add)
-                         { return add["sym"].value==d["start-symbol"].value; });
-    if(it==data["addresses"].array.end())
+    auto it = std::find_if(
+      to_json_array(data["addresses"]).begin(),
+      to_json_array(data["addresses"]).end(),
+      [&d](const jsont &add) {
+        return add["sym"].value == d["start-symbol"].value;
+      });
+    if(it == to_json_array(data["addresses"]).end())
     {
       error() << "Start: Could not find address corresponding to symbol '"
               << d["start-symbol"].value << "' (start of section)" << eom;
@@ -481,12 +483,12 @@ int linker_script_merget::ls_data2instructions(
       linker_values[d["end-symbol"].value]=std::make_pair(end_sym, array_end);
 
       auto entry = std::find_if(
-        data["addresses"].array.begin(),
-        data["addresses"].array.end(),
+        to_json_array(data["addresses"]).begin(),
+        to_json_array(data["addresses"]).end(),
         [&d](const jsont &add) {
           return add["sym"].value == d["end-symbol"].value;
         });
-      if(entry == data["addresses"].array.end())
+      if(entry == to_json_array(data["addresses"]).end())
       {
         error() << "Could not find address corresponding to symbol '"
                 << d["end-symbol"].value << "' (end of section)" << eom;
@@ -539,7 +541,7 @@ int linker_script_merget::ls_data2instructions(
   // address. These will have been declared extern too, so we need to give them
   // a value also. Here, we give them the actual value that they have in the
   // object file, since we're not assigning any object to them.
-  for(const auto &d : data["addresses"].array)
+  for(const auto &d : to_json_array(data["addresses"]))
   {
     auto it=linker_values.find(irep_idt(d["sym"].value));
     if(it!=linker_values.end())
@@ -591,7 +593,7 @@ int linker_script_merget::ls_data2instructions(
 #else
 {
   goto_programt::instructionst initialize_instructions=gp.instructions;
-  for(const auto &d : data["regions"].array)
+  for(const auto &d : to_json_array(data["regions"]))
   {
     unsigned start=safe_string2unsigned(d["start"].value);
     unsigned size=safe_string2unsigned(d["size"].value);
@@ -623,7 +625,7 @@ int linker_script_merget::ls_data2instructions(
     symbol_table.add(sym);
   }
 
-  for(const auto &d : data["addresses"].array)
+  for(const auto &d : to_json_array(data["addresses"]))
   {
     source_locationt loc;
     loc.set_file(linker_script);
@@ -738,38 +740,51 @@ int linker_script_merget::goto_and_object_mismatch(
 
 int linker_script_merget::linker_data_is_malformed(const jsont &data) const
 {
+  if(!data.is_object())
+    return true;
+
+  const json_objectt &data_object = to_json_object(data);
   return (
-    !(data.is_object() && data.object.find("regions") != data.object.end() &&
-      data.object.find("addresses") != data.object.end() &&
+    !(data_object.find("regions") != data_object.end() &&
+      data_object.find("addresses") != data_object.end() &&
       data["regions"].is_array() && data["addresses"].is_array() &&
       std::all_of(
-        data["addresses"].array.begin(),
-        data["addresses"].array.end(),
+        to_json_array(data["addresses"]).begin(),
+        to_json_array(data["addresses"]).end(),
         [](const jsont &j) {
-          return j.is_object() && j.object.find("val") != j.object.end() &&
-                 j.object.find("sym") != j.object.end() &&
-                 j["val"].is_number() && j["sym"].is_string();
+          if(!j.is_object())
+            return false;
+
+          const json_objectt &address = to_json_object(j);
+          return address.find("val") != address.end() &&
+                 address.find("sym") != address.end() &&
+                 address["val"].is_number() && address["sym"].is_string();
         }) &&
       std::all_of(
-        data["regions"].array.begin(),
-        data["regions"].array.end(),
+        to_json_array(data["regions"]).begin(),
+        to_json_array(data["regions"]).end(),
         [](const jsont &j) {
-          return j.is_object() && j.object.find("start") != j.object.end() &&
-                 j.object.find("size") != j.object.end() &&
-                 j.object.find("annot") != j.object.end() &&
-                 j.object.find("commt") != j.object.end() &&
-                 j.object.find("start-symbol") != j.object.end() &&
-                 j.object.find("has-end-symbol") != j.object.end() &&
-                 j.object.find("section") != j.object.end() &&
-                 j["start"].is_number() && j["size"].is_number() &&
-                 j["annot"].is_string() && j["start-symbol"].is_string() &&
-                 j["section"].is_string() && j["commt"].is_string() &&
-                 ((j["has-end-symbol"].is_true() &&
-                   j.object.find("end-symbol") != j.object.end() &&
-                   j["end-symbol"].is_string()) ||
-                  (j["has-end-symbol"].is_false() &&
-                   j.object.find("size-symbol") != j.object.end() &&
-                   j.object.find("end-symbol") == j.object.end() &&
-                   j["size-symbol"].is_string()));
+          if(!j.is_object())
+            return false;
+
+          const json_objectt &region = to_json_object(j);
+          return region.find("start") != region.end() &&
+                 region.find("size") != region.end() &&
+                 region.find("annot") != region.end() &&
+                 region.find("commt") != region.end() &&
+                 region.find("start-symbol") != region.end() &&
+                 region.find("has-end-symbol") != region.end() &&
+                 region.find("section") != region.end() &&
+                 region["start"].is_number() && region["size"].is_number() &&
+                 region["annot"].is_string() &&
+                 region["start-symbol"].is_string() &&
+                 region["section"].is_string() && region["commt"].is_string() &&
+                 ((region["has-end-symbol"].is_true() &&
+                   region.find("end-symbol") != region.end() &&
+                   region["end-symbol"].is_string()) ||
+                  (region["has-end-symbol"].is_false() &&
+                   region.find("size-symbol") != region.end() &&
+                   region.find("end-symbol") == region.end() &&
+                   region["size-symbol"].is_string()));
         })));
 }

src/json-symtab-language/json_symbol.cpp

@@ -48,7 +48,7 @@ symbolt symbol_from_json(const jsont &in)
     throw deserialization_exceptiont("symbol_from_json takes an object");
   symbolt result;
   json_irept json2irep(true);
-  for(const auto &kv : in.object)
+  for(const auto &kv : to_json_object(in))
   {
     if(kv.first == "type")
     {

src/json-symtab-language/json_symbol_table.cpp

@@ -18,7 +18,7 @@ void symbol_table_from_json(const jsont &in, symbol_tablet &symbol_table)
   if(!in.is_array())
     throw deserialization_exceptiont(
       "symbol_table_from_json: JSON input must be an array");
-  for(const auto &js_symbol : in.array)
+  for(const auto &js_symbol : to_json_array(in))
   {
     symbolt deserialized = symbol_from_json(js_symbol);
     if(symbol_table.add(deserialized))

src/json/parser.y

@@ -90,7 +90,7 @@ key_value_pair:
         {
           jsont tmp;
           json_parser.pop(tmp);
-          json_parser.top().object[json_parser.top().value].swap(tmp);
+          to_json_object(json_parser.top())[json_parser.top().value].swap(tmp);
           json_parser.top().value.clear(); // end abuse
         }
         ;
@@ -109,7 +109,7 @@ array_value:
         {
           jsont tmp;
           json_parser.pop(tmp);
-          json_parser.top().array.push_back(tmp);
+          to_json_array(json_parser.top()).push_back(tmp);
         }
         ;