Changeset d4778a6

Timestamp:

May 11, 2015, 3:11:49 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

b1a6d6b, c11e31c

Parents:

48e99f2

Message:

for loop initializers are hoisted properly and for loops a level of scope

Location:

translator

Files:

• ControlStruct/ForExprMutator.cc (modified) (1 diff)
• SymTab/Indexer.cc (modified) (1 diff)
• SymTab/Indexer.h (modified) (1 diff)

translator/ControlStruct/ForExprMutator.cc

@@ -5 +5 @@
 namespace ControlStruct {
     Statement *ForExprMutator::mutate( ForStmt *forStmt ) {
-        DeclStmt *decl;
-        if (( decl = dynamic_cast< DeclStmt * > ( forStmt->get_initialization() )) != 0 ) {
+        forStmt->set_body( forStmt->get_body()->acceptMutator( *this ) );
+        if ( DeclStmt *decl = dynamic_cast< DeclStmt * > ( forStmt->get_initialization() ) ) {
             // create compound statement, move declaration outside, leave _for_ as-is
             CompoundStmt *block = new CompoundStmt( std::list< Label >() );

translator/SymTab/Indexer.cc

@@ -157 +157 @@
         leaveScope();
     }
+
+    void Indexer::visit( ForStmt *forStmt ) {
+        // for statements introduce a level of scope
+        enterScope();
+        Visitor::visit( forStmt );
+        leaveScope();
+    }
+
 
     void Indexer::lookupId( const std::string &id, std::list< DeclarationWithType* > &list ) const {

translator/SymTab/Indexer.h

@@ -32 +32 @@
         virtual void visit( StructInstType *contextInst );
         virtual void visit( UnionInstType *contextInst );
-  
+
+        virtual void visit( ForStmt *forStmt );
+
         // when using an indexer manually (e.g., within a mutator traversal), it is necessary to tell the indexer
         // explicitly when scopes begin and end