From afa8e4c786edb71a83757c3e40be5977fcd5dcde Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sat, 11 Apr 2020 10:54:42 -0400 Subject: [PATCH] Internals: Favor const_iterator. No functional change. --- src/V3AstNodes.h | 3 ++- src/V3EmitC.cpp | 2 +- src/V3LinkLevel.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/V3AstNodes.h b/src/V3AstNodes.h index 2ad684e6b..600c3779e 100644 --- a/src/V3AstNodes.h +++ b/src/V3AstNodes.h @@ -2520,7 +2520,8 @@ public: AstDot(FileLine* fl, AstNode* lhsp, AstNode* rhsp) : ASTGEN_SUPER(fl) { setOp1p(lhsp); setOp2p(rhsp); } ASTNODE_NODE_FUNCS(Dot) - static AstNode* newIfPkg(FileLine*fl, AstPackage* packagep, AstNode* rhsp) { // For parser, make only if non-null package + // For parser, make only if non-null package + static AstNode* newIfPkg(FileLine* fl, AstPackage* packagep, AstNode* rhsp) { if (!packagep) return rhsp; return new AstDot(fl, new AstPackageRef(fl, packagep), rhsp); } diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp index dd59d233b..742ec2f25 100644 --- a/src/V3EmitC.cpp +++ b/src/V3EmitC.cpp @@ -1998,7 +1998,7 @@ void EmitCStmts::displayNode(AstNode* nodep, AstScopeName* scopenamep, case 'e': displayArg(nodep, &elistp, isScan, vfmt, 'e'); break; case 'f': displayArg(nodep, &elistp, isScan, vfmt, 'f'); break; case 'g': displayArg(nodep, &elistp, isScan, vfmt, 'g'); break; - case '^': displayArg(nodep,&elistp,isScan, vfmt,'^'); break; // Realtime + case '^': displayArg(nodep, &elistp, isScan, vfmt, '^'); break; // Realtime case 'v': displayArg(nodep, &elistp, isScan, vfmt, 'v'); break; case 'm': { UASSERT_OBJ(scopenamep, nodep, "Display with %m but no AstScopeName"); diff --git a/src/V3LinkLevel.cpp b/src/V3LinkLevel.cpp index e51172c6e..062cfa44b 100644 --- a/src/V3LinkLevel.cpp +++ b/src/V3LinkLevel.cpp @@ -74,14 +74,14 @@ void V3LinkLevel::modSortByLevel() { // Reorder the netlist's modules to have modules in level sorted order stable_sort(mods.begin(), mods.end(), CmpLevel()); // Sort the vector UINFO(9,"modSortByLevel() sorted\n"); // Comment required for gcc4.6.3 / bug666 - for (ModVec::iterator it = mods.begin(); it != mods.end(); ++it) { + for (ModVec::const_iterator it = mods.begin(); it != mods.end(); ++it) { AstNodeModule* nodep = *it; nodep->clearIter(); // Because we didn't iterate to find the node // pointers, may have a stale m_iterp() needing cleanup nodep->unlinkFrBack(); } UASSERT_OBJ(!v3Global.rootp()->modulesp(), v3Global.rootp(), "Unlink didn't work"); - for (ModVec::iterator it = mods.begin(); it != mods.end(); ++it) { + for (ModVec::const_iterator it = mods.begin(); it != mods.end(); ++it) { AstNodeModule* nodep = *it; v3Global.rootp()->addModulep(nodep); }