Changeset 30d91e4

Timestamp:

Apr 14, 2022, 2:59:16 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

365c8dcb

Parents:

d8c4fab

Message:

Change the code gen for enum value. Hope it fixes the gcc compatibility problem

Files:

• src/CodeGen/CodeGenerator.cc (modified) (2 diffs)
• tests/enum_tests/.expect/typedIntEnum.txt (modified) (1 diff)
• tests/enum_tests/typedIntEnum.cfa (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -276 +276 @@
                 std::list< Declaration* > &memb = enumDecl->get_members();
                 if (enumDecl->base && ! memb.empty()) {
-                        ObjectDecl * last = nullptr;
+                        unsigned long long last_val = -1;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
@@ -284 +284 @@
                                 output << mangleName( obj ) << " ";
                                 output << " = ";
-                                output << "(" << genType(enumDecl->base, "", options) << ")";;
-                                if ( obj->get_init() ) {
-                                        obj->get_init()->accept( *visitor );
+                                output << "(" << genType(enumDecl->base, "", options) << ")";
+                                if ( (BasicType *)(enumDecl->base) && ((BasicType *)(enumDecl->base))->isWholeNumber() ) {
+                                        if ( obj->get_init() ) {
+                                                obj->get_init()->accept( *visitor );
+                                                last_val = ((ConstantExpr *)(((SingleInit *)(obj->init))->value))->constant.get_ival();
+                                        } else {
+                                                output << ++last_val;
+                                        } // if
                                 } else {
-                                        if (last == nullptr) {
-                                                output << 0;
+                                        if ( obj->get_init() ) {
+                                                obj->get_init()->accept( *visitor ); 
                                         } else {
-                                                output << mangleName(last) << " + 1";
+                                                // Should not reach here!
                                         }
-                                } // if—
+                                }
                                 output << ";" << endl;
-                                last = obj;
                         } // for
                 } else {

tests/enum_tests/.expect/typedIntEnum.txt

@@ -1 @@
-zero: 0, one: 1
+0
+1
+1000
+1001
+2000
+2001
+2002

tests/enum_tests/typedIntEnum.cfa

@@ -3 +3 @@
 enum(int) IntEnum {
     zero,
-    one
+    one,
+    thousand = 1000,
+    thousand_one,
+    two_thousand = 2000,
+    two_thousand_one,
+    two_thousand_two
 };
 
 int main() {
-    printf("zero: %d, one: %d\n", zero, one);
+    printf("%d\n", zero);
+    printf("%d\n", one);
+    printf("%d\n", thousand);
+    printf("%d\n", thousand_one);
+    printf("%d\n", two_thousand);
+    printf("%d\n", two_thousand_one);
+    printf("%d\n", two_thousand_two);
     return 0;
 }