irept: use single map for all named sub-nodes

Author: kroening

src/cpp/cpp_type2name.cpp

@@ -36,30 +36,29 @@ static void irep2name(const irept &irep, std::string &result)
   if(irep.id()!="")
     result+=do_prefix(irep.id_string());
 
-  if(irep.get_named_sub().empty() &&
-     irep.get_sub().empty() &&
-     irep.get_comments().empty())
+  if(irep.get_named_sub().empty() && irep.get_sub().empty())
     return;
 
   result+='(';
   bool first=true;
 
   forall_named_irep(it, irep.get_named_sub())
-  {
-    if(first)
-      first=false;
-    else
-      result+=',';
+    if(!irept::is_comment(it->first))
+    {
+      if(first)
+        first = false;
+      else
+        result += ',';
 
-    result+=do_prefix(name2string(it->first));
+      result += do_prefix(name2string(it->first));
 
-    result+='=';
-    std::string tmp;
-    irep2name(it->second, tmp);
-    result+=tmp;
-  }
+      result += '=';
+      std::string tmp;
+      irep2name(it->second, tmp);
+      result += tmp;
+    }
 
-  forall_named_irep(it, irep.get_comments())
+  forall_named_irep(it, irep.get_named_sub())
     if(it->first==ID_C_constant ||
        it->first==ID_C_volatile ||
        it->first==ID_C_restricted)

src/goto-programs/json_goto_trace.cpp

@@ -155,7 +155,7 @@ void convert_decl(
   if(trace_options.json_full_lhs)
   {
     // Not language specific, still mangled, fully-qualified name of lhs
-    json_assignment["rawLhs"] = json_irept(true).convert_from_irep(simplified);
+    json_assignment["rawLhs"] = json_irept().convert_from_irep(simplified);
   }
   json_assignment["hidden"] = jsont::json_boolean(step.hidden);
   json_assignment["internal"] = jsont::json_boolean(step.internal);

src/goto-programs/show_goto_functions_json.cpp

@@ -40,7 +40,7 @@ json_objectt show_goto_functions_jsont::convert(
   const goto_functionst &goto_functions)
 {
   json_arrayt json_functions;
-  const json_irept no_comments_irep_converter(false);
+  const json_irept no_comments_irep_converter;
 
   const auto sorted = goto_functions.sorted();
 

src/goto-programs/show_symbol_table.cpp

@@ -166,7 +166,7 @@ static void show_symbol_table_json_ui(
     result_wrapper.push_back_stream_object("symbolTable");
 
   const namespacet ns(symbol_table);
-  json_irept irep_converter(true);
+  json_irept irep_converter;
 
   for(const auto &id_and_symbol : symbol_table.symbols)
   {
@@ -241,7 +241,7 @@ static void show_symbol_table_brief_json_ui(
     result_wrapper.push_back_stream_object("symbolTable");
 
   const namespacet ns(symbol_table);
-  json_irept irep_converter(true);
+  json_irept irep_converter;
 
   for(const auto &id_and_symbol : symbol_table.symbols)
   {

src/json-symtab-language/json_symbol.cpp

@@ -47,7 +47,7 @@ symbolt symbol_from_json(const jsont &in)
   if(!in.is_object())
     throw deserialization_exceptiont("symbol_from_json takes an object");
   symbolt result;
-  json_irept json2irep(true);
+  json_irept json2irep;
   for(const auto &kv : in.object)
   {
     if(kv.first == "type")