boost/parser
2
0
Fork 0
mirror of https://github.com/boostorg/parser.git synced 2026-01-24 06:02:12 +00:00
Code Issues Projects Releases Wiki Activity

Sketch in folded scalar portion of block rewrite.

Browse Source
This commit is contained in:
Zach Laine
2017-04-24 16:33:59 -05:00
parent a57b0fc0f2
commit 267cd4bbcf
2 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
yaml/parser/block.hpp
View File

@@ -81,6 +81,7 @@ namespace omd { namespace yaml { namespace parser {
qi::rule<Iterator, std::string(int, context_t)> line_prefix;
qi::rule<Iterator, std::string(int, context_t)> l_empty;
qi::rule<Iterator, std::string(int, context_t)> b_l_folded;
qi::rule<
Iterator,
@@ -105,6 +106,21 @@ namespace omd { namespace yaml { namespace parser {
qi::rule<Iterator, std::string(int)> b_nb_literal_text;
qi::rule<Iterator, std::string(int, chomping_t)> literal_content;
qi::rule<
Iterator,
std::string(int),
qi::locals<int, chomping_t>
> folded;
qi::rule<Iterator, std::string(int)> folded_text;
qi::rule<Iterator, std::string(int)> folded_lines;
qi::rule<Iterator, std::string(int)> spaced_text;
qi::rule<Iterator, std::string(int)> spaced;
qi::rule<Iterator, std::string(int)> spaced_lines;
qi::rule<Iterator, std::string(int)> same_lines;
qi::rule<Iterator, std::string(int)> diff_lines;
qi::rule<Iterator, std::string(int, chomping_t)> folded_content;
int n_; // our current indent level (spaces)
typedef omd::yaml::parser::error_handler<Iterator> error_handler_t;

46
yaml/parser/block_def.hpp
View File

@@ -206,6 +206,7 @@ namespace omd { namespace yaml { namespace parser {
auto blank_eol = copy(*blank >> (comment | eol)); // empty until eol
auto & nb_char = flow_g.scalar_value.string_value.nb_char;
auto & ns_char = flow_g.scalar_value.string_value.ns_char;
auto & separate = flow_g.scalar_value.string_value.separate;
auto map_key = copy(
@@ -480,6 +481,11 @@ namespace omd { namespace yaml { namespace parser {
>> eol
;
b_l_folded =
eol >> +l_empty(_r1, _r2) // b-l-trimmed [71]
| eol
;
// 8.1 Block Scalar Styles
// [162]
@@ -557,40 +563,56 @@ namespace omd { namespace yaml { namespace parser {
>> chomped_empty(_r1, _r2)
;
#if 0
// 8.1.3. Folded Style
// [174]
folded =
'>'
>> block_header[_a = chomping(_1), _b = indentation(_1), ref(n_) += _b]
>> (
folded_content(_a)[_val = _1] >> eps[ref(n_) -= _b]
| eps(ref(n_) -= _b < -1) // "< -1" will always evaluate to false
)
>> block_header[_a = _r1 + indentation(_1), _b = chomping(_1)]
>> folded_content(_a, _b)[_val = _1]
;
// [175]
folded_text =
indent(_r1) >> ns_char >> *nb_char
;
// [176]
folded_lines =
folded_text(_r1) >> *(b_l_folded(_r1, context_t::block) >> folded_text(_r1))
;
// [177]
spaced_text =
indent(_r1) >> blank >> *nb_char
;
// [178]
spaced =
eol >> *l_empty(_r1, context_t::block)
;
// [179]
spaced_lines =
spaced_text(_r1) >> *(spaced(_r1) >> spaced_text(_r1))
;
// [180]
same_lines =
*l_empty
>> (folded_lines | spaced_lines)
*l_empty(_r1, context_t::block)
>> (folded_lines(_r1) | spaced_lines(_r1))
;
// [181]
diff_lines =
same_lines >> *(eol >> same_lines)
same_lines(_r1) >> *(eol >> same_lines(_r1))
;
// [182]
folded_content =
-(diff_lines >> chomped_last)
>> chomped_empty
-(diff_lines(_r1) >> eol)
>> chomped_empty(_r1, _r2)
;
#endif
BOOST_SPIRIT_DEBUG_NODES(
(end_of_input)