Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-30 16:00:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

netlist: catch parenthesis count mismatch in formulas.

Browse Source
This commit is contained in:
couriersud 2020-10-03 12:18:04 +02:00
parent a0e531e0e7
commit b49a86981c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/netlist/plib/pfunction.cpp
View File

@ -150,6 +150,8 @@ namespace plib {
throw pexception(plib::pfmt("pfunction: stack underflow on token <{1}> in <{2}>")(cmd)(expr)); throw pexception(plib::pfmt("pfunction: stack underflow on token <{1}> in <{2}>")(cmd)(expr));
if (stk >= narrow_cast<int>(MAX_STACK)) if (stk >= narrow_cast<int>(MAX_STACK))
throw pexception(plib::pfmt("pfunction: stack overflow on token <{1}> in <{2}>")(cmd)(expr)); throw pexception(plib::pfmt("pfunction: stack overflow on token <{1}> in <{2}>")(cmd)(expr));
if (rc.cmd() == LP || rc.cmd() == RP)
throw pexception(plib::pfmt("pfunction: parenthesis inequality on token <{1}> in <{2}>")(cmd)(expr));
m_precompiled.push_back(rc); m_precompiled.push_back(rc);
} }
if (stk != 1) if (stk != 1)

9
src/lib/netlist/tests/test_pfunction.cpp
View File

@ -50,6 +50,11 @@ PTEST(pfunction, unary_minus)
PFUNCEXPECT("3*-trunc(3.2)", -9.0); PFUNCEXPECT("3*-trunc(3.2)", -9.0);
PFUNCEXPECT("3*-(3*2)", -18.0); PFUNCEXPECT("3*-(3*2)", -18.0);
PFUNCEXPECT("3*-(2*1)^2", -12.0); PFUNCEXPECT("3*-(2*1)^2", -12.0);
PEXPECT_THROW(plib::pfunction<double>("(3, 4)")(), plib::pexception); PEXPECT_NO_THROW(plib::pfunction<double>("(-3)")()); // fail
PEXPECT_NO_THROW(plib::pfunction<double>("(3)")()); // fail }
PTEST(pfunction, expect_throw)
{
PEXPECT_THROW(plib::pfunction<double>("(3, 4)")(), plib::pexception);
PEXPECT_THROW(plib::pfunction<double>("((3)")(), plib::pexception);
PEXPECT_THROW(plib::pfunction<double>("(3))")(), plib::pexception);
} }