Changeset 373d0b5

Timestamp:

Dec 1, 2017, 2:49:52 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:

81644e0

Parents:

a378ca7

Message:

Refactor getAggr as a Type member function

Location:

src

Files:

• GenPoly/InstantiateGeneric.cc (modified) (3 diffs)
• SynTree/ReferenceToType.cc (modified) (2 diffs)
• SynTree/Type.h (modified) (3 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -453 +453 @@
                         return false;
                 }
-
-                AggregateDecl * getAggr( Type * t ) {
-                        if ( StructInstType * inst = dynamic_cast< StructInstType * >( t ) ) {
-                                return inst->baseStruct;
-                        } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * >( t ) ) {
-                                return inst->baseUnion;
-                        }
-                        assertf( false, "Non-aggregate type: %s", toString( t ).c_str() );
-                }
         }
 
@@ -469 +460 @@
                 if ( isGenericType( memberExpr->aggregate->result ) ) {
                         // find the location of the member
-                        AggregateDecl * aggr = getAggr( memberExpr->aggregate->result );
+                        AggregateDecl * aggr = memberExpr->aggregate->result->getAggr();
                         std::list< Declaration * > & members = aggr->members;
                         memberIndex = std::distance( members.begin(), std::find( members.begin(), members.end(), memberExpr->member ) );
@@ -479 +470 @@
                 if ( memberIndex != -1 ) {
                         // using the location from the generic type, find the member in the instantiation and rebuild the member expression
-                        AggregateDecl * aggr = getAggr( memberExpr->aggregate->result );
+                        AggregateDecl * aggr = memberExpr->aggregate->result->getAggr();
                         assertf( memberIndex < (int)aggr->members.size(), "Instantiation somehow has fewer members than the generic type." );
                         Declaration * member = *std::next( aggr->members.begin(), memberIndex );

src/SynTree/ReferenceToType.cc

@@ -70 +70 @@
 bool StructInstType::isComplete() const { return baseStruct ? baseStruct->has_body() : false; }
 
+AggregateDecl * StructInstType::getAggr() { return baseStruct; }
+
 void StructInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
         assert( baseStruct );
@@ -101 +103 @@
 
 bool UnionInstType::isComplete() const { return baseUnion ? baseUnion->has_body() : false; }
+
+AggregateDecl * UnionInstType::getAggr() { return baseUnion; }
 
 void UnionInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {

src/SynTree/Type.h

@@ -178 +178 @@
         virtual bool isComplete() const { return true; }
 
+        virtual AggregateDecl * getAggr() {     assertf( false, "Non-aggregate type: %s", toString( this ).c_str() ); }
+
         virtual Type *clone() const = 0;
         virtual void accept( Visitor & v ) = 0;
@@ -405 +407 @@
         virtual bool isComplete() const override;
 
+        virtual AggregateDecl * getAggr() override;
+
         /// Looks up the members of this struct named "name" and places them into "foundDecls".
         /// Clones declarations into "foundDecls", caller responsible for freeing
@@ -436 +440 @@
 
         virtual bool isComplete() const override;
+
+        virtual AggregateDecl * getAggr() override;
 
         /// looks up the members of this union named "name" and places them into "foundDecls"