Changeset 5f2f2d7 for src/SymTab

Timestamp:

Jun 8, 2015, 8:56:35 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

81419b5

Parents:

cd623a4

Message:

fix constant types, remove unnecessary string copying, work on regression testing, fix several memory leaks

Location:

src/SymTab

Files:

• Mangler.cc (modified) (4 diffs)
• Mangler.h (modified) (3 diffs)
• Validate.cc (modified) (2 diffs)

src/SymTab/Mangler.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:40:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:50:47 2015
-// Update Count     : 3
+// Last Modified On : Mon Jun  8 15:12:12 2015
+// Update Count     : 8
 //
 
@@ -160 +160 @@
                 } else {
                         printQualifiers( typeInst );
-                        std::ostrstream numStream;
+                        std::ostringstream numStream;
                         numStream << varNum->second.first;
-                        mangleName << (numStream.pcount() + 1);
                         switch ( (TypeDecl::Kind )varNum->second.second ) {
                           case TypeDecl::Any:
@@ -174 +173 @@
                                 break;
                         } // switch
-                        mangleName << std::string( numStream.str(), numStream.pcount() );
+                        mangleName << numStream.str();
                 } // if
         }
@@ -220 +219 @@
                                         sub_mangler.varNums = varNums;
                                         (*assert)->accept( sub_mangler );
-                                        assertionNames.push_back( std::string( sub_mangler.mangleName.str(), sub_mangler.mangleName.pcount() ) );
+                                        assertionNames.push_back( sub_mangler.mangleName.str() );
                                 } // for
                         } // for

src/SymTab/Mangler.h

@@ -10 +10 @@
 // Created On       : Sun May 17 21:44:03 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:49:21 2015
-// Update Count     : 3
+// Last Modified On : Mon Jun  8 14:47:14 2015
+// Update Count     : 5
 //
 
@@ -17 +17 @@
 #define MANGLER_H
 
-#include <strstream>
+#include <sstream>
 #include "SynTree/SynTree.h"
 #include "SynTree/Visitor.h"
@@ -43 +43 @@
                 virtual void visit( TupleType *tupleType );
   
-                std::string get_mangleName() { return std::string( mangleName.str(), mangleName.pcount() ); }
+                std::string get_mangleName() { return mangleName.str(); }
           private:
-                std::ostrstream mangleName;
+                std::ostringstream mangleName;
                 typedef std::map< std::string, std::pair< int, int > > VarMapType;
                 VarMapType varNums;

src/SymTab/Validate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon May 25 14:27:15 2015
-// Update Count     : 21
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jun  8 17:19:35 2015
+// Update Count     : 22
 //
 
@@ -651 +651 @@
 
         void addDecls( std::list< Declaration * > &declsToAdd, std::list< Statement * > &statements, std::list< Statement * >::iterator i ) {
-                if ( ! declsToAdd.empty() ) {
-                        for ( std::list< Declaration * >::iterator decl = declsToAdd.begin(); decl != declsToAdd.end(); ++decl ) {
-                                statements.insert( i, new DeclStmt( noLabels, *decl ) );
-                        } // for
-                        declsToAdd.clear();
-                } // if
+                for ( std::list< Declaration * >::iterator decl = declsToAdd.begin(); decl != declsToAdd.end(); ++decl ) {
+                        statements.insert( i, new DeclStmt( noLabels, *decl ) );
+                } // for
+                declsToAdd.clear();
         }