Changes in src/ControlStruct/TranslateEnumRange.cpp [d3aa55e9:d66a43b]

File:

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

src/ControlStruct/TranslateEnumRange.cpp

@@ -26 +26 @@
         auto enumDecl = enumInst->base;
 
-        auto objInit = stmt->inits.front();
+        auto init = stmt->inits.front();
 
-        auto initLocation = objInit->location;
-        auto rangeLocation = stmt->range_over->location;
-        assert( stmt->inits.size() == 1 );
-
-        if (auto declStmt = objInit.as<ast::DeclStmt>()) {
+        if (auto declStmt = init.as<ast::DeclStmt>()) {
             auto decl = declStmt->decl;
             if ( auto objDecl = decl.as<ast::ObjectDecl>()) {
@@ -61 +57 @@
                 if ( !objDecl->init ) {
                     auto location = stmt->location;
-                    ast::SingleInit * newInit;
-                    newInit = new ast::SingleInit( location, 
-                        new ast::NameExpr( location, 
-                        stmt->is_inc? enumDecl->members.front()->name: enumDecl->members.back()->name ) );
+                    auto newInit = new ast::SingleInit( location, new ast::NameExpr( location, enumDecl->members.front()->name ) );
                     auto objDeclWithInit = ast::mutate_field( objDecl, &ast::ObjectDecl::init, newInit );
                     auto declWithInit = ast::mutate_field( declStmt, &ast::DeclStmt::decl, objDeclWithInit );
@@ -85 +78 @@
     auto enumInst = typeExpr->type.strict_as<ast::EnumInstType>();
     auto enumDecl = enumInst->base;
-    
-    // Both inc and dec check if the current posn less than the number of enumerator
-    // for dec, it keeps call pred until it passes 0 (the first enumerator) and underflow,
-    // it wraps around and become unsigned max
-    ast::UntypedExpr * condition = ast::UntypedExpr::createCall( location,
-        "?<=?",
-        { 
-            ast::UntypedExpr::createCall(location, "posn", { new ast::NameExpr( location, indexName ) } ),
-            ast::ConstantExpr::from_ulong( location, enumDecl->members.size()-1 )
-        });
-    auto increment = ast::UntypedExpr::createCall( location, 
-        stmt->is_inc? "succ": "pred",
-        { new ast::NameExpr( location, indexName ) });
+
+    auto condition = ast::UntypedExpr::createCall( location, "?<=?", {
+        new ast::NameExpr( location, indexName ),
+        // ast::ConstantExpr::from_ulong( location, enumDecl->members.size() )
+        new ast::NameExpr( location, enumDecl->members.back()->name )
+    });
+    auto increment = ast::UntypedExpr::createCall( location, "succ", {
+        new ast::NameExpr( location, indexName )
+    });
     auto assig = ast::UntypedExpr::createAssign( location, new ast::NameExpr( location, indexName ), increment );
     auto mut = ast::mutate_field( stmt, &ast::ForStmt::cond, condition );