Changeset 26238c1 for src/SymTab


Ignore:
Timestamp:
Aug 28, 2017, 2:59:36 PM (8 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:
234223f, afce1cf
Parents:
2065609 (diff), 1cb758f2 (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

Location:
src/SymTab
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/SymTab/Indexer.cc

    r2065609 r26238c1  
    345345                leaveScope();
    346346
    347                 debugPrint( "Adding context " << aggregateDecl->get_name() << std::endl );
     347                debugPrint( "Adding trait " << aggregateDecl->get_name() << std::endl );
    348348                addTrait( aggregateDecl );
    349349        }
  • src/SymTab/Validate.cc

    r2065609 r26238c1  
    467467                        return;
    468468                }
     469
     470                // handle other traits
    469471                TraitDecl *traitDecl = indexer->lookupTrait( traitInst->get_name() );
    470472                if ( ! traitDecl ) {
Note: See TracChangeset for help on using the changeset viewer.