Changes in src/CodeGen/CodeGenerator.cc [a0c7dc36:e612146c]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 18 15:34:00 2017
-// Update Count     : 488
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Sep  3 20:42:52 2017
+// Update Count     : 490
 //
 #include "CodeGenerator.h"
@@ -59 +59 @@
 
         void CodeGenerator::asmName( DeclarationWithType * decl ) {
-                if ( ConstantExpr * asmName = decl->get_asmName() ) {
+                if ( ConstantExpr * asmName = dynamic_cast<ConstantExpr *>(decl->get_asmName()) ) {
                         output << " asm ( " << asmName->get_constant()->get_value() << " )";
                 } // if
@@ -258 +258 @@
 
         void CodeGenerator::visit( TraitDecl * traitDecl ) {
-                assertf( ! genC, "TraitDecls should not reach code generation." );
+                assertf( ! genC, "TraitDecl nodes should not reach code generation." );
                 extension( traitDecl );
                 handleAggregate( traitDecl, "trait " );
@@ -271 +271 @@
 
         void CodeGenerator::visit( TypeDecl * typeDecl ) {
-                assertf( ! genC, "TypeDecls should not reach code generation." );
-                output << typeDecl->genTypeString() << " " << typeDecl->get_name();
-                if ( typeDecl->get_kind() != TypeDecl::Any && typeDecl->get_sized() ) {
-                        output << " | sized(" << typeDecl->get_name() << ")";
-                }
-                if ( ! typeDecl->get_assertions().empty() ) {
-                        output << " | { ";
-                        genCommaList( typeDecl->get_assertions().begin(), typeDecl->get_assertions().end() );
-                        output << " }";
+                if ( genC ) {
+                        // really, we should mutate this into something that isn't a TypeDecl but that requires large-scale changes,
+                        // still to be done
+                        extension( typeDecl );
+                        output << "extern unsigned long " << typeDecl->get_name();
+                        if ( typeDecl->get_base() ) {
+                                output << " = sizeof( " << genType( typeDecl->get_base(), "", pretty, genC ) << " )";
+                        } // if
+                } else {
+                        output << typeDecl->genTypeString() << " " << typeDecl->get_name();
+                        if ( typeDecl->get_kind() != TypeDecl::Any && typeDecl->get_sized() ) {
+                                output << " | sized(" << typeDecl->get_name() << ")";
+                        }
+                        if ( ! typeDecl->get_assertions().empty() ) {
+                                output << " | { ";
+                                genCommaList( typeDecl->get_assertions().begin(), typeDecl->get_assertions().end() );
+                                output << " }";
+                        }
                 }
         }