Changes in / [734014e:1b3eef8]

Files:

• src/ResolvExpr/RenameVars.cc (modified) (4 diffs)
• src/ResolvExpr/TypeEnvironment.h (modified) (3 diffs)
• src/SynTree/Declaration.h (modified) (3 diffs)
• src/SynTree/TypeSubstitution.h (modified) (5 diffs)
• tests/.expect/declarationSpecifier.x64.txt (modified) (1 diff)
• tests/declarationSpecifier.cfa (modified) (2 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 : Tue Apr 30 17:07:57 2019
-// Update Count     : 7
+// Last Modified On : Wed Mar  2 17:36:32 2016
+// Update Count     : 5
 //
 
@@ -39 +39 @@
                   private:
                         int level, resetCount;
-                        std::list< std::unordered_map< std::string, std::string > > mapStack;
+                        std::list< std::map< std::string, std::string > > mapStack;
                 };
 
@@ -55 +55 @@
         namespace {
                 RenameVars::RenameVars() : level( 0 ), resetCount( 0 ) {
-                        mapStack.push_front( std::unordered_map< std::string, std::string >() );
+                        mapStack.push_front( std::map< std::string, std::string >() );
                 }
 
@@ -65 +65 @@
                 void RenameVars::previsit( TypeInstType * instType ) {
                         previsit( (Type *)instType );
-                        std::unordered_map< std::string, std::string >::const_iterator i = mapStack.front().find( instType->name );
+                        std::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 : Peter A. Buhr
-// Last Modified On : Tue Apr 30 23:04:10 2019
-// Update Count     : 9
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Mon Jun 18 11:58:00 2018
+// Update Count     : 4
 //
 
@@ -18 +18 @@
 #include <iostream>                    // for ostream
 #include <list>                        // for list, list<>::iterator, list<>...
-#include <map>                                             // for map, map<>::value_compare
-#include <unordered_map>
-#include <set>                                             // for set
+#include <map>                         // for map, map<>::value_compare
+#include <set>                         // for set
 #include <string>                      // for string
 #include <utility>                     // for move, swap
@@ -65 +64 @@
                 AssertionSetValue() : isUsed(false), resnSlot(0) {}
         };
-        typedef std::map< DeclarationWithType *, AssertionSetValue, AssertCompare > AssertionSet;
-        typedef std::unordered_map< std::string, TypeDecl::Data > OpenVarSet;
+        typedef std::map< DeclarationWithType*, AssertionSetValue, AssertCompare > AssertionSet;
+        typedef std::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 : Wed May  1 07:46:49 2019
-// Update Count     : 134
+// Last Modified On : Sun Sep  3 19:24:06 2017
+// Update Count     : 131
 //
 
@@ -19 +19 @@
 #include <iosfwd>                // for ostream
 #include <list>                  // for list
-#include <unordered_map>         // for unordered_map
 #include <string>                // for string, operator+, allocator, to_string
 
@@ -335 +334 @@
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
   private:
-        std::unordered_map< std::string, long long int > enumValues;
+        std::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 : Tue Apr 30 22:52:47 2019
-// Update Count     : 9
+// Last Modified On : Sat Jul 22 09:52:24 2017
+// Update Count     : 3
 //
 
@@ -19 +19 @@
 #include <iosfwd>                  // for ostream
 #include <list>                    // for list<>::iterator, _List_iterator
-#include <unordered_map>
-#include <unordered_set>
+#include <map>                     // for _Rb_tree_iterator, map, map<>::val...
+#include <set>                     // for set
 #include <string>                  // for string, operator!=
 #include <utility>                 // for pair
@@ -78 +78 @@
         friend class PassVisitor;
 
-        typedef std::unordered_map< std::string, Type * > TypeEnvType;
-        typedef std::unordered_map< std::string, Expression * > VarEnvType;
+        typedef std::map< std::string, Type* > TypeEnvType;
+        typedef std::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::unordered_set< std::string > BoundVarsType;
+                typedef std::set< std::string > BoundVarsType;
                 BoundVarsType boundVars;
 };

tests/.expect/declarationSpecifier.x64.txt

@@ -691 +691 @@
     ((void)(_X12_retval_maini_1=0) /* ?{} */);
     return _X12_retval_maini_1;
+    ((void)(_X12_retval_maini_1=0) /* ?{} */);
+    return _X12_retval_maini_1;
 }
 static inline int invoke_main(int argc, char* argv[], char* envp[]) { (void)argc; (void)argv; (void)envp; return _X4mainFi_iPPKc__1((signed int )argc, (const char **)argv); }

tests/declarationSpecifier.cfa

@@ -10 +10 @@
 // Created On       : Wed Aug 17 08:21:04 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 30 18:20:36 2019
-// Update Count     : 4
+// Last Modified On : Tue Nov  6 17:52:59 2018
+// Update Count     : 3
 // 
 
@@ -89 +89 @@
 
 //Dummy main
-int main( int argc, char const * argv[] ) {}
+int main(int argc, char const *argv[])
+{
+        return 0;
+}
 
 // Local Variables: //