Changeset 06cafa4

Timestamp:

Aug 11, 2017, 2:38:10 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

c3acf0aa

Parents:

c65a80b (diff), 2006db0 (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 branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• Common/Indenter.h (modified) (1 diff)
• Parser/DeclarationNode.cc (modified) (2 diffs)
• Parser/ParseNode.h (modified) (3 diffs)
• Parser/TypeData.cc (modified) (4 diffs)
• SynTree/Declaration.h (modified) (4 diffs)

src/Common/Indenter.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// utility.h --
+// Indenter.h --
 //
-// Author           : Richard C. Bilson
-// Created On       : Mon May 18 07:44:20 2015
+// Author           : Rob Schluntz
+// Created On       : Fri Jun 30 16:55:23 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri May 5 11:03:00 2017
-// Update Count     : 32
+// Last Modified On : Fri Aug 11 11:15:00 2017
+// Update Count     : 1
 //
 

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 14 16:55:00 2017
-// Update Count     : 1020
+// Last Modified On : Thr Aug 10 17:02:00 2017
+// Update Count     : 1021
 //
 
@@ -275 +275 @@
         return newnode;
 } // DeclarationNode::newEnumConstant
-
-DeclarationNode * DeclarationNode::newTreeStruct( Aggregate kind, const string * name, const string * parent, ExpressionNode * actuals, DeclarationNode * fields, bool body ) {
-        assert( name );
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Aggregate );
-        newnode->type->aggregate.kind = kind;
-        newnode->type->aggregate.name = name;
-        newnode->type->aggregate.actuals = actuals;
-        newnode->type->aggregate.fields = fields;
-        newnode->type->aggregate.body = body;
-        newnode->type->aggregate.tagged = true;
-        newnode->type->aggregate.parent = parent;
-        return newnode;
-} // DeclarationNode::newTreeStruct
 
 DeclarationNode * DeclarationNode::newName( string * name ) {

src/Parser/ParseNode.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 27 12:08:08 2017
-// Update Count     : 788
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Aug 10 16:54:00 2017
+// Update Count     : 789
 //
 
@@ -248 +248 @@
         static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement
 
-        // Perhaps this would best fold into newAggragate.
-        static DeclarationNode * newTreeStruct( Aggregate kind, const std::string * name, const std::string * parent, ExpressionNode * actuals, DeclarationNode * fields, bool body );
-
         DeclarationNode();
         ~DeclarationNode();
@@ -335 +332 @@
 
         static UniqueName anonymous;
-
-        // Temp to test TreeStruct
-        const std::string * parent_name;
 }; // DeclarationNode
 

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  9 13:50:00 2017
+// Last Modified On : Fri Aug 11 10:50:00 2017
 // Update Count     : 567
 //
@@ -63 +63 @@
                 aggregate.fields = nullptr;
                 aggregate.body = false;
-                aggregate.tagged = false;
-                aggregate.parent = nullptr;
                 break;
           case AggregateInst:
@@ -123 +121 @@
                 delete aggregate.actuals;
                 delete aggregate.fields;
-                delete aggregate.parent;
                 // delete aggregate;
                 break;
@@ -624 +621 @@
         switch ( td->aggregate.kind ) {
           case DeclarationNode::Struct:
-                if ( td->aggregate.tagged ) {
-                        at = new StructDecl( *td->aggregate.name, td->aggregate.parent, attributes, linkage );
-                        buildForall( td->aggregate.params, at->get_parameters() );
-                        break;
-                }
           case DeclarationNode::Coroutine:
           case DeclarationNode::Monitor:

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  9 14:45:00 2017
-// Update Count     : 126
+// Last Modified On : Fri Aug 11 10:20:00 2017
+// Update Count     : 127
 //
 
@@ -269 +269 @@
         typedef AggregateDecl Parent;
   public:
-        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ), tagged( false ), parent_name( "" ) {}
-        StructDecl( const std::string &name, const std::string *parent, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( DeclarationNode::Struct ), tagged( true ), parent_name( parent ? *parent : "" ) {}
-        StructDecl( const StructDecl &other ) : Parent( other ) {}
+        StructDecl( const std::string &name, DeclarationNode::Aggregate kind = DeclarationNode::Struct, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall ) : Parent( name, attributes, linkage ), kind( kind ) {}
+        StructDecl( const StructDecl &other ) : Parent( other ), kind( other.kind ) {}
 
         bool is_coroutine() { return kind == DeclarationNode::Coroutine; }
@@ -277 +276 @@
         bool is_thread() { return kind == DeclarationNode::Thread; }
 
-        // Tagged/Tree Structure Excetion
-        bool get_tagged() { return tagged; }
-        void set_tagged( bool newValue ) { tagged = newValue; }
-        bool has_parent() { return parent_name != ""; }
-        std::string get_parentName() { return parent_name; }
-
         virtual StructDecl *clone() const { return new StructDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -289 +282 @@
         DeclarationNode::Aggregate kind;
         virtual std::string typeString() const;
-
-        bool tagged;
-        std::string parent_name;
 };