ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-18 02:40:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ICG doesn't handle inherited template classes correctly

Browse Source 
When a template is in a namespace the type that is marked for the node containing
the full definition of the type is elaborated.  We need to go into
the elaborated name and get the underlying type.  Added code to do this
and tests to see if the type we are checking is itself a template or the
elaborated type is a template.  Sorry, this probably only makes sense to me.

refs #124
This commit is contained in:
Alex Lin 2015-09-18 13:18:05 -05:00
parent 57c76041f5
commit 952b899093
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp
View File

@ -122,6 +122,17 @@ bool CXXRecordVisitor::VisitType(clang::Type *t) {
return true;
}
static bool isTypeTemplateSpecialization(const clang::Type * type_ptr) {
if ( type_ptr->getTypeClass() == clang::Type::TemplateSpecialization ) {
return true ;
} else if ( type_ptr->getTypeClass() == clang::Type::Elaborated ) {
const clang::ElaboratedType * et = type_ptr->getAs<clang::ElaboratedType>() ;
//std::cout << "\ninherited Type = " << et->getNamedType().getTypePtr()->getTypeClassName() << "" << std::endl ;
return et->getNamedType().getTypePtr()->getTypeClass() == clang::Type::TemplateSpecialization ;
}
return false ;
}
bool CXXRecordVisitor::VisitCXXRecordDecl( clang::CXXRecordDecl *rec ) {
if ( debug_level >= 2 ) {
rec->dump() ; std::cout << std::endl ;
@ -182,7 +193,7 @@ bool CXXRecordVisitor::VisitCXXRecordDecl( clang::CXXRecordDecl *rec ) {
// If we are inheriting from a template specialization, don't save the inherited class. This list
// is maintained to call init_attr of the inherited classes. A template specialization does not have
// these attributes.
if ( temp->getTypeClass() != clang::Type::TemplateSpecialization ) {
if ( ! isTypeTemplateSpecialization(temp) ) {
// We want to save the inherited class data, but it's going to go out of scope so we need to make
// a copy of it.
ClassValues * icv = new ClassValues(*(inherit_cvis.get_class_data())) ;
@ -227,7 +238,7 @@ bool CXXRecordVisitor::VisitCXXRecordDecl( clang::CXXRecordDecl *rec ) {
// If we are inheriting from a template specialization, don't save the inherited class. This list
// is maintained to call init_attr of the inherited classes. A template specialization does not have
// these attributes.
if ( temp->getTypeClass() != clang::Type::TemplateSpecialization ) {
if ( ! isTypeTemplateSpecialization(temp) ) {
ClassValues * icv = new ClassValues(*(inherit_cvis.get_class_data())) ;
// The inherited classes of this inherted class are not required in the copy, and they are going out of scope
icv->clearInheritedClass() ;