Skip to content

Added new trim_whitespace_without_normalization option #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Added new trim_whitespace_without_normalization option #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion include/boost/property_tree/detail/xml_parser_flags.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,16 @@ namespace boost { namespace property_tree { namespace xml_parser
static const int no_comments = 0x2;
/// Whitespace should be collapsed and trimmed.
static const int trim_whitespace = 0x4;
/// Whitespace should only be trimmed.
static const int trim_whitespace_without_normalization = 0x8;

inline bool validate_flags(int flags)
{
return (flags & ~(no_concat_text | no_comments | trim_whitespace)) == 0;
return (flags & ~(no_concat_text
| no_comments
| trim_whitespace
| trim_whitespace_without_normalization
)) == 0;
}

} } }
Expand Down
19 changes: 15 additions & 4 deletions include/boost/property_tree/detail/xml_parser_read_rapidxml.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ namespace boost { namespace property_tree { namespace xml_parser

try {
// Parse using appropriate flags
const int f_tws_n = parse_trim_whitespace;
const int f_tws_n_c = parse_trim_whitespace
| parse_comment_nodes;
const int f_tws = parse_normalize_whitespace
| parse_trim_whitespace;
const int f_c = parse_comment_nodes;
Expand All @@ -114,13 +117,21 @@ namespace boost { namespace property_tree { namespace xml_parser
if (flags & no_comments) {
if (flags & trim_whitespace)
doc.BOOST_NESTED_TEMPLATE parse<f_tws>(&v.front());
else
doc.BOOST_NESTED_TEMPLATE parse<0>(&v.front());
else {
if (flags & trim_whitespace_without_normalization)
doc.BOOST_NESTED_TEMPLATE parse<f_tws_n>(&v.front());
else
doc.BOOST_NESTED_TEMPLATE parse<0>(&v.front());
}
} else {
if (flags & trim_whitespace)
doc.BOOST_NESTED_TEMPLATE parse<f_tws_c>(&v.front());
else
doc.BOOST_NESTED_TEMPLATE parse<f_c>(&v.front());
else {
if (flags & trim_whitespace_without_normalization)
doc.BOOST_NESTED_TEMPLATE parse<f_tws_n_c>(&v.front());
else
doc.BOOST_NESTED_TEMPLATE parse<f_c>(&v.front());
}
}

// Create ptree from nodes
Expand Down
2 changes: 2 additions & 0 deletions include/boost/property_tree/xml_parser.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ namespace boost { namespace property_tree { namespace xml_parser
* @li @c no_comments -- Skip XML comments.
* @li @c trim_whitespace -- Trim leading and trailing whitespace from text,
* and collapse sequences of whitespace.
* @li @c trim_whitespace_without_normalization -- Trim leading and trailing
* whitespace from text.
*/
template<class Ptree>
void read_xml(std::basic_istream<
Expand Down