Changeset 6e47b49 for src/AST

Timestamp:

Mar 29, 2022, 4:28:06 PM (4 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/AST

Files:

• Convert.cpp (modified) (1 diff)
• Decl.cpp (modified) (1 diff)
• Type.cpp (modified) (1 diff)
• Type.hpp (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 = {} )