Changeset b29f8f3 for src/SynTree

Timestamp:

Jul 29, 2015, 12:07:38 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:

093f1a0

Parents:

1e8f143 (diff), 51b986f (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 from origin

Location:

src/SynTree

Files:

• Declaration.cc (modified) (2 diffs)
• Declaration.h (modified) (7 diffs)
• FunctionDecl.cc (modified) (5 diffs)
• Mutator.cc (modified) (3 diffs)
• Mutator.h (modified) (2 diffs)
• ObjectDecl.cc (modified) (2 diffs)
• Statement.cc (modified) (3 diffs)
• Statement.h (modified) (3 diffs)
• Type.cc (modified) (2 diffs)
• Type.h (modified) (2 diffs)
• Visitor.cc (modified) (2 diffs)

src/SynTree/Declaration.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 13 08:07:20 2015
-// Update Count     : 9
+// Last Modified On : Mon Jul 13 17:58:38 2015
+// Update Count     : 10
 //
 
@@ -27 +27 @@
 
 Declaration::Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage )
-                : name( name ), storageClass( sc ), linkage( linkage ), uniqueId( 0 ) {
+                : name( name ), storageClass( sc ), linkage( linkage ), isInline( false ), isNoreturn( false ), uniqueId( 0 ) {
 }
 
 Declaration::Declaration( const Declaration &other )
-                : name( other.name ), storageClass( other.storageClass ), linkage( other.linkage ), uniqueId( other.uniqueId ) {
+        : name( other.name ), storageClass( other.storageClass ), linkage( other.linkage ), isInline( other.isInline ), isNoreturn( other.isNoreturn ), uniqueId( other.uniqueId ) {
 }
 

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 13 09:10:31 2015
-// Update Count     : 25
+// Last Modified On : Mon Jul 13 18:15:59 2015
+// Update Count     : 28
 //
 
@@ -35 +35 @@
         LinkageSpec::Type get_linkage() const { return linkage; }
         void set_linkage( LinkageSpec::Type newValue ) { linkage = newValue; }
+        bool get_isInline() const { return isInline; }
+        void set_isInline( bool newValue ) { isInline = newValue; }
+        bool get_isNoreturn() const { return isNoreturn; }
+        void set_isNoreturn( bool newValue ) { isNoreturn = newValue; }
         UniqueId get_uniqueId() const { return uniqueId; }
 
@@ -50 +54 @@
         DeclarationNode::StorageClass storageClass;
         LinkageSpec::Type linkage;
+        bool isInline, isNoreturn;
         UniqueId uniqueId;
 };
@@ -75 +80 @@
         typedef DeclarationWithType Parent;
   public:
-        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init );
+        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init, bool isInline = false, bool isNoreturn = false );
         ObjectDecl( const ObjectDecl &other );
         virtual ~ObjectDecl();
