Changeset 83ab931


Ignore:
Timestamp:
Dec 10, 2018, 2:47:37 PM (3 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
9aaacc27
Parents:
40290497
Message:

Fix type renaming issue with deferred resolution

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/ResolvExpr/ResolveAssertions.cc

    r40290497 r83ab931  
    1616#include "ResolveAssertions.h"
    1717
    18 #include <cassert>                // for assertf
    19 #include <list>                   // for list
    20 #include <unordered_map>          // for unordered_map, unordered_multimap
    21 #include <utility>                // for move
    22 #include <vector>                 // for vector
    23 
    24 #include "Alternative.h"          // for Alternative, AssertionItem, AssertionList
    25 #include "Common/FilterCombos.h"  // for filterCombos
    26 #include "Common/utility.h"       // for sort_mins
    27 #include "SymTab/Indexer.h"       // for Indexer
    28 #include "SynTree/Expression.h"   // for InferredParams
    29 #include "TypeEnvironment.h"      // for TypeEnvironment, etc.
    30 #include "typeops.h"              // for adjustExprType
    31 #include "Unify.h"                // for unify
     18#include <cassert>                  // for assertf
     19#include <list>                     // for list
     20#include <unordered_map>            // for unordered_map, unordered_multimap
     21#include <utility>                  // for move
     22#include <vector>                   // for vector
     23
     24#include "Alternative.h"            // for Alternative, AssertionItem, AssertionList
     25#include "Common/FilterCombos.h"    // for filterCombos
     26#include "Common/utility.h"         // for sort_mins
     27#include "ResolvExpr/RenameVars.h"  // for renameTyVars
     28#include "SymTab/Indexer.h"         // for Indexer
     29#include "SynTree/Expression.h"     // for InferredParams
     30#include "TypeEnvironment.h"        // for TypeEnvironment, etc.
     31#include "typeops.h"                // for adjustExprType
     32#include "Unify.h"                  // for unify
    3233
    3334namespace ResolvExpr {
     
    248249                        Type* adjType = candidate->get_type()->clone();
    249250                        adjustExprType( adjType, newEnv, resn.indexer );
     251                        renameTyVars( adjType );
    250252
    251253                        // keep unifying candidates
Note: See TracChangeset for help on using the changeset viewer.