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

Fix horribly mistaken guess at what the unexplained "m" parameter in

Browse Source 
s-l+block-indented(n,c) meant in the spec.
This commit is contained in:
Zach Laine
2017-04-30 00:45:38 -05:00
parent bf11a1e0ca
commit 17ac5cc43f
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yaml/parser/block_styles.hpp
View File

@@ -94,9 +94,9 @@ namespace yaml { namespace parser {
qi::rule<Iterator, int()> auto_detect_indent;
qi::rule<Iterator, ast::seq_t(int), qi::locals<int>> block_sequence;
qi::rule<Iterator, ast::value_t(int n, int m)> block_seq_entry;
qi::rule<Iterator, ast::value_t(int n, context_t, int m)> block_indented;
qi::rule<Iterator, ast::seq_t(int n, int m)> compact_sequence;
qi::rule<Iterator, ast::value_t(int n)> block_seq_entry;
qi::rule<Iterator, ast::value_t(int n, context_t), qi::locals<int>> block_indented;
qi::rule<Iterator, ast::seq_t(int n)> compact_sequence;
qi::rule<Iterator, ast::map_t(int), qi::locals<int>> block_mapping;
qi::rule<Iterator, ast::map_element_t(int)> block_map_entry;

21
yaml/parser/block_styles_def.hpp
View File

@@ -59,7 +59,6 @@ namespace yaml { namespace parser {
qi::_1_type _1;
qi::_r1_type _r1;
qi::_r2_type _r2;
qi::_r3_type _r3;
qi::_a_type _a;
qi::_b_type _b;
qi::lit_type lit;
@@ -243,27 +242,31 @@ namespace yaml { namespace parser {
// [183]
block_sequence =
auto_detect_indent[_a = _1]
>> +(indent(_a) >> block_seq_entry(_r1, _a - _r1)[pb])
>> +(indent(_a) >> block_seq_entry(_a)[pb])
;
// [184]
block_seq_entry =
'-'
>> !ns_char
>> block_indented(_r1, context_t::block_in, _r2)
>> block_indented(_r1, context_t::block_in)
;
// [185]
// TODO: WTF is up with "m" in the spec?
block_indented =
indent(_r3) >> (compact_sequence(_r1 + 1, _r3) | compact_mapping(_r1 + 1 + _r3))
| block_node(_r1, _r2)
auto_detect_indent[_a = _1]
>> indent(_a)
>> (
compact_sequence(_r1 + 1 + _a)[_val = _1]
| compact_mapping(_r1 + 1 + _a)[_val = _1]
)
| block_node(_r1, _r2)[_val = _1]
| attr(ast::value_t()) >> s_l_comments
;
// [186]
compact_sequence =
block_seq_entry(_r1, _r2) % indent(_r1)
block_seq_entry(_r1) % indent(_r1)
;
// 8.2.1. Block Mappings
@@ -287,12 +290,12 @@ namespace yaml { namespace parser {
// [190]
block_map_explicit_key =
'?' >> block_indented(_r1, context_t::block_out, 0) // TODO: Should the 0 be m?
'?' >> block_indented(_r1, context_t::block_out)
;
// [191]
block_map_explicit_value =
indent(_r1) >> ':' >> block_indented(_r1, context_t::block_out, 0) // TODO: Should the 0 be m?
indent(_r1) >> ':' >> block_indented(_r1, context_t::block_out)
;
// [192]