Changeset a984e65 for src/CodeGen

Timestamp:

Sep 1, 2017, 2:42:12 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

51c6353

Parents:

2bf9c37

git-author:

Rob Schluntz <rschlunt@…> (09/01/17 14:41:42)

git-committer:

Rob Schluntz <rschlunt@…> (09/01/17 14:42:12)

Message:

Remove TraitDecl? prior to CodeGen?, add debug codegen for TraitDecl?

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (3 diffs)
• Generate.cc (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc

@@ -195 +195 @@
                 }
 
-                output << kind;
-                if ( aggDecl->get_name() != "" )
-                        output << aggDecl->get_name();
+                output << kind << aggDecl->get_name();
 
                 if ( aggDecl->has_body() ) {
@@ -233 +231 @@
                 genAttributes( enumDecl->get_attributes() );
 
-                if ( enumDecl->get_name() != "" )
-                        output << enumDecl->get_name();
+                output << enumDecl->get_name();
 
                 std::list< Declaration* > &memb = enumDecl->get_members();
@@ -260 +257 @@
         }
 
-        void CodeGenerator::visit( __attribute__((unused)) TraitDecl * traitDecl ) {}
+        void CodeGenerator::visit( TraitDecl * traitDecl ) {
+                assertf( ! genC, "TraitDecl nodes should not reach code generation." );
+                extension( traitDecl );
+                handleAggregate( traitDecl, "trait " );
+        }
 
         void CodeGenerator::visit( TypedefDecl * typeDecl ) {

src/CodeGen/Generate.cc

@@ -21 +21 @@
 #include "CodeGenerator.h"           // for CodeGenerator, doSemicolon, oper...
 #include "GenType.h"                 // for genPrettyType
+#include "Common/PassVisitor.h"      // for PassVisitor
 #include "Parser/LinkageSpec.h"      // for isBuiltin, isGeneratable
 #include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
@@ -29 +30 @@
 
 namespace CodeGen {
+        namespace {
+                /// Removes misc. nodes that should not exist in CodeGen
+                struct TreeCleaner {
+                        void visit( CompoundStmt * stmt );
+
+                        static bool shouldClean( Declaration * );
+                };
+
+                void cleanTree( std::list< Declaration * > & translationUnit ) {
+                        PassVisitor<TreeCleaner> cleaner;
+                        filter( translationUnit, [](Declaration * decl) { return TreeCleaner::shouldClean(decl); }, false );
+                        acceptAll( translationUnit, cleaner );
+                } // cleanTree
+        } // namespace
+
         void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC, bool lineMarks ) {
+                cleanTree( translationUnit );
+
                 CodeGen::CodeGenerator cgv( os, pretty, generateC, lineMarks );
                 for ( auto & dcl : translationUnit ) {
@@ -52 +70 @@
                 os << std::endl;
         }
+
+        namespace {
+                void TreeCleaner::visit( CompoundStmt * cstmt ) {
+                        filter( cstmt->kids, [](Statement * stmt) {
+                                if ( DeclStmt * declStmt = dynamic_cast< DeclStmt * >( stmt ) ) {
+                                        return shouldClean( declStmt->decl );
+                                }
+                                return false;
+                        }, false );
+                }
+
+                bool TreeCleaner::shouldClean( Declaration * decl ) {
+                        return dynamic_cast< TraitDecl * >( decl );
+                }
+        } // namespace
 } // namespace CodeGen