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.cpp24
1 files changed, 5 insertions, 19 deletions
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index b2ade9d48ce..9af1ec92d51 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -352,7 +352,7 @@ namespace netlist
return false;
}
- bool nlparse_t::parse_tokens(const parser_t::token_store &tokens, const pstring &name)
+ bool nlparse_t::parse_tokens(const plib::detail::token_store &tokens, const pstring &name)
{
parser_t parser(*this);
return parser.parse(tokens, name);
@@ -1282,7 +1282,10 @@ void models_t::model_parse(const pstring &model_in, map_t &map)
key = plib::ucase(model);
auto i = m_models.find(key);
if (i == m_models.end())
- throw nl_exception(MF_MODEL_NOT_FOUND("xx" + model));
+ {
+ throw nl_exception(MF_MODEL_NOT_FOUND(pstring("xx") + model));
+ }
+
model = i->second;
}
pstring xmodel = plib::left(model, pos);
@@ -1759,22 +1762,5 @@ plib::istream_uptr source_proc_t::stream(const pstring &name)
return plib::istream_uptr();
}
-bool source_token_t::parse(nlparse_t &setup, const pstring &name)
-{
- if (name == m_name)
- {
- auto ret = setup.parse_tokens(m_store, name);
- return ret;
- }
-
- return false;
-}
-
-plib::istream_uptr source_token_t::stream(const pstring &name)
-{
- plib::unused_var(name);
- return plib::istream_uptr();
-}
-
} // namespace netlist