Changeset b7b3e41 for src/Validate/Autogen.cpp

Timestamp:

Jun 19, 2023, 1:57:11 PM (2 years ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

adc73a5

Parents:

fa5e1aa5 (diff), 33d4bc8 (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/Validate/Autogen.cpp (modified) (4 diffs)

src/Validate/Autogen.cpp

@@ -321 +321 @@
 void FuncGenerator::produceDecl( const ast::FunctionDecl * decl ) {
         assert( nullptr != decl->stmts );
+        assert( decl->type_params.size() == getGenericParams( type ).size() );
 
         definitions.push_back( decl );
@@ -356 +357 @@
                 decl->init = nullptr;
                 splice( assertions, decl->assertions );
-                oldToNew.emplace( std::make_pair( old_param, decl ) );
+                oldToNew.emplace( old_param, decl );
                 type_params.push_back( decl );
         }
@@ -522 +523 @@
         InitTweak::InitExpander_new srcParam( src );
         // Assign to destination.
-        ast::Expr * dstSelect = new ast::MemberExpr(
+        ast::MemberExpr * dstSelect = new ast::MemberExpr(
                 location,
                 field,
@@ -574 +575 @@
                 }
 
-                ast::Expr * srcSelect = (srcParam) ? new ast::MemberExpr(
+                ast::MemberExpr * srcSelect = (srcParam) ? new ast::MemberExpr(
                         location, field, new ast::VariableExpr( location, srcParam )
                 ) : nullptr;