Changeset 12df6fe

Timestamp:

Sep 19, 2022, 11:48:13 AM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

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

Children:

4520b77e

Parents:

b0d9ff7

Message:

Fix an enumerator value bug; add basic tests for new features; save the current progress before merge

Files:

• src/CodeGen/CodeGenerator.cc (modified) (2 diffs)
• src/Parser/TypeData.cc (modified) (1 diff)
• src/ResolvExpr/Resolver.cc (modified) (2 diffs)
• tests/enum_tests/.expect/funcEnum.txt (added)
• tests/enum_tests/.expect/pointerEnum.cfa (added)
• tests/enum_tests/.expect/qualifiedEnum.cfa (added)
• tests/enum_tests/.expect/voidEnum.txt (added)
• tests/enum_tests/funcEnum.cfa (added)
• tests/enum_tests/pointerEnum.cfa (added)
• tests/enum_tests/qualifiedEnum.cfa (added)
• tests/enum_tests/structEnum.cfa (modified) (1 diff)
• tests/enum_tests/voidEnum.cfa (added)

src/CodeGen/CodeGenerator.cc ¶

@@ -277 +277 @@
                 std::list< Declaration* > &memb = enumDecl->get_members();
                 if (enumDecl->base && ! memb.empty()) {
-                        unsigned long long last_val = -1;
+                        unsigned long long last_val = -1; // if the first enum value has no explicit initializer, 
+                        // as other 
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
@@ -289 +290 @@
                                         if ( obj->get_init() ) {
                                                 obj->get_init()->accept( *visitor );
-                                                // last_val = ((ConstantExpr *)(((SingleInit *)(obj->init))->value))->constant.get_ival();
+                                                last_val = ((ConstantExpr *)(((SingleInit *)(obj->init))->value))->constant.get_ival();
                                         } else {
                                                 output << ++last_val;

src/Parser/TypeData.cc ¶

@@ -926 +926 @@
         list< Declaration * >::iterator members = ret->get_members().begin();
         for ( const DeclarationNode * cur = td->enumeration.constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
-                if ( ret->isTyped && cur->has_enumeratorValue() ) {
+                if ( ret->isTyped && !ret->base && cur->has_enumeratorValue() ) {
                         SemanticError( td->location, "Enumerator of enum(void) cannot have an explicit initializer value." );
                 } else if ( cur->has_enumeratorValue() ) {

src/ResolvExpr/Resolver.cc ¶

@@ -1478 +1478 @@
                         // enum type is still incomplete at this point. Use `int` instead.
 
-                        if (dynamic_cast< const ast::EnumInstType * >( objectDecl->get_type() )->base->base) {
+                        if ( auto enumBase = dynamic_cast< const ast::EnumInstType * >
+                                ( objectDecl->get_type() )->base->base ) {
                                 objectDecl = fixObjectType( objectDecl, context );
-                                const ast::Type * enumBase =  (dynamic_cast< const ast::EnumInstType * >( objectDecl->get_type() )->base->base.get());
                                 currentObject = ast::CurrentObject{ 
                                         objectDecl->location, 
@@ -1493 +1493 @@
                 }
                 else {
-                        if (!objectDecl->isTypeFixed) {
+                        if ( !objectDecl->isTypeFixed ) {
                                 auto newDecl = fixObjectType(objectDecl, context);
                                 auto mutDecl = mutate(newDecl);

tests/enum_tests/structEnum.cfa ¶

@@ -24 +24 @@
 struct Point apple = first;
 // Failed due to Qualified name is currently unimplemented.
-struct Point banana = PointEnum.first;
 
 int main() {
      PointEnum vals = second;
      PointEnum val2;
-     // P1
-     val2 = vals;
+     // The failing line: assignment
+     // val2 = vals;
 
      printf("%d %c\n", apple.x, apple.y);