Changeset 9b18044

Timestamp:

Sep 1, 2017, 2:37:35 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:

2bf9c37

Parents:

7d9ad510

Message:

Handle TraitDecl? in Box Pass2

Location:

src/GenPoly

Files:

• Box.cc (modified) (4 diffs)
• GenPoly.cc (modified) (1 diff)

src/GenPoly/Box.cc

@@ -141 +141 @@
                         virtual StructDecl *mutate( StructDecl *structDecl ) override;
                         virtual UnionDecl *mutate( UnionDecl *unionDecl ) override;
+                        virtual TraitDecl *mutate( TraitDecl *unionDecl ) override;
                         virtual TypeDecl *mutate( TypeDecl *typeDecl ) override;
                         virtual TypedefDecl *mutate( TypedefDecl *typedefDecl ) override;
@@ -216 +217 @@
                   private:
                 };
-
         } // anonymous namespace
 
@@ -1351 +1351 @@
                 }
 
+                TraitDecl * Pass2::mutate( TraitDecl *aggDecl ) {
+                        return handleAggDecl( aggDecl );
+                }
+
                 TypeDecl * Pass2::mutate( TypeDecl *typeDecl ) {
                         addToTyVarMap( typeDecl, scopeTyVars );
@@ -1376 +1380 @@
                 Type *Pass2::mutate( FunctionType *funcType ) {
                         scopeTyVars.beginScope();
+
                         makeTyVarMap( funcType, scopeTyVars );
 

src/GenPoly/GenPoly.cc

@@ -433 +433 @@
 
         void addToTyVarMap( TypeDecl * tyVar, TyVarMap &tyVarMap ) {
+                // xxx - should this actually be insert?
                 tyVarMap[ tyVar->get_name() ] = TypeDecl::Data{ tyVar };
         }