Changeset 36ebd03 for src/SymTab/Validate.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/Validate.cc (modified) (9 diffs)

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jan 27 22:03:12 2016
-// Update Count     : 225
+// Last Modified On : Wed Mar  2 17:31:39 2016
+// Update Count     : 226
 //
 
@@ -101 +101 @@
                 virtual void visit( StructInstType *structInst );
                 virtual void visit( UnionInstType *unionInst );
-                virtual void visit( ContextInstType *contextInst );
+                virtual void visit( TraitInstType *contextInst );
                 virtual void visit( StructDecl *structDecl );
                 virtual void visit( UnionDecl *unionDecl );
@@ -137 +137 @@
                 virtual void visit( UnionDecl *structDecl );
                 virtual void visit( TypeDecl *typeDecl );
-                virtual void visit( ContextDecl *ctxDecl );
+                virtual void visit( TraitDecl *ctxDecl );
                 virtual void visit( FunctionDecl *functionDecl );
 
@@ -192 +192 @@
                 virtual Declaration *mutate( UnionDecl * unionDecl );
                 virtual Declaration *mutate( EnumDecl * enumDecl );
-                virtual Declaration *mutate( ContextDecl * contextDecl );
+                virtual Declaration *mutate( TraitDecl * contextDecl );
 
                 template<typename AggDecl>
@@ -404 +404 @@
         }
 
-        void Pass2::visit( ContextInstType *contextInst ) {
+        void Pass2::visit( TraitInstType *contextInst ) {
                 Parent::visit( contextInst );
-                ContextDecl *ctx = indexer->lookupContext( contextInst->get_name() );
+                TraitDecl *ctx = indexer->lookupTrait( contextInst->get_name() );
                 if ( ! ctx ) {
                         throw SemanticError( "use of undeclared context " + contextInst->get_name() );
@@ -412 +412 @@
                 for ( std::list< TypeDecl * >::const_iterator i = ctx->get_parameters().begin(); i != ctx->get_parameters().end(); ++i ) {
                         for ( std::list< DeclarationWithType * >::const_iterator assert = (*i )->get_assertions().begin(); assert != (*i )->get_assertions().end(); ++assert ) {
-                                if ( ContextInstType *otherCtx = dynamic_cast< ContextInstType * >(*assert ) ) {
+                                if ( TraitInstType *otherCtx = dynamic_cast< TraitInstType * >(*assert ) ) {
                                         cloneAll( otherCtx->get_members(), contextInst->get_members() );
                                 } else {
@@ -476 +476 @@
                         while ( ! toBeDone.empty() ) {
                                 for ( std::list< DeclarationWithType * >::iterator assertion = toBeDone.begin(); assertion != toBeDone.end(); ++assertion ) {
-                                        if ( ContextInstType *ctx = dynamic_cast< ContextInstType * >( (*assertion )->get_type() ) ) {
+                                        if ( TraitInstType *ctx = dynamic_cast< TraitInstType * >( (*assertion )->get_type() ) ) {
                                                 for ( std::list< Declaration * >::const_iterator i = ctx->get_members().begin(); i != ctx->get_members().end(); ++i ) {
                                                         DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( *i );
@@ -851 +851 @@
         }
 
-        void AutogenerateRoutines::visit( ContextDecl *) {
+        void AutogenerateRoutines::visit( TraitDecl *) {
                 // ensure that we don't add assignment ops for types defined as part of the context
         }
@@ -1075 +1075 @@
         }
 
-                Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
+                Declaration *EliminateTypedef::mutate( TraitDecl * contextDecl ) {
                 Mutator::mutate( contextDecl );
                 return handleAggregate( contextDecl );