Clang format PR updates.

thomasspriggs · thomasspriggs · commit de5367b9ab04 · 2018-05-11T09:12:29.000+01:00
diff --git a/src/cbmc/all_properties.cpp b/src/cbmc/all_properties.cpp
@@ -214,8 +214,8 @@ void bmc_all_propertiest::report(const cover_goalst &cover_goals)
       for(const auto &g : goal_map)
       {
         json_stream_objectt &result = result_array.push_back_stream_object();
-        result["property"]=json_stringt(g.first);
-        result["description"]=json_stringt(g.second.description);
+        result["property"] = json_stringt(g.first);
+        result["description"] = json_stringt(g.second.description);
         result["status"]=json_stringt(g.second.status_string());
 
         if(g.second.status==goalt::statust::FAILURE)
diff --git a/src/cbmc/bmc.cpp b/src/cbmc/bmc.cpp
@@ -74,9 +74,9 @@ void bmct::error_trace()
       json_stream_objectt &json_result =
         status().json_stream().push_back_stream_object();
       const goto_trace_stept &step=goto_trace.steps.back();
-      json_result["property"]=
+      json_result["property"] =
         json_stringt(step.pc->source_location.get_property_id());
-      json_result["description"]=
+      json_result["description"] =
         json_stringt(step.pc->source_location.get_comment());
       json_result["status"]=json_stringt("failed");
       json_stream_arrayt &json_trace =
diff --git a/src/cbmc/bmc_cover.cpp b/src/cbmc/bmc_cover.cpp
@@ -382,7 +382,7 @@ bool bmc_covert::operator()()
             if(step.is_input())
             {
               json_objectt json_input;
-              json_input["id"]=json_stringt(step.io_id);
+              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/static_analyzer.cpp b/src/goto-analyzer/static_analyzer.cpp
@@ -153,10 +153,9 @@ void static_analyzert::json_report(const std::string &file_name)
       else
         j["status"]=json_stringt("UNKNOWN");
 
-      j["file"]=json_stringt(i_it->source_location.get_file());
+      j["file"] = json_stringt(i_it->source_location.get_file());
       j["line"]=json_numbert(id2string(i_it->source_location.get_line()));
-      j["description"]=json_stringt(
-        i_it->source_location.get_comment());
+      j["description"] = json_stringt(i_it->source_location.get_comment());
     }
   }
 
