Changeset 800d275 for src/SymTab

Timestamp:

Aug 29, 2017, 2:54:49 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:

235b41f

Parents:

28e58fd (diff), 6454949 (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:

• Indexer.cc (modified) (1 diff)
• Validate.cc (modified) (3 diffs)

src/SymTab/Indexer.cc

@@ -345 +345 @@
                 leaveScope();
 
-                debugPrint( "Adding context " << aggregateDecl->get_name() << std::endl );
+                debugPrint( "Adding trait " << aggregateDecl->get_name() << std::endl );
                 addTrait( aggregateDecl );
         }

src/SymTab/Validate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tus Aug  8 13:27:00 2017
-// Update Count     : 358
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Aug 28 13:47:23 2017
+// Update Count     : 359
 //
 
@@ -467 +467 @@
                         return;
                 }
+
+                // handle other traits
                 TraitDecl *traitDecl = indexer->lookupTrait( traitInst->get_name() );
                 if ( ! traitDecl ) {
@@ -662 +664 @@
                 } else {
                         TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
-                        assertf( base != typedeclNames.end(), "Can't find typedecl name %s", typeInst->get_name().c_str() );
+                        assertf( base != typedeclNames.end(), "Cannot find typedecl name %s", typeInst->get_name().c_str() );
                         typeInst->set_baseType( base->second );
                 } // if