Merge pull request #521 from danpoe/camel-case-for-json-output

Camel case for json output

Author: Daniel Kroening

src/goto-analyzer/taint_analysis.cpp

@@ -386,7 +386,7 @@ bool taint_analysist::operator()(
         if(use_json)
         {
           json_objectt json;
-          json["bug_class"]=
+          json["bugClass"]=
             json_stringt(id2string(i_it->source_location.get_property_class()));
           json["file"]=
             json_stringt(id2string(i_it->source_location.get_file()));

src/goto-analyzer/unreachable_instructions.cpp

@@ -11,6 +11,7 @@ Date: April 2016
 #include <sstream>
 
 #include <util/json.h>
+#include <util/json_expr.h>
 #include <util/file_util.h>
 
 #include <analyses/cfg_dominators.h>
@@ -133,12 +134,12 @@ static void add_to_json(
   assert(end_function->is_end_function());
 
   entry["function"]=json_stringt(id2string(end_function->function));
-  entry["file name"]=
+  entry["fileName"]=
     json_stringt(concat_dir_file(
         id2string(end_function->source_location.get_working_directory()),
         id2string(end_function->source_location.get_file())));
 
-  json_arrayt &dead_ins=entry["unreachable instructions"].make_array();
+  json_arrayt &dead_ins=entry["unreachableInstructions"].make_array();
 
   for(dead_mapt::const_iterator it=dead_map.begin();
       it!=dead_map.end();
@@ -160,7 +161,7 @@ static void add_to_json(
     // print info for file actually with full path
     json_objectt &i_entry=dead_ins.push_back().make_object();
     const source_locationt &l=it->second->source_location;
-    i_entry["source location"]=json_stringt(l.as_string_with_cwd());
+    i_entry["sourceLocation"]=json(l);
     i_entry["statement"]=json_stringt(s);
   }
 }

src/goto-instrument/unwind.cpp

@@ -493,9 +493,9 @@ jsont goto_unwindt::unwind_logt::output_log_json() const
     goto_programt::const_targett target=it->first;
     unsigned location_number=it->second;
 
-    object["original_location_number"]=json_numbert(std::to_string(
+    object["originalLocationNumber"]=json_numbert(std::to_string(
       location_number));
-    object["new_location_number"]=json_numbert(std::to_string(
+    object["newLocationNumber"]=json_numbert(std::to_string(
       target->location_number));
   }
 

src/goto-programs/goto_inline_class.cpp

@@ -1312,13 +1312,13 @@ jsont goto_inlinet::goto_inline_logt::output_inline_log_json() const
     object["call"]=json_numbert(std::to_string(info.call_location_number));
     object["function"]=json_stringt(info.function.c_str());
 
-    json_arrayt &json_orig=object["original_segment"].make_array();
+    json_arrayt &json_orig=object["originalSegment"].make_array();
     json_orig.push_back()=json_numbert(std::to_string(
       info.begin_location_number));
     json_orig.push_back()=json_numbert(std::to_string(
       info.end_location_number));
 
-    json_arrayt &json_new=object["inlined_segment"].make_array();
+    json_arrayt &json_new=object["inlinedSegment"].make_array();
     json_new.push_back()=json_numbert(std::to_string(start->location_number));
     json_new.push_back()=json_numbert(std::to_string(end->location_number));
   }