wip

Author: biojppm

CMakeLists.txt

@@ -44,8 +44,8 @@ c4_add_library(ryml
         c4/yml/common.cpp
         c4/yml/emit.def.hpp
         c4/yml/emit.hpp
-        c4/yml/evt/event_handler_stack.hpp
-        c4/yml/evt/event_handler_tree.hpp
+        c4/yml/event_handler_stack.hpp
+        c4/yml/event_handler_tree.hpp
         c4/yml/filter_processor.hpp
         c4/yml/fwd.hpp
         c4/yml/export.hpp

samples/quickstart.cpp

@@ -871,7 +871,7 @@ I am something: indeed
     // Getting the location of nodes in the source:
     //
     // Location tracking is opt-in:
-    ryml::evt::EventHandlerTree evt_handler = {};
+    ryml::EventHandlerTree evt_handler = {};
     ryml::Parser parser(&evt_handler, ryml::ParserOptions().locations(true));
     // Now the parser will start by building the accelerator structure:
     ryml::Tree tree2 = parse_in_arena(&parser, "expected.yml", expected_result);
@@ -2035,7 +2035,7 @@ bar2: [22,32]
  * @see doc_parse */
 void sample_parse_reuse_parser()
 {
-    ryml::evt::EventHandlerTree evt_handler = {};
+    ryml::EventHandlerTree evt_handler = {};
     ryml::Parser parser(&evt_handler);
 
     // it is also advised to reserve the parser depth
@@ -2069,7 +2069,7 @@ void sample_parse_reuse_tree_and_parser()
     // then reserve also the arena's size:
     tree.reserve(256); // reserve 256 characters (good enough for this sample)
 
-    ryml::evt::EventHandlerTree evt_handler;
+    ryml::EventHandlerTree evt_handler;
     ryml::Parser parser(&evt_handler);
     // it is also advised to reserve the parser depth
     // to the expected depth of the data tree:
@@ -4854,7 +4854,7 @@ void sample_global_allocator()
 
     // verify that by reserving we save allocations
     {
-        ryml::evt::EventHandlerTree evt_handler;
+        ryml::EventHandlerTree evt_handler;
         ryml::Parser parser(&evt_handler); // reuse a parser
         ryml::Tree tree;          // reuse a tree
 
@@ -4960,7 +4960,7 @@ void sample_per_tree_allocator()
     {
         // Watchout: ensure that the lifetime of the callbacks target
         // exceeds the lifetime of the tree.
-        ryml::evt::EventHandlerTree evt_handler(mrp.callbacks());
+        ryml::EventHandlerTree evt_handler(mrp.callbacks());
         ryml::Parser parser(&evt_handler);
         ryml::Tree tree1(mr1.callbacks());
         ryml::Tree tree2(mr2.callbacks());
@@ -5022,7 +5022,7 @@ foo: [one, [two, three]]
     // default.
     ryml::ParserOptions opts = {};
     opts.locations(true); // enable locations, default is false
-    ryml::evt::EventHandlerTree evt_handler = {};
+    ryml::EventHandlerTree evt_handler = {};
     ryml::Parser parser(&evt_handler, opts);
     CHECK(parser.options().locations());
     // When locations are enabled, the first task while parsing will

src/c4/yml/evt/event_handler_stack.hpp src/c4/yml/event_handler_stack.hppsrc/c4/yml/evt/event_handler_stack.hpp renamed to src/c4/yml/event_handler_stack.hpp

@@ -1,5 +1,5 @@
-#ifndef _C4_YML_EVT_EVENT_HANDLER_STACK_HPP_
-#define _C4_YML_EVT_EVENT_HANDLER_STACK_HPP_
+#ifndef _C4_YML_EVENT_HANDLER_STACK_HPP_
+#define _C4_YML_EVENT_HANDLER_STACK_HPP_
 
 #ifndef _C4_YML_DETAIL_STACK_HPP_
 #include "c4/yml/detail/stack.hpp"
@@ -191,4 +191,4 @@ struct EventHandlerStack
 
 // NOLINTEND(hicpp-signed-bitwise)
 
-#endif /* _C4_YML_EVT_EVENT_HANDLER_STACK_HPP_ */
+#endif /* _C4_YML_EVENT_HANDLER_STACK_HPP_ */

src/c4/yml/evt/event_handler_tree.hpp src/c4/yml/event_handler_tree.hppsrc/c4/yml/evt/event_handler_tree.hpp renamed to src/c4/yml/event_handler_tree.hpp

@@ -1,20 +1,19 @@
-#ifndef _C4_YML_EVT_EVENT_HANDLER_TREE_HPP_
-#define _C4_YML_EVT_EVENT_HANDLER_TREE_HPP_
+#ifndef _C4_YML_EVENT_HANDLER_TREE_HPP_
+#define _C4_YML_EVENT_HANDLER_TREE_HPP_
 
 #ifndef _C4_YML_TREE_HPP_
 #include "c4/yml/tree.hpp"
 #endif
 
-#ifndef _C4_YML_EVT_EVENT_HANDLER_STACK_HPP_
-#include "c4/yml/evt/event_handler_stack.hpp"
+#ifndef _C4_YML_EVENT_HANDLER_STACK_HPP_
+#include "c4/yml/event_handler_stack.hpp"
 #endif
 
 C4_SUPPRESS_WARNING_MSVC_WITH_PUSH(4702) // unreachable code
 // NOLINTBEGIN(hicpp-signed-bitwise)
 
 namespace c4 {
 namespace yml {
-namespace evt {
 
 /** @addtogroup doc_event_handlers
  * @{ */
@@ -761,7 +760,6 @@ struct EventHandlerTree : public EventHandlerStack<EventHandlerTree, EventHandle
 
 /** @} */
 
-} // namespace evt
 } // namespace yml
 } // namespace c4
 

src/c4/yml/fwd.hpp

@@ -15,10 +15,8 @@ class ConstNodeRef;
 class Tree;
 struct ReferenceResolver;
 template<class EventHandler> class ParseEngine;
-namespace evt {
 struct EventHandlerTree;
-} // namespace evt
-using Parser = ParseEngine<evt::EventHandlerTree>;
+using Parser = ParseEngine<EventHandlerTree>;
 
 } // namespace c4
 } // namespace yml

src/c4/yml/parse.cpp

@@ -9,8 +9,8 @@
 #ifndef _C4_YML_PARSE_ENGINE_DEF_HPP_
 #include "c4/yml/parse_engine.def.hpp"
 #endif
-#ifndef _C4_YML_EVT_EVENT_HANDLER_TREE_HPP_
-#include "c4/yml/evt/event_handler_tree.hpp"
+#ifndef _C4_YML_EVENT_HANDLER_TREE_HPP_
+#include "c4/yml/event_handler_tree.hpp"
 #endif
 
 
@@ -20,7 +20,7 @@ namespace c4 {
 namespace yml {
 
 // instantiate the parser class
-template class ParseEngine<evt::EventHandlerTree>;
+template class ParseEngine<EventHandlerTree>;
 
 namespace {
 inline void _reset_tree_handler(Parser *parser, Tree *t, id_type node_id)

src/c4/yml/parse.hpp

@@ -11,9 +11,7 @@ namespace yml {
 class Tree;
 class NodeRef;
 template<class EventHandler> class ParseEngine;
-namespace evt {
 struct EventHandlerTree;
-} // namespace evt;
 RYML_EXPORT id_type estimate_tree_capacity(csubstr src); // NOLINT
 
 
@@ -33,7 +31,7 @@ RYML_EXPORT id_type estimate_tree_capacity(csubstr src); // NOLINT
  * @see ParseEngine
  * @see EventHandlerTree
  * */
-using Parser = RYML_EXPORT ParseEngine<evt::EventHandlerTree>;
+using Parser = RYML_EXPORT ParseEngine<EventHandlerTree>;
 
 
 //-----------------------------------------------------------------------------

src/c4/yml/tree.cpp

@@ -1806,7 +1806,7 @@ Tree::_lookup_path_token Tree::_next_token(lookup_result *r, _lookup_path_token
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
-#include "c4/yml/evt/event_handler_tree.hpp"
+#include "c4/yml/event_handler_tree.hpp"
 #include "c4/yml/parse_engine.def.hpp"
 #include "c4/yml/parse.hpp"
 

src/c4/yml/yml.hpp

@@ -5,7 +5,7 @@
 #include "c4/yml/tree.hpp"
 #include "c4/yml/node.hpp"
 #include "c4/yml/emit.hpp"
-#include "c4/yml/evt/event_handler_tree.hpp"
+#include "c4/yml/event_handler_tree.hpp"
 #include "c4/yml/parse_engine.hpp"
 #include "c4/yml/filter_processor.hpp"
 #include "c4/yml/parse.hpp"

…/c4/yml/evt/extra/event_handler_ints.cpp …xtra/c4/yml/extra/event_handler_ints.cppsrc/c4/yml/evt/extra/event_handler_ints.cpp renamed to src_extra/c4/yml/extra/event_handler_ints.cpp src/c4/yml/evt/extra/event_handler_ints.cpp renamed to src_extra/c4/yml/extra/event_handler_ints.cpp

@@ -1,16 +1,13 @@
-#include "./event_handler_ints.hpp"
+#include "c4/yml/extra/event_handler_ints.hpp"
 #include <c4/yml/parse_engine.def.hpp>
 
 namespace c4 {
 namespace yml {
-namespace evt {
 namespace extra {
-
 } // namespace extra
-} // namespace evt
 
 // instantiate the template
-template class ParseEngine<evt::extra::EventHandlerInts>;
+template class ParseEngine<extra::EventHandlerInts>;
 
 } // namespace yml
 } // namespace c4