Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/SymTab/Validate.cc

    rdd020c0 rfb7dca0  
    1010// Created On       : Sun May 17 21:50:04 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri Mar  3 21:02:23 2017
    13 // Update Count     : 332
     12// Last Modified On : Thu Feb  2 17:47:54 2017
     13// Update Count     : 312
    1414//
    1515
     
    629629                } else {
    630630                        TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
    631                         assertf( base != typedeclNames.end(), "Can't find typedecl name %s", typeInst->get_name().c_str() );
     631                        assertf( base != typedeclNames.end(), "Can't find name %s", typeInst->get_name().c_str() );
    632632                        typeInst->set_baseType( base->second );
    633633                } // if
     
    691691                DeclarationWithType *ret = Mutator::mutate( objDecl );
    692692                typedefNames.endScope();
    693 
    694                 if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) { // function type?
     693                // is the type a function?
     694                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) {
    695695                        // replace the current object declaration with a function declaration
    696                         FunctionDecl * newDecl = new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, objDecl->get_attributes(), ret->get_funcSpec() );
     696                        FunctionDecl * newDecl = new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, ret->get_isInline(), ret->get_isNoreturn(), objDecl->get_attributes() );
    697697                        objDecl->get_attributes().clear();
    698698                        objDecl->set_type( nullptr );
    699699                        delete objDecl;
    700700                        return newDecl;
     701                } else if ( objDecl->get_isInline() || objDecl->get_isNoreturn() ) {
     702                        throw SemanticError( "invalid inline or _Noreturn specification in declaration of ", objDecl );
    701703                } // if
    702704                return ret;
     
    730732        }
    731733
    732         // there may be typedefs nested within aggregates. in order for everything to work properly, these should be removed
     734        // there may be typedefs nested within aggregates in order for everything to work properly, these should be removed
    733735        // as well
    734736        template<typename AggDecl>
Note: See TracChangeset for help on using the changeset viewer.