Changeset 937e51d for src/CodeGen/GenType.cc

Timestamp:

Jun 26, 2015, 4:00:26 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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:

0df292b, e0ff3e6

Parents:

eb50842 (diff), 1869adf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pointer to pointer to qualified fix into master

File:

• src/CodeGen/GenType.cc (modified) (6 diffs)

src/CodeGen/GenType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 23:38:22 2015
-// Update Count     : 2
-//
-
-#include <strstream>
+// Last Modified On : Mon Jun  8 14:36:02 2015
+// Update Count     : 9
+//
+
+#include <sstream>
 #include <cassert>
 
 #include "GenType.h"
-#include "CodeGenerator2.h"
+#include "CodeGenerator.h"
 #include "SynTree/Visitor.h"
 #include "SynTree/Type.h"
@@ -68 +68 @@
 
         void GenType::genArray( const Type::Qualifiers &qualifiers, Type *base, Expression *dimension, bool isVarLen, bool isStatic ) {
-                std::ostrstream os;
+                std::ostringstream os;
                 if ( typeString != "" ) {
                         if ( typeString[ 0 ] == '*' ) {
@@ -97 +97 @@
                 } // if
                 if ( dimension != 0 ) {
-                        CodeGenerator2 cg( os );
+                        CodeGenerator cg( os );
                         dimension->accept( cg );
                 } // if
                 os << "]";
 
-                typeString = std::string( os.str(), os.pcount() );
+                typeString = os.str();
   
                 base->accept( *this );
@@ -127 +127 @@
 
         void GenType::visit( FunctionType *funcType ) {
-                std::ostrstream os;
+                std::ostringstream os;
 
                 if ( typeString != "" ) {
@@ -148 +148 @@
                         } // if
                 } else {
-                        CodeGenerator2 cg( os );
+                        CodeGenerator cg( os );
                         os << "(" ;
 
@@ -159 +159 @@
                 } // if
   
-                typeString = std::string( os.str(), os.pcount() );
+                typeString = os.str();
 
                 if ( funcType->get_returnVals().size() == 0 ) {