summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/plib/ptokenizer.cpp
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2020-08-09 12:00:57 +0200
committer couriersud <couriersud@gmx.org>2020-08-09 12:00:57 +0200
commit77dbc79547b7ce9163d4cdc0762b7682dfae32fc (patch)
treed5b52f0d6d490bf0ea491ed66b002389523ad7cc /src/lib/netlist/plib/ptokenizer.cpp
parentb0b2e1351a39587a14cc5a500eabf99da772ee5d (diff)
netlist: fix line-number tracking when at end of line.
* Also remove a semicolon from nlm_opamp.cpp
Diffstat (limited to 'src/lib/netlist/plib/ptokenizer.cpp')
-rw-r--r--src/lib/netlist/plib/ptokenizer.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/netlist/plib/ptokenizer.cpp b/src/lib/netlist/plib/ptokenizer.cpp
index cc3d6538f8d..ab4b0444e42 100644
--- a/src/lib/netlist/plib/ptokenizer.cpp
+++ b/src/lib/netlist/plib/ptokenizer.cpp
@@ -48,7 +48,7 @@ namespace plib {
if (m_px == m_cur_line.end())
{
//++m_source_location.back();
- if (m_strm->readline(m_cur_line))
+ if (m_strm->readline_lf(m_cur_line))
{
m_px = m_cur_line.begin();
if (*m_px != '#')
@@ -56,7 +56,6 @@ namespace plib {
}
else
return 0;
- return '\n';
}
pstring::value_type c = *(m_px++);
return c;
@@ -169,7 +168,7 @@ namespace plib {
if (ret.str() == "1")
benter = true;
if (ret.str() == "2")
- bexit = false;
+ bexit = true;
// FIXME: process flags; actually only 1 (file enter) and 2 (after file exit)
ret = get_token_queue();
}
@@ -177,7 +176,7 @@ namespace plib {
m_source_location.pop_back();
if (!benter) // new location!
m_source_location.pop_back();
- m_source_location.emplace_back(plib::source_location(file, lineno));
+ m_source_location.emplace_back(plib::source_location(file, lineno - 1));
}
else if (ret.is_type(token_type::SOURCELINE))
{