Replace "this" string literals by ID_this

tautschnig · Daniel Kroening · commit 1b22b5733b59 · 2019-01-20T12:11:37.000Z
This avoids typos and may be slightly faster.
diff --git a/jbmc/src/java_bytecode/expr2java.cpp b/jbmc/src/java_bytecode/expr2java.cpp
@@ -314,7 +314,7 @@ std::string expr2javat::convert_java_this(
   const exprt &src,
   unsigned precedence)
 {
-  return "this";
+  return id2string(ID_this);
 }
 
 std::string expr2javat::convert_java_instanceof(
diff --git a/jbmc/src/java_bytecode/java_bytecode_convert_class.cpp b/jbmc/src/java_bytecode/java_bytecode_convert_class.cpp
@@ -833,7 +833,7 @@ void java_bytecode_convert_classt::add_array_types(symbol_tablet &symbol_table)
       id2string(struct_tag_type_identifier) + ".clone:()Ljava/lang/Object;";
     java_method_typet::parametert this_param;
     this_param.set_identifier(id2string(clone_name)+"::this");
-    this_param.set_base_name("this");
+    this_param.set_base_name(ID_this);
     this_param.set_this();
     this_param.type() = java_reference_type(struct_tag_type);
     const java_method_typet clone_type({this_param}, java_lang_object_type());
diff --git a/jbmc/src/java_bytecode/java_bytecode_convert_method.cpp b/jbmc/src/java_bytecode/java_bytecode_convert_method.cpp
@@ -99,7 +99,7 @@ static void assign_parameter_names(
     irep_idt base_name, identifier;
 
     if(i==0 && parameters[i].get_this())
-      base_name="this";
+      base_name = ID_this;
     else
       base_name="stub_ignored_arg"+std::to_string(i);
 
@@ -516,7 +516,7 @@ void java_bytecode_convert_methodt::convert(
     if(param_index==0 && param.get_this())
     {
       // my.package.ClassName.myMethodName:(II)I::this
-      base_name="this";
+      base_name = ID_this;
       identifier=id2string(method_identifier)+"::"+id2string(base_name);
     }
     else
@@ -2096,7 +2096,7 @@ void java_bytecode_convert_methodt::convert_invoke(
       reference_typet object_ref_type = java_reference_type(thistype);
       java_method_typet::parametert this_p(object_ref_type);
       this_p.set_this();
-      this_p.set_base_name("this");
+      this_p.set_base_name(ID_this);
       parameters.insert(parameters.begin(), this_p);
     }
   }
@@ -3013,7 +3013,7 @@ void java_bytecode_initialize_parameter_names(
     if(param_index == 0 && param.get_this())
     {
       // my.package.ClassName.myMethodName:(II)I::this
-      base_name = "this";
+      base_name = ID_this;
       identifier = id2string(method_symbol.name) + "::" + id2string(base_name);
     }
     else
diff --git a/jbmc/unit/java-testing-utils/require_goto_statements.cpp b/jbmc/unit/java-testing-utils/require_goto_statements.cpp
@@ -177,7 +177,7 @@ require_goto_statements::find_this_component_assignment(
           member_expr.op().op0().id() == ID_symbol &&
           has_suffix(
             id2string(to_symbol_expr(member_expr.op().op0()).get_identifier()),
-            "this"))
+            id2string(ID_this)))
         {
           if(
             code_assign.rhs() ==
diff --git a/jbmc/unit/java_bytecode/goto_program_generics/generic_bases_test.cpp b/jbmc/unit/java_bytecode/goto_program_generics/generic_bases_test.cpp
@@ -41,7 +41,7 @@ SCENARIO(
       //   this = &tmp_object_factory$1;
       const irep_idt &this_tmp_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN("Object 'this' created has correctly specialized inherited field")
       {
@@ -81,7 +81,7 @@ SCENARIO(
       // parts of the previous tests.
       const auto &this_tmp_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN("Object 'this' has correctly specialized inherited field")
       {
@@ -113,7 +113,7 @@ SCENARIO(
       // parts of the previous tests.
       const auto &this_tmp_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN("Object 'this' has correctly specialized inherited field")
       {
@@ -158,7 +158,7 @@ SCENARIO(
       // parts of the previous tests.
       const auto &this_tmp_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN(
         "The object 'this' has field 'f' of type "
@@ -205,7 +205,7 @@ SCENARIO(
       // parts of the previous tests.
       const auto &this_tmp_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN("The object 'this' has field 'f' of type java::SuperclassMixed")
       {
@@ -261,7 +261,7 @@ SCENARIO(
       // parts of the previous tests.
       const auto &this_tmp_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN(
         "The object 'this' has fields 'inner' and 'inner_gen' "
@@ -334,7 +334,7 @@ SCENARIO(
       // parts of the previous tests.
       const auto &this_tmp_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN(
         "The object 'this' has field 'f' of type "
@@ -470,7 +470,7 @@ SCENARIO(
       //   this = &tmp_object_factory$1;
       const irep_idt &this_tmp_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN("Object 'this' created has unspecialized inherited field")
       {
@@ -518,7 +518,7 @@ SCENARIO(
       // parts of the previous tests.
       const irep_idt &this_tmp_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN("Object 'this' created has unspecialized inherited field")
       {
diff --git a/jbmc/unit/java_bytecode/goto_program_generics/generic_parameters_test.cpp b/jbmc/unit/java_bytecode/goto_program_generics/generic_parameters_test.cpp
@@ -39,7 +39,7 @@ SCENARIO(
       //   this = &tmp_object_factory$1;
       const irep_idt &tmp_object_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN("Object 'this' has field 'field_input' of type Wrapper")
       {
@@ -102,7 +102,7 @@ SCENARIO(
       // for, so we need to extract its identifier, and start looking for that.
       const auto &tmp_object_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN("Type of multiple generic fields should be right")
       {
@@ -188,7 +188,7 @@ SCENARIO(
 
       const auto &tmp_object_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN("Object 'this' has field 'field_input1' of type Wrapper")
       {
@@ -246,7 +246,7 @@ SCENARIO(
 
       const auto &tmp_object_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN("Object 'this' has field 'field_input' of type PairWrapper")
       {
@@ -563,7 +563,7 @@ SCENARIO(
 
       const irep_idt &tmp_object_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN("Object 'this' has field 'f' of type UnsupportedWrapper2")
       {
@@ -627,7 +627,7 @@ SCENARIO(
 
       const irep_idt &tmp_object_name =
         require_goto_statements::require_entry_point_argument_assignment(
-          "this", entry_point_code);
+          ID_this, entry_point_code);
 
       THEN("Object 'this' has field 'f' of type OpaqueWrapper")
       {
diff --git a/jbmc/unit/java_bytecode/goto_program_generics/mutually_recursive_generics.cpp b/jbmc/unit/java_bytecode/goto_program_generics/mutually_recursive_generics.cpp
@@ -100,7 +100,7 @@ SCENARIO(
 
     const irep_idt &tmp_object_name =
       require_goto_statements::require_entry_point_argument_assignment(
-        "this", entry_point_code);
+        ID_this, entry_point_code);
 
     THEN(
       "The Object has a field `example1` of type `KeyValue<String, Integer>`")
diff --git a/src/cpp/cpp_typecheck_function.cpp b/src/cpp/cpp_typecheck_function.cpp
@@ -181,7 +181,7 @@ irep_idt cpp_typecheckt::function_identifier(const typet &type)
       result += "$const";
     if(symbol.get_bool(ID_C_volatile))
       result += "$volatile";
-    result+="this";
+    result += id2string(ID_this);
     first=false;
     it++;
   }
diff --git a/src/cpp/expr2cpp.cpp b/src/cpp/expr2cpp.cpp
@@ -316,7 +316,7 @@ std::string expr2cppt::convert_cpp_this(
   const exprt &src,
   unsigned precedence)
 {
-  return "this";
+  return id2string(ID_this);
 }
 
 std::string expr2cppt::convert_cpp_new(
diff --git a/src/goto-analyzer/taint_parser.cpp b/src/goto-analyzer/taint_parser.cpp
@@ -88,7 +88,7 @@ bool taint_parser(
     {
       rule.where=taint_parse_treet::rulet::RETURN_VALUE;
     }
-    else if(where=="this")
+    else if(where == id2string(ID_this))
     {
       rule.where=taint_parse_treet::rulet::THIS;
     }

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ std::string expr2javat::convert_java_this(`
`314`	`314`	`const exprt &src,`
`315`	`315`	`unsigned precedence)`
`316`	`316`	`{`
`317`		`- return "this";`
	`317`	`+ return id2string(ID_this);`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`std::string expr2javat::convert_java_instanceof(`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ static void assign_parameter_names(`
`99`	`99`	`irep_idt base_name, identifier;`
`100`	`100`
`101`	`101`	`if(i==0 && parameters[i].get_this())`
`102`		`- base_name="this";`
	`102`	`+ base_name = ID_this;`
`103`	`103`	`else`
`104`	`104`	`base_name="stub_ignored_arg"+std::to_string(i);`
`105`	`105`
`@@ -516,7 +516,7 @@ void java_bytecode_convert_methodt::convert(`
`516`	`516`	`if(param_index==0 && param.get_this())`
`517`	`517`	`{`
`518`	`518`	`// my.package.ClassName.myMethodName:(II)I::this`
`519`		`- base_name="this";`
	`519`	`+ base_name = ID_this;`
`520`	`520`	`identifier=id2string(method_identifier)+"::"+id2string(base_name);`
`521`	`521`	`}`
`522`	`522`	`else`
`@@ -2096,7 +2096,7 @@ void java_bytecode_convert_methodt::convert_invoke(`
`2096`	`2096`	`reference_typet object_ref_type = java_reference_type(thistype);`
`2097`	`2097`	`java_method_typet::parametert this_p(object_ref_type);`
`2098`	`2098`	`this_p.set_this();`
`2099`		`- this_p.set_base_name("this");`
	`2099`	`+ this_p.set_base_name(ID_this);`
`2100`	`2100`	`parameters.insert(parameters.begin(), this_p);`
`2101`	`2101`	`}`
`2102`	`2102`	`}`
`@@ -3013,7 +3013,7 @@ void java_bytecode_initialize_parameter_names(`
`3013`	`3013`	`if(param_index == 0 && param.get_this())`
`3014`	`3014`	`{`
`3015`	`3015`	`// my.package.ClassName.myMethodName:(II)I::this`
`3016`		`- base_name = "this";`
	`3016`	`+ base_name = ID_this;`
`3017`	`3017`	`identifier = id2string(method_symbol.name) + "::" + id2string(base_name);`
`3018`	`3018`	`}`
`3019`	`3019`	`else`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ require_goto_statements::find_this_component_assignment(`
`177`	`177`	`member_expr.op().op0().id() == ID_symbol &&`
`178`	`178`	`has_suffix(`
`179`	`179`	`id2string(to_symbol_expr(member_expr.op().op0()).get_identifier()),`
`180`		`- "this"))`
	`180`	`+ id2string(ID_this)))`
`181`	`181`	`{`
`182`	`182`	`if(`
`183`	`183`	`code_assign.rhs() ==`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ irep_idt cpp_typecheckt::function_identifier(const typet &type)`
`181`	`181`	`result += "$const";`
`182`	`182`	`if(symbol.get_bool(ID_C_volatile))`
`183`	`183`	`result += "$volatile";`
`184`		`- result+="this";`
	`184`	`+ result += id2string(ID_this);`
`185`	`185`	`first=false;`
`186`	`186`	`it++;`
`187`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ std::string expr2cppt::convert_cpp_this(`
`316`	`316`	`const exprt &src,`
`317`	`317`	`unsigned precedence)`
`318`	`318`	`{`
`319`		`- return "this";`
	`319`	`+ return id2string(ID_this);`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`std::string expr2cppt::convert_cpp_new(`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ bool taint_parser(`
`88`	`88`	`{`
`89`	`89`	`rule.where=taint_parse_treet::rulet::RETURN_VALUE;`
`90`	`90`	`}`
`91`		`- else if(where=="this")`
	`91`	`+ else if(where == id2string(ID_this))`
`92`	`92`	`{`
`93`	`93`	`rule.where=taint_parse_treet::rulet::THIS;`
`94`	`94`	`}`