Changeset 937e51d for src/SynTree/FunctionDecl.cc

Timestamp:

Jun 26, 2015, 4:00:26 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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:

0df292b, e0ff3e6

Parents:

eb50842 (diff), 1869adf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pointer to pointer to qualified fix into master

File:

• src/SynTree/FunctionDecl.cc (modified) (7 diffs)

src/SynTree/FunctionDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu May 21 21:31:16 2015
-// Update Count     : 11
+// Last Modified On : Sat Jun 13 09:10:32 2015
+// Update Count     : 16
 //
 
@@ -21 +21 @@
 #include "utility.h"
 
-FunctionDecl::FunctionDecl( const std::string &name, StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline )
-                : Parent( name, sc, linkage ), type( type ), statements( statements ), isInline( isInline ) {
+FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn )
+                : Parent( name, sc, linkage ), type( type ), statements( statements ), isInline( isInline ), isNoreturn( isNoreturn ) {
         // this is a brazen hack to force the function "main" to have C linkage
         if ( name == "main" ) {
@@ -30 +30 @@
 
 FunctionDecl::FunctionDecl( const FunctionDecl &other )
-                : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ), isInline( other.isInline ) {
+        : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ), isInline( other.isInline ), isNoreturn( other.isNoreturn ) {
 }
 
@@ -52 +52 @@
         
         if ( get_name() != "" ) {
-                os << get_name() << ": a ";
+                os << get_name() << ": ";
         } // if
         if ( get_linkage() != LinkageSpec::Cforall ) {
@@ -60 +60 @@
                 os << "inline ";
         } // if
-        if ( get_storageClass() != NoStorageClass ) {
-                os << storageClassName[ get_storageClass() ] << ' ';
+        if ( isNoreturn ) {
+                os << "_Noreturn ";
+        } // if
+        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
+                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
         } // if
         if ( get_type() ) {
@@ -70 +73 @@
 
         if ( ! oldIdents.empty() ) {
-                os << string( indent+2, ' ' ) << "with parameter names" << endl;
+                os << string( indent + 2, ' ' ) << "with parameter names" << endl;
                 for ( std::list< std::string >::const_iterator i = oldIdents.begin(); i != oldIdents.end(); ++i ) {
-                        os << string( indent+4, ' ' ) << *i << endl;
+                        os << string( indent + 4, ' ' ) << *i << endl;
                 } // for
         } // if
 
         if ( ! oldDecls.empty() ) {
-                os << string( indent+2, ' ' ) << "with parameter declarations" << endl;
-                printAll( oldDecls, os, indent+4 );
+                os << string( indent + 2, ' ' ) << "with parameter declarations" << endl;
+                printAll( oldDecls, os, indent + 4 );
         } // if
         if ( statements ) {
-                os << string( indent+2, ' ' ) << "with body " << endl;
-                statements->print( os, indent+4 );
+                os << string( indent + 2, ' ' ) << "with body " << endl;
+                statements->print( os, indent + 4 );
         } // if
 }
@@ -91 +94 @@
         
         if ( get_name() != "" ) {
-                os << get_name() << ": a ";
+                os << get_name() << ": ";
         } // if
         if ( isInline ) {
                 os << "inline ";
         } // if
-        if ( get_storageClass() != NoStorageClass ) {
-                os << storageClassName[ get_storageClass() ] << ' ';
+        if ( isNoreturn ) {
+                os << "_Noreturn ";
+        } // if
+        if ( get_storageClass() != DeclarationNode::NoStorageClass ) {
+                os << DeclarationNode::storageName[ get_storageClass() ] << ' ';
         } // if
         if ( get_type() ) {