wip

Author: biojppm

samples/quickstart-ints.cpp

@@ -6,13 +6,24 @@
 // ryml can be used as a single header, or as a simple library:
 #if defined(RYML_SINGLE_HEADER) // using the single header directly in the executable
     #define RYML_SINGLE_HDR_DEFINE_NOW
-    #include <ryml_all.hpp>
+    #ifndef RYML_SINGLE_HEADER_INTS
+        #include <ryml_all.hpp>
+    #else
+        #include <ryml_ints.hpp>
+    #endif
 #elif defined(RYML_SINGLE_HEADER_LIB) // using the single header from a library
-    #include <ryml_all.hpp>
+    #ifndef RYML_SINGLE_HEADER_INTS
+        #include <ryml_all.hpp>
+    #else
+        #include <ryml_ints.hpp>
+    #endif
 #else
 #include <c4/yml/parse_engine.def.hpp>
 #endif
+
+#ifndef RYML_SINGLE_HEADER_INTS
 #include <c4/yml/extra/event_handler_ints.hpp>
+#endif
 
 
 // NOLINTBEGIN(hicpp-signed-bitwise)

samples/singleheader-ints/CMakeLists.txt

@@ -9,6 +9,7 @@ amalgamate_ryml(SINGLE_HEADER_DIR SINGLE_HEADER)
 add_executable(ryml-quickstart-ints ../quickstart-ints.cpp ${SINGLE_HEADER})
 target_compile_features(ryml-quickstart-ints PUBLIC cxx_std_11)
 target_compile_definitions(ryml-quickstart-ints PUBLIC -DRYML_SINGLE_HEADER)
+target_compile_definitions(ryml-quickstart-ints PUBLIC -DRYML_SINGLE_HEADER_INTS)
 target_include_directories(ryml-quickstart-ints PUBLIC "${SINGLE_HEADER_DIR}")
 
 add_custom_target(run ryml-quickstart-ints

samples/singleheaderlib-ints/CMakeLists.txt

@@ -14,6 +14,7 @@ target_include_directories(ryml PUBLIC "${SINGLE_HEADER_DIR}")
 add_executable(ryml-quickstart-ints ../quickstart-ints.cpp)
 target_link_libraries(ryml-quickstart-ints PRIVATE ryml)
 target_compile_definitions(ryml-quickstart-ints PUBLIC -DRYML_SINGLE_HEADER_LIB)
+target_compile_definitions(ryml-quickstart-ints PUBLIC -DRYML_SINGLE_HEADER_INTS)
 
 # adjustments for shared library
 if(BUILD_SHARED_LIBS)

src_extra/c4/yml/extra/event_handler_ints.cpp

@@ -1,7 +1,14 @@
-#ifndef RYML_SINGLE_HEADER
+
+#ifdef RYML_SINGLE_HEADER_INTS
+#include <ryml_ints.hpp>
+#elif defined(RYML_SINGLE_HEADER)
+#include <ryml_all.hpp>
+#else
 #include <c4/yml/parse_engine.def.hpp>
 #endif
+#ifndef RYML_SINGLE_HEADER_INTS
 #include "c4/yml/extra/event_handler_ints.hpp"
+#endif
 
 namespace c4 {
 namespace yml {

src_extra/c4/yml/extra/event_handler_ints.hpp

@@ -9,9 +9,7 @@
  * @see c4::yml::extra::EventHandlerInts
  * */
 
-#ifdef RYML_SINGLE_HEADER
-#include <ryml_all.hpp>
-#else
+#ifndef RYML_SINGLE_HEADER
 #ifndef _C4_YML_NODE_TYPE_HPP_
 #include <c4/yml/node_type.hpp>
 #endif
@@ -26,7 +24,6 @@
 #endif
 #endif
 
-
 namespace c4 {
 namespace yml {
 namespace extra {
@@ -84,7 +81,7 @@ typedef enum : DataType {
     ///< is set not to filter)
     UNFILT = (1 << 24),
     // Utility flags/masks
-    LAST = UNFILT,                ///< the last flag defined above
+    LAST = UNFILT,              ///< the last flag defined above
     MASK = (LAST << 1) - 1,     ///< a mask of all bits in this enumeration
     WSTR = SCLR|ALIA|ANCH|TAG_, ///< with string: mask of all the events that encode a string
                                 ///< following the event. in the event has a string. the next two
@@ -110,9 +107,9 @@ namespace extra {
  * the number of events without undergoing a full parse. This
  * estimation is meant to exceed the actual number of required events.
  *
- * @note This function overpredicts (as intended) for every case in
- * the hundreds/thousands of extensive tests of rapidyaml (both for
- * the YAML test suite and the internal cases). If you find a case
+ * @note This function must overpredict. It does so for every case in
+ * the hundreds/thousands of extensive tests of rapidyaml -- both for
+ * the YAML test suite and the internal cases. If you find a case
  * where that does not hold, it is a bug. Please report it at
  * https://github.com/biojppm/rapidyaml/issues! */
 RYML_EXPORT int32_t estimate_events_ints_size(csubstr src);

src_extra/c4/yml/extra/event_handler_ints_utils.cpp

@@ -7,6 +7,7 @@
 #endif
 
 C4_SUPPRESS_WARNING_GCC_WITH_PUSH("-Wold-style-cast")
+C4_SUPPRESS_WARNING_CLANG_WITH_PUSH("-Wold-style-cast")
 // NOLINTBEGIN(hicpp-signed-bitwise)
 
 namespace c4 {
@@ -213,4 +214,5 @@ size_t emit_events_test_suite_from_ints(csubstr parsed_yaml,
 } // namespace c4
 
 // NOLINTEND(hicpp-signed-bitwise)
+C4_SUPPRESS_WARNING_CLANG_POP
 C4_SUPPRESS_WARNING_GCC_POP

src_extra/c4/yml/extra/string.hpp

@@ -1,11 +1,7 @@
 #ifndef _C4_YML_EXTRA_STRING_HPP_
 #define _C4_YML_EXTRA_STRING_HPP_
 
-#ifdef RYML_SINGLE_HEADER
-#ifndef _RYML_SINGLE_HEADER_AMALGAMATED_HPP_
-#include <ryml_all.hpp>
-#endif
-#else
+#ifndef RYML_SINGLE_HEADER
 #ifndef _C4_YML_COMMON_HPP_
 #include "c4/yml/common.hpp"
 #endif