Skip to content

Commit

Permalink
Internals: Rename classOrPackageSkip as kept confusing with member ac…
Browse files Browse the repository at this point in the history 
…cessor. No functional change.
  • Loading branch information
@wsnyder
wsnyder committed Nov 29, 2024
1 parent 9f8fcaf commit f631587
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 27 deletions.
4 changes: 3 additions & 1 deletion src/V3AstNodeExpr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -780,9 +780,11 @@ class AstClassOrPackageRef final : public AstNodeExpr {
void dump(std::ostream& str = std::cout) const override;
void dumpJson(std::ostream& str = std::cout) const override;
string name() const override VL_MT_STABLE { return m_name; } // * = Var name
// There's no classOrPackagep(); use classOrPackageNodep() to get Node,
// or iterating to package with classOrPackageSkipp()
AstNodeModule* classOrPackageSkipp() const;
AstNode* classOrPackageNodep() const { return m_classOrPackageNodep; }
void classOrPackageNodep(AstNode* nodep) { m_classOrPackageNodep = nodep; }
AstNodeModule* classOrPackagep() const;
AstPackage* packagep() const { return VN_CAST(classOrPackageNodep(), Package); }
void classOrPackagep(AstNodeModule* nodep) { m_classOrPackageNodep = (AstNode*)nodep; }

Expand Down
2 changes: 1 addition & 1 deletion src/V3AstNodes.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2596,7 +2596,7 @@ void AstClassOrPackageRef::dump(std::ostream& str) const {
}
}
void AstClassOrPackageRef::dumpJson(std::ostream& str) const { dumpJsonGen(str); }
AstNodeModule* AstClassOrPackageRef::classOrPackagep() const {
AstNodeModule* AstClassOrPackageRef::classOrPackageSkipp() const {
AstNode* foundp = m_classOrPackageNodep;
AstNode* lastp = nullptr;
while (foundp != lastp) {
Expand Down
47 changes: 24 additions & 23 deletions src/V3LinkDot.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ class LinkDotState final {
}
VSymEnt* resolveClassOrPackage(VSymEnt* lookSymp, AstClassOrPackageRef* nodep, bool classOnly,
const string& forWhat) {
if (nodep->classOrPackagep()) return getNodeSym(nodep->classOrPackagep());
if (nodep->classOrPackageSkipp()) return getNodeSym(nodep->classOrPackageSkipp());
VSymEnt* foundp = lookSymp->findIdFallback(nodep->name());
if (!foundp && v3Global.rootp()->stdPackagep()) { // Look under implied std::
foundp = getNodeSym(v3Global.rootp()->stdPackagep())->findIdFlat(nodep->name());
Expand Down Expand Up @@ -1182,11 +1182,11 @@ class LinkDotFindVisitor final : public VNVisitor {
nodep->v3warn(E_UNSUPPORTED,
"Unsupported: extern function definition with class-in-class");
} else {
if (!cpackagerefp->classOrPackagep()) {
if (!cpackagerefp->classOrPackageSkipp()) {
m_statep->resolveClassOrPackage(m_curSymp, cpackagerefp, false,
"External definition :: reference");
}
AstClass* const classp = VN_CAST(cpackagerefp->classOrPackagep(), Class);
AstClass* const classp = VN_CAST(cpackagerefp->classOrPackageSkipp(), Class);
if (!classp) {
nodep->v3error("Extern declaration's scope is not a defined class");
} else {
Expand Down Expand Up @@ -2863,14 +2863,14 @@ class LinkDotResolveVisitor final : public VNVisitor {
if (cpackagerefp->name() == "local::") {
m_randSymp = nullptr;
first = true;
} else if (!cpackagerefp->classOrPackagep()) {
} else if (!cpackagerefp->classOrPackageSkipp()) {
VSymEnt* const foundp = m_statep->resolveClassOrPackage(
m_ds.m_dotSymp, cpackagerefp, false, ":: reference");
if (!foundp) return;
classOrPackagep = cpackagerefp->classOrPackagep();
classOrPackagep = cpackagerefp->classOrPackageSkipp();
m_ds.m_dotSymp = m_statep->getNodeSym(classOrPackagep);
} else {
classOrPackagep = cpackagerefp->classOrPackagep();
classOrPackagep = cpackagerefp->classOrPackageSkipp();
UASSERT_OBJ(classOrPackagep, m_ds.m_dotp->lhsp(), "Bad package link");
m_ds.m_dotSymp = m_statep->getNodeSym(classOrPackagep);
}
Expand Down Expand Up @@ -3216,23 +3216,23 @@ class LinkDotResolveVisitor final : public VNVisitor {
VL_RESTORER(m_usedPins);
m_usedPins.clear();
UASSERT_OBJ(m_statep->forPrimary() || VN_IS(nodep->classOrPackageNodep(), ParamTypeDType)
|| nodep->classOrPackagep(),
|| nodep->classOrPackageSkipp(),
nodep, "ClassRef has unlinked class");
UASSERT_OBJ(m_statep->forPrimary() || !nodep->paramsp(), nodep,
"class reference parameter not removed by V3Param");
{
VL_RESTORER(m_ds);
VL_RESTORER(m_pinSymp);

if (!nodep->classOrPackagep() && nodep->name() != "local::") {
if (!nodep->classOrPackageSkipp() && nodep->name() != "local::") {
m_statep->resolveClassOrPackage(m_ds.m_dotSymp, nodep, false, ":: reference");
}

// ClassRef's have pins, so track
if (nodep->classOrPackagep()) {
m_pinSymp = m_statep->getNodeSym(nodep->classOrPackagep());
if (nodep->classOrPackageSkipp()) {
m_pinSymp = m_statep->getNodeSym(nodep->classOrPackageSkipp());
}
AstClass* const refClassp = VN_CAST(nodep->classOrPackagep(), Class);
AstClass* const refClassp = VN_CAST(nodep->classOrPackageSkipp(), Class);
// Make sure any extends() are properly imported within referenced class
if (refClassp && !m_statep->forPrimary()) classExtendImport(refClassp);

Expand All @@ -3242,7 +3242,7 @@ class LinkDotResolveVisitor final : public VNVisitor {

AstClass* const modClassp = VN_CAST(m_modp, Class);
if (m_statep->forPrimary() && refClassp && !nodep->paramsp()
&& nodep->classOrPackagep()->hasGParam()
&& nodep->classOrPackageSkipp()->hasGParam()
// Don't warn on typedefs, which are hard to know if there's a param somewhere
// buried
&& VN_IS(nodep->classOrPackageNodep(), Class)
Expand All @@ -3263,8 +3263,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
return;
}
}
if (m_ds.m_dotPos == DP_PACKAGE && nodep->classOrPackagep()) {
m_ds.m_dotSymp = m_statep->getNodeSym(nodep->classOrPackagep());
if (m_ds.m_dotPos == DP_PACKAGE && nodep->classOrPackageSkipp()) {
m_ds.m_dotSymp = m_statep->getNodeSym(nodep->classOrPackageSkipp());
UINFO(9, indent() << "set sym " << m_ds.ascii() << endl);
}
}
Expand Down Expand Up @@ -3515,12 +3515,12 @@ class LinkDotResolveVisitor final : public VNVisitor {
if (cpackagerefp->name() == "local::") {
m_randSymp = nullptr;
first = true;
} else if (!cpackagerefp->classOrPackagep()) {
} else if (!cpackagerefp->classOrPackageSkipp()) {
VSymEnt* const foundp = m_statep->resolveClassOrPackage(
m_ds.m_dotSymp, cpackagerefp, false, ":: reference");
if (foundp) nodep->classOrPackagep(cpackagerefp->classOrPackagep());
if (foundp) nodep->classOrPackagep(cpackagerefp->classOrPackageSkipp());
} else {
nodep->classOrPackagep(cpackagerefp->classOrPackagep());
nodep->classOrPackagep(cpackagerefp->classOrPackageSkipp());
}
// Class/package :: HERE function() . method_called_on_function_return_value()
m_ds.m_dotPos = DP_MEMBER;
Expand Down Expand Up @@ -3895,8 +3895,8 @@ class LinkDotResolveVisitor final : public VNVisitor {
VSymEnt* const foundp = m_statep->resolveClassOrPackage(
lookSymp, lookNodep, false, nodep->verilogKwd());
if (!foundp) return;
UASSERT_OBJ(lookNodep->classOrPackagep(), nodep, "Bad package link");
lookSymp = m_statep->getNodeSym(lookNodep->classOrPackagep());
UASSERT_OBJ(lookNodep->classOrPackageSkipp(), nodep, "Bad package link");
lookSymp = m_statep->getNodeSym(lookNodep->classOrPackageSkipp());
} else {
dotp->lhsp()->v3error("Attempting to extend" // LCOV_EXCL_LINE
" using non-class under dot");
Expand Down Expand Up @@ -4068,12 +4068,12 @@ class LinkDotResolveVisitor final : public VNVisitor {
iterate(cpackagep);
return;
}
if (!cpackagerefp->classOrPackagep()) {
if (!cpackagerefp->classOrPackageSkipp()) {
VSymEnt* const foundp = m_statep->resolveClassOrPackage(
m_ds.m_dotSymp, cpackagerefp, false, "class/package reference");
if (!foundp) return;
}
nodep->classOrPackagep(cpackagerefp->classOrPackagep());
nodep->classOrPackagep(cpackagerefp->classOrPackageSkipp());
if (!VN_IS(nodep->classOrPackagep(), Class)
&& !VN_IS(nodep->classOrPackagep(), Package)) {
// Likely impossible, as error thrown earlier
Expand All @@ -4094,8 +4094,9 @@ class LinkDotResolveVisitor final : public VNVisitor {
UASSERT_OBJ(VN_IS(m_ds.m_dotp->lhsp(), ClassOrPackageRef), m_ds.m_dotp->lhsp(),
"Bad package link");
auto* const cpackagerefp = VN_AS(m_ds.m_dotp->lhsp(), ClassOrPackageRef);
UASSERT_OBJ(cpackagerefp->classOrPackagep(), m_ds.m_dotp->lhsp(), "Bad package link");
nodep->classOrPackagep(cpackagerefp->classOrPackagep());
UASSERT_OBJ(cpackagerefp->classOrPackageSkipp(), m_ds.m_dotp->lhsp(),
"Bad package link");
nodep->classOrPackagep(cpackagerefp->classOrPackageSkipp());
m_ds.m_dotPos = DP_SCOPE;
} else {
checkNoDot(nodep);
Expand Down
5 changes: 3 additions & 2 deletions src/V3Param.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,8 @@ class ParamProcessor final {
if (AstClassRefDType* const classRefp = VN_CAST(nodep, ClassRefDType)) {
if (classRefp->classp() == oldClassp) classRefp->classp(newClassp);
} else if (AstClassOrPackageRef* const classRefp = VN_CAST(nodep, ClassOrPackageRef)) {
if (classRefp->classOrPackagep() == oldClassp) classRefp->classOrPackagep(newClassp);
if (classRefp->classOrPackageSkipp() == oldClassp)
classRefp->classOrPackagep(newClassp);
}

if (nodep->op1p()) replaceRefsRecurse(nodep->op1p(), oldClassp, newClassp);
Expand Down Expand Up @@ -1084,7 +1085,7 @@ class ParamVisitor final : public VNVisitor {
if (const auto* modCellp = VN_CAST(cellp, Cell)) {
srcModp = modCellp->modp();
} else if (const auto* classRefp = VN_CAST(cellp, ClassOrPackageRef)) {
srcModp = classRefp->classOrPackagep();
srcModp = classRefp->classOrPackageSkipp();
if (VN_IS(classRefp->classOrPackageNodep(), ParamTypeDType)) continue;
} else if (const auto* classRefp = VN_CAST(cellp, ClassRefDType)) {
srcModp = classRefp->classp();
Expand Down

0 comments on commit f631587

Please sign in to comment.