Changeset 90ce35aa for src

Timestamp:

Oct 4, 2019, 10:49:31 AM (5 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

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

Children:

cf32116

Parents:

4a60488

Message:

Fixing new-resolver bug where libcfa build erroneously complains about ambiguous ?{} lookup.

File:

• src/ResolvExpr/Unify.cc (modified) (2 diffs)

src/ResolvExpr/Unify.cc

@@ -933 +933 @@
 
         private:
-                template< typename RefType >
-                const RefType * handleRefType( const RefType * inst, const ast::Type * other ) {
+                // Returns: other, cast as XInstType
+                // Assigns this->result: whether types are compatible (up to generic parameters)
+                template< typename XInstType >
+                const XInstType * handleRefType( const XInstType * inst, const ast::Type * other ) {
                         // check that the other type is compatible and named the same
-                        auto otherInst = dynamic_cast< const RefType * >( other );
-                        result = otherInst && inst->name == otherInst->name;
+                        auto otherInst = dynamic_cast< const XInstType * >( other );
+                        this->result = otherInst && inst->name == otherInst->name;
                         return otherInst;
                 }
@@ -958 +960 @@
                 }
 
-                template< typename RefType >
-                void handleGenericRefType( const RefType * inst, const ast::Type * other ) {
+                template< typename XInstType >
+                void handleGenericRefType( const XInstType * inst, const ast::Type * other ) {
                         // check that other type is compatible and named the same
-                        const RefType * inst2 = handleRefType( inst, other );
-                        if ( ! inst2 ) return;
+                        const XInstType * otherInst = handleRefType( inst, other );
+                        if ( ! this->result ) return;
 
                         // check that parameters of types unify, if any
                         const std::vector< ast::ptr< ast::Expr > > & params = inst->params;
-                        const std::vector< ast::ptr< ast::Expr > > & params2 = inst2->params;
+                        const std::vector< ast::ptr< ast::Expr > > & params2 = otherInst->params;
 
                         auto it = params.begin();