Changeset 8ca3a72

Timestamp:

Jun 5, 2017, 5:49:43 PM (7 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:

10e90cb

Parents:

7985fa5

git-author:

Rob Schluntz <rschlunt@…> (06/05/17 17:47:19)

git-committer:

Rob Schluntz <rschlunt@…> (06/05/17 17:49:43)

Message:

remove redundant noLabels variables

Location:

src

Files:

• GenPoly/Box.cc (modified) (1 diff)
• GenPoly/CopyParams.cc (modified) (1 diff)
• GenPoly/DeclMutator.cc (modified) (14 diffs)
• GenPoly/Lvalue.cc (modified) (1 diff)
• InitTweak/FixGlobalInit.cc (modified) (1 diff)
• InitTweak/GenInit.cc (modified) (1 diff)
• SynTree/Attribute.h (modified) (1 diff)

src/GenPoly/Box.cc

@@ -62 +62 @@
 namespace GenPoly {
         namespace {
-                const std::list<Label> noLabels;
-
                 FunctionType *makeAdapterType( FunctionType *adaptee, const TyVarMap &tyVars );
 

src/GenPoly/CopyParams.cc

@@ -45 +45 @@
 
         CopyParams::CopyParams() : namer( "_cp" ) {}
-
-        static const std::list< Label > noLabels;
 
         void CopyParams::visit( FunctionDecl *funcDecl ) {

src/GenPoly/DeclMutator.cc

@@ -20 +20 @@
 
 namespace GenPoly {
-        namespace {
-                const std::list<Label> noLabels;
-        }
-
         DeclMutator::DeclMutator() : Mutator(), declsToAdd(1), declsToAddAfter(1) {}
 
         DeclMutator::~DeclMutator() {}
-        
+
         void DeclMutator::mutateDeclarationList( std::list< Declaration* > &decls ) {
                 for ( std::list< Declaration* >::iterator decl = decls.begin(); ; ++decl ) {
@@ -34 +30 @@
 
                         if ( decl == decls.end() ) break;
-                        
+
                         // run mutator on declaration
                         *decl = maybeMutate( *decl, *this );
@@ -55 +51 @@
                 newBack->splice( newBack->end(), *back );
                 declsToAdd.pop_back();
-                
+
                 back = declsToAddAfter.rbegin();
                 newBack = back + 1;
@@ -66 +62 @@
                 CompoundStmt *compoundStmt = dynamic_cast< CompoundStmt* >(stmt);
                 if ( compoundStmt ) return mutate( compoundStmt );
-                
+
                 doBeginScope();
-                
+
                 // run mutator on statement
                 stmt = maybeMutate( stmt, *this );
@@ -102 +98 @@
                 doBeginScope();
 
-                
+
                 for ( std::list< Statement* >::iterator stmt = stmts.begin(); ; ++stmt ) {
                         // add any new declarations after the previous statement
@@ -112 +108 @@
 
                         if ( stmt == stmts.end() ) break;
-                        
+
                         // run mutator on statement
                         *stmt = maybeMutate( *stmt, *this );
@@ -123 +119 @@
                         declsToAdd.back().clear();
                 }
-                
+
                 doEndScope();
         }
@@ -139 +135 @@
                 return compoundStmt;
         }
-        
+
         Statement* DeclMutator::mutate(IfStmt *ifStmt) {
                 ifStmt->set_condition( maybeMutate( ifStmt->get_condition(), *this ) );
@@ -146 +142 @@
                 return ifStmt;
         }
-        
+
         Statement* DeclMutator::mutate(WhileStmt *whileStmt) {
                 whileStmt->set_condition( maybeMutate( whileStmt->get_condition(), *this ) );
@@ -152 +148 @@
                 return whileStmt;
         }
-        
+
         Statement* DeclMutator::mutate(ForStmt *forStmt) {
                 mutateAll( forStmt->get_initialization(), *this );
@@ -160 +156 @@
                 return forStmt;
         }
-        
+
         Statement* DeclMutator::mutate(SwitchStmt *switchStmt) {
                 switchStmt->set_condition( maybeMutate( switchStmt->get_condition(), *this ) );
@@ -166 +162 @@
                 return switchStmt;
         }
-        
+
         Statement* DeclMutator::mutate(CaseStmt *caseStmt) {
                 caseStmt->set_condition( maybeMutate( caseStmt->get_condition(), *this ) );
@@ -172 +168 @@
                 return caseStmt;
         }
-        
+
         Statement* DeclMutator::mutate(TryStmt *tryStmt) {
                 tryStmt->set_block( maybeMutate( tryStmt->get_block(), *this ) );
@@ -179 +175 @@
                 return tryStmt;
         }
-        
+
         Statement* DeclMutator::mutate(CatchStmt *catchStmt) {
                 catchStmt->set_decl( maybeMutate( catchStmt->get_decl(), *this ) );

src/GenPoly/Lvalue.cc

@@ -35 +35 @@
 namespace GenPoly {
         namespace {
-                const std::list<Label> noLabels;
-
                 /// Replace uses of lvalue returns with appropriate pointers
                 class Pass1 : public Mutator {

src/InitTweak/FixGlobalInit.cc

@@ -26 +26 @@
 
 namespace InitTweak {
-        namespace {
-                const std::list<Label> noLabels;
-        }
-
         class GlobalFixer : public Visitor {
           public:

src/InitTweak/GenInit.cc

@@ -16 +16 @@
 #include <stack>
 #include <list>
+
+#include "InitTweak.h"
 #include "GenInit.h"
-#include "InitTweak.h"
+
+#include "Common/PassVisitor.h"
+
+#include "GenPoly/DeclMutator.h"
+#include "GenPoly/PolyMutator.h"
+#include "GenPoly/ScopedSet.h"
+
+#include "ResolvExpr/typeops.h"
+
 #include "SynTree/Declaration.h"
-#include "SynTree/Type.h"
 #include "SynTree/Expression.h"
-#include "SynTree/Statement.h"
 #include "SynTree/Initializer.h"
 #include "SynTree/Mutator.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Type.h"
+
 #include "SymTab/Autogen.h"
 #include "SymTab/Mangler.h"
-#include "GenPoly/PolyMutator.h"
-#include "GenPoly/DeclMutator.h"
-#include "GenPoly/ScopedSet.h"
-#include "ResolvExpr/typeops.h"
 
 namespace InitTweak {
-        namespace {
-                const std::list<Label> noLabels;
-                const std::list<Expression *> noDesignators;
-        }
-
         class ReturnFixer final : public GenPoly::PolyMutator {
           public:

src/SynTree/Attribute.h

@@ -40 +40 @@
 };
 
+const std::list< Attribute * > noAttributes;
+
 #endif