Remove unnecessary brackets in constructon of json_objectt

thomasspriggs · thomasspriggs · commit 2b15ce06524b · 2019-01-28T14:03:31.000Z
With the new constructors, these brackets are no longer required and can
be removed, in order to improve readability.
diff --git a/jbmc/src/jbmc/jbmc_parse_options.cpp b/jbmc/src/jbmc/jbmc_parse_options.cpp
@@ -465,7 +465,7 @@ int jbmc_parse_optionst::doit()
       break;
     case ui_message_handlert::uit::JSON_UI:
     {
-      json_objectt json_options({{"options", options.to_json()}});
+      json_objectt json_options{{"options", options.to_json()}};
       debug() << json_options;
       break;
     }
diff --git a/src/analyses/ai.cpp b/src/analyses/ai.cpp
@@ -101,11 +101,11 @@ jsont ai_baset::output_json(
     std::ostringstream out;
     goto_program.output_instruction(ns, identifier, out, *i_it);
 
-    json_objectt location(
-      {{"locationNumber", json_numbert(std::to_string(i_it->location_number))},
-       {"sourceLocation", json_stringt(i_it->source_location.as_string())},
-       {"abstractState", abstract_state_before(i_it)->output_json(*this, ns)},
-       {"instruction", json_stringt(out.str())}});
+    json_objectt location{
+      {"locationNumber", json_numbert(std::to_string(i_it->location_number))},
+      {"sourceLocation", json_stringt(i_it->source_location.as_string())},
+      {"abstractState", abstract_state_before(i_it)->output_json(*this, ns)},
+      {"instruction", json_stringt(out.str())}};
 
     contents.push_back(std::move(location));
   }
