Changes in src/CodeGen/CodeGenerator.cc [0bd46fd:1931bb01]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -277 +277 @@
                 std::list< Declaration* > &memb = enumDecl->get_members();
                 if (enumDecl->base && ! memb.empty()) {
-                        unsigned long long last_val = -1; // if the first enum value has no explicit initializer,
-                        // as other
+                        unsigned long long last_val = -1;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << "static ";
-                                output << genType(enumDecl->base, "", options) << " const ";
+                                output << "static const ";
+                                output << genType(enumDecl->base, "", options) << " ";
                                 output << mangleName( obj ) << " ";
                                 output << " = ";
@@ -494 +493 @@
                                         assert( false );
                                 } // switch
-                        } else if( varExpr->get_var()->get_linkage() == LinkageSpec::BuiltinCFA && varExpr->get_var()->get_name() == "intptr" ) {
-                                // THIS is a hack to make it a constant until a proper constexpr solution is created
-                                output << "((void*)";
-                                std::list< Expression* >::iterator arg = applicationExpr->get_args().begin();
-                                (*arg++)->accept( *visitor );
-                                output << ")";
                         } else {
                                 varExpr->accept( *visitor );
@@ -696 +689 @@
                         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
@@ -914 +911 @@
         }
 
-        // QualifiedNameExpr should not reach to CodeGen.
-        // FixQualifiedName Convert QualifiedNameExpr to VariableExpr
-        void CodeGenerator::postvisit( QualifiedNameExpr * expr ) {
-                output << "/* label */" << mangleName(expr->var);
-        }
 
         // *** Statements