- added some converting methods: esc_to_json(...), esc_to_xml(...), esc_to_csv() (convert/misc.h)
- BaseParser: added possibility to read from TextStream and WTextStream - HTMLParser: added filter(const WTextStream & in, Stream & out, ...) method - added utf8_stream.h with one method: template<typename StreamIteratorType> size_t utf8_to_int( StreamIteratorType & iterator_in, StreamIteratorType & iterator_end, int & res, bool & correct)
This commit is contained in:
@@ -40,6 +40,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <fstream>
|
||||
#include "textstream/textstream.h"
|
||||
|
||||
|
||||
namespace pt
|
||||
@@ -51,15 +52,18 @@ protected:
|
||||
|
||||
BaseParser();
|
||||
|
||||
void clear();
|
||||
virtual void clear_input_flags();
|
||||
|
||||
int read_utf8_char();
|
||||
int read_ascii_char();
|
||||
int read_char_from_wchar_string();
|
||||
int read_char_from_utf8_string();
|
||||
int read_char_from_ascii_string();
|
||||
int read_char_no_escape();
|
||||
int read_char();
|
||||
virtual int read_utf8_char();
|
||||
virtual int read_ascii_char();
|
||||
virtual int read_char_from_wchar_string();
|
||||
virtual int read_char_from_utf8_string();
|
||||
virtual int read_char_from_ascii_string();
|
||||
virtual int read_char_from_wtext_stream();
|
||||
virtual int read_char_from_utf8_text_stream();
|
||||
virtual int read_char_from_ascii_text_stream();
|
||||
virtual int read_char_no_escape();
|
||||
virtual int read_char();
|
||||
|
||||
|
||||
|
||||
@@ -75,6 +79,7 @@ protected:
|
||||
*/
|
||||
bool reading_from_file;
|
||||
|
||||
|
||||
/*
|
||||
pointers to the current character
|
||||
if ParseString() is in used
|
||||
@@ -84,9 +89,20 @@ protected:
|
||||
|
||||
|
||||
/*
|
||||
true if ParseString(wchar_t *) or ParseString(std::wstring&) was called
|
||||
*/
|
||||
bool reading_from_wchar_string;
|
||||
pointers to WTextStream iterators
|
||||
if set then both of them should be set
|
||||
*/
|
||||
WTextStream::const_iterator * wtext_stream_iterator;
|
||||
WTextStream::const_iterator * wtext_stream_iterator_end;
|
||||
|
||||
|
||||
/*
|
||||
pointers to TextStream iterators
|
||||
if set then both of them should be set
|
||||
*/
|
||||
TextStream::const_iterator * text_stream_iterator;
|
||||
TextStream::const_iterator * text_stream_iterator_end;
|
||||
|
||||
|
||||
/*
|
||||
last read char
|
||||
@@ -112,7 +128,6 @@ protected:
|
||||
|
||||
|
||||
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user