Changes in / [cf5e5b1:ae32d96]

Location:

src

Files:

• ControlStruct/Mutate.cc (modified) (1 diff)
• ControlStruct/Mutate.h (modified) (2 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (3 diffs)
• SymTab/Validate.cc (modified) (3 diffs)
• main.cc (modified) (1 diff)

src/ControlStruct/Mutate.cc

@@ -27 +27 @@
 #include "SynTree/Visitor.h"       // for acceptAll
 
+using namespace std;
+
 namespace ControlStruct {
-        void fixLabels( std::list< Declaration * > & translationUnit ) {
+        void mutate( std::list< Declaration * > translationUnit ) {
+                // hoist initialization out of for statements
+                PassVisitor<ForExprMutator> formut;
+
+                // normalizes label definitions and generates multi-level exit labels
                 PassVisitor<LabelFixer> lfix;
+
+                mutateAll( translationUnit, formut );
                 acceptAll( translationUnit, lfix );
-        }
-
-        void hoistControlDecls( std::list< Declaration * > & translationUnit ) {
-                PassVisitor<ForExprMutator> formut;
-                mutateAll( translationUnit, formut );
         }
 } // namespace CodeGen

src/ControlStruct/Mutate.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Mutate.h --
+// Mutate.h -- 
 //
 // Author           : Rodolfo G. Esteves
@@ -20 +20 @@
 class Declaration;
 
-/// Desugars Cforall control structures
 namespace ControlStruct {
-        /// normalizes label definitions and generates multi-level exit labels
-        void fixLabels( std::list< Declaration * > & translationUnit );
-
-        /// hoist initialization out of for statements
-        void hoistControlDecls( std::list< Declaration * > & translationUnit );
+        /// Desugars Cforall control structures
+        void mutate( std::list< Declaration* > translationUnit );
 } // namespace ControlStruct
 

src/ResolvExpr/AlternativeFinder.cc

@@ -299 +299 @@
                 // it's okay for the aggregate expression to have reference type -- cast it to the base type to treat the aggregate as the referenced value
                 std::unique_ptr<Expression> aggrExpr( alt.expr->clone() );
-                alt.env.apply( aggrExpr->result );
-                Type * aggrType = aggrExpr->result;
+                alt.env.apply( aggrExpr->get_result() );
+                Type * aggrType = aggrExpr->get_result();
                 if ( dynamic_cast< ReferenceType * >( aggrType ) ) {
                         aggrType = aggrType->stripReferences();
@@ -306 +306 @@
                 }
 
-                if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->result ) ) {
+                if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->get_result() ) ) {
                         NameExpr nameExpr( "" );
                         addAggMembers( structInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, &nameExpr );
-                } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->result ) ) {
+                } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->get_result() ) ) {
                         NameExpr nameExpr( "" );
                         addAggMembers( unionInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, &nameExpr );
@@ -320 +320 @@
                 NameExpr * nameExpr = dynamic_cast< NameExpr * >( member );
                 if ( ! nameExpr ) return;
-                const std::string & name = nameExpr->name;
+                const std::string & name = nameExpr->get_name();
                 std::list< Declaration* > members;
                 aggInst->lookup( name, members );

src/SymTab/Validate.cc

@@ -48 +48 @@
 #include "CodeGen/CodeGenerator.h"     // for genName
 #include "CodeGen/OperatorTable.h"     // for isCtorDtor, isCtorDtorAssign
-#include "ControlStruct/Mutate.h"      // for ForExprMutator
 #include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
 #include "Common/ScopedMap.h"          // for ScopedMap
@@ -77 +76 @@
 class SwitchStmt;
 
+
 #define debugPrint( x ) if ( doDebug ) { std::cout << x; }
 
@@ -275 +275 @@
                 Concurrency::applyKeywords( translationUnit );
                 acceptAll( translationUnit, fpd ); // must happen before autogenerateRoutines, after Concurrency::applyKeywords because uniqueIds must be set on declaration before resolution
-                ControlStruct::hoistControlDecls( translationUnit );  // hoist initialization out of for statements; must happen before autogenerateRoutines
                 autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecay
                 Concurrency::implementMutexFuncs( translationUnit );

src/main.cc

@@ -264 +264 @@
                 } // if
 
-                PASS( "fixLabels", ControlStruct::fixLabels( translationUnit ) );
+                PASS( "mutate", ControlStruct::mutate( translationUnit ) );
                 PASS( "fixNames", CodeGen::fixNames( translationUnit ) );
                 PASS( "genInit", InitTweak::genInit( translationUnit ) );