From e3c1d36e6e036a4bfb48f0f5568fd8aef98ec360 Mon Sep 17 00:00:00 2001 From: github action Date: Tue, 1 Apr 2025 11:34:45 +0000 Subject: [PATCH] Apply 'make format' --- src/V3PreProc.cpp | 49 ++++++++++------------ test_regress/t/t_define_override.py | 4 +- test_regress/t/t_define_override_output.py | 4 +- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/src/V3PreProc.cpp b/src/V3PreProc.cpp index 880a4fb63..9e10f7821 100644 --- a/src/V3PreProc.cpp +++ b/src/V3PreProc.cpp @@ -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); } diff --git a/test_regress/t/t_define_override.py b/test_regress/t/t_define_override.py index 27b14d9e1..97130569b 100755 --- a/test_regress/t/t_define_override.py +++ b/test_regress/t/t_define_override.py @@ -11,6 +11,8 @@ import vltest_bootstrap test.scenarios('linter') -test.lint(verilator_flags2=["+define+TEST_MACRO=20 +define+TEST_MACRO=50"], fails=True, expect_filename=test.golden_filename) +test.lint(verilator_flags2=["+define+TEST_MACRO=20 +define+TEST_MACRO=50"], + fails=True, + expect_filename=test.golden_filename) test.passes() diff --git a/test_regress/t/t_define_override_output.py b/test_regress/t/t_define_override_output.py index ffcf12e1c..6244ac55a 100755 --- a/test_regress/t/t_define_override_output.py +++ b/test_regress/t/t_define_override_output.py @@ -12,7 +12,9 @@ import vltest_bootstrap test.scenarios('vlt') test.top_filename = "t/t_define_override.v" -test.compile(verilator_flags2=["-Wno-DEFOVERRIDE -Wno-REDEFMACRO +define+TEST_MACRO=20 +define+TEST_MACRO=50"]) +test.compile(verilator_flags2=[ + "-Wno-DEFOVERRIDE -Wno-REDEFMACRO +define+TEST_MACRO=20 +define+TEST_MACRO=50" +]) test.execute(expect_filename=test.golden_filename)