Changeset bfae637

Timestamp:

Apr 11, 2016, 3:22:36 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

6f49cdf

Parents:

63c0dbf

Message:

Initial compiling build with TyVarMap? as ErasableScopedMap?

Location:

src/GenPoly

Files:

• Box.cc (modified) (1 diff)
• ErasableScopedMap.h (added)
• FindFunction.cc (modified) (1 diff)
• GenPoly.cc (modified) (1 diff)
• GenPoly.h (modified) (2 diffs)
• PolyMutator.cc (modified) (1 diff)

src/GenPoly/Box.cc

@@ -1278 +1278 @@
                         std::list< Expression *>::iterator paramBegin = appExpr->get_args().begin();
 
-                        TyVarMap exprTyVars;
+                        TyVarMap exprTyVars( (TypeDecl::Kind)-1 );
                         makeTyVarMap( function, exprTyVars );
                         ReferenceToType *polyRetType = isPolyRet( function );

src/GenPoly/FindFunction.cc

@@ -55 +55 @@
                         TyVarMap::iterator var = tyVars.find( (*i)->get_name() );
                         if ( var != tyVars.end() ) {
-                                tyVars.erase( var );
+                                tyVars.erase( var->first );
                         } // if
                 } // for

src/GenPoly/GenPoly.cc

@@ -37 +37 @@
         ReferenceToType *isPolyRet( FunctionType *function ) {
                 if ( ! function->get_returnVals().empty() ) {
-                        TyVarMap forallTypes;
+                        TyVarMap forallTypes( (TypeDecl::Kind)-1 );
                         makeTyVarMap( function, forallTypes );
                         return (ReferenceToType*)isPolyType( function->get_returnVals().front()->get_type(), forallTypes );

src/GenPoly/GenPoly.h

@@ -17 +17 @@
 #define GENPOLY_H
 
-#include <map>
 #include <string>
 #include <iostream>
 #include <utility>
+
+#include "ErasableScopedMap.h"
 
 #include "SymTab/Mangler.h"
@@ -29 +30 @@
 
 namespace GenPoly {
-        typedef std::map< std::string, TypeDecl::Kind > TyVarMap;
+        typedef ErasableScopedMap< std::string, TypeDecl::Kind > TyVarMap;
 
         /// A function needs an adapter if it returns a polymorphic value or if any of its

src/GenPoly/PolyMutator.cc

@@ -27 +27 @@
         }
 
-        PolyMutator::PolyMutator() : env( 0 ) {
-        }
+        PolyMutator::PolyMutator() : scopeTyVars( (TypeDecl::Kind)-1 ), env( 0 ) {}
 
         void PolyMutator::mutateStatementList( std::list< Statement* > &statements ) {