Changeset 33a7b6d for src/SynTree

Timestamp:

Nov 15, 2016, 5:30:52 PM (8 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:

d9fa60a

Parents:

8f9cc50

Message:

changed use of formal types to actual types for boxing return parameters and passing type variables, fix bug where generic struct's members would change types when a member is accessed on a concrete instantiation

File:

• src/SynTree/ReferenceToType.cc (modified) (3 diffs)

src/SynTree/ReferenceToType.cc

@@ -46 +46 @@
 
 namespace {
-        void doLookup( const std::list< Declaration* > &members, const std::list< TypeDecl* > &parms, const std::list< Expression* > &args, const std::string &name, std::list< Declaration* > &foundDecls ) {
-                std::list< Declaration* > found;
+        void doLookup( const std::list< Declaration* > &members, const std::string &name, std::list< Declaration* > &foundDecls ) {
                 for ( std::list< Declaration* >::const_iterator i = members.begin(); i != members.end(); ++i ) {
                         if ( (*i)->get_name() == name ) {
-                                found.push_back( *i );
+                                foundDecls.push_back( *i );
                         } // if
                 } // for
-                applySubstitution( parms.begin(), parms.end(), args.begin(), found.begin(), found.end(), back_inserter( foundDecls ) );
         }
 } // namespace
@@ -68 +66 @@
 void StructInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
         assert( baseStruct );
-        doLookup( baseStruct->get_members(), baseStruct->get_parameters(), parameters, name, foundDecls );
+        doLookup( baseStruct->get_members(), name, foundDecls );
 }
 
@@ -94 +92 @@
 void UnionInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
         assert( baseUnion );
-        doLookup( baseUnion->get_members(), baseUnion->get_parameters(), parameters, name, foundDecls );
+        doLookup( baseUnion->get_members(), name, foundDecls );
 }