Changeset 982832e for src/CodeGen/CodeGenerator.cc

Timestamp:

Sep 13, 2017, 2:44:01 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ba54f7d, c935c3a

Parents:

e3e16bc (diff), 7dc09294 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/CodeGen/CodeGenerator.cc

@@ -258 +258 @@
 
         void CodeGenerator::visit( TraitDecl * traitDecl ) {
-                assertf( ! genC, "TraitDecl nodes should not reach code generation." );
+                assertf( ! genC, "TraitDecls should not reach code generation." );
                 extension( traitDecl );
                 handleAggregate( traitDecl, "trait " );
@@ -271 +271 @@
 
         void CodeGenerator::visit( TypeDecl * typeDecl ) {
-                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 << " }";
-                        }
+                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 << " }";
                 }
         }