diff --git a/src/V3PreProc.cpp b/src/V3PreProc.cpp index 28058644f..cea6db1f2 100644 --- a/src/V3PreProc.cpp +++ b/src/V3PreProc.cpp @@ -212,7 +212,7 @@ private: void parsingOn() { m_off--; - if (m_off < 0) fatalSrc("Underflow of parsing cmds"); + if (m_off < 0) v3fatalSrc("Underflow of parsing cmds"); // addLineComment no longer needed; getFinalToken will correct. } void parsingOff() { m_off++; } @@ -541,7 +541,7 @@ void V3PreProcImp::unputString(const string& strg) { // so instead we scan from a temporary buffer, then on EOF return. // This is also faster than the old scheme, amazingly. if (VL_UNCOVERABLE(m_lexp->m_bufferState != m_lexp->currentBuffer())) { - fatalSrc("bufferStack missing current buffer; will return incorrectly"); + v3fatalSrc("bufferStack missing current buffer; will return incorrectly"); // Hard to debug lost text as won't know till much later } m_lexp->scanBytes(strg); @@ -1091,7 +1091,7 @@ int V3PreProcImp::getStateToken() { m_lexp->pushStateDefForm(); goto next_tok; } else { // LCOV_EXCL_LINE - fatalSrc("Bad case\n"); + v3fatalSrc("Bad case\n"); } goto next_tok; } else if (tok == VP_TEXT) { @@ -1165,7 +1165,7 @@ int V3PreProcImp::getStateToken() { } else { const string msg = std::string{"Bad define text, unexpected "} + tokenName(tok) + "\n"; - fatalSrc(msg); + v3fatalSrc(msg); } statePop(); // DEFVALUE is terminated by a return, but lex can't return both tokens. @@ -1179,7 +1179,7 @@ int V3PreProcImp::getStateToken() { goto next_tok; } else { if (VL_UNCOVERABLE(m_defRefs.empty())) { - fatalSrc("Shouldn't be in DEFPAREN w/o active defref"); + v3fatalSrc("Shouldn't be in DEFPAREN w/o active defref"); } const VDefineRef* const refp = &(m_defRefs.top()); error(std::string{"Expecting ( to begin argument list for define reference `"} @@ -1190,7 +1190,7 @@ int V3PreProcImp::getStateToken() { } case ps_DEFARG: { if (VL_UNCOVERABLE(m_defRefs.empty())) { - fatalSrc("Shouldn't be in DEFARG w/o active defref"); + v3fatalSrc("Shouldn't be in DEFARG w/o active defref"); } VDefineRef* refp = &(m_defRefs.top()); refp->nextarg(refp->nextarg() + m_lexp->m_defValue); @@ -1217,7 +1217,7 @@ int V3PreProcImp::getStateToken() { if (state() == ps_JOIN) { // Handle {left}```FOO(ARG) where `FOO(ARG) might be empty if (VL_UNCOVERABLE(m_joinStack.empty())) { - fatalSrc("`` join stack empty, but in a ``"); + v3fatalSrc("`` join stack empty, but in a ``"); } const string lhs = m_joinStack.top(); m_joinStack.pop(); @@ -1307,7 +1307,7 @@ int V3PreProcImp::getStateToken() { case ps_JOIN: { if (tok == VP_SYMBOL || tok == VP_TEXT) { if (VL_UNCOVERABLE(m_joinStack.empty())) { - fatalSrc("`` join stack empty, but in a ``"); + v3fatalSrc("`` join stack empty, but in a ``"); } const string lhs = m_joinStack.top(); m_joinStack.pop(); @@ -1363,7 +1363,7 @@ int V3PreProcImp::getStateToken() { goto next_tok; } } - default: fatalSrc("Bad case\n"); + default: v3fatalSrc("Bad case\n"); } // Default is to do top level expansion of some tokens switch (tok) { @@ -1445,7 +1445,7 @@ int V3PreProcImp::getStateToken() { // Just output the substitution if (state() == ps_JOIN) { // Handle {left}```FOO where `FOO might be empty if (VL_UNCOVERABLE(m_joinStack.empty())) { - fatalSrc("`` join stack empty, but in a ``"); + v3fatalSrc("`` join stack empty, but in a ``"); } const string lhs = m_joinStack.top(); m_joinStack.pop(); @@ -1481,7 +1481,7 @@ int V3PreProcImp::getStateToken() { goto next_tok; } } - fatalSrc("Bad case\n"); // FALLTHRU + v3fatalSrc("Bad case\n"); // FALLTHRU goto next_tok; // above fatal means unreachable, but fixes static analysis warning } case VP_ERROR: { @@ -1518,7 +1518,7 @@ int V3PreProcImp::getStateToken() { case VP_DEFFORM: // Handled by state=ps_DEFFORM; case VP_DEFVALUE: // Handled by state=ps_DEFVALUE; default: // LCOV_EXCL_LINE - fatalSrc(std::string{"Internal error: Unexpected token "} + tokenName(tok) + "\n"); + v3fatalSrc(std::string{"Internal error: Unexpected token "} + tokenName(tok) + "\n"); break; // LCOV_EXCL_LINE } return tok; diff --git a/src/V3PreProc.h b/src/V3PreProc.h index 72126141e..f13ef98ed 100644 --- a/src/V3PreProc.h +++ b/src/V3PreProc.h @@ -28,9 +28,6 @@ #include #include -// Compatibility with Verilog-Perl's preprocessor -#define fatalSrc(msg) v3fatalSrc(msg) - class VInFilter; class VSpellCheck;