Changeset 3f7e12cb for src/SynTree/Declaration.cc

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

954908d

Parents:

78315272 (diff), e35f30a (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 branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/SynTree/Declaration.cc (modified) (3 diffs)

src/SynTree/Declaration.cc

@@ -42 +42 @@
 
 void Declaration::fixUniqueId() {
+        // don't need to set unique ID twice
+        if ( uniqueId ) return;
         uniqueId = ++lastUniqueId;
         idMap[ uniqueId ] = this;
@@ -59 +61 @@
 }
 
-std::ostream & operator<<( std::ostream & out, const Declaration * decl ) {
-        if ( decl ){
-                decl->print( out );
-        } else {
-                out << "nullptr";
-        }
-        return out;
-}
-
 
 AsmDecl::AsmDecl( AsmStmt *stmt ) : Declaration( "", Type::StorageClasses(), LinkageSpec::C ), stmt( stmt ) {
@@ -79 +72 @@
 }
 
-void AsmDecl::print( std::ostream &os, int indent ) const {
+void AsmDecl::print( std::ostream &os, Indenter indent ) const {
         stmt->print( os, indent );
 }
 
-void AsmDecl::printShort( std::ostream &os, int indent ) const {
+void AsmDecl::printShort( std::ostream &os, Indenter indent ) const {
         stmt->print( os, indent );
 }