Changeset 36ebd03 for src/SymTab/Indexer.cc

Timestamp:

Mar 3, 2016, 1:28:56 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

3627356

Parents:

9d7b3ea (diff), 4040425 (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

File:

• src/SymTab/Indexer.cc (modified) (4 diffs)

src/SymTab/Indexer.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:37:33 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 05 13:52:42 2015
-// Update Count     : 10
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Mar  2 17:31:29 2016
+// Update Count     : 11
 //
 
@@ -143 +143 @@
         }
 
-        void Indexer::visit( ContextDecl *aggregateDecl ) {
+        void Indexer::visit( TraitDecl *aggregateDecl ) {
                 enterScope();
                 acceptAll( aggregateDecl->get_parameters(), *this );
@@ -293 +293 @@
 
 
-        void Indexer::visit( ContextInstType *contextInst ) {
+        void Indexer::visit( TraitInstType *contextInst ) {
                 acceptAll( contextInst->get_parameters(), *this );
                 acceptAll( contextInst->get_members(), *this );
@@ -350 +350 @@
         }
 
-        ContextDecl  * Indexer::lookupContext( const std::string &id ) const {
+        TraitDecl  * Indexer::lookupTrait( const std::string &id ) const {
                 return contextTable.lookup( id );
         }