Changes in src/CodeGen/CodeGenerator.cc [13073be:3ed994e]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -119 +119 @@
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
-                // GCC builtins should always be printed unmangled
-                if ( pretty || decl->linkage.is_gcc_builtin ) return decl->name;
-                if ( decl->mangleName != "" ) {
+                if ( pretty ) return decl->get_name();
+                if ( decl->get_mangleName() != "" ) {
                         // need to incorporate scope level in order to differentiate names for destructors
                         return decl->get_scopedMangleName();
                 } else {
-                        return decl->name;
+                        return decl->get_name();
                 } // if
         }
@@ -172 +171 @@
         // *** Declarations
         void CodeGenerator::postvisit( FunctionDecl * functionDecl ) {
+                // deleted decls should never be used, so don't print them
+                if ( functionDecl->isDeleted && genC ) return;
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
@@ -185 +186 @@
                         functionDecl->get_statements()->accept( *visitor );
                 } // if
+                if ( functionDecl->isDeleted ) {
+                        output << " = void";
+                }
         }
 
         void CodeGenerator::postvisit( ObjectDecl * objectDecl ) {
+                // deleted decls should never be used, so don't print them
+                if ( objectDecl->isDeleted && genC ) return;
                 if (objectDecl->get_name().empty() && genC ) {
                         // only generate an anonymous name when generating C code, otherwise it clutters the output too much
@@ -206 +212 @@
                         objectDecl->get_init()->accept( *visitor );
                 } // if
+                if ( objectDecl->isDeleted ) {
+                        output << " = void";
+                }
 
                 if ( objectDecl->get_bitfieldWidth() ) {
@@ -827 +836 @@
                 expr->expr->accept( *visitor );
         }
+
+        void CodeGenerator::postvisit( GenericExpr * expr ) {
+                assertf( ! genC, "C11 _Generic expressions should not reach code generation." );
+                output << "_Generic(";
+                expr->control->accept( *visitor );
+                output << ", ";
+                unsigned int numAssocs = expr->associations.size();
+                unsigned int i = 0;
+                for ( GenericExpr::Association & assoc : expr->associations ) {
+                        if (assoc.isDefault) {
+                                output << "default: ";
+                        } else {
+                                output << genType( assoc.type, "", pretty, genC ) << ": ";
+                        }
+                        assoc.expr->accept( *visitor );
+                        if ( i+1 != numAssocs ) {
+                                output << ", ";
+                        }
+                        i++;
+                }
+                output << ")";
+        }
+
 
         // *** Statements