Changeset de62360d for src/Parser/TypeData.cc

Timestamp:

Jun 24, 2015, 4:04:19 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

94e0864d

Parents:

a1d5d2a

Message:

fix computed goto, fixed -std=, implicit typedefs for enum and aggregates, add _Noreturn _Thread_local

File:

• src/Parser/TypeData.cc (modified) (14 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 13 08:03:20 2015
-// Update Count     : 15
+// Last Modified On : Thu Jun 18 22:06:23 2015
+// Update Count     : 21
 //
 
@@ -437 +437 @@
                         assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) );
                         assignType->get_returnVals().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) );
-                        (*i)->get_assertions().push_front( new FunctionDecl( "?=?", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, assignType, 0, false ) );
+                        (*i)->get_assertions().push_front( new FunctionDecl( "?=?", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, assignType, 0, false, false ) );
                 } // if
         } // for
 }
 
-Declaration *TypeData::buildDecl( std::string name, DeclarationNode::StorageClass sc, Expression *bitfieldWidth, bool isInline, LinkageSpec::Type linkage, Initializer *init ) const {
+Declaration *TypeData::buildDecl( std::string name, DeclarationNode::StorageClass sc, Expression *bitfieldWidth, bool isInline, bool isNoreturn, LinkageSpec::Type linkage, Initializer *init ) const {
         if ( kind == TypeData::Function ) {
                 FunctionDecl *decl;
@@ -450 +450 @@
                                 CompoundStmt *body = dynamic_cast< CompoundStmt* >( stmt );
                                 assert( body );
-                                decl = new FunctionDecl( name, sc, linkage, buildFunction(), body, isInline );
+                                decl = new FunctionDecl( name, sc, linkage, buildFunction(), body, isInline, isNoreturn );
                         } else {
                                 // std::list<Label> ls;
-                                decl = new FunctionDecl( name, sc, linkage, buildFunction(), new CompoundStmt( std::list<Label>() ), isInline );
+                                decl = new FunctionDecl( name, sc, linkage, buildFunction(), new CompoundStmt( std::list<Label>() ), isInline, isNoreturn );
                         } // if
                 } else {
-                        decl = new FunctionDecl( name, sc, linkage, buildFunction(), 0, isInline );
+                        decl = new FunctionDecl( name, sc, linkage, buildFunction(), 0, isInline, isNoreturn );
                 } // if
                 for ( DeclarationNode *cur = function->idList; cur != 0; cur = dynamic_cast< DeclarationNode* >( cur->get_link() ) ) {
@@ -474 +474 @@
                 return buildVariable();
         } else {
-                if ( isInline ) {
-                        throw SemanticError( "invalid inline specification in declaration of ", this );
+                if ( isInline || isNoreturn ) {
+                        throw SemanticError( "invalid inline or _Noreturn specification in declaration of ", this );
                 } else {
                         return new ObjectDecl( name, sc, linkage, bitfieldWidth, build(), init );
@@ -598 +598 @@
                                 } // if
                                 break;
-        
                           case DeclarationNode::Complex:
                                 switch ( ret ) {
@@ -791 +790 @@
                         break;
                   default:
-                        ft->get_returnVals().push_back( dynamic_cast< DeclarationWithType* >( base->buildDecl( "", DeclarationNode::NoStorageClass, 0, false, LinkageSpec::Cforall ) ) );
+                        ft->get_returnVals().push_back( dynamic_cast< DeclarationWithType* >( base->buildDecl( "", DeclarationNode::NoStorageClass, 0, false, false, LinkageSpec::Cforall ) ) );
                 } // switch
         } else {
@@ -806 +805 @@
                 at = new StructDecl( aggregate->name );
                 break;
-        
           case DeclarationNode::Union:
                 at = new UnionDecl( aggregate->name );
                 break;
-        
           case DeclarationNode::Context:
                 at = new ContextDecl( aggregate->name );
                 break;
-        
           default:
                 assert( false );
@@ -838 +834 @@
 ReferenceToType *TypeData::buildAggInst() const {
         assert( kind == AggregateInst );
-        std::string name;
 
         ReferenceToType *ret;
@@ -883 +878 @@
         TypeDecl *ret = new TypeDecl( variable->name, DeclarationNode::NoStorageClass, 0, kindMap[ variable->tyClass ] );
         buildList( variable->assertions, ret->get_assertions() );
-        
         return ret;
 }
@@ -891 +885 @@
         EnumDecl *ret = new EnumDecl( enumeration->name );
         buildList( enumeration->constants, ret->get_members() );
-
         return ret;
 }
@@ -900 +893 @@
         buildList( symbolic->actuals, ret->get_parameters() );
         buildForall( forall, ret->get_forall() );
-
         return ret;
 }
@@ -909 +901 @@
         buildTypeList( tuple->members, ret->get_types() );
         buildForall( forall, ret->get_forall() );
-
         return ret;
 }
@@ -918 +909 @@
         assert( typeexpr->expr );
         TypeofType *ret = new TypeofType( buildQualifiers(), typeexpr->expr->build() );
-
         return ret;
 }
@@ -932 +922 @@
                 ret = new AttrType( buildQualifiers(), attr->name, attr->type->buildType() );
         } // if
-
         return ret;
 }