Changeset bfae637


Ignore:
Timestamp:
Apr 11, 2016, 3:22:36 PM (6 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, string, with_gc
Children:
6f49cdf
Parents:
63c0dbf
Message:

Initial compiling build with TyVarMap? as ErasableScopedMap?

Location:
src/GenPoly
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • src/GenPoly/Box.cc

    r63c0dbf rbfae637  
    12781278                        std::list< Expression *>::iterator paramBegin = appExpr->get_args().begin();
    12791279
    1280                         TyVarMap exprTyVars;
     1280                        TyVarMap exprTyVars( (TypeDecl::Kind)-1 );
    12811281                        makeTyVarMap( function, exprTyVars );
    12821282                        ReferenceToType *polyRetType = isPolyRet( function );
  • src/GenPoly/FindFunction.cc

    r63c0dbf rbfae637  
    5555                        TyVarMap::iterator var = tyVars.find( (*i)->get_name() );
    5656                        if ( var != tyVars.end() ) {
    57                                 tyVars.erase( var );
     57                                tyVars.erase( var->first );
    5858                        } // if
    5959                } // for
  • src/GenPoly/GenPoly.cc

    r63c0dbf rbfae637  
    3737        ReferenceToType *isPolyRet( FunctionType *function ) {
    3838                if ( ! function->get_returnVals().empty() ) {
    39                         TyVarMap forallTypes;
     39                        TyVarMap forallTypes( (TypeDecl::Kind)-1 );
    4040                        makeTyVarMap( function, forallTypes );
    4141                        return (ReferenceToType*)isPolyType( function->get_returnVals().front()->get_type(), forallTypes );
  • src/GenPoly/GenPoly.h

    r63c0dbf rbfae637  
    1717#define GENPOLY_H
    1818
    19 #include <map>
    2019#include <string>
    2120#include <iostream>
    2221#include <utility>
     22
     23#include "ErasableScopedMap.h"
    2324
    2425#include "SymTab/Mangler.h"
     
    2930
    3031namespace GenPoly {
    31         typedef std::map< std::string, TypeDecl::Kind > TyVarMap;
     32        typedef ErasableScopedMap< std::string, TypeDecl::Kind > TyVarMap;
    3233
    3334        /// A function needs an adapter if it returns a polymorphic value or if any of its
  • src/GenPoly/PolyMutator.cc

    r63c0dbf rbfae637  
    2727        }
    2828
    29         PolyMutator::PolyMutator() : env( 0 ) {
    30         }
     29        PolyMutator::PolyMutator() : scopeTyVars( (TypeDecl::Kind)-1 ), env( 0 ) {}
    3130
    3231        void PolyMutator::mutateStatementList( std::list< Statement* > &statements ) {
Note: See TracChangeset for help on using the changeset viewer.