fix for parameter names

Daniel Kroening · Daniel Kroening · commit f5493d781ca2 · 2016-10-12T18:21:48.000+01:00
diff --git a/src/cpp/cpp_typecheck_function.cpp b/src/cpp/cpp_typecheck_function.cpp
@@ -33,16 +33,16 @@ void cpp_typecheckt::convert_parameter(
   const irep_idt &mode,
   code_typet::parametert &parameter)
 {
-  std::string identifier=id2string(parameter.get_identifier());
+  irep_idt base_name=id2string(parameter.get_base_name());
 
-  if(identifier.empty())
+  if(base_name.empty())
   {
-    identifier="#anon_arg"+i2string(anon_counter++);
-    parameter.set_base_name(identifier);
+    base_name="#anon_arg"+i2string(anon_counter++);
+    parameter.set_base_name(base_name);
   }
 
-  identifier=cpp_scopes.current_scope().prefix+
-             id2string(identifier);
+  irep_idt identifier=cpp_scopes.current_scope().prefix+
+                      id2string(base_name);
 
   parameter.set_identifier(identifier);
 

Original file line number	Diff line number	Diff line change
`@@ -33,16 +33,16 @@ void cpp_typecheckt::convert_parameter(`
`33`	`33`	`const irep_idt &mode,`
`34`	`34`	`code_typet::parametert &parameter)`
`35`	`35`	`{`
`36`		`- std::string identifier=id2string(parameter.get_identifier());`
	`36`	`+ irep_idt base_name=id2string(parameter.get_base_name());`
`37`	`37`
`38`		`- if(identifier.empty())`
	`38`	`+ if(base_name.empty())`
`39`	`39`	`{`
`40`		`- identifier="#anon_arg"+i2string(anon_counter++);`
`41`		`- parameter.set_base_name(identifier);`
	`40`	`+ base_name="#anon_arg"+i2string(anon_counter++);`
	`41`	`+ parameter.set_base_name(base_name);`
`42`	`42`	`}`
`43`	`43`
`44`		`- identifier=cpp_scopes.current_scope().prefix+`
`45`		`- id2string(identifier);`
	`44`	`+ irep_idt identifier=cpp_scopes.current_scope().prefix+`
	`45`	`+ id2string(base_name);`
`46`	`46`
`47`	`47`	`parameter.set_identifier(identifier);`
`48`	`48`