Implement changes to review comments in #167

Author: NlightNFotis

regression/goto-instrument/store_goto_locations/test.desc

@@ -6,4 +6,3 @@ main.c
 Original GOTO location
 --
 --
-This is tracked by the JIRA issue TYT-4: https://diffblue.atlassian.net/projects/TYT/issues/TYT-4

src/analyses/ai.cpp

@@ -233,9 +233,11 @@ xmlt ai_baset::output_xml(
       i_it->source_location.as_string());
     auto original_location = i_it->source_location.get_goto_location();
     if(original_location!="")
+    {
       location.set_attribute(
-        "originalGOTOLocation",
+        "original_GOTO_Location",
         id2string(original_location));
+    }
 
     location.new_element(find_state(i_it).output_xml(*this, ns));
 

src/goto-instrument/goto_instrument_parse_options.cpp

@@ -436,10 +436,9 @@ int goto_instrument_parse_optionst::doit()
 
     if(cmdline.isset("store-goto-locations"))
     {
-      Forall_goto_functions(it, goto_functions)
+      for(auto &function : goto_functions.function_map)
       {
-        auto &function_body = it->second.body;
-        store_goto_locations(function_body);
+        store_goto_locations(function.second.body);
       }
     }
 

src/goto-instrument/store_goto_location.cpp

@@ -5,13 +5,13 @@
 
 void store_goto_locations(goto_programt &goto_program)
 {
-    for (auto it=goto_program.instructions.begin();
-         it!=goto_program.instructions.end();
-         it++)
+    for(auto it=goto_program.instructions.begin();
+        it!=goto_program.instructions.end();
+        it++)
     {
-        auto &source_location = it->source_location;
-        auto location_number = it->location_number;
+      auto &source_location=it->source_location;
+      auto location_number=it->location_number;
 
-        source_location.set_goto_location(location_number);
+      source_location.set_goto_location(location_number);
     }
 }

src/goto-instrument/store_goto_location.h

@@ -8,12 +8,12 @@ Date: August 2017
 
 \*******************************************************************/
 
-#ifndef STORE_GOTO_LOCATION_H
-#define STORE_GOTO_LOCATION_H
+#ifndef CPROVER_GOTO_INSTRUMENT_STORE_GOTO_LOCATION_H
+#define CPROVER_GOTO_INSTRUMENT_STORE_GOTO_LOCATION_H
 
 
 #include <goto-programs/goto_program.h>
 
 void store_goto_locations(goto_programt &goto_program);
 
-#endif // STORE_GOTO_LOCATION_H
+#endif // CPROVER_GOTO_INSTRUMENT_STORE_GOTO_LOCATION_H

src/goto-programs/goto_program.cpp

@@ -48,15 +48,11 @@ std::ostream &goto_programt::output_instruction(
   std::ostream &out,
   const goto_program_templatet::instructiont &instruction) const
 {
+  out << "        // " << instruction.location_number << " ";
   auto original_location=instruction.source_location.get_goto_location();
   if(original_location!="")
   {
-    out << "        // " << instruction.location_number << " "
-        << "(Original GOTO location: " << original_location << ") ";
-  }
-  else
-  {
-    out << "        // " << instruction.location_number << " ";
+    out << "(Original GOTO location: " << original_location << ") ";
   }
 
   if(!instruction.source_location.is_nil())

src/goto-programs/show_goto_functions_json.cpp

@@ -69,8 +69,10 @@ json_objectt show_goto_functions_jsont::convert(
             json(instruction.code.source_location());
 
           if(instruction.code.source_location().get_goto_location()!="")
+          {
             instruction_entry["originalGOTOLocation"]=
               json_stringt(id2string(instruction.code.source_location().get_goto_location()));
+          }
         }
 
         std::ostringstream instruction_builder;

src/util/irep_ids.def

@@ -810,6 +810,7 @@ IREP_ID_ONE(cprover_string_to_upper_case_func)
 IREP_ID_ONE(cprover_string_trim_func)
 IREP_ID_ONE(cprover_string_value_of_func)
 IREP_ID_ONE(array_replace)
+IREP_ID_ONE(original_GOTO_location)
 
 #undef IREP_ID_ONE
 #undef IREP_ID_TWO

src/util/source_location.h

@@ -142,12 +142,12 @@ class source_locationt:public irept
 
   void set_goto_location(unsigned location)
   {
-    set("GOTO_location", location);
+    set(ID_original_GOTO_location, location);
   }
 
   const irep_idt get_goto_location() const
   {
-    return get("GOTO_location");
+    return get(ID_original_GOTO_location);
   }
 
   static bool is_built_in(const std::string &s)