From 388b5471190bded3e8a91a88187f0be30b6377dd Mon Sep 17 00:00:00 2001 From: Thomas Kiley Date: Thu, 23 Apr 2020 17:46:45 +0100 Subject: [PATCH 1/2] Apply clang format to declaration and assignment printing --- src/goto-programs/xml_goto_trace.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/goto-programs/xml_goto_trace.cpp b/src/goto-programs/xml_goto_trace.cpp index b7f8fc43b1c..32c8b7ce10b 100644 --- a/src/goto-programs/xml_goto_trace.cpp +++ b/src/goto-programs/xml_goto_trace.cpp @@ -70,7 +70,7 @@ void convert( xml_assignment.new_element().swap(xml_location); { - auto lhs_object=step.get_lhs_object(); + auto lhs_object = step.get_lhs_object(); const symbolt *symbol; @@ -80,16 +80,19 @@ void convert( { const symbolt *symbol; - if(lhs_object.has_value() && - !ns.lookup(lhs_object->get_identifier(), symbol)) + if( + lhs_object.has_value() && + !ns.lookup(lhs_object->get_identifier(), symbol)) { - std::string type_string=from_type(ns, symbol->name, symbol->type); + std::string type_string = from_type(ns, symbol->name, symbol->type); xml_assignment.set_attribute("mode", id2string(symbol->mode)); xml_assignment.set_attribute("identifier", id2string(symbol->name)); - xml_assignment.set_attribute("base_name", id2string(symbol->base_name)); - xml_assignment.set_attribute("display_name", id2string(symbol->display_name())); - xml_assignment.new_element("type").data=type_string; + xml_assignment.set_attribute( + "base_name", id2string(symbol->base_name)); + xml_assignment.set_attribute( + "display_name", id2string(symbol->display_name())); + xml_assignment.new_element("type").data = type_string; } } } From a7cc33777d9a94111856d7751b388dfefd85d58d Mon Sep 17 00:00:00 2001 From: Thomas Kiley Date: Thu, 23 Apr 2020 17:49:28 +0100 Subject: [PATCH 2/2] Remove duplicated code lhs_object and symbol were declare and initalized (to the same value) twice. Looks like a copy-paste error. --- src/goto-programs/xml_goto_trace.cpp | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/goto-programs/xml_goto_trace.cpp b/src/goto-programs/xml_goto_trace.cpp index 32c8b7ce10b..9051ee5230c 100644 --- a/src/goto-programs/xml_goto_trace.cpp +++ b/src/goto-programs/xml_goto_trace.cpp @@ -70,30 +70,21 @@ void convert( xml_assignment.new_element().swap(xml_location); { - auto lhs_object = step.get_lhs_object(); - const symbolt *symbol; if( lhs_object.has_value() && !ns.lookup(lhs_object->get_identifier(), symbol)) { - const symbolt *symbol; - - if( - lhs_object.has_value() && - !ns.lookup(lhs_object->get_identifier(), symbol)) - { - std::string type_string = from_type(ns, symbol->name, symbol->type); - - xml_assignment.set_attribute("mode", id2string(symbol->mode)); - xml_assignment.set_attribute("identifier", id2string(symbol->name)); - xml_assignment.set_attribute( - "base_name", id2string(symbol->base_name)); - xml_assignment.set_attribute( - "display_name", id2string(symbol->display_name())); - xml_assignment.new_element("type").data = type_string; - } + std::string type_string = from_type(ns, symbol->name, symbol->type); + + xml_assignment.set_attribute("mode", id2string(symbol->mode)); + xml_assignment.set_attribute("identifier", id2string(symbol->name)); + xml_assignment.set_attribute( + "base_name", id2string(symbol->base_name)); + xml_assignment.set_attribute( + "display_name", id2string(symbol->display_name())); + xml_assignment.new_element("type").data = type_string; } }