Changeset d4da1535 for src/Concurrency/KeywordsNew.cpp

Timestamp:

Mar 29, 2022, 4:41:30 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

4598e03

Parents:

edf247b (diff), 6e47b49 (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

File:

• src/Concurrency/KeywordsNew.cpp (modified) (2 diffs)

src/Concurrency/KeywordsNew.cpp

@@ -88 +88 @@
                 auto typeDecl = ast::deepCopy( typeParam );
                 mutFunc->type_params.push_back( typeDecl );
-                mutType->forall.push_back(
-                        new ast::TypeInstType( typeDecl->name, typeDecl ) );
+                mutType->forall.push_back( new ast::TypeInstType( typeDecl ) );
                 for ( auto & assertion : typeDecl->assertions ) {
                         mutFunc->assertions.push_back( assertion );
@@ -108 +107 @@
         for ( const ast::ptr<ast::TypeDecl> & typeDecl : mutFunc->type_params ) {
                 paramTypeInst->params.push_back(
-                        new ast::TypeExpr( location,
-                                new ast::TypeInstType( typeDecl->name, typeDecl ) ) );
+                        new ast::TypeExpr( location, new ast::TypeInstType( typeDecl ) ) );
                 typeParamInst->params.push_back(
-                        new ast::TypeExpr( location,
-                                new ast::TypeInstType( typeDecl->name, typeDecl ) ) );
+                        new ast::TypeExpr( location, new ast::TypeInstType( typeDecl ) ) );
         }