luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-10-08 02:53:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Internals: Fix some shadow and other warnings. No functional change

Browse Source
This commit is contained in:
Wilson Snyder
2017-09-14 23:26:23 -04:00
parent 74420550e6
commit 960b2ed023
13 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3PreProc.cpp
+5 -5
View File
@@ -568,24 +568,24 @@ string V3PreProcImp::defineSubst(V3DefineRef* refp) {
//UINFO(4," Parse Paren="<<paren<<" Arg="<<numArgs<<" token='"<<token<<"' Parse="<<cp<<endl);
if (!quote && paren==1) {
if (*cp==')' || *cp==',') {
string value;
if (haveDefault) { value=token; } else { argName=token; }
string valueDef;
if (haveDefault) { valueDef=token; } else { argName=token; }
argName = trimWhitespace(argName,true);
UINFO(4," Got Arg="<<numArgs<<" argName='"<<argName<<"' default='"<<value<<"'"<<endl);
UINFO(4," Got Arg="<<numArgs<<" argName='"<<argName<<"' default='"<<valueDef<<"'"<<endl);
// Parse it
if (argName!="") {
if (refp->args().size() > numArgs) {
// A call `def( a ) must be equivelent to `def(a ), so trimWhitespace
// At one point we didn't trim trailing whitespace, but this confuses `"
string arg = trimWhitespace(refp->args()[numArgs], true);
if (arg != "") value = arg;
if (arg != "") valueDef = arg;
} else if (!haveDefault) {
error("Define missing argument '"+argName+"' for: "+refp->name()+"\n");
return " `"+refp->name()+" ";
}
numArgs++;
}
argValueByName[argName] = value;
argValueByName[argName] = valueDef;
// Prepare for next
argName = "";
token = "";