Properly set up scope prefix instead of hacking it away

Author: tautschnig

src/cpp/cpp_instantiate_template.cpp

@@ -173,7 +173,7 @@ const symbolt &cpp_typecheckt::class_template_symbol(
     template_scope!=nullptr, nullptr_exceptiont, "template_scope is null");
 
   irep_idt identifier=
-    id2string(template_scope->prefix)+
+    id2string(template_scope->get_parent().prefix)+
     "tag-"+id2string(template_symbol.base_name)+
     id2string(suffix);
 
@@ -212,7 +212,7 @@ const symbolt &cpp_typecheckt::class_template_symbol(
 
   id.id_class=cpp_idt::id_classt::CLASS;
   id.is_scope=true;
-  id.prefix=template_scope->prefix+
+  id.prefix=template_scope->get_parent().prefix+
             id2string(s_ptr->base_name)+
             id2string(suffix)+"::";
   id.class_identifier=s_ptr->name;

src/cpp/cpp_typecheck_template.cpp

@@ -729,10 +729,7 @@ cpp_scopet &cpp_typecheckt::typecheck_template_parameters(
 
   // produce a new scope for the template parameters
   cpp_scopet &template_scope=
-    cpp_scopes.current_scope().new_scope(
-      cpp_scopes.current_scope().prefix+id_suffix);
-
-  template_scope.prefix=template_scope.get_parent().prefix+id_suffix;
+    cpp_scopes.current_scope().new_scope(id_suffix);
   template_scope.id_class=cpp_idt::id_classt::TEMPLATE_SCOPE;
 
   cpp_scopes.go_to(template_scope);
@@ -843,9 +840,6 @@ cpp_scopet &cpp_typecheckt::typecheck_template_parameters(
     #endif
   }
 
-  // continue without adding to the prefix
-  template_scope.prefix=template_scope.get_parent().prefix;
-
   return template_scope;
 }