Changeset 73d0e3f4

Timestamp:

Jun 29, 2024, 5:22:36 PM (5 days ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

011c29e

Parents:

115ac1ce

Message:

Current enum has bug when use as a reference as in ?++. Change TranslateEnumRange? to use succ and pred instead. Will look back into the reference problem

Files:

• libcfa/src/enum.cfa (modified) (1 diff)
• libcfa/src/enum.hfa (modified) (1 diff)
• src/ControlStruct/TranslateEnumRange.cpp (modified) (4 diffs)

libcfa/src/enum.cfa

@@ -23 +23 @@
     int ?>?(E l, E r) { return posn(l) > posn(r); }
     int ?>=?(E l, E r) { return posn(l) >= posn(r); }
+
+    E ++?(E& l) { 
+        l = succ(l);
+        return l;
+    }
+    
+    E ?++(E& l) {
+        E ret = l;
+        l = succ(l);
+        return ret;
+    }
+
+    E --?(E& l) {
+        l = pred(l);
+        return l;
+    }
+
+    E ?--(E& l) {
+        E ret = l;
+        l = pred(l);
+        return ret;
+    }
 }

libcfa/src/enum.hfa

@@ -49 +49 @@
     int ?>?(E, E);
     int ?>=?(E, E);
+
+    int ++?(E&);
+    int ?++(E&);
+    int --?(E&);
+    int ?--(E&);
 }

src/ControlStruct/TranslateEnumRange.cpp

@@ -27 +27 @@
 
         auto objInit = stmt->inits.front();
-
         auto initLocation = objInit->location;
         auto rangeLocation = stmt->range_over->location;
@@ -61 +60 @@
                 if ( !objDecl->init ) {
                     auto location = stmt->location;
-                    ast::SingleInit * newInit;
-                    newInit = new ast::SingleInit( location, 
+                    // auto newInit = new ast::SingleInit( location, new ast::NameExpr( location, enumDecl->members.front()->name ) );
+                    ast::SingleInit * newInit = new ast::SingleInit( location, 
                         new ast::NameExpr( location, 
-                        stmt->is_inc? enumDecl->members.front()->name: enumDecl->members.back()->name ) );
+                           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 );
@@ -85 +84 @@
     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,
@@ -93 +92 @@
         {new ast::CastExpr(location,
             new ast::NameExpr( location, indexName ),
-            new ast::BasicType( ast::BasicKind::UnsignedInt ),
-            ast::GeneratedFlag::ExplicitCast),
+            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? "?++": "?--",
-        { 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 );