libraries
/
libxml-cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Accept but ignore special tags: <!, <?; Start of class UnsingedInteger; success: make distcheck

Browse Source
master
Marc Wäckerlin 16 years ago
parent 071268b768
commit 6393bf7b03
5 changed files with 100 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      doc/doxyfile.in
  2. 13
      doc/makefile.am
  3. 20
      makefile.am
  4. 40
      src/xml-cxx/xml.hxx
  5. 67
      src/xml.cxx

2
doc/doxyfile.in
Unescape View File

@ -542,7 +542,7 @@ FILE_PATTERNS = *.[ch]xx \
# should be searched for input files as well. Possible values are YES and NO. # should be searched for input files as well. Possible values are YES and NO.
# If left blank NO is used. # If left blank NO is used.
RECURSIVE = NO RECURSIVE = YES
# The EXCLUDE tag can be used to specify files and/or directories that should # The EXCLUDE tag can be used to specify files and/or directories that should
# excluded from the INPUT source files. This way you can easily exclude a # excluded from the INPUT source files. This way you can easily exclude a

13
doc/makefile.am
Unescape View File

@ -5,7 +5,7 @@
## 1 2 3 4 5 6 7 8 ## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
develdir = ${pkgdatadir}/doc/ develdir = ${pkgdatadir}/doc
devel_DATA = html/index.html devel_DATA = html/index.html
ALL_SRC = ${top_srcdir}/src/*.[ch]xx ${top_srcdir}/test/*.[ch]xx ALL_SRC = ${top_srcdir}/src/*.[ch]xx ${top_srcdir}/test/*.[ch]xx
@ -32,16 +32,17 @@ CLEANFILES = doxygen.errors @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
DISTCLEANFILES = @PACKAGENAME@.doxytag DISTCLEANFILES = @PACKAGENAME@.doxytag
MAINTAINERCLEANFILES = makefile.in MAINTAINERCLEANFILES = makefile.in
distclean-local: distclean-local:
- rm -r html latex - rm -r html latex
dist-hook: html dist-hook: ${devel_DATA}
cp -r html ${distdir}/ cp -r html ${distdir}/
install-data-hook: install-data-hook:
chmod -R u+w ${develdir} chmod -R u+w ${develdir}
cp html/* ${develdir} cp -r html/* ${develdir}/
#uninstall-hook: uninstall-hook:
# chmod -R u+w ${develdir} -chmod -R u+w ${develdir}
# rm -rf ${develdir} -rm -rf ${develdir}/*

20
makefile.am
Unescape View File

@ -41,27 +41,9 @@ tag: distcheck
deps = ${top_srcdir}/COPYING ${top_srcdir}/README ${top_srcdir}/INSTALL ${top_srcdir}/NEWS ${top_srcdir}/ChangeLog deps = ${top_srcdir}/COPYING ${top_srcdir}/README ${top_srcdir}/INSTALL ${top_srcdir}/NEWS ${top_srcdir}/ChangeLog
clean-local: maintainer-clean-local:
- rm doxygen.err lib@PACKAGENAME@.doxytag
distclean-local:
- rm -r ${top_builddir}/@DOC_DIR@/html/* ${top_builddir}/@DOC_DIR@/latex/*
- rm makefile makefile.in doxygen.err libmrw.doxytag
- find . -name '*~' | xargs rm - find . -name '*~' | xargs rm
- rm -r autom4te.cache - rm -r autom4te.cache
- rm aclocal.m4 config.guess config.sub configure \ - rm aclocal.m4 config.guess config.sub configure \
depcomp install-sh ltmain.sh makefile makefile.in \ depcomp install-sh ltmain.sh makefile makefile.in \
missing mkinstalldirs missing mkinstalldirs
dist-hook:
test -d ${distdir}/@DOC_DIR@/html || \
mkdir -p ${distdir}/@DOC_DIR@/html
cp ${top_builddir}/@DOC_DIR@/html/* ${distdir}/@DOC_DIR@/html/.
install-data-hook:
chmod -R u+w ${pkgdatadir}/doc
cp -rf ${top_builddir}/@DOC_DIR@/html ${pkgdatadir}/@DOC_DIR@/
uninstall-hook:
chmod -R u+w ${pkgdatadir}/doc
rm -rf ${pkgdatadir}/@DOC_DIR@/html

40
src/xml-cxx/xml.hxx
Unescape View File

@ -46,12 +46,13 @@ namespace xml {
iterator _active; iterator _active;
}; };
typedef Attributes::Value Attr; typedef Attributes::Value Attr;
enum NodeType {START, END, EMPTY}; enum NodeType {START, END, EMPTY, SPECIAL};
struct Tag { struct Tag {
std::string name; std::string name;
NodeType type; NodeType type;
std::string text; std::string text;
Attributes attributes; Attributes attributes;
std::string special;
}; };
const bool mandatory = true; const bool mandatory = true;
const bool optional = false; const bool optional = false;
@ -82,6 +83,13 @@ namespace xml {
exception("tag ('<') expected, text not allowed\ntext: "+txt, t) {} exception("tag ('<') expected, text not allowed\ntext: "+txt, t) {}
}; };
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
class type_mismatch: public exception {
public:
type_mismatch(const Node& t, const std::string& txt) throw():
exception("wrong type, text contains mismatching character\ntext: "
+txt, t) {}
};
//----------------------------------------------------------------------------
class access_error: public exception { class access_error: public exception {
public: public:
access_error(const Node& t, const std::string& name) throw(); access_error(const Node& t, const std::string& name) throw();
@ -204,7 +212,8 @@ namespace xml {
virtual std::ostream& out(std::ostream& o, unsigned int level=0) const virtual std::ostream& out(std::ostream& o, unsigned int level=0) const
throw(); throw();
virtual std::string text() const throw(); virtual std::string text() const throw();
virtual Node& text(const std::string& txt) throw(tag_expected); virtual Node& text(const std::string& txt) throw(tag_expected,
type_mismatch);
virtual Node& append(const Node& o) throw(cannot_have_children); virtual Node& append(const Node& o) throw(cannot_have_children);
virtual Node& set(const Attributes& o) throw(); virtual Node& set(const Attributes& o) throw();
Node& clear() throw (); Node& clear() throw ();
@ -230,7 +239,8 @@ namespace xml {
//! Get the first named child. //! Get the first named child.
Node& operator[](const std::string& child) throw(access_error); Node& operator[](const std::string& child) throw(access_error);
std::string operator*() const throw(); std::string operator*() const throw();
Node& operator=(const std::string& contents) throw(tag_expected); Node& operator=(const std::string& contents) throw(tag_expected,
type_mismatch);
friend std::ostream& operator<<(std::ostream& o, const Node& t) throw(); friend std::ostream& operator<<(std::ostream& o, const Node& t) throw();
protected: protected:
Attributes _attributes; Attributes _attributes;
@ -250,7 +260,25 @@ namespace xml {
virtual std::auto_ptr<Node> clone() const throw(); virtual std::auto_ptr<Node> clone() const throw();
virtual ~String() throw() {} virtual ~String() throw() {}
virtual std::string text() const throw(); virtual std::string text() const throw();
virtual String& text(const std::string& txt) throw(tag_expected); virtual String& text(const std::string& txt) throw(tag_expected,
type_mismatch);
virtual std::ostream& out(std::ostream& o, unsigned int level=0) const
throw();
virtual String& append(const Node& o) throw(cannot_have_children);
Node& operator=(const std::string& contents) throw();
private:
std::string _text;
};
//----------------------------------------------------------------------------
class UnsignedInteger: public Node {
public:
String(std::string name, const std::string& text = std::string()) throw();
virtual std::auto_ptr<Node> clone() const throw();
virtual ~String() throw() {}
virtual std::string text() const throw();
virtual String& text(const std::string& txt) throw(tag_expected,
type_mismatch);
virtual std::ostream& out(std::ostream& o, unsigned int level=0) const virtual std::ostream& out(std::ostream& o, unsigned int level=0) const
throw(); throw();
virtual String& append(const Node& o) throw(cannot_have_children); virtual String& append(const Node& o) throw(cannot_have_children);
@ -268,7 +296,7 @@ namespace xml {
Factory(const Node& t) throw(); Factory(const Node& t) throw();
const Node& operator*() const throw(); const Node& operator*() const throw();
std::auto_ptr<Node> read(std::istream& is) std::auto_ptr<Node> read(std::istream& is)
throw(wrong_end_tag, wrong_start_tag, tag_expected, throw(wrong_end_tag, wrong_start_tag, tag_expected, type_mismatch,
second_slash_in_tag, character_after_slash, second_slash_in_tag, character_after_slash,
missing_end_tag, attribute_value_not_quoted, access_error, missing_end_tag, attribute_value_not_quoted, access_error,
empty_stream, duplicate_attribute, attributes_in_end_tag); empty_stream, duplicate_attribute, attributes_in_end_tag);
@ -278,7 +306,7 @@ namespace xml {
Factory(const Factory&); // not implemented Factory(const Factory&); // not implemented
bool ws(char c) const throw(); bool ws(char c) const throw();
std::auto_ptr<Node> read(std::istream& is, const Node& position) std::auto_ptr<Node> read(std::istream& is, const Node& position)
throw(wrong_end_tag, wrong_start_tag, tag_expected, throw(wrong_end_tag, wrong_start_tag, tag_expected, type_mismatch,
second_slash_in_tag, character_after_slash, second_slash_in_tag, character_after_slash,
missing_end_tag, missing_end_tag,
attribute_value_not_quoted, access_error, duplicate_attribute, attribute_value_not_quoted, access_error, duplicate_attribute,

67
src/xml.cxx
Unescape View File

@ -200,7 +200,7 @@ namespace xml {
s+=***it; s+=***it;
return s; return s;
} }
Node& Node::text(const std::string& txt) throw(tag_expected) { Node& Node::text(const std::string& txt) throw(tag_expected, type_mismatch) {
throw tag_expected(*this, txt); throw tag_expected(*this, txt);
} }
Node& Node::append(const Node& o) throw(cannot_have_children) { Node& Node::append(const Node& o) throw(cannot_have_children) {
@ -281,7 +281,8 @@ namespace xml {
std::string Node::operator*() const throw() { std::string Node::operator*() const throw() {
return text(); return text();
} }
Node& Node::operator=(const std::string& contents) throw(tag_expected) { Node& Node::operator=(const std::string& contents) throw(tag_expected,
type_mismatch) {
return text(contents); return text(contents);
} }
std::ostream& operator<<(std::ostream& o, const Node& t) throw() { std::ostream& operator<<(std::ostream& o, const Node& t) throw() {
@ -310,7 +311,8 @@ namespace xml {
std::string String::text() const throw() { std::string String::text() const throw() {
return _text; return _text;
} }
String& String::text(const std::string& txt) throw(tag_expected) { String& String::text(const std::string& txt) throw(tag_expected,
type_mismatch) {
_text = txt; _text = txt;
return *this; return *this;
} }
@ -337,13 +339,52 @@ namespace xml {
return text(contents); return text(contents);
} }
//----------------------------------------------------------------------------
UnsingedInteger::UnsingedInteger(std::string name, const std::string& text) throw():
Node(name), _text(text) {
}
std::auto_ptr<Node> UnsingedInteger::clone() const throw() {
return std::auto_ptr<Node>(new UnsingedInteger(*this));
}
std::string UnsingedInteger::text() const throw() {
return _text;
}
UnsingedInteger& UnsingedInteger::text(const std::string& txt) throw(tag_expected,
type_mismatch) {
_text = txt;
return *this;
}
std::ostream& UnsingedInteger::out(std::ostream& o, unsigned int level) const throw() {
if (_text.size()) {
o<<std::string(level, '\t')<<'<'<<name();
for (Attributes::const_iterator it(_attributes.begin());
it!=_attributes.end(); ++it)
o<<' '<<it->first<<"=\""<<it->second<<'"';
o<<'>'<<_text<<"</"<<name()<<'>';
} else {
o<<std::string(level, '\t')<<'<'<<name();
for (Attributes::const_iterator it(_attributes.begin());
it!=_attributes.end(); ++it)
o<<' '<<it->first<<"=\""<<it->second<<'"';
o<<"/>";
}
return o;
}
UnsingedInteger& UnsingedInteger::append(const Node& o) throw(cannot_have_children) {
throw cannot_have_children(*this, o);
}
Node& UnsingedInteger::operator=(const std::string& contents) throw() {
return text(contents);
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
Factory::Factory(const Node& t) throw(): _template(t.clone()) {} Factory::Factory(const Node& t) throw(): _template(t.clone()) {}
const Node& Factory::operator*() const throw() { const Node& Factory::operator*() const throw() {
return *_template; return *_template;
} }
std::auto_ptr<Node> Factory::read(std::istream& is) std::auto_ptr<Node> Factory::read(std::istream& is)
throw(wrong_end_tag, wrong_start_tag, tag_expected, second_slash_in_tag, throw(wrong_end_tag, wrong_start_tag, tag_expected, type_mismatch,
second_slash_in_tag,
character_after_slash, missing_end_tag, attribute_value_not_quoted, character_after_slash, missing_end_tag, attribute_value_not_quoted,
access_error, empty_stream, duplicate_attribute, access_error, empty_stream, duplicate_attribute,
attributes_in_end_tag) { attributes_in_end_tag) {
@ -356,18 +397,19 @@ namespace xml {
throw empty_stream(*node, is, res); throw empty_stream(*node, is, res);
} }
*node<<res.attributes; *node<<res.attributes;
switch (res.type) { while (true) switch (res.type) {
case END: throw wrong_end_tag(*node, is, res); case END: throw wrong_end_tag(*node, is, res);
case EMPTY: return node; // empty case EMPTY: return node; // empty
case START: return read(is, *_template); case START: return read(is, *_template);
case SPECIAL: break; //! @todo ignored could be stored
} }
abort(); // coding error: should not reach here
} }
bool Factory::ws(char c) const throw() { bool Factory::ws(char c) const throw() {
return c==' '||c=='\t'||c=='\n'||c=='\r'; return c==' '||c=='\t'||c=='\n'||c=='\r';
} }
std::auto_ptr<Node> Factory::read(std::istream& is, const Node& node) std::auto_ptr<Node> Factory::read(std::istream& is, const Node& node)
throw(wrong_end_tag, wrong_start_tag, tag_expected, second_slash_in_tag, throw(wrong_end_tag, wrong_start_tag, tag_expected, type_mismatch,
second_slash_in_tag,
character_after_slash, missing_end_tag, attribute_value_not_quoted, character_after_slash, missing_end_tag, attribute_value_not_quoted,
access_error, duplicate_attribute, attributes_in_end_tag) { access_error, duplicate_attribute, attributes_in_end_tag) {
std::auto_ptr<Node> result(node.clone()); std::auto_ptr<Node> result(node.clone());
@ -387,6 +429,7 @@ namespace xml {
case START: { case START: {
*result<<(*read(is, node[res.name])<<res.attributes); *result<<(*read(is, node[res.name])<<res.attributes);
} break; } break;
case SPECIAL: break; //! @todo ignored could be stored
} }
} }
return result; return result;
@ -401,8 +444,7 @@ namespace xml {
if (!is) throw missing_end_tag(position, is, tag); if (!is) throw missing_end_tag(position, is, tag);
if (c!='<') do tag.text+=c; while (is && is.get(c) && c!='<'); if (c!='<') do tag.text+=c; while (is && is.get(c) && c!='<');
bool nameRead(false); bool nameRead(false);
while (is && is.get(c) && c!='>') { for (char last(c); is && is.get(c) && c!='>'; last = c) switch (c) {
switch (c) {
case ' ': case '\t': case '\n': case '\r': case ' ': case '\t': case '\n': case '\r':
if (!nameRead && tag.name.size()) nameRead=true; if (!nameRead && tag.name.size()) nameRead=true;
break; break;
@ -411,6 +453,11 @@ namespace xml {
if (tag.type!=START) throw second_slash_in_tag(position, is, tag, c); if (tag.type!=START) throw second_slash_in_tag(position, is, tag, c);
tag.type = nameRead?EMPTY:END; tag.type = nameRead?EMPTY:END;
break; break;
case '!': case '?':
if (last=='<') { // <! tag or <?xml.. starts
do tag.special+=c; while (c!='>' && is && is.get(c));
return tag;
}
default: default:
if (tag.type==EMPTY) throw character_after_slash(position, is, tag, c); if (tag.type==EMPTY) throw character_after_slash(position, is, tag, c);
if (nameRead) { // read attribute if (nameRead) { // read attribute
@ -431,7 +478,7 @@ namespace xml {
} else { // part of a tag name } else { // part of a tag name
tag.name+=c; tag.name+=c;
} }
}} }
return tag; return tag;
} }

Write Preview
Loading…
Cancel
Save