Changes in src/ControlStruct/TranslateEnumRange.cpp [6d2b3dc:73d0e3f4]

File:

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

src/ControlStruct/TranslateEnumRange.cpp

@@ -22 +22 @@
         auto typeExpr = stmt->range_over.strict_as<ast::TypeExpr>();
         auto type = typeExpr->type;
+        auto inits = stmt->inits;
+        auto enumInst = type.strict_as<ast::EnumInstType>();
+        auto enumDecl = enumInst->base;
 
         auto objInit = stmt->inits.front();
+        auto initLocation = objInit->location;
+        auto rangeLocation = stmt->range_over->location;
         assert( stmt->inits.size() == 1 );
 
@@ -42 +47 @@
 const ast::Stmt* addInit::postvisit( const ast::ForStmt * stmt ) {
     if ( stmt->range_over ) {
+        auto typeExpr = stmt->range_over.strict_as<ast::TypeExpr>();
+        auto type = typeExpr->type;
         auto inits = stmt->inits;
+        auto enumInst = type.strict_as<ast::EnumInstType>();
+        auto enumDecl = enumInst->base;
+
         auto init = stmt->inits.front();
 
@@ -50 +60 @@
                 if ( !objDecl->init ) {
                     auto location = stmt->location;
+                    // auto newInit = new ast::SingleInit( location, new ast::NameExpr( location, enumDecl->members.front()->name ) );
                     ast::SingleInit * newInit = new ast::SingleInit( location, 
-                        stmt->is_inc?
-                        ast::UntypedExpr::createCall( location, "lowerBound", {} ):
-                        ast::UntypedExpr::createCall( location, "upperBound", {} ),
-                        ast::ConstructFlag::MaybeConstruct
-                    );
+                        new ast::NameExpr( location, 
+                           stmt->is_inc? enumDecl->members.front()->name: enumDecl->members.back()->name ) );
                     auto objDeclWithInit = ast::mutate_field( objDecl, &ast::ObjectDecl::init, newInit );
                     auto declWithInit = ast::mutate_field( declStmt, &ast::DeclStmt::decl, objDeclWithInit );
@@ -72 +80 @@
     auto initDecl = declStmt->decl.strict_as<ast::ObjectDecl>();
     auto indexName = initDecl->name;
+    
+    auto typeExpr = stmt->range_over.strict_as<ast::TypeExpr>();
+    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
@@ -78 +90 @@
     ast::UntypedExpr * condition = ast::UntypedExpr::createCall( location,
         "?<=?",
-        {   new ast::NameExpr( location, indexName ),
-            ast::UntypedExpr::createCall( location, "upperBound", {} )  });
+        {new ast::CastExpr(location,
+            new ast::NameExpr( location, indexName ),
+            new ast::BasicType( ast::BasicKind::UnsignedInt 
+        ),ast::GeneratedFlag::ExplicitCast),
+        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 ) });
+        stmt->is_inc? "succ": "pred",{
+        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 );
@@ -90 +106 @@
 
 void translateEnumRange( ast::TranslationUnit & translationUnit ) {
+    ast::Pass<addInitType>::run( translationUnit );
     ast::Pass<addInit>::run( translationUnit );
     ast::Pass<translateEnumRangeCore>::run( translationUnit );