Merge pull request #525 from biojppm/fix/524-parse_complex_map

Author: biojppm

changelog/current.md

@@ -0,0 +1,8 @@
+### Fixes
+
+- Fix [#524](https://github.com/biojppm/rapidyaml/issues/524) ([PR#525](https://github.com/biojppm/rapidyaml/pull/525)): problem parsing nested map value in complex map. Kudos to @MatthewSteel!
+
+
+### Thanks
+
+- @MatthewSteel

src/c4/yml/parse_engine.def.hpp

@@ -6563,7 +6563,6 @@ void ParseEngine<EventHandler>::_handle_map_block()
                     csubstr maybe_filtered = _maybe_filter_key_scalar_squot(sc); // KEY!
                     m_evt_handler->set_key_scalar_squoted(maybe_filtered);
                     _maybe_skip_whitespace_tokens();
-                    _set_indentation(m_evt_handler->m_curr->line_contents.indentation);
                     // keep the child state on RVAL
                     addrem_flags(RVAL, RNXT);
                 }
@@ -6604,7 +6603,6 @@ void ParseEngine<EventHandler>::_handle_map_block()
                     csubstr maybe_filtered = _maybe_filter_key_scalar_dquot(sc); // KEY!
                     m_evt_handler->set_key_scalar_dquoted(maybe_filtered);
                     _maybe_skip_whitespace_tokens();
-                    _set_indentation(m_evt_handler->m_curr->line_contents.indentation);
                     // keep the child state on RVAL
                     addrem_flags(RVAL, RNXT);
                 }
@@ -6666,7 +6664,6 @@ void ParseEngine<EventHandler>::_handle_map_block()
                     csubstr maybe_filtered = _maybe_filter_key_scalar_plain(sc, m_evt_handler->m_curr->indref); // KEY!
                     m_evt_handler->set_key_scalar_plain(maybe_filtered);
                     _maybe_skip_whitespace_tokens();
-                    _set_indentation(m_evt_handler->m_curr->line_contents.indentation);
                     // keep the child state on RVAL
                     addrem_flags(RVAL, RNXT);
                 }
@@ -6846,7 +6843,6 @@ void ParseEngine<EventHandler>::_handle_map_block()
                 m_evt_handler->begin_map_val_block();
                 _handle_annotations_and_indentation_after_start_mapblck(startindent, startline);
                 m_evt_handler->set_key_scalar_plain_empty();
-                _set_indentation(m_evt_handler->m_curr->line_contents.indentation);
                 // keep the child state on RVAL
                 addrem_flags(RVAL, RNXT);
             }

test/test_parse_engine_6_qmrk.cpp

@@ -574,6 +574,83 @@ ENGINE_TEST(QmrkWithTags,
 }
 
 
+ENGINE_TEST(QmrkGithub524_0,
+            ("? outer\n"
+             ": inner1: 1\n"
+             "  inner2: 2\n",
+             "outer:\n"
+             "  inner1: 1\n"
+             "  inner2: 2\n"),
+            "+STR\n"
+            "+DOC\n"
+            "+MAP\n"
+            "=VAL :outer\n"
+            "+MAP\n"
+            "=VAL :inner1\n"
+            "=VAL :1\n"
+            "=VAL :inner2\n"
+            "=VAL :2\n"
+            "-MAP\n"
+            "-MAP\n"
+            "-DOC\n"
+            "-STR\n")
+{
+    ___(ps.begin_stream());
+    ___(ps.begin_doc());
+    ___(ps.begin_map_val_block());
+    ___(ps.set_key_scalar_plain("outer"));
+    ___(ps.begin_map_val_block());
+    ___(ps.set_key_scalar_plain("inner1"));
+    ___(ps.set_val_scalar_plain("1"));
+    ___(ps.add_sibling());
+    ___(ps.set_key_scalar_plain("inner2"));
+    ___(ps.set_val_scalar_plain("2"));
+    ___(ps.end_map());
+    ___(ps.end_map());
+    ___(ps.end_doc());
+    ___(ps.end_stream());
+}
+
+ENGINE_TEST(QmrkGithub524_1,
+            ("? outer\n"
+             ": inner1: 1\n"
+             "inner2: 2\n"
+             ,
+             "outer:\n"
+             "  inner1: 1\n"
+             "inner2: 2\n"),
+            "+STR\n"
+            "+DOC\n"
+            "+MAP\n"
+            "=VAL :outer\n"
+            "+MAP\n"
+            "=VAL :inner1\n"
+            "=VAL :1\n"
+            "-MAP\n"
+            "=VAL :inner2\n"
+            "=VAL :2\n"
+            "-MAP\n"
+            "-DOC\n"
+            "-STR\n"
+            )
+{
+    ___(ps.begin_stream());
+    ___(ps.begin_doc());
+    ___(ps.begin_map_val_block());
+    ___(ps.set_key_scalar_plain("outer"));
+    ___(ps.begin_map_val_block());
+    ___(ps.set_key_scalar_plain("inner1"));
+    ___(ps.set_val_scalar_plain("1"));
+    ___(ps.end_map());
+    ___(ps.add_sibling());
+    ___(ps.set_key_scalar_plain("inner2"));
+    ___(ps.set_val_scalar_plain("2"));
+    ___(ps.end_map());
+    ___(ps.end_doc());
+    ___(ps.end_stream());
+}
+
+
 //-----------------------------------------------------------------------------
 
 ENGINE_TEST(QmrkFlow0,