Changeset 937e51d for src/CodeGen/Generate.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/Generate.cc (modified) (3 diffs)

src/CodeGen/Generate.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:39:24 2015
-// Update Count     : 1
+// Last Modified On : Thu Jun  4 14:04:25 2015
+// Update Count     : 5
 //
 
@@ -21 +21 @@
 #include "Generate.h"
 #include "SynTree/Declaration.h"
-
-#include "CodeGenerator2.h"
+#include "CodeGenerator.h"
 
 using namespace std;
@@ -28 +27 @@
 namespace CodeGen {
         void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics ) {
-                CodeGen::CodeGenerator2 cgv( os );
+                CodeGen::CodeGenerator cgv( os );
 
                 for ( std::list<Declaration *>::iterator i = translationUnit.begin(); i != translationUnit.end();  i++ ) {
                         if ( LinkageSpec::isGeneratable( (*i)->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( (*i)->get_linkage() ) ) ) {
                                 (*i)->accept(cgv);
-                                cgv.shift_left();
                                 if ( doSemicolon( *i ) ) {
                                         os << ";";