@@ -89 +94 @@
         virtual ObjectDecl *clone() const { return new ObjectDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual ObjectDecl *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual DeclarationWithType *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
         virtual void printShort( std::ostream &os, int indent = 0 ) const;
@@ -112 +117 @@
         CompoundStmt *get_statements() const { return statements; }
         void set_statements( CompoundStmt *newValue ) { statements = newValue; }
-        bool get_isInline() const { return isInline; }
-        bool get_isNoreturn() const { return isNoreturn; }
         std::list< std::string >& get_oldIdents() { return oldIdents; }
         std::list< Declaration* >& get_oldDecls() { return oldDecls; }
@@ -125 +128 @@
         FunctionType *type;
         CompoundStmt *statements;
-        bool isInline, isNoreturn;
         std::list< std::string > oldIdents;
         std::list< Declaration* > oldDecls;

src/SynTree/FunctionDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 13 09:10:32 2015
-// Update Count     : 16
+// Last Modified On : Mon Jul 13 18:11:44 2015
+// Update Count     : 19
 //
 
@@ -22 +22 @@
 
 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 ) {
+                : Parent( name, sc, linkage ), type( type ), statements( statements ) {
+        set_isInline( isInline );
+        set_isNoreturn( isNoreturn );
         // this is a brazen hack to force the function "main" to have C linkage
         if ( name == "main" ) {
@@ -30 +32 @@
 
 FunctionDecl::FunctionDecl( const FunctionDecl &other )
-        : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ), isInline( other.isInline ), isNoreturn( other.isNoreturn ) {
+        : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
 }
 
@@ -57 +59 @@
                 os << LinkageSpec::toString( get_linkage() ) << " ";
         } // if
-        if ( isInline ) {
+        if ( get_isInline() ) {
                 os << "inline ";
         } // if
-        if ( isNoreturn ) {
+        if ( get_isNoreturn() ) {
                 os << "_Noreturn ";
         } // if
@@ -96 +98 @@
                 os << get_name() << ": ";
         } // if
-        if ( isInline ) {
+        if ( get_isInline() ) {
                 os << "inline ";
         } // if
-        if ( isNoreturn ) {
+        if ( get_isNoreturn() ) {
                 os << "_Noreturn ";
         } // if

src/SynTree/Mutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 10:10:46 2015
-// Update Count     : 1
+// Last Modified On : Thu Jul 16 16:10:54 2015
+// Update Count     : 3
 //
 
@@ -28 +28 @@
 Mutator::~Mutator() {}
 
-ObjectDecl *Mutator::mutate( ObjectDecl *objectDecl ) {
+DeclarationWithType *Mutator::mutate( ObjectDecl *objectDecl ) {
         objectDecl->set_type( maybeMutate( objectDecl->get_type(), *this ) );
         objectDecl->set_init( maybeMutate( objectDecl->get_init(), *this ) );
@@ -109 +109 @@
 
 Statement *Mutator::mutate( ForStmt *forStmt ) {
-        forStmt->set_initialization( maybeMutate( forStmt->get_initialization(), *this ) );
+        mutateAll( forStmt->get_initialization(), *this );
         forStmt->set_condition( maybeMutate( forStmt->get_condition(), *this ) );
         forStmt->set_increment( maybeMutate( forStmt->get_increment(), *this ) );

src/SynTree/Mutator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 29 16:34:08 2015
-// Update Count     : 4
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jul 13 18:14:47 2015
+// Update Count     : 5
 //
 #include <cassert>
@@ -26 +26 @@
         virtual ~Mutator();
   public:
-        virtual ObjectDecl* mutate( ObjectDecl *objectDecl );
+        virtual DeclarationWithType* mutate( ObjectDecl *objectDecl );
         virtual DeclarationWithType* mutate( FunctionDecl *functionDecl );
         virtual Declaration* mutate( StructDecl *aggregateDecl );

src/SynTree/ObjectDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 13 08:10:16 2015
-// Update Count     : 15
+// Last Modified On : Mon Jul 13 18:08:27 2015
+// Update Count     : 16
 //
 
@@ -20 +20 @@
 #include "utility.h"
 
-ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init )
+ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init, bool isInline, bool isNoreturn )
         : Parent( name, sc, linkage ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
+        set_isInline( isInline );
+        set_isNoreturn( isNoreturn );
 }
 

src/SynTree/Statement.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 29 17:37:10 2015
-// Update Count     : 22
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 15 14:57:40 2015
+// Update Count     : 27
 //
 
@@ -192 +192 @@
 }
 
-ForStmt::ForStmt( std::list<Label> labels, Statement *initialization_, Expression *condition_, Expression *increment_, Statement *body_ ):
+ForStmt::ForStmt( std::list<Label> labels, std::list<Statement *> initialization_, Expression *condition_, Expression *increment_, Statement *body_ ):
         Statement( labels ), initialization( initialization_ ), condition( condition_ ), increment( increment_ ), body( body_ ) {
 }
 
 ForStmt::~ForStmt() {
-        delete initialization;
+        deleteAll( initialization );
         delete condition;
         delete increment;
@@ -213 +213 @@
 
         os << string( indent + 2, ' ' ) << "initialization: \n"; 
-        if ( initialization != 0 )
-                initialization->print( os, indent + 4 );
+        for ( std::list<Statement *>::const_iterator it = initialization.begin(); it != initialization.end(); ++it ) {
+                (*it)->print( os, indent + 4 );
+        }
 
         os << "\n" << string( indent + 2, ' ' ) << "condition: \n"; 

src/SynTree/Statement.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun 23 11:44:27 2015
-// Update Count     : 20
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jul 14 12:14:54 2015
+// Update Count     : 24
 //
 
@@ -199 +199 @@
 class ForStmt : public Statement {
   public:
-        ForStmt( std::list<Label> labels, Statement *initialization = 0,
+        ForStmt( std::list<Label> labels, std::list<Statement *> initialization,
              Expression *condition = 0, Expression *increment = 0, Statement *body = 0 );
         virtual ~ForStmt();
 
-        Statement *get_initialization() { return initialization; }
-        void set_initialization( Statement *newValue ) { initialization = newValue; }
+        std::list<Statement *> &get_initialization() { return initialization; }
+        void set_initialization( std::list<Statement *> newValue ) { initialization = newValue; }
         Expression *get_condition() { return condition; }
         void set_condition( Expression *newValue ) { condition = newValue; }
@@ -217 +217 @@
         virtual void print( std::ostream &os, int indent = 0 ) const;
   private:
-        Statement *initialization;
+        std::list<Statement *> initialization;
         Expression *condition;
         Expression *increment;

src/SynTree/Type.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:52:27 2015
-// Update Count     : 2
+// Last Modified On : Thu Jul  9 16:45:13 2015
+// Update Count     : 3
 //
 
@@ -75 +75 @@
                 os << "_Atomic ";
         } // if
+        if ( tq.isAttribute ) {
+                os << "__attribute(( )) ";
+        } // if
 }
 

src/SynTree/Type.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 26 16:47:54 2015
-// Update Count     : 13
+// Last Modified On : Thu Jul  9 16:46:15 2015
+// Update Count     : 14
 //
 
@@ -25 +25 @@
         struct Qualifiers {  
                 Qualifiers(): isConst( false ), isVolatile( false ), isRestrict( false ), isLvalue( false ), isAtomic( false ), isAttribute( false ) {}
-                Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue, bool isAtomic, bool isAttribute): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ), isAtomic( isAtomic ), isAttribute( isAttribute ) {}
+                Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue, bool isAtomic, bool isAttribute ): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ), isAtomic( isAtomic ), isAttribute( isAttribute ) {}
         
                 Qualifiers &operator+=( const Qualifiers &other );

src/SynTree/Visitor.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 11:14:51 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jul 14 12:31:03 2015
+// Update Count     : 3
 //
 
@@ -94 +94 @@
 
 void Visitor::visit( ForStmt *forStmt ) {
-        // ForStmt still needs to be fixed
-        maybeAccept( forStmt->get_initialization(), *this );
+        acceptAll( forStmt->get_initialization(), *this );
         maybeAccept( forStmt->get_condition(), *this );
         maybeAccept( forStmt->get_increment(), *this );