From ed5bc1e69c95af7201277f3156efde6c782f509a Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sun, 22 Apr 2012 19:18:51 -0400 Subject: [PATCH] Internals: Rename arrayp to rangep(). No functional change intended. --- src/V3AstNodes.h | 14 +++++++------- src/V3EmitCSyms.cpp | 4 ++-- src/V3EmitV.cpp | 2 +- src/V3Width.cpp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/V3AstNodes.h b/src/V3AstNodes.h index 3254689ef..8b1f08975 100644 --- a/src/V3AstNodes.h +++ b/src/V3AstNodes.h @@ -241,16 +241,16 @@ public: AstNodeDType* dtypeSkipRefp() const { return dtypep()->skipRefp(); } // op1 = Range of variable void dtypep(AstNodeDType* nodep) { setOp1p(nodep); } AstNodeDType* subDTypep() const { return dtypep(); } - AstRange* arrayp() const { return op2p()->castRange(); } // op2 = Array(s) of variable - void arrayp(AstRange* nodep) { setOp2p(nodep); } + AstRange* rangep() const { return op2p()->castRange(); } // op2 = Array(s) of variable + void rangep(AstRange* nodep) { setOp2p(nodep); } // METHODS virtual AstBasicDType* basicp() const { return dtypep()->basicp(); } // (Slow) recurse down to find basic data type virtual AstNodeDType* skipRefp() const { return (AstNodeDType*)this; } virtual int widthAlignBytes() const { return dtypep()->widthAlignBytes(); } virtual int widthTotalBytes() const { return elementsConst() * dtypep()->widthTotalBytes(); } - int msb() const { return arrayp()->msbConst(); } - int lsb() const { return arrayp()->lsbConst(); } - int elementsConst() const { return arrayp()->elementsConst(); } + int msb() const { return rangep()->msbConst(); } + int lsb() const { return rangep()->lsbConst(); } + int elementsConst() const { return rangep()->elementsConst(); } int msbMaxSelect() const { return (lsb()<0 ? msb()-lsb() : msb()); } // Maximum value a [] select may index bool isPacked() const { return m_packed; } }; @@ -2388,8 +2388,8 @@ public: m_left = bdtypep ? bdtypep->left() : 0; m_right = bdtypep ? bdtypep->right() : 0; if (AstArrayDType* adtypep = varp->dtypeSkipRefp()->castArrayDType()) { - m_arrayLsb = adtypep->arrayp()->lsbConst(); - m_arrayMsb = adtypep->arrayp()->msbConst(); + m_arrayLsb = adtypep->lsb(); + m_arrayMsb = adtypep->msb(); } else { m_arrayLsb = 0; m_arrayMsb = 0; diff --git a/src/V3EmitCSyms.cpp b/src/V3EmitCSyms.cpp index aa0d3ddc7..51b3664a0 100644 --- a/src/V3EmitCSyms.cpp +++ b/src/V3EmitCSyms.cpp @@ -462,8 +462,8 @@ void EmitCSyms::emitSymImp() { for (AstNodeDType* dtypep=varp->dtypep(); dtypep; ) { dtypep = dtypep->skipRefp(); // Skip AstRefDType/AstTypedef, or return same node if (AstArrayDType* adtypep = dtypep->castArrayDType()) { - bounds += " ,"; bounds += cvtToStr(adtypep->arrayp()->msbConst()); - bounds += ","; bounds += cvtToStr(adtypep->arrayp()->lsbConst()); + bounds += " ,"; bounds += cvtToStr(adtypep->msb()); + bounds += ","; bounds += cvtToStr(adtypep->lsb()); dim++; dtypep = adtypep->subDTypep(); } diff --git a/src/V3EmitV.cpp b/src/V3EmitV.cpp index b030c9b64..ddb20bb51 100644 --- a/src/V3EmitV.cpp +++ b/src/V3EmitV.cpp @@ -495,7 +495,7 @@ class EmitVBaseVisitor : public EmitCBaseVisitor { } virtual void visit(AstArrayDType* nodep, AstNUser*) { nodep->subDTypep()->iterateAndNext(*this); - nodep->arrayp()->iterateAndNext(*this); + nodep->rangep()->iterateAndNext(*this); } virtual void visit(AstNodeFTaskRef* nodep, AstNUser*) { if (nodep->dotted()!="") { putfs(nodep,nodep->dotted()); puts("."); puts(nodep->prettyName()); } diff --git a/src/V3Width.cpp b/src/V3Width.cpp index 0535c3a1f..0c5cb8c4e 100644 --- a/src/V3Width.cpp +++ b/src/V3Width.cpp @@ -632,7 +632,7 @@ private: // Lower datatype determines the width nodep->dtypep()->iterateAndNext(*this,vup); // But also cleanup array size - nodep->arrayp()->iterateAndNext(*this,WidthVP(ANYSIZE,0,BOTH).p()); + nodep->rangep()->iterateAndNext(*this,WidthVP(ANYSIZE,0,BOTH).p()); nodep->widthFrom(nodep->dtypep()); nodep->numericFrom(nodep->dtypep()); UINFO(4,"dtWidthed "<