Changeset 8e4bc30 for src/SynTree

Timestamp:

Oct 8, 2020, 12:45:43 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8fc9a5f, baee756

Parents:

391c065 (diff), 6fbe9a5 (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/SynTree

Files:

• AggregateDecl.cc (modified) (2 diffs)
• Declaration.h (modified) (1 diff)

src/SynTree/AggregateDecl.cc

@@ -21 +21 @@
 #include "Common/utility.h"      // for printAll, cloneAll, deleteAll
 #include "Declaration.h"         // for AggregateDecl, TypeDecl, Declaration
+#include "Expression.h"
 #include "Initializer.h"
 #include "LinkageSpec.h"         // for Spec, linkageName, Cforall
@@ -88 +89 @@
 const char * StructDecl::typeString() const { return aggrString( kind ); }
 
+StructInstType * StructDecl::makeInst( std::list< Expression * > const & new_parameters ) {
+        std::list< Expression * > copy_parameters;
+        cloneAll( new_parameters, copy_parameters );
+        return makeInst( move( copy( copy_parameters ) ) );
+}
+
+StructInstType * StructDecl::makeInst( std::list< Expression * > && new_parameters ) {
+        assert( parameters.size() == new_parameters.size() );
+        StructInstType * type = new StructInstType( noQualifiers, this );
+        type->parameters = std::move( new_parameters );
+        return type;
+}
+
 const char * UnionDecl::typeString() const { return aggrString( Union ); }
 

src/SynTree/Declaration.h

@@ -306 +306 @@
         bool is_thread   () { return kind == Thread   ; }
 
+        // Make a type instance of this declaration.
+        StructInstType * makeInst( std::list< Expression * > const & parameters );
+        StructInstType * makeInst( std::list< Expression * > && parameters );
+
         virtual StructDecl * clone() const override { return new StructDecl( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }