Changeset c7806122 for src/ResolvExpr/Resolver.cc

Timestamp:

Sep 25, 2020, 6:15:27 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

bd47f35

Parents:

91fb850 (diff), 33f3cfb (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/ResolvExpr/Resolver.cc (modified) (3 diffs)

src/ResolvExpr/Resolver.cc

@@ -1223 +1223 @@
                 template<typename Iter>
                 inline bool nextMutex( Iter & it, const Iter & end ) {
-                        while ( it != end && ! (*it)->get_type()->is_mutex() ) { ++it; }
+                        while ( it != end && ! (*it)->is_mutex() ) { ++it; }
                         return it != end;
                 }
@@ -1638 +1638 @@
                                                                 // Check if the argument matches the parameter type in the current
                                                                 // scope
-                                                                ast::ptr< ast::Type > paramType = (*param)->get_type();
+                                                                // ast::ptr< ast::Type > paramType = (*param)->get_type();
                                                                 if (
                                                                         ! unify(
-                                                                                arg->expr->result, paramType, resultEnv, need, have, open,
+                                                                                arg->expr->result, *param, resultEnv, need, have, open,
                                                                                 symtab )
                                                                 ) {
@@ -1648 +1648 @@
                                                                         ss << "candidate function not viable: no known conversion "
                                                                                 "from '";
-                                                                        ast::print( ss, (*param)->get_type() );
+                                                                        ast::print( ss, *param );
                                                                         ss << "' to '";
                                                                         ast::print( ss, arg->expr->result );