mirror of
https://github.com/verilator/verilator.git
synced 2026-09-03 04:03:36 +02:00
Apply 'make format'
This commit is contained in:
+23
-26
@@ -319,9 +319,7 @@ bool V3PreProcImp::defExists(const string& name) {
|
||||
}
|
||||
bool V3PreProcImp::defCmdline(const string& name) {
|
||||
const auto iter = m_defines.find(name);
|
||||
if (iter == m_defines.end()) {
|
||||
return false;
|
||||
}
|
||||
if (iter == m_defines.end()) { return false; }
|
||||
return iter->second.cmdline();
|
||||
}
|
||||
string V3PreProcImp::defValue(const string& name) {
|
||||
@@ -354,32 +352,31 @@ void V3PreProcImp::define(FileLine* fl, const string& name, const string& value,
|
||||
} else {
|
||||
if (defExists(name)) {
|
||||
if (defCmdline(name) && !cmdline) {
|
||||
fl->v3warn(DEFOVERRIDE, "Overriding define: '"
|
||||
<< name << "' with value: '" << value
|
||||
<< "' to existing command line define value: '"
|
||||
<< defValue(name)
|
||||
<< (params == "" ? "" : " ") << params << "'\n"
|
||||
<< fl->warnContextPrimary() << '\n'
|
||||
<< defFileline(name)->warnOther()
|
||||
<< "... Location of previous definition, with value: '"
|
||||
<< defValue(name)
|
||||
<< (defParams(name).empty() ? "" : " ")
|
||||
<< defParams(name) << "'\n"
|
||||
<< defFileline(name)->warnContextSecondary());
|
||||
fl->v3warn(DEFOVERRIDE,
|
||||
"Overriding define: '"
|
||||
<< name << "' with value: '" << value
|
||||
<< "' to existing command line define value: '" << defValue(name)
|
||||
<< (params == "" ? "" : " ") << params << "'\n"
|
||||
<< fl->warnContextPrimary() << '\n'
|
||||
<< defFileline(name)->warnOther()
|
||||
<< "... Location of previous definition, with value: '"
|
||||
<< defValue(name) << (defParams(name).empty() ? "" : " ")
|
||||
<< defParams(name) << "'\n"
|
||||
<< defFileline(name)->warnContextSecondary());
|
||||
return;
|
||||
} else {
|
||||
if (!(defValue(name) == value
|
||||
&& defParams(name) == params)) { // Duplicate defs are OK
|
||||
fl->v3warn(REDEFMACRO, "Redefining existing define: '"
|
||||
<< name << "', with different value: '" << value
|
||||
<< (params == "" ? "" : " ") << params << "'\n"
|
||||
<< fl->warnContextPrimary() << '\n'
|
||||
<< defFileline(name)->warnOther()
|
||||
<< "... Location of previous definition, with value: '"
|
||||
<< defValue(name)
|
||||
<< (defParams(name).empty() ? "" : " ")
|
||||
<< defParams(name) << "'\n"
|
||||
<< defFileline(name)->warnContextSecondary());
|
||||
&& defParams(name) == params)) { // Duplicate defs are OK
|
||||
fl->v3warn(REDEFMACRO,
|
||||
"Redefining existing define: '"
|
||||
<< name << "', with different value: '" << value
|
||||
<< (params == "" ? "" : " ") << params << "'\n"
|
||||
<< fl->warnContextPrimary() << '\n'
|
||||
<< defFileline(name)->warnOther()
|
||||
<< "... Location of previous definition, with value: '"
|
||||
<< defValue(name) << (defParams(name).empty() ? "" : " ")
|
||||
<< defParams(name) << "'\n"
|
||||
<< defFileline(name)->warnContextSecondary());
|
||||
}
|
||||
undef(name);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user