Changeset 5f2f2d7 for src/ResolvExpr

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/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (3 diffs)
• RenameVars.cc (modified) (2 diffs)
• Resolver.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:52:08 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu May 21 16:21:09 2015
-// Update Count     : 12
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jun  8 14:53:58 2015
+// Update Count     : 14
 //
 
@@ -209 +209 @@
                 pruneAlternatives( alternatives.begin(), alternatives.end(), front_inserter( alternatives ), indexer );
                 if ( alternatives.begin() == oldBegin ) {
-                        std::ostrstream stream;
+                        std::ostringstream stream;
                         stream << "Can't choose between alternatives for expression ";
                         expr->print( stream );
@@ -216 +216 @@
                         findMinCost( alternatives.begin(), alternatives.end(), back_inserter( winners ) );
                         printAlts( winners, stream, 8 );
-                        throw SemanticError( std::string( stream.str(), stream.pcount() ) );
+                        throw SemanticError( stream.str() );
                 }
                 alternatives.erase( oldBegin, alternatives.end() );

src/ResolvExpr/RenameVars.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 12:05:18 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 12:07:59 2015
-// Update Count     : 2
+// Last Modified On : Mon Jun  8 14:51:35 2015
+// Update Count     : 4
 //
 
-#include <strstream>
+#include <sstream>
 
 #include "RenameVars.h"
@@ -120 +120 @@
                         mapStack.push_front( mapStack.front() );
                         for ( std::list< TypeDecl* >::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
-                                std::ostrstream output;
+                                std::ostringstream output;
                                 output << "_" << level << "_" << (*i)->get_name();
-                                std::string newname( output.str(), output.pcount() );
+                                std::string newname( output.str() );
                                 mapStack.front()[ (*i)->get_name() ] = newname;
                                 (*i)->set_name( newname );

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Jun 01 13:47:16 2015
-// Update Count     : 21
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jun  7 21:50:37 2015
+// Update Count     : 23
 //