Changes in src/GenPoly/Box.cc [aa19ccf:4b8f918]

File:

• src/GenPoly/Box.cc (modified) (4 diffs)

src/GenPoly/Box.cc

@@ -292 +292 @@
                         /// adds type parameters to the layout call; will generate the appropriate parameters if needed
                         void addOtypeParamsToLayoutCall( UntypedExpr *layoutCall, const std::list< Type* > &otypeParams );
-
-                        /// Enters a new scope for type-variables, adding the type variables from ty
-                        void beginTypeScope( Type *ty );
-                        /// Exits the type-variable scope
-                        void endTypeScope();
                         
                         ScopedSet< std::string > knownLayouts;          ///< Set of generic type layouts known in the current scope, indexed by sizeofName
@@ -1826 +1821 @@
 ////////////////////////////////////////// PolyGenericCalculator ////////////////////////////////////////////////////
 
-                void PolyGenericCalculator::beginTypeScope( Type *ty ) {
-                        scopeTyVars.beginScope();
-                        makeTyVarMap( ty, scopeTyVars );
-                }
-
-                void PolyGenericCalculator::endTypeScope() {
-                        scopeTyVars.endScope();
-                }
-
                 template< typename DeclClass >
                 DeclClass * PolyGenericCalculator::handleDecl( DeclClass *decl, Type *type ) {
-                        beginTypeScope( type );
-                        knownLayouts.beginScope();
-                        knownOffsets.beginScope();
+                        scopeTyVars.beginScope();
+                        makeTyVarMap( type, scopeTyVars );
 
                         DeclClass *ret = static_cast< DeclClass *>( Mutator::mutate( decl ) );
 
-                        knownOffsets.endScope();
-                        knownLayouts.endScope();
-                        endTypeScope();
+                        scopeTyVars.endScope();
                         return ret;
                 }
@@ -1867 +1850 @@
 
                 Type * PolyGenericCalculator::mutate( PointerType *pointerType ) {
-                        beginTypeScope( pointerType );
+                        scopeTyVars.beginScope();
+                        makeTyVarMap( pointerType, scopeTyVars );
 
                         Type *ret = Mutator::mutate( pointerType );
 
-                        endTypeScope();
+                        scopeTyVars.endScope();
                         return ret;
                 }
 
                 Type * PolyGenericCalculator::mutate( FunctionType *funcType ) {
-                        beginTypeScope( funcType );
+                        scopeTyVars.beginScope();
+                        makeTyVarMap( funcType, scopeTyVars );
 
                         // make sure that any type information passed into the function is accounted for
@@ -1889 +1874 @@
                         Type *ret = Mutator::mutate( funcType );
 
-                        endTypeScope();
+                        scopeTyVars.endScope();
                         return ret;
                 }