Changeset 1690778

Timestamp:

May 1, 2019, 7:49:16 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

3908e5d

Parents:

98d4df9

Message:

change from map/set to unordered map/set

Location:

src

Files:

• ResolvExpr/RenameVars.cc (modified) (4 diffs)
• ResolvExpr/TypeEnvironment.h (modified) (3 diffs)
• SynTree/Declaration.h (modified) (3 diffs)
• SynTree/TypeSubstitution.h (modified) (5 diffs)

src/ResolvExpr/RenameVars.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 12:05:18 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:36:32 2016
-// Update Count     : 5
+// Last Modified On : Tue Apr 30 17:07:57 2019
+// Update Count     : 7
 //
 
@@ -39 +39 @@
                   private:
                         int level, resetCount;
-                        std::list< std::map< std::string, std::string > > mapStack;
+                        std::list< std::unordered_map< std::string, std::string > > mapStack;
                 };
 
@@ -55 +55 @@
         namespace {
                 RenameVars::RenameVars() : level( 0 ), resetCount( 0 ) {
-                        mapStack.push_front( std::map< std::string, std::string >() );
+                        mapStack.push_front( std::unordered_map< std::string, std::string >() );
                 }
 
@@ -65 +65 @@
                 void RenameVars::previsit( TypeInstType * instType ) {
                         previsit( (Type *)instType );
-                        std::map< std::string, std::string >::const_iterator i = mapStack.front().find( instType->name );
+                        std::unordered_map< std::string, std::string >::const_iterator i = mapStack.front().find( instType->name );
                         if ( i != mapStack.front().end() ) {
                                 instType->name = i->second;

src/ResolvExpr/TypeEnvironment.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:24:58 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Mon Jun 18 11:58:00 2018
-// Update Count     : 4
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Apr 30 23:04:10 2019
+// Update Count     : 9
 //
 
@@ -18 +18 @@
 #include <iostream>                    // for ostream
 #include <list>                        // for list, list<>::iterator, list<>...
-#include <map>                         // for map, map<>::value_compare
-#include <set>                         // for set
+#include <map>                                             // for map, map<>::value_compare
+#include <unordered_map>
+#include <set>                                             // for set
 #include <string>                      // for string
 #include <utility>                     // for move, swap
@@ -64 +65 @@
                 AssertionSetValue() : isUsed(false), resnSlot(0) {}
         };
-        typedef std::map< DeclarationWithType*, AssertionSetValue, AssertCompare > AssertionSet;
-        typedef std::map< std::string, TypeDecl::Data > OpenVarSet;
+        typedef std::map< DeclarationWithType *, AssertionSetValue, AssertCompare > AssertionSet;
+        typedef std::unordered_map< std::string, TypeDecl::Data > OpenVarSet;
 
         /// merges one set of open vars into another

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep  3 19:24:06 2017
-// Update Count     : 131
+// Last Modified On : Wed May  1 07:46:49 2019
+// Update Count     : 134
 //
 
@@ -19 +19 @@
 #include <iosfwd>                // for ostream
 #include <list>                  // for list
+#include <unordered_map>         // for unordered_map
 #include <string>                // for string, operator+, allocator, to_string
 
@@ -334 +335 @@
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
   private:
-        std::map< std::string, long long int > enumValues;
+        std::unordered_map< std::string, long long int > enumValues;
         virtual std::string typeString() const override;
 };

src/SynTree/TypeSubstitution.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:52:24 2017
-// Update Count     : 3
+// Last Modified On : Tue Apr 30 22:52:47 2019
+// Update Count     : 9
 //
 
@@ -19 +19 @@
 #include <iosfwd>                  // for ostream
 #include <list>                    // for list<>::iterator, _List_iterator
-#include <map>                     // for _Rb_tree_iterator, map, map<>::val...
-#include <set>                     // for set
+#include <unordered_map>
+#include <unordered_set>
 #include <string>                  // for string, operator!=
 #include <utility>                 // for pair
@@ -78 +78 @@
         friend class PassVisitor;
 
-        typedef std::map< std::string, Type* > TypeEnvType;
-        typedef std::map< std::string, Expression* > VarEnvType;
+        typedef std::unordered_map< std::string, Type * > TypeEnvType;
+        typedef std::unordered_map< std::string, Expression * > VarEnvType;
         TypeEnvType typeEnv;
         VarEnvType varEnv;
@@ -98 +98 @@
         ActualIterator actualIt = actualBegin;
         for ( ; formalIt != formalEnd; ++formalIt, ++actualIt ) {
-                if ( TypeDecl *formal = dynamic_cast< TypeDecl* >( *formalIt ) ) {
-                        if ( TypeExpr *actual = dynamic_cast< TypeExpr* >( *actualIt ) ) {
+                if ( TypeDecl *formal = dynamic_cast< TypeDecl * >( *formalIt ) ) {
+                        if ( TypeExpr *actual = dynamic_cast< TypeExpr * >( *actualIt ) ) {
                                 if ( formal->get_name() != "" ) {
                                         TypeEnvType::iterator i = typeEnv.find( formal->get_name() );
@@ -146 +146 @@
                 int subCount = 0;
                 bool freeOnly;
-                typedef std::set< std::string > BoundVarsType;
+                typedef std::unordered_set< std::string > BoundVarsType;
                 BoundVarsType boundVars;
 };