Use s.clear() instead of s=""

tautschnig · tautschnig · commit 11787cb4e50f · 2019-02-15T07:30:59.000Z
This avoids string table lookups.
diff --git a/jbmc/unit/pointer-analysis/custom_value_set_analysis.cpp b/jbmc/unit/pointer-analysis/custom_value_set_analysis.cpp
@@ -171,7 +171,7 @@ SCENARIO("test_value_set_analysis",
   GIVEN("Normal and custom value-set analysis of CustomVSATest::test")
   {
     config.set_arch("none");
-    config.main = "";
+    config.main.clear();
 
     // This classpath is the default, but the config object
     // is global and previous unit tests may have altered it
diff --git a/src/ansi-c/expr2c.cpp b/src/ansi-c/expr2c.cpp
@@ -283,13 +283,13 @@ std::string expr2ct::convert_rec(
     if(width==config.ansi_c.int_width)
     {
       if(is_signed)
-        sign_str="";
+        sign_str.clear();
       return q+sign_str+"int"+d;
     }
     else if(width==config.ansi_c.long_int_width)
     {
       if(is_signed)
-        sign_str="";
+        sign_str.clear();
       return q+sign_str+"long int"+d;
     }
     else if(width==config.ansi_c.char_width)
@@ -300,19 +300,19 @@ std::string expr2ct::convert_rec(
     else if(width==config.ansi_c.short_int_width)
     {
       if(is_signed)
-        sign_str="";
+        sign_str.clear();
       return q+sign_str+"short int"+d;
     }
     else if(width==config.ansi_c.long_long_int_width)
     {
       if(is_signed)
-        sign_str="";
+        sign_str.clear();
       return q+sign_str+"long long int"+d;
     }
     else if(width==128)
     {
       if(is_signed)
-        sign_str="";
+        sign_str.clear();
       return q + sign_str + "__int128" + d;
     }
     else
diff --git a/src/cpp/cpp_name.cpp b/src/cpp/cpp_name.cpp
@@ -66,7 +66,7 @@ void cpp_namet::convert(
     identifier+=name_component;
 
     if(id=="::")
-      base_name="";
+      base_name.clear();
     else
       base_name+=name_component;
   }
diff --git a/src/cpp/cpp_token.h b/src/cpp/cpp_token.h
@@ -29,9 +29,9 @@ class cpp_tokent
   {
     kind=0;
     data.clear();
-    text="";
+    text.clear();
     line_no=0;
-    filename="";
+    filename.clear();
   }
 
   void swap(cpp_tokent &token)
diff --git a/src/cpp/cpp_typecheck_resolve.cpp b/src/cpp/cpp_typecheck_resolve.cpp
@@ -1277,7 +1277,7 @@ void cpp_typecheck_resolvet::show_identifiers(
       else if(id_expr.id() == ID_pod_constructor)
       {
         out << "constructor ";
-        id="";
+        id.clear();
       }
       else if(id_expr.id()==ID_template_function_instance)
       {
diff --git a/src/goto-cc/armcc_mode.cpp b/src/goto-cc/armcc_mode.cpp
@@ -126,7 +126,7 @@ int armcc_modet::doit()
   }
   else
   {
-    compiler.output_file_object="";
+    compiler.output_file_object.clear();
     compiler.output_file_executable="a.out";
   }
 
diff --git a/src/goto-cc/cw_mode.cpp b/src/goto-cc/cw_mode.cpp
@@ -91,7 +91,7 @@ int cw_modet::doit()
   }
   else
   {
-    compiler.output_file_object="";
+    compiler.output_file_object.clear();
     compiler.output_file_executable="a.out";
   }
 
diff --git a/src/goto-cc/gcc_mode.cpp b/src/goto-cc/gcc_mode.cpp
@@ -656,7 +656,7 @@ int gcc_modet::doit()
   }
   else
   {
-    compiler.output_file_object="";
+    compiler.output_file_object.clear();
     compiler.output_file_executable="a.out";
   }
 
@@ -718,14 +718,14 @@ int gcc_modet::doit()
         {
           language=arg_it->arg;
           if(language=="none")
-            language="";
+            language.clear();
         }
       }
       else if(has_prefix(arg_it->arg, "-x"))
       {
         language=std::string(arg_it->arg, 2, std::string::npos);
         if(language=="none")
-          language="";
+          language.clear();
       }
     }
   }
