Changeset d8e2a09

Timestamp:

Apr 10, 2022, 10:06:55 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

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

Children:

5bb1ac1

Parents:

92538ab

Message:

Merge with master

Files:

• src/CodeGen/CodeGenerator.cc (modified) (1 diff)
• src/CodeGen/GenType.cc (modified) (1 diff)
• src/ResolvExpr/Resolver.cc (modified) (2 diffs)
• tests/enum_tests/.expect/stringEnum.txt (added)
• tests/enum_tests/.expect/typedIntEnum.txt (added)
• tests/enum_tests/stringEnum.cfa (added)
• tests/enum_tests/typedIntEnum.cfa (moved) (moved from tests/enum_tests/typedIntEnum.c) (1 diff)

src/CodeGen/CodeGenerator.cc ¶

@@ -275 +275 @@
                 extension( enumDecl );
                 std::list< Declaration* > &memb = enumDecl->get_members();
-                if (enumDecl->base && ! memb.empty() && 
-                (dynamic_cast<BasicType *>(enumDecl->base)
-                 && !(dynamic_cast<BasicType *>(enumDecl->base)->kind == BasicType::Kind::SignedInt))) {
+                if (enumDecl->base && ! memb.empty()) {
                         ObjectDecl * last = nullptr;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {

src/CodeGen/GenType.cc ¶

@@ -253 +253 @@
 
         void GenType::postvisit( EnumInstType * enumInst ) {
-                if ( enumInst->baseEnum->base 
-                && dynamic_cast<BasicType *>(enumInst->baseEnum->base)
-                && dynamic_cast<BasicType *>(enumInst->baseEnum->base)->kind != BasicType::Kind::SignedInt) {
+                if ( enumInst->baseEnum->base ) {
                         typeString = genType(enumInst->baseEnum->base, "", options) + typeString;
                 } else {

src/ResolvExpr/Resolver.cc ¶

@@ -1484 +1484 @@
                                         const ast::Type * pointerBase = enumBaseAsPtr->base.get();
                                         if ( dynamic_cast<const ast::BasicType *>(pointerBase) ) {
-                                                objectDecl = fixObjectType(objectDecl, symtab);
+                                                objectDecl = fixObjectType(objectDecl, context);
                                                 if (dynamic_cast<const ast::BasicType *>(pointerBase)->kind == ast::BasicType::Char)
                                                 currentObject = ast::CurrentObject{
@@ -1491 +1491 @@
                                                         } };
                                         } else {
-                                                objectDecl = fixObjectType(objectDecl, symtab);
+                                                objectDecl = fixObjectType(objectDecl, context);
                                                 currentObject = ast::CurrentObject{objectDecl->location, new ast::BasicType{ ast::BasicType::SignedInt } };
                                         }
                                 }
                         } else {
-                                objectDecl = fixObjectType(objectDecl, symtab);
+                                objectDecl = fixObjectType(objectDecl, context);
                                 currentObject = ast::CurrentObject{
                                         objectDecl->location, new ast::BasicType{ ast::BasicType::SignedInt } };

tests/enum_tests/typedIntEnum.cfa ¶

@@ -7 +7 @@
 
 int main() {
-    printf("zero: %d, one: %d \n", zero, one);
+    printf("zero: %d, one: %d\n", zero, one);
     return 0;
 }