Changes in src/CodeGen/CodeGenerator.cc [6180274:3eb1653]

File:

• src/CodeGen/CodeGenerator.cc (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc

@@ -274 +274 @@
         void CodeGenerator::postvisit( EnumDecl * enumDecl ) {
                 extension( enumDecl );
-                output << "enum ";
-                genAttributes( enumDecl->get_attributes() );
-
-                output << enumDecl->get_name();
-
                 std::list< Declaration* > &memb = enumDecl->get_members();
-
-                if ( ! memb.empty() ) {
-                        output << " {" << endl;
-
-                        ++indent;
+                if (enumDecl->base && ! memb.empty() && 
+                (dynamic_cast<BasicType *>(enumDecl->base)
+                 && !(dynamic_cast<BasicType *>(enumDecl->base)->kind == BasicType::Kind::SignedInt))) {
+                        ObjectDecl * last = nullptr;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << indent << mangleName( obj );
+                                output << "static const ";
+                                output << genType(enumDecl->base, "", options) << " ";
+                                output << mangleName( obj ) << " ";
+                                output << " = ";
+                                output << "(" << genType(enumDecl->base, "", options) << ")";;
                                 if ( obj->get_init() ) {
-                                        output << " = ";
                                         obj->get_init()->accept( *visitor );
-                                } // if
-                                output << "," << endl;
+                                } else {
+                                        if (last == nullptr) {
+                                                output << 0;
+                                        } else {
+                                                output << mangleName(last) << " + 1";
+                                        }
+                                } // if—
+                                output << ";" << endl;
+                                last = obj;
                         } // for
-
+                } else {
+                        output << "enum ";
+                        genAttributes( enumDecl->get_attributes() );
+
+                        output << enumDecl->get_name();
+
+                        if ( ! memb.empty() ) {
+                                output << " {" << endl;
+
+                                ++indent;
+                                for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
+                                        ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
+                                        assert( obj );
+                                        output << indent << mangleName( obj );
+                                        if ( obj->get_init() ) {
+                                                output << " = ";
+                                                obj->get_init()->accept( *visitor );
+                                        } // if
+                                        output << "," << endl;
+                                } // for
                         --indent;
-
                         output << indent << "}";
+                        } // if
                 } // if
         }
@@ -347 +370 @@
                                 des->accept( *visitor );
                         } else {
-                                // otherwise, it has to be a ConstantExpr or CastExpr, initializing array eleemnt
+                                // otherwise, it has to be a ConstantExpr or CastExpr, initializing array element
                                 output << "[";
                                 des->accept( *visitor );
@@ -661 +684 @@
                         output << opInfo->symbol;
                 } else {
+                        // if (dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type()) 
+                        // && dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())->baseEnum->base) {
+                        //      output << '(' <<genType(dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())->baseEnum->base, "", options) << ')';
+                        // }
                         output << mangleName( variableExpr->get_var() );
                 } // if