From 19b472cf0b5ebd7d05951d03f664f576e7e55f0e Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sat, 4 Apr 2020 08:31:14 -0400 Subject: [PATCH] Internals: Cleanup unused nodep in visitors. No functional change intended. --- src/V3Active.cpp | 22 ++++++++-------------- src/V3ActiveTop.cpp | 5 ++--- src/V3Assert.cpp | 5 ++--- src/V3AssertPre.cpp | 4 +--- src/V3Begin.cpp | 10 ++++------ src/V3Broken.cpp | 3 +++ src/V3CUse.cpp | 2 +- src/V3Case.cpp | 10 +++------- src/V3Cast.cpp | 7 ++----- src/V3Cdc.cpp | 14 ++++++-------- src/V3Changed.cpp | 9 ++------- src/V3Clock.cpp | 5 +---- src/V3Combine.cpp | 22 ++++++++-------------- src/V3Const.cpp | 14 ++++++-------- src/V3Coverage.cpp | 1 - src/V3CoverageJoin.cpp | 6 ++---- src/V3Dead.cpp | 7 +++---- src/V3Delayed.cpp | 5 +---- src/V3Depth.cpp | 6 ++---- src/V3DepthBlock.cpp | 9 +++------ src/V3EmitCInlines.cpp | 7 ++----- src/V3EmitCSyms.cpp | 16 ++++++---------- src/V3EmitXml.cpp | 6 ++---- src/V3Expand.cpp | 5 +---- src/V3Gate.cpp | 22 ++++++++-------------- src/V3GenClk.cpp | 10 ++++------ src/V3Hashed.cpp | 12 ++++++------ src/V3Inline.cpp | 11 +++++------ src/V3Inst.cpp | 24 ++++++++---------------- src/V3Life.cpp | 9 +++------ src/V3LifePost.cpp | 10 ++++------ src/V3LinkCells.cpp | 7 ++----- src/V3LinkDot.cpp | 29 +++++++++-------------------- src/V3LinkJump.cpp | 6 ++---- src/V3LinkLValue.cpp | 5 +---- src/V3LinkResolve.cpp | 15 ++++----------- src/V3Localize.cpp | 10 ++++------ src/V3Name.cpp | 5 ++--- src/V3Order.cpp | 19 +++++++------------ src/V3Param.cpp | 5 +---- src/V3Partition.cpp | 4 +--- src/V3Premit.cpp | 13 +++++-------- src/V3ProtectLib.cpp | 2 +- src/V3Reloop.cpp | 9 +++------ src/V3Scope.cpp | 12 ++++-------- src/V3SenTree.h | 9 ++++----- src/V3Slice.cpp | 5 +---- src/V3Split.cpp | 5 ++--- src/V3SplitAs.cpp | 17 ++++++----------- src/V3SplitVar.cpp | 3 ++- src/V3Subst.cpp | 11 +++++------ src/V3Table.cpp | 8 +++----- src/V3Task.cpp | 16 +++++----------- src/V3Trace.cpp | 4 +--- src/V3TraceDecl.cpp | 4 +--- src/V3Tristate.cpp | 5 ++--- src/V3Undriven.cpp | 17 ++++++++--------- src/V3Unknown.cpp | 5 +---- src/V3WidthCommit.h | 19 ++++++++++--------- 59 files changed, 206 insertions(+), 361 deletions(-) diff --git a/src/V3Active.cpp b/src/V3Active.cpp index 0aad9730c..bb15e55c1 100644 --- a/src/V3Active.cpp +++ b/src/V3Active.cpp @@ -79,16 +79,12 @@ private: // Simplify sensitivity list VL_DO_DANGLING(V3Const::constifyExpensiveEdit(nodep), nodep); } - // Empty visitors, speed things up - virtual void visit(AstNodeStmt* nodep) VL_OVERRIDE { } //-------------------- - // Default - virtual void visit(AstNode* nodep) VL_OVERRIDE { - // Default: Just iterate - iterateChildren(nodep); - } - // METHODS + virtual void visit(AstNodeStmt*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: + // METHODS AstScope* scopep() { return m_scopep; } AstActive* getCActive(FileLine* fl) { if (!m_cActivep) { @@ -206,9 +202,8 @@ private: } } //-------------------- - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS ActiveDlyVisitor(AstNode* nodep, CheckType check) { @@ -411,10 +406,9 @@ private: } } - // Empty visitors, speed things up - virtual void visit(AstNodeMath* nodep) VL_OVERRIDE {} - virtual void visit(AstVarScope* nodep) VL_OVERRIDE {} //-------------------- + virtual void visit(AstNodeMath*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstVarScope*) VL_OVERRIDE {} // Accelerate virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: diff --git a/src/V3ActiveTop.cpp b/src/V3ActiveTop.cpp index 6adf1a893..43552c170 100644 --- a/src/V3ActiveTop.cpp +++ b/src/V3ActiveTop.cpp @@ -127,10 +127,9 @@ private: virtual void visit(AstFinal* nodep) VL_OVERRIDE { // LCOV_EXCL_LINE nodep->v3fatalSrc("Node should have been deleted"); } - // Empty visitors, speed things up - virtual void visit(AstNodeMath* nodep) VL_OVERRIDE {} - virtual void visit(AstVarScope* nodep) VL_OVERRIDE {} //-------------------- + virtual void visit(AstNodeMath*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstVarScope*) VL_OVERRIDE {} // Accelerate virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: diff --git a/src/V3Assert.cpp b/src/V3Assert.cpp index 593cad4c0..023450b9c 100644 --- a/src/V3Assert.cpp +++ b/src/V3Assert.cpp @@ -380,9 +380,8 @@ private: m_beginp = lastp; } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit AssertVisitor(AstNetlist* nodep) { diff --git a/src/V3AssertPre.cpp b/src/V3AssertPre.cpp index 57f4b92c5..aec7c4761 100644 --- a/src/V3AssertPre.cpp +++ b/src/V3AssertPre.cpp @@ -133,9 +133,7 @@ private: // Reset defaults m_seniDefaultp = NULL; } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Begin.cpp b/src/V3Begin.cpp index 8084dea5b..80cd56fe8 100644 --- a/src/V3Begin.cpp +++ b/src/V3Begin.cpp @@ -232,9 +232,8 @@ private: iterateChildren(nodep); m_ifDepth = prevIfDepth; } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS BeginVisitor(AstNetlist* nodep, BeginState* statep) { @@ -280,9 +279,8 @@ private: iterateChildren(nodep); } //-------------------- - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS BeginRelinkVisitor(AstNetlist* nodep, BeginState*) { diff --git a/src/V3Broken.cpp b/src/V3Broken.cpp index abf4a25fb..e76cc351e 100644 --- a/src/V3Broken.cpp +++ b/src/V3Broken.cpp @@ -206,8 +206,10 @@ private: } // VISITORS virtual void visit(AstNode* nodep) VL_OVERRIDE { + // Process not just iterate processAndIterate(nodep); } + public: // CONSTRUCTORS explicit BrokenMarkVisitor(AstNetlist* nodep) { @@ -262,6 +264,7 @@ private: nodep, "Assignment LHS is not an lvalue"); } virtual void visit(AstNode* nodep) VL_OVERRIDE { + // Process not just iterate processAndIterate(nodep); } public: diff --git a/src/V3CUse.cpp b/src/V3CUse.cpp index 2c0fc13d8..d16959782 100644 --- a/src/V3CUse.cpp +++ b/src/V3CUse.cpp @@ -93,7 +93,7 @@ class CUseVisitor : public AstNVisitor { } makeUseCells(nodep); } - virtual void visit(AstNode* nodep) VL_OVERRIDE {} // All in AstNodeModule + virtual void visit(AstNode*) VL_OVERRIDE {} // All in AstNodeModule public: // CONSTRUCTORS diff --git a/src/V3Case.cpp b/src/V3Case.cpp index de10eaf3b..c81caf941 100644 --- a/src/V3Case.cpp +++ b/src/V3Case.cpp @@ -102,9 +102,8 @@ private: } } } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit CaseLintVisitor(AstNodeCase* nodep) { @@ -464,10 +463,7 @@ private: } } //-------------------- - // Default: Just iterate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Cast.cpp b/src/V3Cast.cpp index b7a69c52c..4d7ee95f8 100644 --- a/src/V3Cast.cpp +++ b/src/V3Cast.cpp @@ -157,13 +157,10 @@ private: } // NOPs - virtual void visit(AstVar* nodep) VL_OVERRIDE {} + virtual void visit(AstVar*) VL_OVERRIDE {} //-------------------- - // Default: Just iterate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Cdc.cpp b/src/V3Cdc.cpp index a5c306464..0fc002f27 100644 --- a/src/V3Cdc.cpp +++ b/src/V3Cdc.cpp @@ -692,7 +692,7 @@ private: } // Math that shouldn't cause us to clear hazard - virtual void visit(AstConst* nodep) VL_OVERRIDE { } + virtual void visit(AstConst*) VL_OVERRIDE {} virtual void visit(AstReplicate* nodep) VL_OVERRIDE { iterateChildren(nodep); } @@ -712,10 +712,10 @@ private: } // Ignores - virtual void visit(AstInitial* nodep) VL_OVERRIDE { } - virtual void visit(AstTraceInc* nodep) VL_OVERRIDE { } - virtual void visit(AstCoverToggle* nodep) VL_OVERRIDE { } - virtual void visit(AstNodeDType* nodep) VL_OVERRIDE { } + virtual void visit(AstInitial*) VL_OVERRIDE {} + virtual void visit(AstTraceInc*) VL_OVERRIDE {} + virtual void visit(AstCoverToggle*) VL_OVERRIDE {} + virtual void visit(AstNodeDType*) VL_OVERRIDE {} //-------------------- // Default @@ -723,9 +723,7 @@ private: setNodeHazard(nodep); iterateChildren(nodep); } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Changed.cpp b/src/V3Changed.cpp index 9c2d0f470..52877625d 100644 --- a/src/V3Changed.cpp +++ b/src/V3Changed.cpp @@ -283,14 +283,9 @@ private: } } } - virtual void visit(AstNodeMath* nodep) VL_OVERRIDE { - // Short-circuit - } //-------------------- - // Default: Just iterate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNodeMath*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp index a71e15c5f..bbb184244 100644 --- a/src/V3Clock.cpp +++ b/src/V3Clock.cpp @@ -425,10 +425,7 @@ private: } //-------------------- - // Default: Just iterate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Combine.cpp b/src/V3Combine.cpp index 02b37a15d..1ab5714cd 100644 --- a/src/V3Combine.cpp +++ b/src/V3Combine.cpp @@ -131,20 +131,16 @@ private: addCall(nodep); } // Speed things up - virtual void visit(AstNodeAssign* nodep) VL_OVERRIDE {} - virtual void visit(AstNodeMath* nodep) VL_OVERRIDE {} - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNodeAssign*) VL_OVERRIDE {} + virtual void visit(AstNodeMath*) VL_OVERRIDE {} + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS - CombCallVisitor() { - m_find = false; - } + CombCallVisitor() + : m_find(false) {} virtual ~CombCallVisitor() {} - void main(AstNetlist* nodep) { - iterate(nodep); - } + void main(AstNetlist* nodep) { iterate(nodep); } }; //###################################################################### @@ -452,9 +448,7 @@ private: virtual void visit(AstVar*) VL_OVERRIDE {} virtual void visit(AstTraceDecl*) VL_OVERRIDE {} virtual void visit(AstTraceInc*) VL_OVERRIDE {} - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Const.cpp b/src/V3Const.cpp index 8e92b861d..aa460d117 100644 --- a/src/V3Const.cpp +++ b/src/V3Const.cpp @@ -45,9 +45,8 @@ private: virtual void visit(AstVarRef* nodep) VL_OVERRIDE { if (nodep->varp()) nodep->varp()->user4(1); } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit ConstVarMarkVisitor(AstNode* nodep) { @@ -67,9 +66,8 @@ private: virtual void visit(AstVarRef* nodep) VL_OVERRIDE { if (nodep->varp() && nodep->varp()->user4()) m_found = true; } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit ConstVarFindVisitor(AstNode* nodep) { @@ -1367,7 +1365,7 @@ private: } // Special cases - virtual void visit(AstConst* nodep) VL_OVERRIDE {} // Already constant + virtual void visit(AstConst*) VL_OVERRIDE {} // Already constant virtual void visit(AstCell* nodep) VL_OVERRIDE { if (m_params) { @@ -2155,7 +2153,7 @@ private: // These are converted by V3Param. Don't constify as we don't want the // from() VARREF to disappear, if any. // If output of a presel didn't get consted, chances are V3Param didn't visit properly - virtual void visit(AstNodePreSel* nodep) VL_OVERRIDE {} + virtual void visit(AstNodePreSel*) VL_OVERRIDE {} // Ignored, can eliminate early virtual void visit(AstSysIgnore* nodep) VL_OVERRIDE { diff --git a/src/V3Coverage.cpp b/src/V3Coverage.cpp index be7207c22..69f8288c8 100644 --- a/src/V3Coverage.cpp +++ b/src/V3Coverage.cpp @@ -399,7 +399,6 @@ private: // VISITORS - BOTH virtual void visit(AstNode* nodep) VL_OVERRIDE { - // Default: Just iterate if (m_checkBlock) { iterateChildren(nodep); m_checkBlock = true; // Reset as a child may have cleared it diff --git a/src/V3CoverageJoin.cpp b/src/V3CoverageJoin.cpp index 6ef96c206..f721b4eeb 100644 --- a/src/V3CoverageJoin.cpp +++ b/src/V3CoverageJoin.cpp @@ -109,10 +109,8 @@ private: iterateChildren(nodep); } //-------------------- - virtual void visit(AstNodeMath* nodep) VL_OVERRIDE {} // Accelerate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNodeMath*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Dead.cpp b/src/V3Dead.cpp index 60d3fdabb..2f9fcf83c 100644 --- a/src/V3Dead.cpp +++ b/src/V3Dead.cpp @@ -58,10 +58,9 @@ private: nodep->modp()->user1Inc(-1); } //----- - virtual void visit(AstNodeMath* nodep) VL_OVERRIDE {} // Accelerate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNodeMath*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit DeadModVisitor(AstNodeModule* nodep) { diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp index c82c50d31..575ba1ab4 100644 --- a/src/V3Delayed.cpp +++ b/src/V3Delayed.cpp @@ -451,10 +451,7 @@ private: } //-------------------- - // Default: Just iterate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Depth.cpp b/src/V3Depth.cpp index 96c18c2b4..8763ca6b8 100644 --- a/src/V3Depth.cpp +++ b/src/V3Depth.cpp @@ -150,10 +150,8 @@ private: //-------------------- // Default: Just iterate - virtual void visit(AstVar* nodep) VL_OVERRIDE {} // Don't hit varrefs under vars - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstVar*) VL_OVERRIDE {} // Don't hit varrefs under vars + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3DepthBlock.cpp b/src/V3DepthBlock.cpp index f56553d3f..2abd25e6c 100644 --- a/src/V3DepthBlock.cpp +++ b/src/V3DepthBlock.cpp @@ -113,13 +113,10 @@ private: } } - virtual void visit(AstNodeMath* nodep) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNodeMath*) VL_OVERRIDE {} // Accelerate //-------------------- - // Default: Just iterate - virtual void visit(AstVar* nodep) VL_OVERRIDE {} // Don't hit varrefs under vars - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstVar*) VL_OVERRIDE {} // Don't hit varrefs under vars + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3EmitCInlines.cpp b/src/V3EmitCInlines.cpp index 039997b49..d3fa0084c 100644 --- a/src/V3EmitCInlines.cpp +++ b/src/V3EmitCInlines.cpp @@ -96,12 +96,9 @@ class EmitCInlines : EmitCBaseVisitor { iterateChildren(nodep); } - // Default - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } //--------------------------------------- - // ACCESSORS + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: explicit EmitCInlines(AstNetlist* nodep) { iterate(nodep); diff --git a/src/V3EmitCSyms.cpp b/src/V3EmitCSyms.cpp index 6fcba2ef9..ee532ba1d 100644 --- a/src/V3EmitCSyms.cpp +++ b/src/V3EmitCSyms.cpp @@ -337,18 +337,14 @@ class EmitCSyms : EmitCBaseVisitor { iterateChildren(nodep); m_funcp = NULL; } - // NOPs - virtual void visit(AstConst*) VL_OVERRIDE {} - // Default - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + //--------------------------------------- - // ACCESSORS + virtual void visit(AstConst*) VL_OVERRIDE {} + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: - explicit EmitCSyms(AstNetlist* nodep, bool dpiHdrOnly): - m_dpiHdrOnly(dpiHdrOnly) - { + explicit EmitCSyms(AstNetlist* nodep, bool dpiHdrOnly) + : m_dpiHdrOnly(dpiHdrOnly) { m_funcp = NULL; m_modp = NULL; m_coverBins = 0; diff --git a/src/V3EmitXml.cpp b/src/V3EmitXml.cpp index 330906cca..6ae7651fe 100644 --- a/src/V3EmitXml.cpp +++ b/src/V3EmitXml.cpp @@ -253,7 +253,7 @@ private: } } //----- - virtual void visit(AstNode* nodep) VL_OVERRIDE { + virtual void visit(AstNode*) VL_OVERRIDE { // All modules are present at root so no need to iterate on children } @@ -333,9 +333,7 @@ private: m_hasChildren = true; } //----- - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Expand.cpp b/src/V3Expand.cpp index be73f2916..5fe34563f 100644 --- a/src/V3Expand.cpp +++ b/src/V3Expand.cpp @@ -950,11 +950,8 @@ private: } //-------------------- - // Default: Just iterate virtual void visit(AstVar*) VL_OVERRIDE {} // Don't hit varrefs under vars - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Gate.cpp b/src/V3Gate.cpp index e88aad42a..117145039 100644 --- a/src/V3Gate.cpp +++ b/src/V3Gate.cpp @@ -249,7 +249,6 @@ private: } } //-------------------- - // Default virtual void visit(AstNode* nodep) VL_OVERRIDE { // *** Special iterator if (!m_isSimple) return; // Fastpath @@ -264,6 +263,7 @@ private: } else iterateChildren(nodep); } + public: // CONSTRUCTORS GateOkVisitor(AstNode* nodep, bool buffersOnly, bool dedupe) { @@ -523,7 +523,6 @@ private: } //-------------------- - // Default virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); if (nodep->isOutputter() && m_logicVertexp) m_logicVertexp->setConsumed("outputter"); @@ -884,9 +883,8 @@ private: VL_DO_DANGLING(nodep->deleteTree(), nodep); } } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS virtual ~GateElimVisitor() {} @@ -1440,10 +1438,8 @@ private: iterate(nodep->lhsp()); } //-------------------- - // Default - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS GateConcatVisitor() { @@ -1624,11 +1620,9 @@ private: } } // Speedups - virtual void visit(AstVar* nodep) VL_OVERRIDE {} - virtual void visit(AstActive* nodep) VL_OVERRIDE {} - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstVar*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstActive*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3GenClk.cpp b/src/V3GenClk.cpp index a7a796764..8d7d53614 100644 --- a/src/V3GenClk.cpp +++ b/src/V3GenClk.cpp @@ -117,9 +117,8 @@ private: } //----- - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS GenClkRenameVisitor(AstTopScope* nodep, AstNodeModule* topModp) { @@ -216,9 +215,8 @@ private: //----- virtual void visit(AstVar*) VL_OVERRIDE {} // Don't want varrefs under it - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit GenClkReadVisitor(AstNetlist* nodep) diff --git a/src/V3Hashed.cpp b/src/V3Hashed.cpp index 84a582c76..887118e18 100644 --- a/src/V3Hashed.cpp +++ b/src/V3Hashed.cpp @@ -83,23 +83,23 @@ private: } //-------------------- - // Default: Just iterate virtual void visit(AstVar*) VL_OVERRIDE {} virtual void visit(AstTypedef*) VL_OVERRIDE {} virtual void visit(AstParamTypeDType*) VL_OVERRIDE {} virtual void visit(AstNode* nodep) VL_OVERRIDE { + // Hash not just iterate nodeHashIterate(nodep); } public: // CONSTRUCTORS - explicit HashedVisitor(AstNode* nodep) { - m_cacheInUser4 = true; + explicit HashedVisitor(AstNode* nodep) + : m_cacheInUser4(true) { nodeHashIterate(nodep); - //UINFO(9," stmthash "<(nodep)); } V3Hash finalHash() const { return m_lowerHash; } diff --git a/src/V3Inline.cpp b/src/V3Inline.cpp index e09834cd0..382d75263 100644 --- a/src/V3Inline.cpp +++ b/src/V3Inline.cpp @@ -205,7 +205,6 @@ private: } } //-------------------- - // Default: Just iterate virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); if (m_modp) { @@ -245,9 +244,9 @@ private: virtual void visit(AstCell* nodep) VL_OVERRIDE { nodep->user4p(nodep->clonep()); } - // Accelerate - virtual void visit(AstNodeStmt* nodep) VL_OVERRIDE {} - virtual void visit(AstNodeMath* nodep) VL_OVERRIDE {} + //-------------------- + virtual void visit(AstNodeStmt*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNodeMath*) VL_OVERRIDE {} // Accelerate virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: @@ -605,8 +604,8 @@ private: } //-------------------- - virtual void visit(AstNodeMath* nodep) VL_OVERRIDE {} // Accelerate - virtual void visit(AstNodeStmt* nodep) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNodeMath*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNodeStmt*) VL_OVERRIDE {} // Accelerate virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: diff --git a/src/V3Inst.cpp b/src/V3Inst.cpp index e852164ff..e3895e611 100644 --- a/src/V3Inst.cpp +++ b/src/V3Inst.cpp @@ -125,10 +125,8 @@ private: virtual void visit(AstAlways*) VL_OVERRIDE {} //-------------------- - // Default: Just iterate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit InstVisitor(AstNetlist* nodep) { @@ -158,12 +156,9 @@ private: } iterateChildren(nodep); } - // Save some time - virtual void visit(AstNodeMath*) VL_OVERRIDE {} - // Default: Just iterate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNodeMath*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // METHODS void insert(AstVar* nodep) { @@ -442,13 +437,10 @@ private: } } - // Save some time - virtual void visit(AstNodeMath*) VL_OVERRIDE {} //-------------------- - // Default: Just iterate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNodeMath*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit InstDeVisitor(AstNetlist* nodep) { diff --git a/src/V3Life.cpp b/src/V3Life.cpp index e9602a7f9..08f674015 100644 --- a/src/V3Life.cpp +++ b/src/V3Life.cpp @@ -434,9 +434,7 @@ private: } virtual void visit(AstVar*) VL_OVERRIDE {} // Don't want varrefs under it - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS @@ -489,9 +487,8 @@ private: virtual void visit(AstVar*) VL_OVERRIDE {} // Accelerate virtual void visit(AstNodeStmt*) VL_OVERRIDE {} // Accelerate virtual void visit(AstNodeMath*) VL_OVERRIDE {} // Accelerate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS LifeTopVisitor(AstNetlist* nodep, LifeState* statep) { diff --git a/src/V3LifePost.cpp b/src/V3LifePost.cpp index 5e8df83a1..b50adc9e2 100644 --- a/src/V3LifePost.cpp +++ b/src/V3LifePost.cpp @@ -87,9 +87,8 @@ private: iterateChildren(nodep); } virtual void visit(AstVar*) VL_OVERRIDE {} // Don't want varrefs under it - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit LifePostElimVisitor(AstTopScope* nodep) @@ -342,9 +341,8 @@ private: } //----- virtual void visit(AstVar*) VL_OVERRIDE {} // Don't want varrefs under it - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit LifePostDlyVisitor(AstNetlist* nodep) diff --git a/src/V3LinkCells.cpp b/src/V3LinkCells.cpp index 325d727c4..009b3f005 100644 --- a/src/V3LinkCells.cpp +++ b/src/V3LinkCells.cpp @@ -446,11 +446,8 @@ private: // Accelerate the recursion // Must do statements to support Generates, math though... - virtual void visit(AstNodeMath* nodep) VL_OVERRIDE {} - virtual void visit(AstNode* nodep) VL_OVERRIDE { - // Default: Just iterate - iterateChildren(nodep); - } + virtual void visit(AstNodeMath*) VL_OVERRIDE {} + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } // METHODS void readModNames() { diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp index c6c99006b..70ea00511 100644 --- a/src/V3LinkDot.cpp +++ b/src/V3LinkDot.cpp @@ -753,7 +753,7 @@ class LinkDotFindVisitor : public AstNVisitor { m_curSymp = m_modSymp = NULL; } } - virtual void visit(AstTypeTable* nodep) VL_OVERRIDE {} + virtual void visit(AstTypeTable*) VL_OVERRIDE {} virtual void visit(AstNodeModule* nodep) VL_OVERRIDE { // Called on top module from Netlist, other modules from the cell creating them, // and packages @@ -1180,10 +1180,7 @@ class LinkDotFindVisitor : public AstNVisitor { // No longer needed, but can't delete until any multi-instantiated modules are expanded } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - // Default: Just iterate - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS @@ -1244,7 +1241,7 @@ private: } // VISITs - virtual void visit(AstTypeTable* nodep) VL_OVERRIDE {} + virtual void visit(AstTypeTable*) VL_OVERRIDE {} virtual void visit(AstNodeModule* nodep) VL_OVERRIDE { UINFO(5," "<dead() || !nodep->user4()) { @@ -1358,10 +1355,8 @@ private: // We only needed the forward declaration in order to parse correctly. VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep); } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - // Default: Just iterate - iterateChildren(nodep); - } + + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS @@ -1508,10 +1503,7 @@ class LinkDotScopeVisitor : public AstNVisitor { virtual void visit(AstCell*) VL_OVERRIDE {} virtual void visit(AstVar*) VL_OVERRIDE {} virtual void visit(AstNodeMath*) VL_OVERRIDE {} - virtual void visit(AstNode* nodep) VL_OVERRIDE { - // Default: Just iterate - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS @@ -1596,10 +1588,7 @@ class LinkDotIfaceVisitor : public AstNVisitor { nodep->unlinkFrBack(); VL_DO_DANGLING(pushDeletep(nodep), nodep); } } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - // Default: Just iterate - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS @@ -1777,7 +1766,7 @@ private: // Recurse..., backward as must do packages before using packages iterateChildrenBackwards(nodep); } - virtual void visit(AstTypeTable* nodep) VL_OVERRIDE {} + virtual void visit(AstTypeTable*) VL_OVERRIDE {} virtual void visit(AstNodeModule* nodep) VL_OVERRIDE { if (nodep->dead()) return; checkNoDot(nodep); @@ -2578,10 +2567,10 @@ private: } virtual void visit(AstNode* nodep) VL_OVERRIDE { - // Default: Just iterate checkNoDot(nodep); iterateChildren(nodep); } + public: // CONSTRUCTORS LinkDotResolveVisitor(AstNetlist* rootp, LinkDotState* statep) { diff --git a/src/V3LinkJump.cpp b/src/V3LinkJump.cpp index 010db9f25..50244c0b5 100644 --- a/src/V3LinkJump.cpp +++ b/src/V3LinkJump.cpp @@ -243,11 +243,9 @@ private: virtual void visit(AstVarRef* nodep) VL_OVERRIDE { if (m_loopInc && nodep->varp()) nodep->varp()->usedLoopIdx(true); } + virtual void visit(AstConst*) VL_OVERRIDE {} + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } - virtual void visit(AstConst* nodep) VL_OVERRIDE {} - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } public: // CONSTRUCTORS explicit LinkJumpVisitor(AstNetlist* nodep) { diff --git a/src/V3LinkLValue.cpp b/src/V3LinkLValue.cpp index 73d51f5eb..c4318b8cb 100644 --- a/src/V3LinkLValue.cpp +++ b/src/V3LinkLValue.cpp @@ -266,10 +266,7 @@ private: } } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - // Default: Just iterate - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp index 3ae6c2a8a..44fa612d3 100644 --- a/src/V3LinkResolve.cpp +++ b/src/V3LinkResolve.cpp @@ -453,10 +453,7 @@ private: iterateChildren(nodep); } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - // Default: Just iterate - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS @@ -502,13 +499,9 @@ private: if (nodep->modp()->modPublic()) m_modp->modPublic(true); //** No iteration for speed } - virtual void visit(AstNodeMath* nodep) VL_OVERRIDE { - // Speedup - } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - // Default: Just iterate - iterateChildren(nodep); - } + virtual void visit(AstNodeMath*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit LinkBotupVisitor(AstNetlist* rootp) { diff --git a/src/V3Localize.cpp b/src/V3Localize.cpp index e100a1d37..25667dc9e 100644 --- a/src/V3Localize.cpp +++ b/src/V3Localize.cpp @@ -80,9 +80,8 @@ private: nodep->hierThis(true); } } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit LocalizeDehierVisitor(AstNetlist* nodep) { @@ -220,9 +219,8 @@ private: } // No iterate; Don't want varrefs under it } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit LocalizeVisitor(AstNetlist* nodep) { diff --git a/src/V3Name.cpp b/src/V3Name.cpp index eca692e44..c995fbfb9 100644 --- a/src/V3Name.cpp +++ b/src/V3Name.cpp @@ -130,9 +130,8 @@ private: } //-------------------- - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit NameVisitor(AstNetlist* nodep) { diff --git a/src/V3Order.cpp b/src/V3Order.cpp index 1f1c3a216..65f859012 100644 --- a/src/V3Order.cpp +++ b/src/V3Order.cpp @@ -362,9 +362,7 @@ private: iterateChildren(nodep); m_inClocked = false; } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS @@ -399,15 +397,14 @@ private: } iterateChildren(nodep->rhsp()); } - virtual void visit(AstVarRef* nodep) VL_OVERRIDE { + virtual void visit(AstVarRef*) VL_OVERRIDE { // Previous versions checked attrClocker() here, but this breaks // the updated t_clocker VCD test. // If reenable this visitor note AstNodeMath short circuit below } - virtual void visit(AstNodeMath* nodep) VL_OVERRIDE {} // Accelerate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNodeMath*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit OrderClkAssVisitor(AstNode* nodep) { @@ -1250,10 +1247,8 @@ private: // on the next evaluation loop. } //-------------------- - // Default - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS OrderVisitor() { diff --git a/src/V3Param.cpp b/src/V3Param.cpp index df3657b03..9c5a745c0 100644 --- a/src/V3Param.cpp +++ b/src/V3Param.cpp @@ -545,10 +545,7 @@ private: VL_DO_DANGLING(nodep->deleteTree(), nodep); } - // Default: Just iterate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Partition.cpp b/src/V3Partition.cpp index 9bc836a4f..04a063f31 100644 --- a/src/V3Partition.cpp +++ b/src/V3Partition.cpp @@ -1779,9 +1779,7 @@ private: m_tracingCall = true; iterate(nodep->funcp()); } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Premit.cpp b/src/V3Premit.cpp index a4f4c4b77..ec613e954 100644 --- a/src/V3Premit.cpp +++ b/src/V3Premit.cpp @@ -69,9 +69,7 @@ private: } } } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS @@ -359,7 +357,8 @@ private: checkNode(nodep); } virtual void visit(AstConst* nodep) VL_OVERRIDE { - iterateChildren(nodep); checkNode(nodep); + iterateChildren(nodep); + checkNode(nodep); } virtual void visit(AstNodeCond* nodep) VL_OVERRIDE { iterateChildren(nodep); @@ -407,10 +406,8 @@ private: //-------------------- // Default: Just iterate - virtual void visit(AstVar* nodep) VL_OVERRIDE {} // Don't hit varrefs under vars - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstVar*) VL_OVERRIDE {} // Don't hit varrefs under vars + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3ProtectLib.cpp b/src/V3ProtectLib.cpp index 1577df6d9..ecb49ff4b 100644 --- a/src/V3ProtectLib.cpp +++ b/src/V3ProtectLib.cpp @@ -363,7 +363,7 @@ class ProtectVisitor : public AstNVisitor { } } - virtual void visit(AstNode* nodep) VL_OVERRIDE { } + virtual void visit(AstNode*) VL_OVERRIDE {} string cInputConnection(AstVar* varp) { string frstmt; diff --git a/src/V3Reloop.cpp b/src/V3Reloop.cpp index 08d917f93..0654a7dae 100644 --- a/src/V3Reloop.cpp +++ b/src/V3Reloop.cpp @@ -222,12 +222,9 @@ private: UINFO(9, "Start merge i="<varScopep(); } } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit SplitAsFindVisitor(AstAlways* nodep) { @@ -117,9 +116,8 @@ private: m_keepStmt = oldKeep || m_keepStmt; UINFO(9," upKeep="< m_refs; - virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } virtual void visit(AstNodeModule* nodep) VL_OVERRIDE { UASSERT_OBJ(m_modp == NULL, m_modp, "Nested module declration"); if (!VN_IS(nodep, Module)) { @@ -1063,6 +1062,8 @@ class SplitPackedVarVisitor : public AstNVisitor, public SplitVarImpl { iterateChildren(nodep); } } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + // Extract necessary bit range from a newly created variable to meet ref static AstNode* extractBits(const PackedVarRefEntry& ref, const SplitNewVar& var, bool lvalue) { diff --git a/src/V3Subst.cpp b/src/V3Subst.cpp index 0c6295b0e..6c4eee97b 100644 --- a/src/V3Subst.cpp +++ b/src/V3Subst.cpp @@ -202,10 +202,9 @@ private: } } } - virtual void visit(AstConst* nodep) VL_OVERRIDE {} // Accelerate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstConst*) VL_OVERRIDE {} // Accelerate + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS SubstUseVisitor(AstNode* nodep, int origStep) { @@ -362,8 +361,8 @@ private: } } } - virtual void visit(AstVar* nodep) VL_OVERRIDE {} - virtual void visit(AstConst* nodep) VL_OVERRIDE {} + virtual void visit(AstVar*) VL_OVERRIDE {} + virtual void visit(AstConst*) VL_OVERRIDE {} virtual void visit(AstNode* nodep) VL_OVERRIDE { m_ops++; if (!nodep->isSubstOptimizable()) { diff --git a/src/V3Table.cpp b/src/V3Table.cpp index 15c9fd6ec..80803503d 100644 --- a/src/V3Table.cpp +++ b/src/V3Table.cpp @@ -450,16 +450,14 @@ private: VL_DO_DANGLING(createTable(nodep), nodep); } } - virtual void visit(AstAssignAlias* nodep) VL_OVERRIDE {} + virtual void visit(AstAssignAlias*) VL_OVERRIDE {} virtual void visit(AstAssignW* nodep) VL_OVERRIDE { // It's nearly impossible to have a large enough assign to make this worthwhile // For now we won't bother. // Accelerated: no iterate } - // default - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit TableVisitor(AstNetlist* nodep) { diff --git a/src/V3Task.cpp b/src/V3Task.cpp index 2943b7285..b18323150 100644 --- a/src/V3Task.cpp +++ b/src/V3Task.cpp @@ -230,10 +230,8 @@ private: } } //-------------------- - // Default: Just iterate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit TaskStateVisitor(AstNetlist* nodep) { @@ -275,9 +273,8 @@ private: } //-------------------- - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit TaskRelinkVisitor(AstBegin* nodep) { // Passed temporary tree @@ -1289,10 +1286,7 @@ private: m_insStmtp = NULL; // Next thing should be new statement } //-------------------- - // Default: Just iterate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Trace.cpp b/src/V3Trace.cpp index 0a4b1b7f1..6e8296b85 100644 --- a/src/V3Trace.cpp +++ b/src/V3Trace.cpp @@ -726,9 +726,7 @@ private: } } //-------------------- - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3TraceDecl.cpp b/src/V3TraceDecl.cpp index 935da5d6c..c1286d404 100644 --- a/src/V3TraceDecl.cpp +++ b/src/V3TraceDecl.cpp @@ -359,9 +359,7 @@ private: } //-------------------- - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3Tristate.cpp b/src/V3Tristate.cpp index 0e34c862c..42fe48ee2 100644 --- a/src/V3Tristate.cpp +++ b/src/V3Tristate.cpp @@ -306,9 +306,8 @@ class TristatePinVisitor : public TristateBaseVisitor { UASSERT_OBJ(!m_lvalue, nodep, "SliceSel conversion to output, under tristate node"); iterateChildren(nodep); } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS TristatePinVisitor(AstNode* nodep, TristateGraph& tgraph, bool lvalue) diff --git a/src/V3Undriven.cpp b/src/V3Undriven.cpp index 7b0897d36..50c7311d9 100644 --- a/src/V3Undriven.cpp +++ b/src/V3Undriven.cpp @@ -414,20 +414,19 @@ private: } // Until we support tables, primitives will have undriven and unused I/Os - virtual void visit(AstPrimitive* nodep) VL_OVERRIDE {} + virtual void visit(AstPrimitive*) VL_OVERRIDE {} // Coverage artifacts etc shouldn't count as a sink - virtual void visit(AstCoverDecl* nodep) VL_OVERRIDE {} - virtual void visit(AstCoverInc* nodep) VL_OVERRIDE {} - virtual void visit(AstCoverToggle* nodep) VL_OVERRIDE {} - virtual void visit(AstTraceDecl* nodep) VL_OVERRIDE {} - virtual void visit(AstTraceInc* nodep) VL_OVERRIDE {} + virtual void visit(AstCoverDecl*) VL_OVERRIDE {} + virtual void visit(AstCoverInc*) VL_OVERRIDE {} + virtual void visit(AstCoverToggle*) VL_OVERRIDE {} + virtual void visit(AstTraceDecl*) VL_OVERRIDE {} + virtual void visit(AstTraceInc*) VL_OVERRIDE {} // iterate virtual void visit(AstConst* nodep) VL_OVERRIDE {} - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS explicit UndrivenVisitor(AstNetlist* nodep) { diff --git a/src/V3Unknown.cpp b/src/V3Unknown.cpp index 49cdb602d..cfc998c2f 100644 --- a/src/V3Unknown.cpp +++ b/src/V3Unknown.cpp @@ -452,10 +452,7 @@ private: } } //-------------------- - // Default: Just iterate - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } public: // CONSTRUCTORS diff --git a/src/V3WidthCommit.h b/src/V3WidthCommit.h index b2a91a474..7f4617b9d 100644 --- a/src/V3WidthCommit.h +++ b/src/V3WidthCommit.h @@ -34,6 +34,14 @@ class WidthRemoveVisitor : public AstNVisitor { private: + // METHODS + void replaceWithSignedVersion(AstNode* nodep, AstNode* newp) { + UINFO(6, " Replace " << nodep << " w/ " << newp << endl); + nodep->replaceWith(newp); + newp->dtypeFrom(nodep); + VL_DO_DANGLING(pushDeletep(nodep), nodep); + } + // VISITORS virtual void visit(AstSigned* nodep) VL_OVERRIDE { VL_DO_DANGLING(replaceWithSignedVersion(nodep, nodep->lhsp()->unlinkFrBack()), nodep); @@ -41,15 +49,8 @@ private: virtual void visit(AstUnsigned* nodep) VL_OVERRIDE { VL_DO_DANGLING(replaceWithSignedVersion(nodep, nodep->lhsp()->unlinkFrBack()), nodep); } - virtual void visit(AstNode* nodep) VL_OVERRIDE { - iterateChildren(nodep); - } - void replaceWithSignedVersion(AstNode* nodep, AstNode* newp) { - UINFO(6," Replace "<replaceWith(newp); - newp->dtypeFrom(nodep); - VL_DO_DANGLING(pushDeletep(nodep), nodep); - } + virtual void visit(AstNode* nodep) VL_OVERRIDE { iterateChildren(nodep); } + public: // CONSTRUCTORS WidthRemoveVisitor() {}