Changeset 2ed94a9 for src/GenPoly/GenPoly.cc

Timestamp:

Feb 8, 2023, 2:27:55 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master

Children:

b110bcc

Parents:

997185e (diff), ccb29b4 (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/GenPoly/GenPoly.cc (modified) (6 diffs)

src/GenPoly/GenPoly.cc

@@ -24 +24 @@
 #include <vector>                       // for vector
 
+#include "AST/Expr.hpp"
 #include "AST/Type.hpp"
+#include "AST/TypeSubstitution.hpp"
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
 #include "ResolvExpr/typeops.h"         // for flatten
@@ -170 +172 @@
 
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
-                        if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
+                        if ( tyVars.contains( typeInst->get_name() ) ) {
                                 return type;
                         }
@@ -187 +189 @@
 
                 if ( auto typeInst = dynamic_cast< const ast::TypeInstType * >( type ) ) {
-                        return tyVars.find(typeInst->typeString()) != tyVars.end() ? type : nullptr;
+                        if ( tyVars.contains( typeInst->typeString() ) ) return type;
                 } else if ( auto arrayType = dynamic_cast< const ast::ArrayType * >( type ) ) {
                         return isPolyType( arrayType->base, env );
@@ -203 +205 @@
 
         if ( auto inst = dynamic_cast< const ast::TypeInstType * >( type ) ) {
-                if ( typeVars.find( *inst ) != typeVars.end() ) return type;
+                if ( typeVars.contains( *inst ) ) return type;
         } else if ( auto array = dynamic_cast< const ast::ArrayType * >( type ) ) {
                 return isPolyType( array->base, subst );
@@ -391 +393 @@
 
                 if ( TypeInstType *typeInstType = dynamic_cast< TypeInstType * >( type ) ) {
-                        if ( tyVars.find( typeInstType->get_name() ) != tyVars.end() ) {
+                        if ( tyVars.contains( typeInstType->get_name() ) ) {
                                 return true;
                         }
@@ -490 +492 @@
                 }
 
+                /// Flattens a list of types.
+                // There is another flattenList in Unify.
                 void flattenList( vector<ast::ptr<ast::Type>> const & src,
                                 vector<ast::ptr<ast::Type>> & out ) {