Changes in src/ControlStruct/TranslateEnumRange.cpp [a9ae5ca:0c327ce]

File:

• src/ControlStruct/TranslateEnumRange.cpp (modified) (3 diffs)

src/ControlStruct/TranslateEnumRange.cpp

@@ -5 +5 @@
 
 namespace ControlStruct {
+
+struct addInitType {
+    const ast::Stmt * postvisit( const ast::ForStmt * stmt );
+};
 
 struct addInit {
@@ -13 +17 @@
     const ast::Stmt * postvisit( const ast::ForStmt * stmt );
 };
+
+const ast::Stmt* addInitType::postvisit( const ast::ForStmt * stmt ) {
+    if ( stmt->range_over ) {
+        auto typeExpr = stmt->range_over.strict_as<ast::TypeExpr>();
+        auto type = typeExpr->type;
+
+        auto objInit = stmt->inits.front();
+        assert( stmt->inits.size() == 1 );
+
+        if (auto declStmt = objInit.as<ast::DeclStmt>()) {
+            auto decl = declStmt->decl;
+            if ( auto objDecl = decl.as<ast::ObjectDecl>()) {
+                if ( !objDecl->type && type ) {
+                    auto objDeclWithType = ast::mutate_field( objDecl, &ast::ObjectDecl::type, type );
+                    auto declWithType = ast::mutate_field( declStmt, &ast::DeclStmt::decl, objDeclWithType );
+                    stmt = ast::mutate_field_index( stmt, &ast::ForStmt::inits, 0, declWithType );
+                }
+            }
+        }
+    }
+    return stmt;
+}
 
 const ast::Stmt* addInit::postvisit( const ast::ForStmt * stmt ) {
@@ -61 +87 @@
     mut = ast::mutate_field(stmt, &ast::ForStmt::inc, assig );
     return mut;
-}  
+}
 
 void translateEnumRange( ast::TranslationUnit & translationUnit ) {