Changeset 32fc0d6

Timestamp:

Mar 21, 2022, 3:51:57 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

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

Children:

7a486f4a

Parents:

4390fb6

Message:

Fix the missing pieces in codeGen

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (2 diffs)
• SynTree/Declaration.h (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -197 +197 @@
                 if ( objectDecl->isDeleted && options.genC ) return;
 
-                // objectDecl->checkAssignedValue();
-                /* Temporary add the enum check here; need a better location */
-                // {
-                //      EnumInstType * enumTypePtr = dynamic_cast< EnumInstType *>(objectDecl->get_type());
-                //      if (enumTypePtr) {
-                //              EnumDecl * enumBase = enumTypePtr -> baseEnum;
-                //              if ( enumTypePtr && enumBase->base ) {
-                //                      std::list< Declaration * > & enumMembers = enumBase->get_members();
-                //                      auto in_enum = [&]( Declaration * enumMem ) -> bool {
-                //                              ObjectDecl * obj = dynamic_cast< ObjectDecl* >( enumMem );
-                //                              if ( mangleName( obj ) == mangleName( objectDecl ) ) {
-                //                                      return true;
-                //                              }
-                //                              return false;
-                //                      };
-                //                      if ( std::find_if( enumMembers.begin(), enumMembers.end(), in_enum ) == enumMembers.end() ) {
-                //                              output<< "/* Cannot assign a Non-enum member value to a typed enum variable. */" ;
-                //                      }
-                                
-                //              }
-                //      }
-                        
-                // }
-
                 // gcc allows an empty declarator (no name) for bit-fields and C states: 6.7.2.1 Structure and union specifiers,
                 // point 4, page 113: If the (bit field) value is zero, the declaration shall have no declarator.  For anything
@@ -302 +278 @@
                 if (enumDecl->base && ! memb.empty() && 
                 (dynamic_cast<BasicType *>(enumDecl->base)
-                 && !dynamic_cast<BasicType *>(enumDecl->base)->kind == BasicType::Kind::SignedInt)) {
+                 && !(dynamic_cast<BasicType *>(enumDecl->base)->kind == BasicType::Kind::SignedInt))) {
                         ObjectDecl * last = nullptr;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {

src/SynTree/Declaration.h

@@ -119 +119 @@
   public:
         Type * type;
-        Initializer * init; // For Enum, the init is a pointer that contain the enum value; see Parser::TypeData::buildEnum
+        Initializer * init;
         Expression * bitfieldWidth;
 
@@ -144 +144 @@
         virtual void print( std::ostream & os, Indenter indent = {} ) const override;
         virtual void printShort( std::ostream & os, Indenter indent = {} ) const override;
+
+        // TODO: Move to the right place
+        void checkAssignedValue() const;
 };