Changeset 6e47b49

Timestamp:

Mar 29, 2022, 4:28:06 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

d080549, d4da1535

Parents:

262fafd9 (diff), b230091 (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:

• AST/Convert.cpp (modified) (1 diff)
• AST/Decl.cpp (modified) (1 diff)
• AST/Type.cpp (modified) (1 diff)
• AST/Type.hpp (modified) (1 diff)
• Concurrency/KeywordsNew.cpp (modified) (2 diffs)
• ResolvExpr/Resolver.cc (modified) (1 diff)
• Validate/Autogen.cpp (modified) (2 diffs)
• Validate/ForallPointerDecay.cpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -2717 +2717 @@
 
                 for (auto & param : foralls) {
-                        ty->forall.emplace_back(new ast::TypeInstType(param->name, param));
+                        ty->forall.emplace_back(new ast::TypeInstType(param));
                         for (auto asst : param->assertions) {
                                 ty->assertions.emplace_back(new ast::VariableExpr({}, asst));

src/AST/Decl.cpp

@@ -68 +68 @@
         }
         for (auto & tp : this->type_params) {
-                ftype->forall.emplace_back(new TypeInstType(tp->name, tp));
+                ftype->forall.emplace_back(new TypeInstType(tp));
                 for (auto & ap: tp->assertions) {
                         ftype->assertions.emplace_back(new VariableExpr(loc, ap));

src/AST/Type.cpp

@@ -147 +147 @@
 // --- TypeInstType
 
+TypeInstType::TypeInstType( const TypeDecl * b,
+        CV::Qualifiers q, std::vector<ptr<Attribute>> && as )
+: BaseInstType( b->name, q, move(as) ), base( b ), kind( b->kind ) {}
+
 void TypeInstType::set_base( const TypeDecl * b ) {
         base = b;

src/AST/Type.hpp

@@ -421 +421 @@
                 std::vector<ptr<Attribute>> && as = {} )
         : BaseInstType( n, q, std::move(as) ), base( b ), kind( b->kind ) {}
+
+        TypeInstType( const TypeDecl * b,
+                CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} );
+
         TypeInstType( const std::string& n, TypeDecl::Kind k, CV::Qualifiers q = {},
                 std::vector<ptr<Attribute>> && as = {} )

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 ) ) );
         }
 

src/ResolvExpr/Resolver.cc

@@ -1385 +1385 @@
                         for (auto & typeParam : mutDecl->type_params) {
                                 symtab.addType(typeParam);
-                                mutType->forall.emplace_back(new ast::TypeInstType(typeParam->name, typeParam));
+                                mutType->forall.emplace_back(new ast::TypeInstType(typeParam));
                         }
                         for (auto & asst : mutDecl->assertions) {

src/Validate/Autogen.cpp

@@ -248 +248 @@
                 structInst.params.push_back( new ast::TypeExpr(
                         typeDecl->location,
-                        new ast::TypeInstType( typeDecl->name, typeDecl )
+                        new ast::TypeInstType( typeDecl )
                 ) );
         }
@@ -264 +264 @@
                 unionInst.params.push_back( new ast::TypeExpr(
                         unionDecl->location,
-                        new ast::TypeInstType( typeDecl->name, typeDecl )
+                        new ast::TypeInstType( typeDecl )
                 ) );
         }

src/Validate/ForallPointerDecay.cpp

@@ -41 +41 @@
         for ( auto & type_param : decl->type_params ) {
                 type->forall.emplace_back(
-                        new ast::TypeInstType( type_param->name, type_param ) );
+                        new ast::TypeInstType( type_param ) );
         }
         for ( auto & assertion : decl->assertions ) {