Changeset 0bcc2b7 for src

Timestamp:

Jul 9, 2018, 10:31:54 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

036dd5f

Parents:

062e8df

Message:

Fix handling of traits and TypeDecls? in ReplaceTypedef?

File:

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

src/SymTab/Validate.cc

@@ -200 +200 @@
                 void premutate( UnionDecl * unionDecl );
                 void premutate( EnumDecl * enumDecl );
+                void premutate( TraitDecl * );
 
                 void premutate( FunctionType * ftype );
@@ -211 +212 @@
                 typedef std::unique_ptr<TypedefDecl> TypedefDeclPtr;
                 typedef ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
-                typedef std::map< std::string, TypeDecl * > TypeDeclMap; // xxx - convert to ScopedMap
+                typedef ScopedMap< std::string, TypeDecl * > TypeDeclMap;
                 TypedefMap typedefNames;
                 TypeDeclMap typedeclNames;
@@ -981 +982 @@
                 } // if
 
-                typedeclNames[ typeDecl->name ] = typeDecl;
+                typedeclNames.insert( typeDecl->name, typeDecl );
         }
 
         void ReplaceTypedef::premutate( FunctionDecl * ) {
                 GuardScope( typedefNames );
+                GuardScope( typedeclNames );
         }
 
         void ReplaceTypedef::premutate( ObjectDecl * ) {
                 GuardScope( typedefNames );
+                GuardScope( typedeclNames );
         }
 
@@ -1006 +1009 @@
         void ReplaceTypedef::premutate( CastExpr * ) {
                 GuardScope( typedefNames );
+                GuardScope( typedeclNames );
         }
 
         void ReplaceTypedef::premutate( CompoundStmt * ) {
                 GuardScope( typedefNames );
+                GuardScope( typedeclNames );
                 scopeLevel += 1;
                 GuardAction( [this](){ scopeLevel -= 1; } );
@@ -1042 +1047 @@
 
                 GuardScope( typedefNames );
+                GuardScope( typedeclNames );
                 mutateAll( aggr->parameters, *visitor );
 
@@ -1080 +1086 @@
                 GuardValue( inFunctionType );
                 inFunctionType = true;
+        }
+
+        void ReplaceTypedef::premutate( TraitDecl * ) {
+                GuardScope( typedefNames );
+                GuardScope( typedeclNames);
         }