Changes in src/SymTab/Validate.cc [46f6134:79970ed]

File:

• src/SymTab/Validate.cc (modified) (9 diffs)

src/SymTab/Validate.cc

@@ -49 +49 @@
 #include "SynTree/Statement.h"
 #include "SynTree/TypeSubstitution.h"
-#include "GenPoly/ScopedMap.h"
 #include "Indexer.h"
 #include "FixFunction.h"
@@ -163 +162 @@
                 void addImplicitTypedef( AggDecl * aggDecl );
 
-                typedef std::unique_ptr<TypedefDecl> TypedefDeclPtr;
-                typedef GenPoly::ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
+                typedef std::map< std::string, std::pair< TypedefDecl *, int > > TypedefMap;
                 typedef std::map< std::string, TypeDecl * > TypeDeclMap;
                 TypedefMap typedefNames;
@@ -533 +531 @@
                         TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
                         assert( base != typedeclNames.end() );
-                        typeInst->set_baseType( base->second );
+                        typeInst->set_baseType( base->second->clone() );
                 } // if
                 return typeInst;
@@ -551 +549 @@
                         }
                 } else {
-                        typedefNames[ tyDecl->get_name() ] = std::make_pair( TypedefDeclPtr( tyDecl ), scopeLevel );
+                        typedefNames[ tyDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
                 } // if
 
@@ -569 +567 @@
                         return new EnumDecl( enumDecl->get_name() );
                 } else {
-                        return ret->clone();
+                        return ret;
                 } // if
         }
@@ -584 +582 @@
 
         DeclarationWithType *EliminateTypedef::mutate( FunctionDecl * funcDecl ) {
-                typedefNames.beginScope();
+                TypedefMap oldNames = typedefNames;
                 DeclarationWithType *ret = Mutator::mutate( funcDecl );
-                typedefNames.endScope();
+                typedefNames = oldNames;
                 return ret;
         }
 
         DeclarationWithType *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
-                typedefNames.beginScope();
+                TypedefMap oldNames = typedefNames;
                 DeclarationWithType *ret = Mutator::mutate( objDecl );
-                typedefNames.endScope();
+                typedefNames = oldNames;
                 // is the type a function?
                 if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) {
@@ -605 +603 @@
 
         Expression *EliminateTypedef::mutate( CastExpr * castExpr ) {
-                typedefNames.beginScope();
+                TypedefMap oldNames = typedefNames;
                 Expression *ret = Mutator::mutate( castExpr );
-                typedefNames.endScope();
+                typedefNames = oldNames;
                 return ret;
         }
 
         CompoundStmt *EliminateTypedef::mutate( CompoundStmt * compoundStmt ) {
-                typedefNames.beginScope();
+                TypedefMap oldNames = typedefNames;
                 scopeLevel += 1;
                 CompoundStmt *ret = Mutator::mutate( compoundStmt );
@@ -627 +625 @@
                         i = next;
                 } // while
-                typedefNames.endScope();
+                typedefNames = oldNames;
                 return ret;
         }
@@ -658 +656 @@
                                 type = new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() );
                         } // if
-                        TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), DeclarationNode::NoStorageClass, type ) );
-                        typedefNames[ aggDecl->get_name() ] = std::make_pair( std::move( tyDecl ), scopeLevel );
+                        TypedefDecl * tyDecl = new TypedefDecl( aggDecl->get_name(), DeclarationNode::NoStorageClass, type );
+                        typedefNames[ aggDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
                 } // if
         }