-rw-r--r-- | include/opkele/expat.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/opkele/expat.h b/include/opkele/expat.h index 97ed61a..60c41ac 100644 --- a/include/opkele/expat.h +++ b/include/opkele/expat.h | |||
@@ -1,61 +1,59 @@ | |||
1 | #ifndef __OPKELE_EXPAT_H | 1 | #ifndef __OPKELE_EXPAT_H |
2 | #define __OPKELE_EXPAT_H | 2 | #define __OPKELE_EXPAT_H |
3 | 3 | ||
4 | #include <cassert> | 4 | #include <cassert> |
5 | #include <expat.h> | 5 | #include <expat.h> |
6 | 6 | ||
7 | namespace opkele { | 7 | namespace opkele { |
8 | 8 | ||
9 | namespace util { | 9 | namespace util { |
10 | 10 | ||
11 | class expat_t { | 11 | class expat_t { |
12 | public: | 12 | public: |
13 | XML_Parser _x; | 13 | XML_Parser _x; |
14 | 14 | ||
15 | expat_t() : _x(0) { } | 15 | expat_t() : _x(0) { } |
16 | expat_t(XML_Parser x) : _x(x) { } | 16 | expat_t(XML_Parser x) : _x(x) { } |
17 | virtual ~expat_t() throw(); | 17 | virtual ~expat_t() throw(); |
18 | 18 | ||
19 | expat_t& operator=(XML_Parser x); | 19 | expat_t& operator=(XML_Parser x); |
20 | 20 | ||
21 | operator const XML_Parser(void) const { return _x; } | 21 | operator const XML_Parser(void) const { return _x; } |
22 | operator XML_Parser(void) { return _x; } | 22 | operator XML_Parser(void) { return _x; } |
23 | 23 | ||
24 | inline bool parse(const char *s,int len,bool final=false) { | 24 | inline bool parse(const char *s,int len,bool final=false) { |
25 | assert(_x); | 25 | assert(_x); |
26 | return XML_Parse(_x,s,len,final); } | 26 | return XML_Parse(_x,s,len,final); |
27 | enum XML_Status stop_parser(bool resumable=false) { | 27 | } |
28 | assert(_x); | ||
29 | return XML_StopParser(_x,resumable); } | ||
30 | 28 | ||
31 | virtual void start_element(const XML_Char *n,const XML_Char **a) { } | 29 | virtual void start_element(const XML_Char *n,const XML_Char **a) { } |
32 | virtual void end_element(const XML_Char *n) { } | 30 | virtual void end_element(const XML_Char *n) { } |
33 | void set_element_handler(); | 31 | void set_element_handler(); |
34 | 32 | ||
35 | virtual void character_data(const XML_Char *s,int l) { } | 33 | virtual void character_data(const XML_Char *s,int l) { } |
36 | void set_character_data_handler(); | 34 | void set_character_data_handler(); |
37 | 35 | ||
38 | virtual void processing_instruction(const XML_Char *t,const XML_Char *d) { } | 36 | virtual void processing_instruction(const XML_Char *t,const XML_Char *d) { } |
39 | void set_processing_instruction_handler(); | 37 | void set_processing_instruction_handler(); |
40 | 38 | ||
41 | virtual void comment(const XML_Char *d) { } | 39 | virtual void comment(const XML_Char *d) { } |
42 | void set_comment_handler(); | 40 | void set_comment_handler(); |
43 | 41 | ||
44 | virtual void start_cdata_section() { } | 42 | virtual void start_cdata_section() { } |
45 | virtual void end_cdata_section() { } | 43 | virtual void end_cdata_section() { } |
46 | void set_cdata_section_handler(); | 44 | void set_cdata_section_handler(); |
47 | 45 | ||
48 | virtual void default_handler(const XML_Char *s,int l) { } | 46 | virtual void default_handler(const XML_Char *s,int l) { } |
49 | void set_default_handler(); | 47 | void set_default_handler(); |
50 | void set_default_handler_expand(); | 48 | void set_default_handler_expand(); |
51 | 49 | ||
52 | virtual void start_namespace_decl(const XML_Char *p,const XML_Char *u) { } | 50 | virtual void start_namespace_decl(const XML_Char *p,const XML_Char *u) { } |
53 | virtual void end_namespace_decl(const XML_Char *p) { } | 51 | virtual void end_namespace_decl(const XML_Char *p) { } |
54 | void set_namespace_decl_handler(); | 52 | void set_namespace_decl_handler(); |
55 | 53 | ||
56 | inline enum XML_Error get_error_code() { | 54 | inline enum XML_Error get_error_code() { |
57 | assert(_x); return XML_GetErrorCode(_x); } | 55 | assert(_x); return XML_GetErrorCode(_x); } |
58 | static inline const XML_LChar *error_string(XML_Error c) { | 56 | static inline const XML_LChar *error_string(XML_Error c) { |
59 | return XML_ErrorString(c); } | 57 | return XML_ErrorString(c); } |
60 | 58 | ||
61 | inline long get_current_byte_index() { | 59 | inline long get_current_byte_index() { |