diff --git a/src/analyses/dependence_graph.cpp b/src/analyses/dependence_graph.cpp
@@ -283,19 +283,19 @@ jsont dep_graph_domaint::output_json(
 
   for(const auto &cd : control_deps)
   {
-    json_objectt link(
-      {{"locationNumber", json_numbert(std::to_string(cd->location_number))},
-       {"sourceLocation", json(cd->source_location)},
-       {"type", json_stringt("control")}});
+    json_objectt link{
+      {"locationNumber", json_numbert(std::to_string(cd->location_number))},
+      {"sourceLocation", json(cd->source_location)},
+      {"type", json_stringt("control")}};
     graph.push_back(std::move(link));
   }
 
   for(const auto &dd : data_deps)
   {
-    json_objectt link(
-      {{"locationNumber", json_numbert(std::to_string(dd->location_number))},
-       {"sourceLocation", json(dd->source_location)},
-       {"type", json_stringt("data")}});
+    json_objectt link{
+      {"locationNumber", json_numbert(std::to_string(dd->location_number))},
+      {"sourceLocation", json(dd->source_location)},
+      {"type", json_stringt("data")}};
     graph.push_back(std::move(link));
   }
 
diff --git a/src/cbmc/bmc_cover.cpp b/src/cbmc/bmc_cover.cpp
@@ -383,7 +383,7 @@ bool bmc_covert::operator()()
           {
             if(step.is_input())
             {
-              json_objectt json_input({{"id", json_stringt(step.io_id)}});
+              json_objectt json_input{{"id", json_stringt(step.io_id)}};
               if(step.io_args.size()==1)
                 json_input["value"]=
                   json(step.io_args.front(), bmc.ns, ID_unknown);
diff --git a/src/goto-analyzer/taint_analysis.cpp b/src/goto-analyzer/taint_analysis.cpp
@@ -353,12 +353,12 @@ bool taint_analysist::operator()(
 
         if(use_json)
         {
-          json_objectt json(
-            {{"bugClass",
-              json_stringt(i_it->source_location.get_property_class())},
-             {"file", json_stringt(i_it->source_location.get_file())},
-             {"line",
-              json_numbert(id2string(i_it->source_location.get_line()))}});
+          json_objectt json{
+            {"bugClass",
+             json_stringt(i_it->source_location.get_property_class())},
+            {"file", json_stringt(i_it->source_location.get_file())},
+            {"line",
+             json_numbert(id2string(i_it->source_location.get_line()))}};
           json_result.push_back(std::move(json));
         }
         else
diff --git a/src/goto-analyzer/unreachable_instructions.cpp b/src/goto-analyzer/unreachable_instructions.cpp
@@ -124,12 +124,12 @@ static void add_to_json(
   DATA_INVARIANT(end_function->is_end_function(),
                  "The last instruction in a goto-program must be END_FUNCTION");
 
-  json_objectt entry(
-    {{"function", json_stringt(end_function->function)},
-     {"fileName",
-      json_stringt(concat_dir_file(
-        id2string(end_function->source_location.get_working_directory()),
-        id2string(end_function->source_location.get_file())))}});
+  json_objectt entry{
+    {"function", json_stringt(end_function->function)},
+    {"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["unreachableInstructions"].make_array();
 
@@ -152,8 +152,8 @@ static void add_to_json(
 
     // print info for file actually with full path
     const source_locationt &l=it->second->source_location;
-    json_objectt i_entry(
-      {{"sourceLocation", json(l)}, {"statement", json_stringt(s)}});
+    json_objectt i_entry{{"sourceLocation", json(l)},
+                         {"statement", json_stringt(s)}};
     dead_ins.push_back(std::move(i_entry));
   }
 
@@ -256,14 +256,14 @@ static void json_output_function(
   const source_locationt &last_location,
   json_arrayt &dest)
 {
-  json_objectt entry(
-    {{"function", json_stringt(function)},
-     {"file name",
-      json_stringt(concat_dir_file(
-        id2string(first_location.get_working_directory()),
-        id2string(first_location.get_file())))},
-     {"first line", json_numbert(id2string(first_location.get_line()))},
-     {"last line", json_numbert(id2string(last_location.get_line()))}});
+  json_objectt entry{
+    {"function", json_stringt(function)},
+    {"file name",
+     json_stringt(concat_dir_file(
+       id2string(first_location.get_working_directory()),
+       id2string(first_location.get_file())))},
+    {"first line", json_numbert(id2string(first_location.get_line()))},
+    {"last line", json_numbert(id2string(last_location.get_line()))}};
 
   dest.push_back(std::move(entry));
 }
diff --git a/src/goto-diff/goto_diff_base.cpp b/src/goto-diff/goto_diff_base.cpp
@@ -38,9 +38,9 @@ void goto_difft::output_functions() const
     }
     case ui_message_handlert::uit::JSON_UI:
     {
-      json_objectt json_result(
-        {{"totalNumberOfFunctions",
-          json_stringt(std::to_string(total_functions_count))}});
+      json_objectt json_result{
+        {"totalNumberOfFunctions",
+         json_stringt(std::to_string(total_functions_count))}};
       convert_function_group_json(
         json_result["newFunctions"].make_array(), new_functions, goto_model2);
       convert_function_group_json(
diff --git a/src/goto-instrument/unwind.cpp b/src/goto-instrument/unwind.cpp
@@ -339,11 +339,10 @@ jsont goto_unwindt::unwind_logt::output_log_json() const
     goto_programt::const_targett target=it->first;
     unsigned location_number=it->second;
 
-    json_objectt object(
-      {{"originalLocationNumber",
-        json_numbert(std::to_string(location_number))},
-       {"newLocationNumber",
-        json_numbert(std::to_string(target->location_number))}});
+    json_objectt object{
+      {"originalLocationNumber", json_numbert(std::to_string(location_number))},
+      {"newLocationNumber",
+       json_numbert(std::to_string(target->location_number))}};
 
     json_unwound.push_back(std::move(object));
   }
diff --git a/src/goto-programs/goto_inline_class.cpp b/src/goto-programs/goto_inline_class.cpp
@@ -887,17 +887,17 @@ jsont goto_inlinet::goto_inline_logt::output_inline_log_json() const
 
     PRECONDITION(start->location_number <= end->location_number);
 
-    json_arrayt json_orig(
-      {json_numbert(std::to_string(info.begin_location_number)),
-       json_numbert(std::to_string(info.end_location_number))});
-    json_arrayt json_new({json_numbert(std::to_string(start->location_number)),
-                          json_numbert(std::to_string(end->location_number))});
-
-    json_objectt object(
-      {{"call", json_numbert(std::to_string(info.call_location_number))},
-       {"function", json_stringt(info.function.c_str())},
-       {"originalSegment", std::move(json_orig)},
-       {"inlinedSegment", std::move(json_new)}});
+    json_arrayt json_orig{
+      json_numbert(std::to_string(info.begin_location_number)),
+      json_numbert(std::to_string(info.end_location_number))};
+    json_arrayt json_new{json_numbert(std::to_string(start->location_number)),
+                         json_numbert(std::to_string(end->location_number))};
+
+    json_objectt object{
+      {"call", json_numbert(std::to_string(info.call_location_number))},
+      {"function", json_stringt(info.function.c_str())},
+      {"originalSegment", std::move(json_orig)},
+      {"inlinedSegment", std::move(json_new)}};
 
     json_inlined.push_back(std::move(object));
   }
diff --git a/src/goto-programs/json_expr.cpp b/src/goto-programs/json_expr.cpp
@@ -172,8 +172,8 @@ json_objectt json(const typet &type, const namespacet &ns, const irep_idt &mode)
       to_struct_type(type).components();
     for(const auto &component : components)
     {
-      json_objectt e({{"name", json_stringt(component.get_name())},
-                      {"type", json(component.type(), ns, mode)}});
+      json_objectt e{{"name", json_stringt(component.get_name())},
+                     {"type", json(component.type(), ns, mode)}};
       members.push_back(std::move(e));
     }
   }
@@ -185,8 +185,8 @@ json_objectt json(const typet &type, const namespacet &ns, const irep_idt &mode)
       to_union_type(type).components();
     for(const auto &component : components)
     {
-      json_objectt e({{"name", json_stringt(component.get_name())},
-                      {"type", json(component.type(), ns, mode)}});
+      json_objectt e{{"name", json_stringt(component.get_name())},
+                     {"type", json(component.type(), ns, mode)}};
       members.push_back(std::move(e));
     }
   }
@@ -348,8 +348,8 @@ json_objectt json(const exprt &expr, const namespacet &ns, const irep_idt &mode)
 
     forall_operands(it, expr)
     {
-      json_objectt e({{"index", json_numbert(std::to_string(index))},
-                      {"value", json(*it, ns, mode)}});
+      json_objectt e{{"index", json_numbert(std::to_string(index))},
+                     {"value", json(*it, ns, mode)}};
       elements.push_back(std::move(e));
       index++;
     }
@@ -370,8 +370,8 @@ json_objectt json(const exprt &expr, const namespacet &ns, const irep_idt &mode)
       json_arrayt &members = result["members"].make_array();
       for(std::size_t m = 0; m < expr.operands().size(); m++)
       {
-        json_objectt e({{"value", json(expr.operands()[m], ns, mode)},
-                        {"name", json_stringt(components[m].get_name())}});
+        json_objectt e{{"value", json(expr.operands()[m], ns, mode)},
+                       {"name", json_stringt(components[m].get_name())}};
         members.push_back(std::move(e));
       }
     }
diff --git a/src/goto-programs/show_goto_functions_json.cpp b/src/goto-programs/show_goto_functions_json.cpp
@@ -70,8 +70,8 @@ json_objectt show_goto_functions_jsont::convert(
       for(const goto_programt::instructiont &instruction :
         function.body.instructions)
       {
-        json_objectt instruction_entry(
-          {{"instructionId", json_stringt(instruction.to_string())}});
+        json_objectt instruction_entry{
+          {"instructionId", json_stringt(instruction.to_string())}};
 
         if(instruction.code.source_location().is_not_nil())
         {
diff --git a/src/goto-programs/show_properties.cpp b/src/goto-programs/show_properties.cpp
@@ -129,12 +129,12 @@ void convert_properties_json(
 
     irep_idt property_id=source_location.get_property_id();
 
-    json_objectt json_property(
-      {{"name", json_stringt(property_id)},
-       {"class", json_stringt(property_class)},
-       {"sourceLocation", json(source_location)},
-       {"description", json_stringt(description)},
-       {"expression", json_stringt(from_expr(ns, identifier, ins.guard))}});
+    json_objectt json_property{
+      {"name", json_stringt(property_id)},
+      {"class", json_stringt(property_class)},
+      {"sourceLocation", json(source_location)},
+      {"description", json_stringt(description)},
+      {"expression", json_stringt(from_expr(ns, identifier, ins.guard))}};
 
     if(!source_location.get_basic_block_covered_lines().empty())
       json_property["coveredLines"] =
@@ -155,7 +155,7 @@ void show_properties_json(
   for(const auto &fct : goto_functions.function_map)
     convert_properties_json(json_properties, ns, fct.first, fct.second.body);
 
-  json_objectt json_result({{"properties", json_properties}});
+  json_objectt json_result{{"properties", json_properties}};
   msg.result() << json_result;
 }
 
diff --git a/src/goto-programs/show_symbol_table.cpp b/src/goto-programs/show_symbol_table.cpp
@@ -194,36 +194,36 @@ static void show_symbol_table_json_ui(
     if(symbol.value.is_not_nil())
       ptr->from_expr(symbol.value, value_str, ns);
 
-    json_objectt symbol_json(
-      {{"prettyName", json_stringt(symbol.pretty_name)},
-       {"name", json_stringt(symbol.name)},
-       {"baseName", json_stringt(symbol.base_name)},
-       {"mode", json_stringt(symbol.mode)},
-       {"module", json_stringt(symbol.module)},
-
-       {"prettyType", json_stringt(type_str)},
-       {"prettyValue", json_stringt(value_str)},
-
-       {"type", irep_converter.convert_from_irep(symbol.type)},
-       {"value", irep_converter.convert_from_irep(symbol.value)},
-       {"location", irep_converter.convert_from_irep(symbol.location)},
-
-       {"isType", jsont::json_boolean(symbol.is_type)},
-       {"isMacro", jsont::json_boolean(symbol.is_macro)},
-       {"isExported", jsont::json_boolean(symbol.is_exported)},
-       {"isInput", jsont::json_boolean(symbol.is_input)},
-       {"isOutput", jsont::json_boolean(symbol.is_output)},
-       {"isStateVar", jsont::json_boolean(symbol.is_state_var)},
-       {"isProperty", jsont::json_boolean(symbol.is_property)},
-       {"isStaticLifetime", jsont::json_boolean(symbol.is_static_lifetime)},
-       {"isThreadLocal", jsont::json_boolean(symbol.is_thread_local)},
-       {"isLvalue", jsont::json_boolean(symbol.is_lvalue)},
-       {"isFileLocal", jsont::json_boolean(symbol.is_file_local)},
-       {"isExtern", jsont::json_boolean(symbol.is_extern)},
-       {"isVolatile", jsont::json_boolean(symbol.is_volatile)},
-       {"isParameter", jsont::json_boolean(symbol.is_parameter)},
-       {"isAuxiliary", jsont::json_boolean(symbol.is_auxiliary)},
-       {"isWeak", jsont::json_boolean(symbol.is_weak)}});
+    json_objectt symbol_json{
+      {"prettyName", json_stringt(symbol.pretty_name)},
+      {"name", json_stringt(symbol.name)},
+      {"baseName", json_stringt(symbol.base_name)},
+      {"mode", json_stringt(symbol.mode)},
+      {"module", json_stringt(symbol.module)},
+
+      {"prettyType", json_stringt(type_str)},
+      {"prettyValue", json_stringt(value_str)},
+
+      {"type", irep_converter.convert_from_irep(symbol.type)},
+      {"value", irep_converter.convert_from_irep(symbol.value)},
+      {"location", irep_converter.convert_from_irep(symbol.location)},
+
+      {"isType", jsont::json_boolean(symbol.is_type)},
+      {"isMacro", jsont::json_boolean(symbol.is_macro)},
+      {"isExported", jsont::json_boolean(symbol.is_exported)},
+      {"isInput", jsont::json_boolean(symbol.is_input)},
+      {"isOutput", jsont::json_boolean(symbol.is_output)},
+      {"isStateVar", jsont::json_boolean(symbol.is_state_var)},
+      {"isProperty", jsont::json_boolean(symbol.is_property)},
+      {"isStaticLifetime", jsont::json_boolean(symbol.is_static_lifetime)},
+      {"isThreadLocal", jsont::json_boolean(symbol.is_thread_local)},
+      {"isLvalue", jsont::json_boolean(symbol.is_lvalue)},
+      {"isFileLocal", jsont::json_boolean(symbol.is_file_local)},
+      {"isExtern", jsont::json_boolean(symbol.is_extern)},
+      {"isVolatile", jsont::json_boolean(symbol.is_volatile)},
+      {"isParameter", jsont::json_boolean(symbol.is_parameter)},
+      {"isAuxiliary", jsont::json_boolean(symbol.is_auxiliary)},
+      {"isWeak", jsont::json_boolean(symbol.is_weak)}};
 
     result.push_back(id2string(symbol.name), std::move(symbol_json));
   }
@@ -265,15 +265,15 @@ static void show_symbol_table_brief_json_ui(
     if(symbol.type.is_not_nil())
       ptr->from_type(symbol.type, type_str, ns);
 
-    json_objectt symbol_json(
-      {{"prettyName", json_stringt(symbol.pretty_name)},
-       {"baseName", json_stringt(symbol.base_name)},
-       {"mode", json_stringt(symbol.mode)},
-       {"module", json_stringt(symbol.module)},
+    json_objectt symbol_json{
+      {"prettyName", json_stringt(symbol.pretty_name)},
+      {"baseName", json_stringt(symbol.base_name)},
+      {"mode", json_stringt(symbol.mode)},
+      {"module", json_stringt(symbol.module)},
 
-       {"prettyType", json_stringt(type_str)},
+      {"prettyType", json_stringt(type_str)},
 
-       {"type", irep_converter.convert_from_irep(symbol.type)}});
+      {"type", irep_converter.convert_from_irep(symbol.type)}};
 
     result.push_back(id2string(symbol.name), std::move(symbol_json));
   }

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ int jbmc_parse_optionst::doit()`
`465`	`465`	`break;`
`466`	`466`	`case ui_message_handlert::uit::JSON_UI:`
`467`	`467`	`{`
`468`		`- json_objectt json_options({{"options", options.to_json()}});`
	`468`	`+ json_objectt json_options{{"options", options.to_json()}};`
`469`	`469`	`debug() << json_options;`
`470`	`470`	`break;`
`471`	`471`	`}`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ bool bmc_covert::operator()()`
`383`	`383`	`{`
`384`	`384`	`if(step.is_input())`
`385`	`385`	`{`
`386`		`- json_objectt json_input({{"id", json_stringt(step.io_id)}});`
	`386`	`+ json_objectt json_input{{"id", json_stringt(step.io_id)}};`
`387`	`387`	`if(step.io_args.size()==1)`
`388`	`388`	`json_input["value"]=`
`389`	`389`	`json(step.io_args.front(), bmc.ns, ID_unknown);`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ void goto_difft::output_functions() const`
`38`	`38`	`}`
`39`	`39`	`case ui_message_handlert::uit::JSON_UI:`
`40`	`40`	`{`
`41`		`- json_objectt json_result(`
`42`		`- {{"totalNumberOfFunctions",`
`43`		`- json_stringt(std::to_string(total_functions_count))}});`
	`41`	`+ json_objectt json_result{`
	`42`	`+ {"totalNumberOfFunctions",`
	`43`	`+ json_stringt(std::to_string(total_functions_count))}};`
`44`	`44`	`convert_function_group_json(`
`45`	`45`	`json_result["newFunctions"].make_array(), new_functions, goto_model2);`
`46`	`46`	`convert_function_group_json(`
Original file line number	Diff line number	Diff line change
`@@ -172,8 +172,8 @@ json_objectt json(const typet &type, const namespacet &ns, const irep_idt &mode)`
`172`	`172`	`to_struct_type(type).components();`
`173`	`173`	`for(const auto &component : components)`
`174`	`174`	`{`
`175`		`- json_objectt e({{"name", json_stringt(component.get_name())},`
`176`		`- {"type", json(component.type(), ns, mode)}});`
	`175`	`+ json_objectt e{{"name", json_stringt(component.get_name())},`
	`176`	`+ {"type", json(component.type(), ns, mode)}};`
`177`	`177`	`members.push_back(std::move(e));`
`178`	`178`	`}`
`179`	`179`	`}`
`@@ -185,8 +185,8 @@ json_objectt json(const typet &type, const namespacet &ns, const irep_idt &mode)`
`185`	`185`	`to_union_type(type).components();`
`186`	`186`	`for(const auto &component : components)`
`187`	`187`	`{`
`188`		`- json_objectt e({{"name", json_stringt(component.get_name())},`
`189`		`- {"type", json(component.type(), ns, mode)}});`
	`188`	`+ json_objectt e{{"name", json_stringt(component.get_name())},`
	`189`	`+ {"type", json(component.type(), ns, mode)}};`
`190`	`190`	`members.push_back(std::move(e));`
`191`	`191`	`}`
`192`	`192`	`}`
`@@ -348,8 +348,8 @@ json_objectt json(const exprt &expr, const namespacet &ns, const irep_idt &mode)`
`348`	`348`
`349`	`349`	`forall_operands(it, expr)`
`350`	`350`	`{`
`351`		`- json_objectt e({{"index", json_numbert(std::to_string(index))},`
`352`		`- {"value", json(*it, ns, mode)}});`
	`351`	`+ json_objectt e{{"index", json_numbert(std::to_string(index))},`
	`352`	`+ {"value", json(*it, ns, mode)}};`
`353`	`353`	`elements.push_back(std::move(e));`
`354`	`354`	`index++;`
`355`	`355`	`}`
`@@ -370,8 +370,8 @@ json_objectt json(const exprt &expr, const namespacet &ns, const irep_idt &mode)`
`370`	`370`	`json_arrayt &members = result["members"].make_array();`
`371`	`371`	`for(std::size_t m = 0; m < expr.operands().size(); m++)`
`372`	`372`	`{`
`373`		`- json_objectt e({{"value", json(expr.operands()[m], ns, mode)},`
`374`		`- {"name", json_stringt(components[m].get_name())}});`
	`373`	`+ json_objectt e{{"value", json(expr.operands()[m], ns, mode)},`
	`374`	`+ {"name", json_stringt(components[m].get_name())}};`
`375`	`375`	`members.push_back(std::move(e));`
`376`	`376`	`}`
`377`	`377`	`}`