summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/nl_setup.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/netlist/nl_setup.cpp')
-rw-r--r--src/lib/netlist/nl_setup.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index de680df09a5..29104962c02 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -208,12 +208,15 @@ namespace netlist
bool nlparse_t::parse_stream(plib::unique_ptr<plib::pistream> &&istrm, const pstring &name)
{
- return parser_t(std::move(plib::ppreprocessor(&m_defines).process(std::move(istrm))), *this).parse(name);
+ plib::ppreprocessor y(&m_defines);
+ plib::ppreprocessor &x(y.process(std::move(istrm)));
+ return parser_t(std::move(x), *this).parse(name);
+ //return parser_t(std::move(plib::ppreprocessor(&m_defines).process(std::move(istrm))), *this).parse(name);
}
void nlparse_t::add_define(const pstring &defstr)
{
- auto p = defstr.find("=");
+ auto p = defstr.find('=');
if (p != pstring::npos)
add_define(plib::left(defstr, p), defstr.substr(p+1));
else
@@ -351,7 +354,7 @@ std::vector<pstring> setup_t::get_terminals_for_device_name(const pstring &devna
if (plib::startsWith(t.second->name(), devname))
{
pstring tn(t.second->name().substr(devname.length()+1));
- if (tn.find(".") == pstring::npos)
+ if (tn.find('.') == pstring::npos)
terms.push_back(tn);
}
}
@@ -362,7 +365,7 @@ std::vector<pstring> setup_t::get_terminals_for_device_name(const pstring &devna
{
pstring tn(t.first.substr(devname.length()+1));
//printf("\t%s %s %s\n", t.first.c_str(), t.second.c_str(), tn.c_str());
- if (tn.find(".") == pstring::npos)
+ if (tn.find('.') == pstring::npos)
{
terms.push_back(tn);
pstring resolved = resolve_alias(t.first);
@@ -842,7 +845,7 @@ const log_type &setup_t::log() const
void models_t::register_model(const pstring &model_in)
{
- auto pos = model_in.find(" ");
+ auto pos = model_in.find(' ');
if (pos == pstring::npos)
throw nl_exception(MF_UNABLE_TO_PARSE_MODEL_1(model_in));
pstring model = plib::ucase(plib::trim(plib::left(model_in, pos)));
@@ -859,7 +862,7 @@ void models_t::model_parse(const pstring &model_in, model_map_t &map)
while (true)
{
- pos = model.find("(");
+ pos = model.find('(');
if (pos != pstring::npos) break;
key = plib::ucase(model);
@@ -890,7 +893,7 @@ void models_t::model_parse(const pstring &model_in, model_map_t &map)
std::vector<pstring> pairs(plib::psplit(remainder," ", true));
for (pstring &pe : pairs)
{
- auto pose = pe.find("=");
+ auto pose = pe.find('=');
if (pose == pstring::npos)
throw nl_exception(MF_MODEL_ERROR_ON_PAIR_1(model));
map[plib::ucase(plib::left(pe, pose))] = pe.substr(pose + 1);
@@ -901,7 +904,7 @@ pstring models_t::model_string(model_map_t &map)
{
pstring ret = map["COREMODEL"] + "(";
for (auto & i : map)
- ret = ret + i.first + "=" + i.second + " ";
+ ret += (i.first + '=' + i.second + ' ');
return ret + ")";
}
@@ -956,7 +959,7 @@ nl_double models_t::value(const pstring &model, const pstring &entity)
// FIXME: check for errors
//printf("%s %s %e %e\n", entity.c_str(), tmp.c_str(), plib::pstonum<nl_double>(tmp), factor);
bool err(false);
- nl_double val = plib::pstonum_ne<nl_double, true>(tmp, err);
+ auto val = plib::pstonum_ne<nl_double, true>(tmp, err);
if (err)
throw nl_exception(MF_MODEL_NUMBER_CONVERSION_ERROR(entity, tmp, "double", model));
return val * factor;