diff options
author | 2022-05-29 18:30:25 +0200 | |
---|---|---|
committer | 2022-05-30 02:30:25 +1000 | |
commit | 5155e51bbe24d0cc45a84ddb66138f83ff1810cf (patch) | |
tree | 80e3f8bcf6b39c8a06e3a6d6ba59c9f45de1449d /src/lib/netlist/nl_parser.h | |
parent | bfc1c9cd01aeb286357a88259f9bd360ef792348 (diff) |
netlist: static solver work and improve code readability (#9841)
- nltool: Added support for building individual static solver files.
- Added pre-built documentation files for nltool and nlwav.
- plib: Extended typed_version to have patchlevel as well.
- plib: Compile more of ppmf.h with nvcc.
- create_devinc.py: Add include guards to the generated files.
- makefile: Recreate generated files when python code has changed.
- Reduced nld_base.h usage in the core.
- <oved extern template class declarations to where they belong.
- Generally improved code readability and fixed a lot of issues cspell reported.
Diffstat (limited to 'src/lib/netlist/nl_parser.h')
-rw-r--r-- | src/lib/netlist/nl_parser.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/netlist/nl_parser.h b/src/lib/netlist/nl_parser.h index 480b5da1e31..0f5e135e9a6 100644 --- a/src/lib/netlist/nl_parser.h +++ b/src/lib/netlist/nl_parser.h @@ -16,39 +16,39 @@ namespace netlist { - class parser_t : public plib::ptoken_reader + class parser_t : public plib::token_reader_t { public: - using token_t = plib::ptokenizer::token_t; - using token_type = plib::ptokenizer::token_type; - using token_id_t = plib::ptokenizer::token_id_t; - using token_store = plib::ptokenizer::token_store; + using token_t = plib::tokenizer_t::token_t; + using token_type = plib::tokenizer_t::token_type; + using token_id_t = plib::tokenizer_t::token_id_t; + using token_store_t = plib::tokenizer_t::token_store_t; parser_t(nlparse_t &setup); bool parse(plib::istream_uptr &&strm, const pstring &nlname); - bool parse(const token_store &tokstor, const pstring &nlname); - void parse_tokens(plib::istream_uptr &&strm, token_store &tokstor); + bool parse(const token_store_t &store, const pstring &nlname); + void parse_tokens(plib::istream_uptr &&strm, token_store_t &tokstore); protected: void parse_netlist(); void net_alias(); - void dippins(); + void dip_pins(); void netdev_param(); - void netdev_defparam(); + void netdev_default_param(); void netdev_hint(); void net_c(); void frontier(); void device(const pstring &dev_type); void netdev_netlist_end(); void net_model(); - void net_submodel(); + void net_sub_model(); void net_include(); void net_local_source(); void net_external_source(); void net_lib_entry(bool is_local); void net_register_dev(); - void net_truthtable_start(const pstring &nlname); + void net_truth_table_start(const pstring &nlname); void verror(const pstring &msg) override; private: @@ -85,17 +85,17 @@ namespace netlist token_id_t m_tok_TT_LINE; token_id_t m_tok_TT_FAMILY; - plib::ptokenizer m_tokenizer; + plib::tokenizer_t m_tokenizer; nlparse_t &m_setup; - std::unordered_map<pstring, token_store> m_local; - token_store *m_cur_local; + std::unordered_map<pstring, token_store_t> m_local; + token_store_t *m_cur_local; }; class source_token_t : public source_netlist_t { public: - source_token_t(const pstring &name, const parser_t::token_store &store) + source_token_t(const pstring &name, const parser_t::token_store_t &store) : m_store(store) , m_name(name) { @@ -107,7 +107,7 @@ namespace netlist plib::istream_uptr stream(const pstring &name) override; private: - parser_t::token_store m_store; + parser_t::token_store_t m_store; pstring m_name; }; |