Changeset b726084 for src/SymTab

Timestamp:

Nov 9, 2016, 2:51:42 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:

30b65d8, d073e3c

Parents:

141b786 (diff), 84118d8 (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' into tuples

Conflicts:

src/ControlStruct/LabelTypeChecker.cc
src/InitTweak/FixInit.cc
src/ResolvExpr/Resolver.cc
src/Tuples/TupleAssignment.cc
src/Tuples/TupleAssignment.h

File:

• src/SymTab/Validate.cc (modified) (3 diffs)

src/SymTab/Validate.cc

@@ -94 +94 @@
 
         /// Associates forward declarations of aggregates with their definitions
-        class Pass2 : public Indexer {
+        class Pass2 final : public Indexer {
                 typedef Indexer Parent;
           public:
                 Pass2( bool doDebug, const Indexer *indexer );
           private:
-                virtual void visit( StructInstType *structInst );
-                virtual void visit( UnionInstType *unionInst );
-                virtual void visit( TraitInstType *contextInst );
-                virtual void visit( StructDecl *structDecl );
-                virtual void visit( UnionDecl *unionDecl );
-                virtual void visit( TypeInstType *typeInst );
+                using Indexer::visit;
+                void visit( StructInstType *structInst ) final;
+                void visit( UnionInstType *unionInst ) final;
+                void visit( TraitInstType *contextInst ) final;
+                void visit( StructDecl *structDecl ) final;
+                void visit( UnionDecl *unionDecl ) final;
+                void visit( TypeInstType *typeInst ) final;
 
                 const Indexer *indexer;
@@ -182 +183 @@
         };
 
-        class CompoundLiteral : public GenPoly::DeclMutator {
+        class CompoundLiteral final : public GenPoly::DeclMutator {
                 DeclarationNode::StorageClass storageclass = DeclarationNode::NoStorageClass;
 
-                virtual DeclarationWithType * mutate( ObjectDecl *objectDecl );
-                virtual Expression *mutate( CompoundLiteralExpr *compLitExpr );
+                using GenPoly::DeclMutator::mutate;
+                DeclarationWithType * mutate( ObjectDecl *objectDecl ) final;
+                Expression *mutate( CompoundLiteralExpr *compLitExpr ) final;
         };
 
@@ -652 +654 @@
         void EliminateTypedef::addImplicitTypedef( AggDecl * aggDecl ) {
                 if ( typedefNames.count( aggDecl->get_name() ) == 0 ) {
-                        Type *type;
+                        Type *type = nullptr;
                         if ( StructDecl * newDeclStructDecl = dynamic_cast< StructDecl * >( aggDecl ) ) {
                                 type = new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() );