diff options
| author | 2020-01-25 21:13:21 +0100 | |
|---|---|---|
| committer | 2020-01-25 21:13:21 +0100 | |
| commit | 6874b1f7ac8e5d91503a5b47fe95f86e491d5914 (patch) | |
| tree | 21fc875d7f9574f1213a9be264498bf11a36b031 /src/lib/netlist/nl_setup.cpp | |
| parent | 9431ee68e78aa0fe5164bfa7466f35ebd02f560d (diff) | |
netlist: clang lint readability fixes. (nw)
Diffstat (limited to 'src/lib/netlist/nl_setup.cpp')
| -rw-r--r-- | src/lib/netlist/nl_setup.cpp | 174 |
1 files changed, 76 insertions, 98 deletions
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp index b1fac785ff6..dad4684e2eb 100644 --- a/src/lib/netlist/nl_setup.cpp +++ b/src/lib/netlist/nl_setup.cpp @@ -36,7 +36,7 @@ namespace netlist void nlparse_t::register_dip_alias_arr(const pstring &terms) { std::vector<pstring> list(plib::psplit(terms,", ")); - if (list.size() == 0 || (list.size() % 2) == 1) + if (list.empty() || (list.size() % 2) == 1) { log().fatal(MF_DIP_PINS_MUST_BE_AN_EQUAL_NUMBER_OF_PINS_1(build_fqn(""))); throw nl_exception(MF_DIP_PINS_MUST_BE_AN_EQUAL_NUMBER_OF_PINS_1(build_fqn(""))); @@ -80,7 +80,7 @@ namespace netlist register_dev(classname, name); - if (params_and_connections.size() > 0) + if (!params_and_connections.empty()) { auto ptok(params_and_connections.begin()); auto ptok_end(params_and_connections.end()); @@ -146,19 +146,17 @@ namespace netlist log().fatal(MF_CLASS_1_NOT_FOUND(classname)); throw nl_exception(MF_CLASS_1_NOT_FOUND(classname)); } - else + + // make sure we parse macro library entries + f->macro_actions(*this, name); + pstring key = build_fqn(name); + if (device_exists(key)) { - // make sure we parse macro library entries - f->macro_actions(*this, name); - pstring key = build_fqn(name); - if (device_exists(key)) - { - log().fatal(MF_DEVICE_ALREADY_EXISTS_1(name)); - throw nl_exception(MF_DEVICE_ALREADY_EXISTS_1(name)); - } - else - m_device_factory.insert(m_device_factory.end(), {key, f}); + log().fatal(MF_DEVICE_ALREADY_EXISTS_1(name)); + throw nl_exception(MF_DEVICE_ALREADY_EXISTS_1(name)); } + + m_device_factory.insert(m_device_factory.end(), {key, f}); } void nlparse_t::register_link(const pstring &sin, const pstring &sout) @@ -281,11 +279,8 @@ namespace netlist pstring nlparse_t::build_fqn(const pstring &obj_name) const { - if (m_namespace_stack.empty()) - //return netlist().name() + "." + obj_name; - return obj_name; - else - return m_namespace_stack.top() + "." + obj_name; + return (m_namespace_stack.empty()) ? obj_name + : m_namespace_stack.top() + "." + obj_name; } void nlparse_t::register_alias_nofqn(const pstring &alias, const pstring &out) @@ -343,7 +338,7 @@ setup_t::setup_t(netlist_state_t &nlstate) { } -pstring setup_t::termtype_as_str(detail::core_terminal_t &in) const +pstring setup_t::termtype_as_str(detail::core_terminal_t &in) { switch (in.type()) { @@ -362,10 +357,7 @@ pstring setup_t::termtype_as_str(detail::core_terminal_t &in) const pstring setup_t::get_initial_param_val(const pstring &name, const pstring &def) const { auto i = m_param_values.find(name); - if (i != m_param_values.end()) - return i->second; - else - return def; + return (i != m_param_values.end()) ? i->second : def; } void setup_t::register_term(detail::core_terminal_t &term) @@ -544,8 +536,8 @@ detail::core_terminal_t *setup_t::find_terminal(const pstring &terminal_in, log().fatal(MF_OBJECT_1_2_WRONG_TYPE(terminal_in, tname)); throw nl_exception(MF_OBJECT_1_2_WRONG_TYPE(terminal_in, tname)); } - else - term = nullptr; + + term = nullptr; } if (term != nullptr) log().debug("Found input {1}\n", tname); @@ -576,39 +568,38 @@ devices::nld_base_proxy *setup_t::get_d_a_proxy(detail::core_terminal_t &out) auto &out_cast = static_cast<logic_output_t &>(out); auto iter_proxy(m_proxies.find(&out)); - if (iter_proxy == m_proxies.end()) - { - // create a new one ... - pstring x = plib::pfmt("proxy_da_{1}_{2}")(out.name())(m_proxy_cnt); - auto new_proxy = - out_cast.logic_family()->create_d_a_proxy(m_nlstate, x, &out_cast); - m_proxy_cnt++; - // connect all existing terminals to new net + if (iter_proxy != m_proxies.end()) + return iter_proxy->second; + + // create a new one ... + pstring x = plib::pfmt("proxy_da_{1}_{2}")(out.name())(m_proxy_cnt); + auto new_proxy = + out_cast.logic_family()->create_d_a_proxy(m_nlstate, x, &out_cast); + m_proxy_cnt++; + // connect all existing terminals to new net - for (auto & p : out.net().core_terms()) + for (auto & p : out.net().core_terms()) + { + p->clear_net(); // de-link from all nets ... + if (!connect(new_proxy->proxy_term(), *p)) { - p->clear_net(); // de-link from all nets ... - if (!connect(new_proxy->proxy_term(), *p)) - { - log().fatal(MF_CONNECTING_1_TO_2( - new_proxy->proxy_term().name(), (*p).name())); - throw nl_exception(MF_CONNECTING_1_TO_2( - new_proxy->proxy_term().name(), (*p).name())); - } + log().fatal(MF_CONNECTING_1_TO_2( + new_proxy->proxy_term().name(), (*p).name())); + throw nl_exception(MF_CONNECTING_1_TO_2( + new_proxy->proxy_term().name(), (*p).name())); } - out.net().core_terms().clear(); + } + out.net().core_terms().clear(); - out.net().add_terminal(new_proxy->in()); + out.net().add_terminal(new_proxy->in()); - auto proxy(new_proxy.get()); - if (!m_proxies.insert({&out, proxy}).second) - throw nl_exception(MF_DUPLICATE_PROXY_1(out.name())); + auto proxy(new_proxy.get()); + if (!m_proxies.insert({&out, proxy}).second) + throw nl_exception(MF_DUPLICATE_PROXY_1(out.name())); + + m_nlstate.register_device(new_proxy->name(), std::move(new_proxy)); + return proxy; - m_nlstate.register_device(new_proxy->name(), std::move(new_proxy)); - return proxy; - } - else - return iter_proxy->second; } devices::nld_base_proxy *setup_t::get_a_d_proxy(detail::core_terminal_t &inp) @@ -621,42 +612,40 @@ devices::nld_base_proxy *setup_t::get_a_d_proxy(detail::core_terminal_t &inp) if (iter_proxy != m_proxies.end()) return iter_proxy->second; - else - { - log().debug("connect_terminal_input: connecting proxy\n"); - pstring x = plib::pfmt("proxy_ad_{1}_{2}")(inp.name())(m_proxy_cnt); - auto new_proxy = incast.logic_family()->create_a_d_proxy(m_nlstate, x, &incast); - //auto new_proxy = plib::owned_ptr<devices::nld_a_to_d_proxy>::Create(netlist(), x, &incast); - auto ret(new_proxy.get()); + log().debug("connect_terminal_input: connecting proxy\n"); + pstring x = plib::pfmt("proxy_ad_{1}_{2}")(inp.name())(m_proxy_cnt); + auto new_proxy = incast.logic_family()->create_a_d_proxy(m_nlstate, x, &incast); + //auto new_proxy = plib::owned_ptr<devices::nld_a_to_d_proxy>::Create(netlist(), x, &incast); + + auto ret(new_proxy.get()); - if (!m_proxies.insert({&inp, ret}).second) - throw nl_exception(MF_DUPLICATE_PROXY_1(inp.name())); + if (!m_proxies.insert({&inp, ret}).second) + throw nl_exception(MF_DUPLICATE_PROXY_1(inp.name())); - m_proxy_cnt++; + m_proxy_cnt++; - // connect all existing terminals to new net + // connect all existing terminals to new net - if (inp.has_net()) + if (inp.has_net()) + { + for (auto & p : inp.net().core_terms()) { - for (auto & p : inp.net().core_terms()) + p->clear_net(); // de-link from all nets ... + if (!connect(ret->proxy_term(), *p)) { - p->clear_net(); // de-link from all nets ... - if (!connect(ret->proxy_term(), *p)) - { - log().fatal(MF_CONNECTING_1_TO_2( - ret->proxy_term().name(), (*p).name())); - throw nl_exception(MF_CONNECTING_1_TO_2( - ret->proxy_term().name(), (*p).name())); + log().fatal(MF_CONNECTING_1_TO_2( + ret->proxy_term().name(), (*p).name())); + throw nl_exception(MF_CONNECTING_1_TO_2( + ret->proxy_term().name(), (*p).name())); - } } - inp.net().core_terms().clear(); // clear the list } - ret->out().net().add_terminal(inp); - m_nlstate.register_device(new_proxy->name(), std::move(new_proxy)); - return ret; + inp.net().core_terms().clear(); // clear the list } + ret->out().net().add_terminal(inp); + m_nlstate.register_device(new_proxy->name(), std::move(new_proxy)); + return ret; } detail::core_terminal_t &setup_t::resolve_proxy(detail::core_terminal_t &term) @@ -901,7 +890,7 @@ void setup_t::resolve_inputs() // after all other terminals were connected. unsigned tries = m_netlist_params->m_max_link_loops(); - while (m_links.size() > 0 && tries > 0) + while (!m_links.empty() > 0 && tries > 0) { for (auto li = m_links.begin(); li != m_links.end(); ) @@ -1079,26 +1068,22 @@ pstring models_t::value_str(const pstring &model, const pstring &entity) { model_map_t &map = m_cache[model]; - if (map.size() == 0) + if (map.empty()) model_parse(model , map); - pstring ret; - if (entity != plib::ucase(entity)) throw nl_exception(MF_MODEL_PARAMETERS_NOT_UPPERCASE_1_2(entity, model_string(map))); if (map.find(entity) == map.end()) throw nl_exception(MF_ENTITY_1_NOT_FOUND_IN_MODEL_2(entity, model_string(map))); - else - ret = map[entity]; - return ret; + return map[entity]; } nl_fptype models_t::value(const pstring &model, const pstring &entity) { model_map_t &map = m_cache[model]; - if (map.size() == 0) + if (map.empty()) model_parse(model , map); pstring tmp = value_str(model, entity); @@ -1210,8 +1195,7 @@ void setup_t::delete_empty_nets() x->state().run_state_manager().remove_save_items(x.get()); return true; } - else - return false; + return false; }), m_nlstate.nets().end()); } @@ -1275,7 +1259,7 @@ void setup_t::prepare_to_run() } } - bool use_deactivate = m_netlist_params->m_use_deactivate() ? true : false; + const bool use_deactivate = m_netlist_params->m_use_deactivate(); for (auto &d : m_nlstate.devices()) { @@ -1346,10 +1330,7 @@ void setup_t::prepare_to_run() bool source_netlist_t::parse(nlparse_t &setup, const pstring &name) { auto strm(stream(name)); - if (strm) - return setup.parse_stream(std::move(strm), name); - else - return false; + return (strm) ? setup.parse_stream(std::move(strm), name) : false; } source_string_t::stream_ptr source_string_t::stream(const pstring &name) @@ -1372,10 +1353,7 @@ source_file_t::stream_ptr source_file_t::stream(const pstring &name) { plib::unused_var(name); auto ret(plib::make_unique<std::ifstream>(plib::filesystem::u8path(m_filename))); - if (ret->is_open()) - return std::move(ret); - else - return stream_ptr(nullptr); + return (ret->is_open()) ? std::move(ret) : stream_ptr(nullptr); } bool source_proc_t::parse(nlparse_t &setup, const pstring &name) @@ -1385,8 +1363,8 @@ bool source_proc_t::parse(nlparse_t &setup, const pstring &name) m_setup_func(setup); return true; } - else - return false; + + return false; } source_proc_t::stream_ptr source_proc_t::stream(const pstring &name) |
