From 4d15501a30d78eecc5011ebdd12a7568954129cb Mon Sep 17 00:00:00 2001 From: couriersud Date: Thu, 19 Jan 2017 18:05:19 +0100 Subject: Netlist: code refactoring Make streams provide binary access only. Use putf8_reader and putf8_writer to actually access streams. Replace some char * parameters with pstring where appropriate. Minor code refactoring and move functionality were it belongs. (nw) --- src/lib/netlist/plib/pparser.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/lib/netlist/plib/pparser.cpp') diff --git a/src/lib/netlist/plib/pparser.cpp b/src/lib/netlist/plib/pparser.cpp index 35629aacdee..9d25adffcbe 100644 --- a/src/lib/netlist/plib/pparser.cpp +++ b/src/lib/netlist/plib/pparser.cpp @@ -15,7 +15,7 @@ namespace plib { // A simple tokenizer // ---------------------------------------------------------------------------------------- -ptokenizer::ptokenizer(pistream &strm) +ptokenizer::ptokenizer(plib::putf8_reader &strm) : m_strm(strm), m_lineno(0), m_cur_line(""), m_px(m_cur_line.begin()), m_unget(0), m_string('"') { } @@ -483,7 +483,7 @@ pstring ppreprocessor::process_line(const pstring &line) } -postream & ppreprocessor::process_i(pistream &istrm, postream &ostrm) +void ppreprocessor::process(putf8_reader &istrm, putf8_writer &ostrm) { pstring line; while (istrm.readline(line)) @@ -491,7 +491,6 @@ postream & ppreprocessor::process_i(pistream &istrm, postream &ostrm) line = process_line(line); ostrm.writeline(line); } - return ostrm; } } -- cgit v1.2.3-70-g09d2