Changeset f80e0218 for src/ResolvExpr/RenameVars.cc

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/ResolvExpr/RenameVars.cc (modified) (4 diffs)

src/ResolvExpr/RenameVars.cc

@@ -45 +45 @@
         void RenameVars::visit( PointerType *pointerType ) {
                 typeBefore( pointerType );
-///   std::cout << "do pointer" << std::endl;
                 maybeAccept( pointerType->get_base(), *this );
-///   std::cout << "done pointer" << std::endl;
                 typeAfter( pointerType );
         }
@@ -60 +58 @@
         void RenameVars::visit( FunctionType *functionType ) {
                 typeBefore( functionType );
-///   std::cout << "return vals" << std::endl;
                 acceptAll( functionType->get_returnVals(), *this );
-///   std::cout << functionType->get_parameters().size() << " parameters" << std::endl;
                 acceptAll( functionType->get_parameters(), *this );
-///   std::cout << "done function" << std::endl;
                 typeAfter( functionType );
         }
@@ -95 +90 @@
         void RenameVars::visit( TypeInstType *instType ) {
                 typeBefore( instType );
-///   std::cout << "instance of type " << instType->get_name() << std::endl;
                 std::map< std::string, std::string >::const_iterator i = mapStack.front().find( instType->get_name() );
                 if ( i != mapStack.front().end() ) {
-///     std::cout << "found name " << i->second << std::endl;
                         instType->set_name( i->second );
                 } else {
-///     std::cout << "no name found" << std::endl;
                 } // if
                 acceptAll( instType->get_parameters(), *this );
@@ -120 +112 @@
         void RenameVars::typeBefore( Type *type ) {
                 if ( ! type->get_forall().empty() ) {
-///     std::cout << "type with forall: ";
-///     type->print( std::cout );
-///     std::cout << std::endl;
                         // copies current name mapping into new mapping
                         mapStack.push_front( mapStack.front() );