diff --git a/src/goto-cc/ld_mode.cpp b/src/goto-cc/ld_mode.cpp
@@ -120,7 +120,7 @@ int ld_modet::doit()
   }
   else
   {
-    compiler.output_file_object = "";
+    compiler.output_file_object.clear();
     compiler.output_file_executable = "a.out";
   }
 
diff --git a/src/goto-cc/ms_cl_cmdline.cpp b/src/goto-cc/ms_cl_cmdline.cpp
@@ -431,7 +431,7 @@ void ms_cl_cmdlinet::process_cl_option(const std::string &s)
       if(s.size()==2)
       {
         option.islong=false;
-        option.optstring="";
+        option.optstring.clear();
         option.optchar=s[1];
         optnr=getoptnr(option.optchar);
       }
@@ -467,7 +467,7 @@ void ms_cl_cmdlinet::process_cl_option(const std::string &s)
       if(ms_cl_prefix.size()==1)
       {
         option.islong=false;
-        option.optstring="";
+        option.optstring.clear();
         option.optchar=ms_cl_prefix[0];
         optnr=getoptnr(option.optchar);
       }
diff --git a/src/goto-instrument/dump_c.cpp b/src/goto-instrument/dump_c.cpp
@@ -447,7 +447,7 @@ void dump_ct::convert_compound(
     if(comp_type.id()==ID_c_bit_field &&
        to_c_bit_field_type(comp_type).get_width()==0)
     {
-      comp_name="";
+      comp_name.clear();
       s=type_to_string(comp_type);
     }
 
@@ -497,7 +497,7 @@ void dump_ct::convert_compound(
       typedef_map.insert({typedef_str, typedef_infot(typedef_str)});
     PRECONDITION(!td_map_entry.second);
     if(!td_map_entry.first->second.early)
-      td_map_entry.first->second.type_decl_str="";
+      td_map_entry.first->second.type_decl_str.clear();
     os << "typedef ";
   }
 
diff --git a/src/pointer-analysis/value_set.cpp b/src/pointer-analysis/value_set.cpp
@@ -110,12 +110,12 @@ void value_sett::output(
     if(has_prefix(id2string(e.identifier), "value_set::dynamic_object"))
     {
       display_name=id2string(e.identifier)+e.suffix;
-      identifier="";
+      identifier.clear();
     }
     else if(e.identifier=="value_set::return_value")
     {
       display_name="RETURN_VALUE"+e.suffix;
-      identifier="";
+      identifier.clear();
     }
     else
     {
diff --git a/src/pointer-analysis/value_set_fi.cpp b/src/pointer-analysis/value_set_fi.cpp
@@ -58,7 +58,7 @@ void value_set_fit::output(
     if(has_prefix(id2string(e.identifier), "value_set::dynamic_object"))
     {
       display_name=id2string(e.identifier)+e.suffix;
-      identifier="";
+      identifier.clear();
     }
     else
     {
diff --git a/src/util/cmdline.cpp b/src/util/cmdline.cpp
@@ -169,7 +169,7 @@ bool cmdlinet::parse(int argc, const char **argv, const char *optstring)
       option.islong=true;
       option.optchar=0;
       option.isset=false;
-      option.optstring="";
+      option.optstring.clear();
 
       for(optstring++; optstring[0]!=')' && optstring[0]!=0; optstring++)
         option.optstring+=optstring[0];
@@ -181,7 +181,7 @@ bool cmdlinet::parse(int argc, const char **argv, const char *optstring)
     {
       option.islong=false;
       option.optchar=optstring[0];
-      option.optstring="";
+      option.optstring.clear();
       option.isset=false;
 
       optstring++;
diff --git a/src/util/identifier.cpp b/src/util/identifier.cpp
@@ -43,6 +43,6 @@ void identifiert::parse(const std::string &s)
     }
 
     components.push_back(component);
-    component="";
+    component.clear();
   }
 }
diff --git a/src/util/lispexpr.cpp b/src/util/lispexpr.cpp
@@ -62,7 +62,7 @@ bool lispexprt::parse(
   std::string::size_type &ptr)
 {
   clear();
-  value="";
+  value.clear();
 
   if(ptr==std::string::npos || ptr>=s.size())
     return true;
@@ -156,7 +156,7 @@ int test_lispexpr()
 
   while(true)
   {
-    line="";
+    line.clear();
 
     while(true)
     {
diff --git a/src/util/lispirep.cpp b/src/util/lispirep.cpp
@@ -43,7 +43,7 @@ void lisp2irep(const lispexprt &src, irept &dest)
 void irep2lisp(const irept &src, lispexprt &dest)
 {
   dest.clear();
-  dest.value="";
+  dest.value.clear();
   dest.type=lispexprt::List;
 
 #ifdef NAMED_SUB_IS_FORWARD_LIST
@@ -65,7 +65,7 @@ void irep2lisp(const irept &src, lispexprt &dest)
   {
     lispexprt name;
     name.type=lispexprt::String;
-    name.value="";
+    name.value.clear();
     dest.push_back(name);
 
     lispexprt sub;

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ SCENARIO("test_value_set_analysis",`
`171`	`171`	`GIVEN("Normal and custom value-set analysis of CustomVSATest::test")`
`172`	`172`	`{`
`173`	`173`	`config.set_arch("none");`
`174`		`- config.main = "";`
	`174`	`+ config.main.clear();`
`175`	`175`
`176`	`176`	`// This classpath is the default, but the config object`
`177`	`177`	`// is global and previous unit tests may have altered it`
Original file line number	Diff line number	Diff line change
`@@ -283,13 +283,13 @@ std::string expr2ct::convert_rec(`
`283`	`283`	`if(width==config.ansi_c.int_width)`
`284`	`284`	`{`
`285`	`285`	`if(is_signed)`
`286`		`- sign_str="";`
	`286`	`+ sign_str.clear();`
`287`	`287`	`return q+sign_str+"int"+d;`
`288`	`288`	`}`
`289`	`289`	`else if(width==config.ansi_c.long_int_width)`
`290`	`290`	`{`
`291`	`291`	`if(is_signed)`
`292`		`- sign_str="";`
	`292`	`+ sign_str.clear();`
`293`	`293`	`return q+sign_str+"long int"+d;`
`294`	`294`	`}`
`295`	`295`	`else if(width==config.ansi_c.char_width)`
`@@ -300,19 +300,19 @@ std::string expr2ct::convert_rec(`
`300`	`300`	`else if(width==config.ansi_c.short_int_width)`
`301`	`301`	`{`
`302`	`302`	`if(is_signed)`
`303`		`- sign_str="";`
	`303`	`+ sign_str.clear();`
`304`	`304`	`return q+sign_str+"short int"+d;`
`305`	`305`	`}`
`306`	`306`	`else if(width==config.ansi_c.long_long_int_width)`
`307`	`307`	`{`
`308`	`308`	`if(is_signed)`
`309`		`- sign_str="";`
	`309`	`+ sign_str.clear();`
`310`	`310`	`return q+sign_str+"long long int"+d;`
`311`	`311`	`}`
`312`	`312`	`else if(width==128)`
`313`	`313`	`{`
`314`	`314`	`if(is_signed)`
`315`		`- sign_str="";`
	`315`	`+ sign_str.clear();`
`316`	`316`	`return q + sign_str + "__int128" + d;`
`317`	`317`	`}`
`318`	`318`	`else`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ void cpp_namet::convert(`
`66`	`66`	`identifier+=name_component;`
`67`	`67`
`68`	`68`	`if(id=="::")`
`69`		`- base_name="";`
	`69`	`+ base_name.clear();`
`70`	`70`	`else`
`71`	`71`	`base_name+=name_component;`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ class cpp_tokent`
`29`	`29`	`{`
`30`	`30`	`kind=0;`
`31`	`31`	`data.clear();`
`32`		`- text="";`
	`32`	`+ text.clear();`
`33`	`33`	`line_no=0;`
`34`		`- filename="";`
	`34`	`+ filename.clear();`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`void swap(cpp_tokent &token)`
Original file line number	Diff line number	Diff line change
`@@ -1277,7 +1277,7 @@ void cpp_typecheck_resolvet::show_identifiers(`
`1277`	`1277`	`else if(id_expr.id() == ID_pod_constructor)`
`1278`	`1278`	`{`
`1279`	`1279`	`out << "constructor ";`
`1280`		`- id="";`
	`1280`	`+ id.clear();`
`1281`	`1281`	`}`
`1282`	`1282`	`else if(id_expr.id()==ID_template_function_instance)`
`1283`	`1283`	`{`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ int armcc_modet::doit()`
`126`	`126`	`}`
`127`	`127`	`else`
`128`	`128`	`{`
`129`		`- compiler.output_file_object="";`
	`129`	`+ compiler.output_file_object.clear();`
`130`	`130`	`compiler.output_file_executable="a.out";`
`131`	`131`	`}`
`132`	`132`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ int cw_modet::doit()`
`91`	`91`	`}`
`92`	`92`	`else`
`93`	`93`	`{`
`94`		`- compiler.output_file_object="";`
	`94`	`+ compiler.output_file_object.clear();`
`95`	`95`	`compiler.output_file_executable="a.out";`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ int gcc_modet::doit()`
`656`	`656`	`}`
`657`	`657`	`else`
`658`	`658`	`{`
`659`		`- compiler.output_file_object="";`
	`659`	`+ compiler.output_file_object.clear();`
`660`	`660`	`compiler.output_file_executable="a.out";`
`661`	`661`	`}`
`662`	`662`
`@@ -718,14 +718,14 @@ int gcc_modet::doit()`
`718`	`718`	`{`
`719`	`719`	`language=arg_it->arg;`
`720`	`720`	`if(language=="none")`
`721`		`- language="";`
	`721`	`+ language.clear();`
`722`	`722`	`}`
`723`	`723`	`}`
`724`	`724`	`else if(has_prefix(arg_it->arg, "-x"))`
`725`	`725`	`{`
`726`	`726`	`language=std::string(arg_it->arg, 2, std::string::npos);`
`727`	`727`	`if(language=="none")`
`728`		`- language="";`
	`728`	`+ language.clear();`
`729`	`729`	`}`
`730`	`730`	`}`
`731`	`731`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ int ld_modet::doit()`
`120`	`120`	`}`
`121`	`121`	`else`
`122`	`122`	`{`
`123`		`- compiler.output_file_object = "";`
	`123`	`+ compiler.output_file_object.clear();`
`124`	`124`	`compiler.output_file_executable = "a.out";`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,7 @@ void ms_cl_cmdlinet::process_cl_option(const std::string &s)`
`431`	`431`	`if(s.size()==2)`
`432`	`432`	`{`
`433`	`433`	`option.islong=false;`
`434`		`- option.optstring="";`
	`434`	`+ option.optstring.clear();`
`435`	`435`	`option.optchar=s[1];`
`436`	`436`	`optnr=getoptnr(option.optchar);`
`437`	`437`	`}`
`@@ -467,7 +467,7 @@ void ms_cl_cmdlinet::process_cl_option(const std::string &s)`
`467`	`467`	`if(ms_cl_prefix.size()==1)`
`468`	`468`	`{`
`469`	`469`	`option.islong=false;`
`470`		`- option.optstring="";`
	`470`	`+ option.optstring.clear();`
`471`	`471`	`option.optchar=ms_cl_prefix[0];`
`472`	`472`	`optnr=getoptnr(option.optchar);`
`473`	`473`	`}`