diff --git a/src/goto-analyzer/taint_analysis.cpp b/src/goto-analyzer/taint_analysis.cpp
@@ -351,10 +351,9 @@ bool taint_analysist::operator()(
         if(use_json)
         {
           json_objectt json;
-          json["bugClass"]=
+          json["bugClass"] =
             json_stringt(i_it->source_location.get_property_class());
-          json["file"]=
-            json_stringt(i_it->source_location.get_file());
+          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);
diff --git a/src/goto-analyzer/unreachable_instructions.cpp b/src/goto-analyzer/unreachable_instructions.cpp
@@ -127,7 +127,7 @@ static void add_to_json(
   DATA_INVARIANT(end_function->is_end_function(),
                  "The last instruction in a goto-program must be END_FUNCTION");
 
-  entry["function"]=json_stringt(end_function->function);
+  entry["function"] = json_stringt(end_function->function);
   entry["fileName"]=
     json_stringt(concat_dir_file(
         id2string(end_function->source_location.get_working_directory()),
@@ -261,7 +261,7 @@ static void json_output_function(
 {
   json_objectt &entry=dest.push_back().make_object();
 
-  entry["function"]=json_stringt(function);
+  entry["function"] = json_stringt(function);
   entry["file name"]=
     json_stringt(concat_dir_file(
         id2string(first_location.get_working_directory()),
diff --git a/src/goto-programs/show_goto_functions_json.cpp b/src/goto-programs/show_goto_functions_json.cpp
@@ -48,7 +48,7 @@ json_objectt show_goto_functions_jsont::convert(
 
     json_objectt &json_function=
       json_functions.push_back(jsont()).make_object();
-    json_function["name"]=json_stringt(function_name);
+    json_function["name"] = json_stringt(function_name);
     json_function["isBodyAvailable"]=
       jsont::json_boolean(function.body_available());
     bool is_internal=
diff --git a/src/goto-programs/show_properties.cpp b/src/goto-programs/show_properties.cpp
@@ -131,13 +131,13 @@ void convert_properties_json(
 
     json_objectt &json_property=
       json_properties.push_back(jsont()).make_object();
-    json_property["name"]=json_stringt(property_id);
-    json_property["class"]=json_stringt(property_class);
+    json_property["name"] = json_stringt(property_id);
+    json_property["class"] = json_stringt(property_class);
     if(!source_location.get_basic_block_covered_lines().empty())
-      json_property["coveredLines"]=
+      json_property["coveredLines"] =
         json_stringt(source_location.get_basic_block_covered_lines());
     json_property["sourceLocation"]=json(source_location);
-    json_property["description"]=json_stringt(description);
+    json_property["description"] = json_stringt(description);
     json_property["expression"]=
       json_stringt(from_expr(ns, identifier, ins.guard));
   }
diff --git a/src/util/json_expr.cpp b/src/util/json_expr.cpp
@@ -85,24 +85,22 @@ json_objectt json(const source_locationt &location)
   json_objectt result;
 
   if(!location.get_working_directory().empty())
-    result["workingDirectory"]=
-      json_stringt(location.get_working_directory());
+    result["workingDirectory"] = json_stringt(location.get_working_directory());
 
   if(!location.get_file().empty())
-    result["file"]=json_stringt(location.get_file());
+    result["file"] = json_stringt(location.get_file());
 
   if(!location.get_line().empty())
-    result["line"]=json_stringt(location.get_line());
+    result["line"] = json_stringt(location.get_line());
 
   if(!location.get_column().empty())
-    result["column"]=json_stringt(location.get_column());
+    result["column"] = json_stringt(location.get_column());
 
   if(!location.get_function().empty())
-    result["function"]=json_stringt(location.get_function());
+    result["function"] = json_stringt(location.get_function());
 
   if(!location.get_java_bytecode_index().empty())
-    result["bytecodeIndex"]=
-      json_stringt(location.get_java_bytecode_index());
+    result["bytecodeIndex"] = json_stringt(location.get_java_bytecode_index());
 
   return result;
 }
@@ -193,7 +191,7 @@ json_objectt json(
     for(const auto &component : components)
     {
       json_objectt &e=members.push_back().make_object();
-      e["name"]=json_stringt(component.get_name());
+      e["name"] = json_stringt(component.get_name());
       e["type"]=json(component.type(), ns, mode);
     }
   }
@@ -206,7 +204,7 @@ json_objectt json(
     for(const auto &component : components)
     {
       json_objectt &e=members.push_back().make_object();
-      e["name"]=json_stringt(component.get_name());
+      e["name"] = json_stringt(component.get_name());
       e["type"]=json(component.type(), ns, mode);
     }
   }
@@ -263,15 +261,15 @@ json_objectt json(
       std::size_t width=to_bitvector_type(type).get_width();
 
       result["name"]=json_stringt("integer");
-      result["binary"]=json_stringt(constant_expr.get_value());
+      result["binary"] = json_stringt(constant_expr.get_value());
       result["width"]=json_numbert(std::to_string(width));
       result["type"]=json_stringt(type_string);
       result["data"]=json_stringt(value_string);
     }
     else if(type.id()==ID_c_enum)
     {
       result["name"]=json_stringt("integer");
-      result["binary"]=json_stringt(constant_expr.get_value());
+      result["binary"] = json_stringt(constant_expr.get_value());
       result["width"]=json_numbert(type.subtype().get_string(ID_width));
       result["type"]=json_stringt("enum");
       result["data"]=json_stringt(value_string);
@@ -286,21 +284,21 @@ json_objectt json(
     else if(type.id()==ID_bv)
     {
       result["name"]=json_stringt("bitvector");
-      result["binary"]=json_stringt(constant_expr.get_value());
+      result["binary"] = json_stringt(constant_expr.get_value());
     }
     else if(type.id()==ID_fixedbv)
     {
       result["name"]=json_stringt("fixed");
       result["width"]=json_numbert(type.get_string(ID_width));
-      result["binary"]=json_stringt(constant_expr.get_value());
+      result["binary"] = json_stringt(constant_expr.get_value());
       result["data"]=
         json_stringt(fixedbvt(to_constant_expr(expr)).to_ansi_c_string());
     }
     else if(type.id()==ID_floatbv)
     {
       result["name"]=json_stringt("float");
       result["width"]=json_numbert(type.get_string(ID_width));
-      result["binary"]=json_stringt(constant_expr.get_value());
+      result["binary"] = json_stringt(constant_expr.get_value());
       result["data"]=
         json_stringt(ieee_floatt(to_constant_expr(expr)).to_ansi_c_string());
     }
@@ -341,7 +339,7 @@ json_objectt json(
     else if(type.id()==ID_string)
     {
       result["name"]=json_stringt("string");
-      result["data"]=json_stringt(constant_expr.get_value());
+      result["data"] = json_stringt(constant_expr.get_value());
     }
     else
     {
@@ -381,7 +379,7 @@ json_objectt json(
       {
         json_objectt &e=members.push_back().make_object();
         e["value"]=json(expr.operands()[m], ns, mode);
-        e["name"]=json_stringt(components[m].get_name());
+        e["name"] = json_stringt(components[m].get_name());
       }
     }
   }
@@ -392,7 +390,7 @@ json_objectt json(
     const union_exprt &union_expr=to_union_expr(expr);
     json_objectt &e=result["member"].make_object();
     e["value"]=json(union_expr.op(), ns, mode);
-    e["name"]=json_stringt(union_expr.get_component_name());
+    e["name"] = json_stringt(union_expr.get_component_name());
   }
   else
     result["name"]=json_stringt("unknown");

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ bool bmc_covert::operator()()`
`382`	`382`	`if(step.is_input())`
`383`	`383`	`{`
`384`	`384`	`json_objectt json_input;`
`385`		`- json_input["id"]=json_stringt(step.io_id);`
	`385`	`+ json_input["id"] = json_stringt(step.io_id);`
`386`	`386`	`if(step.io_args.size()==1)`
`387`	`387`	`json_input["value"]=`
`388`	`388`	`json(step.io_args.front(), bmc.ns, ID_unknown);`
Original file line number	Diff line number	Diff line change
`@@ -153,10 +153,9 @@ void static_analyzert::json_report(const std::string &file_name)`
`153`	`153`	`else`
`154`	`154`	`j["status"]=json_stringt("UNKNOWN");`
`155`	`155`
`156`		`- j["file"]=json_stringt(i_it->source_location.get_file());`
	`156`	`+ j["file"] = json_stringt(i_it->source_location.get_file());`
`157`	`157`	`j["line"]=json_numbert(id2string(i_it->source_location.get_line()));`
`158`		`- j["description"]=json_stringt(`
`159`		`- i_it->source_location.get_comment());`
	`158`	`+ j["description"] = json_stringt(i_it->source_location.get_comment());`
`160`	`159`	`}`
`161`	`160`	`}`
`162`	`161`
Original file line number	Diff line number	Diff line change
`@@ -85,24 +85,22 @@ json_objectt json(const source_locationt &location)`
`85`	`85`	`json_objectt result;`
`86`	`86`
`87`	`87`	`if(!location.get_working_directory().empty())`
`88`		`- result["workingDirectory"]=`
`89`		`- json_stringt(location.get_working_directory());`
	`88`	`+ result["workingDirectory"] = json_stringt(location.get_working_directory());`
`90`	`89`
`91`	`90`	`if(!location.get_file().empty())`
`92`		`- result["file"]=json_stringt(location.get_file());`
	`91`	`+ result["file"] = json_stringt(location.get_file());`
`93`	`92`
`94`	`93`	`if(!location.get_line().empty())`
`95`		`- result["line"]=json_stringt(location.get_line());`
	`94`	`+ result["line"] = json_stringt(location.get_line());`
`96`	`95`
`97`	`96`	`if(!location.get_column().empty())`
`98`		`- result["column"]=json_stringt(location.get_column());`
	`97`	`+ result["column"] = json_stringt(location.get_column());`
`99`	`98`
`100`	`99`	`if(!location.get_function().empty())`
`101`		`- result["function"]=json_stringt(location.get_function());`
	`100`	`+ result["function"] = json_stringt(location.get_function());`
`102`	`101`
`103`	`102`	`if(!location.get_java_bytecode_index().empty())`
`104`		`- result["bytecodeIndex"]=`
`105`		`- json_stringt(location.get_java_bytecode_index());`
	`103`	`+ result["bytecodeIndex"] = json_stringt(location.get_java_bytecode_index());`
`106`	`104`
`107`	`105`	`return result;`
`108`	`106`	`}`
`@@ -193,7 +191,7 @@ json_objectt json(`
`193`	`191`	`for(const auto &component : components)`
`194`	`192`	`{`
`195`	`193`	`json_objectt &e=members.push_back().make_object();`
`196`		`- e["name"]=json_stringt(component.get_name());`
	`194`	`+ e["name"] = json_stringt(component.get_name());`
`197`	`195`	`e["type"]=json(component.type(), ns, mode);`
`198`	`196`	`}`
`199`	`197`	`}`
`@@ -206,7 +204,7 @@ json_objectt json(`
`206`	`204`	`for(const auto &component : components)`
`207`	`205`	`{`
`208`	`206`	`json_objectt &e=members.push_back().make_object();`
`209`		`- e["name"]=json_stringt(component.get_name());`
	`207`	`+ e["name"] = json_stringt(component.get_name());`
`210`	`208`	`e["type"]=json(component.type(), ns, mode);`
`211`	`209`	`}`
`212`	`210`	`}`
`@@ -263,15 +261,15 @@ json_objectt json(`
`263`	`261`	`std::size_t width=to_bitvector_type(type).get_width();`
`264`	`262`
`265`	`263`	`result["name"]=json_stringt("integer");`
`266`		`- result["binary"]=json_stringt(constant_expr.get_value());`
	`264`	`+ result["binary"] = json_stringt(constant_expr.get_value());`
`267`	`265`	`result["width"]=json_numbert(std::to_string(width));`
`268`	`266`	`result["type"]=json_stringt(type_string);`
`269`	`267`	`result["data"]=json_stringt(value_string);`
`270`	`268`	`}`
`271`	`269`	`else if(type.id()==ID_c_enum)`
`272`	`270`	`{`
`273`	`271`	`result["name"]=json_stringt("integer");`
`274`		`- result["binary"]=json_stringt(constant_expr.get_value());`
	`272`	`+ result["binary"] = json_stringt(constant_expr.get_value());`
`275`	`273`	`result["width"]=json_numbert(type.subtype().get_string(ID_width));`
`276`	`274`	`result["type"]=json_stringt("enum");`
`277`	`275`	`result["data"]=json_stringt(value_string);`
`@@ -286,21 +284,21 @@ json_objectt json(`
`286`	`284`	`else if(type.id()==ID_bv)`
`287`	`285`	`{`
`288`	`286`	`result["name"]=json_stringt("bitvector");`
`289`		`- result["binary"]=json_stringt(constant_expr.get_value());`
	`287`	`+ result["binary"] = json_stringt(constant_expr.get_value());`
`290`	`288`	`}`
`291`	`289`	`else if(type.id()==ID_fixedbv)`
`292`	`290`	`{`
`293`	`291`	`result["name"]=json_stringt("fixed");`
`294`	`292`	`result["width"]=json_numbert(type.get_string(ID_width));`
`295`		`- result["binary"]=json_stringt(constant_expr.get_value());`
	`293`	`+ result["binary"] = json_stringt(constant_expr.get_value());`
`296`	`294`	`result["data"]=`
`297`	`295`	`json_stringt(fixedbvt(to_constant_expr(expr)).to_ansi_c_string());`
`298`	`296`	`}`
`299`	`297`	`else if(type.id()==ID_floatbv)`
`300`	`298`	`{`
`301`	`299`	`result["name"]=json_stringt("float");`
`302`	`300`	`result["width"]=json_numbert(type.get_string(ID_width));`
`303`		`- result["binary"]=json_stringt(constant_expr.get_value());`
	`301`	`+ result["binary"] = json_stringt(constant_expr.get_value());`
`304`	`302`	`result["data"]=`
`305`	`303`	`json_stringt(ieee_floatt(to_constant_expr(expr)).to_ansi_c_string());`
`306`	`304`	`}`
`@@ -341,7 +339,7 @@ json_objectt json(`
`341`	`339`	`else if(type.id()==ID_string)`
`342`	`340`	`{`
`343`	`341`	`result["name"]=json_stringt("string");`
`344`		`- result["data"]=json_stringt(constant_expr.get_value());`
	`342`	`+ result["data"] = json_stringt(constant_expr.get_value());`
`345`	`343`	`}`
`346`	`344`	`else`
`347`	`345`	`{`
`@@ -381,7 +379,7 @@ json_objectt json(`
`381`	`379`	`{`
`382`	`380`	`json_objectt &e=members.push_back().make_object();`
`383`	`381`	`e["value"]=json(expr.operands()[m], ns, mode);`
`384`		`- e["name"]=json_stringt(components[m].get_name());`
	`382`	`+ e["name"] = json_stringt(components[m].get_name());`
`385`	`383`	`}`
`386`	`384`	`}`
`387`	`385`	`}`
`@@ -392,7 +390,7 @@ json_objectt json(`
`392`	`390`	`const union_exprt &union_expr=to_union_expr(expr);`
`393`	`391`	`json_objectt &e=result["member"].make_object();`
`394`	`392`	`e["value"]=json(union_expr.op(), ns, mode);`
`395`		`- e["name"]=json_stringt(union_expr.get_component_name());`
	`393`	`+ e["name"] = json_stringt(union_expr.get_component_name());`
`396`	`394`	`}`
`397`	`395`	`else`
`398`	`396`	`result["name"]=json_stringt("unknown");`