summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/nl_parser.cpp
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2016-05-25 20:28:58 +0200
committer couriersud <couriersud@arcor.de>2016-05-27 01:19:59 +0200
commitfd62273a87b8fe43492e4a466ea97993b88904f8 (patch)
tree896b1aca134a5396e0dedb31aac26875b3466c60 /src/lib/netlist/nl_parser.cpp
parent111c5a3dc080a4d454dbcadb6c211ccf2c749da7 (diff)
Moved more code into plib namespace. (nw)
Diffstat (limited to 'src/lib/netlist/nl_parser.cpp')
-rw-r--r--src/lib/netlist/nl_parser.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/netlist/nl_parser.cpp b/src/lib/netlist/nl_parser.cpp
index 41060df73e6..2aa4366b0ba 100644
--- a/src/lib/netlist/nl_parser.cpp
+++ b/src/lib/netlist/nl_parser.cpp
@@ -158,7 +158,7 @@ void parser_t::net_truthtable_start()
pstring def_param = get_string();
require_token(m_tok_param_right);
- powned_ptr<netlist::devices::netlist_base_factory_truthtable_t> ttd = netlist::devices::nl_tt_factory_create(ni, no, hs,
+ plib::powned_ptr<netlist::devices::netlist_base_factory_truthtable_t> ttd = netlist::devices::nl_tt_factory_create(ni, no, hs,
name, name, "+" + def_param);
while (true)
@@ -287,14 +287,14 @@ void parser_t::net_c()
if (n.is(m_tok_param_right))
break;
if (!n.is(m_tok_comma))
- error(pfmt("expected a comma, found <{1}>")(n.str()) );
+ error(plib::pfmt("expected a comma, found <{1}>")(n.str()) );
}
}
void parser_t::dippins()
{
- pstring_vector_t pins;
+ plib::pstring_vector_t pins;
pins.push_back(get_identifier());
require_token(m_tok_comma);
@@ -307,15 +307,15 @@ void parser_t::dippins()
if (n.is(m_tok_param_right))
break;
if (!n.is(m_tok_comma))
- error(pfmt("expected a comma, found <{1}>")(n.str()) );
+ error(plib::pfmt("expected a comma, found <{1}>")(n.str()) );
}
if ((pins.size() % 2) == 1)
error("You must pass an equal number of pins to DIPPINS");
unsigned n = pins.size();
for (unsigned i = 0; i < n / 2; i++)
{
- m_setup.register_alias(pfmt("{1}")(i+1), pins[i*2]);
- m_setup.register_alias(pfmt("{1}")(n-i), pins[i*2 + 1]);
+ m_setup.register_alias(plib::pfmt("{1}")(i+1), pins[i*2]);
+ m_setup.register_alias(plib::pfmt("{1}")(n-i), pins[i*2 + 1]);
}
}
@@ -352,8 +352,8 @@ void parser_t::device(const pstring &dev_type)
else
{
base_factory_t *f = m_setup.factory().factory_by_name(dev_type);
- pstring_vector_t termlist = f->term_param_list();
- pstring_vector_t def_params = f->def_params();
+ plib::pstring_vector_t termlist = f->term_param_list();
+ plib::pstring_vector_t def_params = f->def_params();
std::size_t cnt;