json_cursor_tests

Author: danielaparker

include/jsoncons/json_cursor.hpp

@@ -280,7 +280,7 @@ class basic_json_cursor : public basic_staj_cursor<CharT>, private virtual ser_c
     void read_to(basic_json_visitor<CharT>& visitor,
                  std::error_code& ec) override
     {
-        if (current().event_type() == staj_event_type::begin_object || current().event_type() == staj_event_type::begin_array)
+        if (is_begin_container(current().event_type()))
         {
             parser_.cursor_mode(false);
             parser_.mark_level(parser_.level());

include/jsoncons/staj_event.hpp

@@ -35,23 +35,35 @@
 
 namespace jsoncons {
 
-enum class staj_event_type
+enum class staj_event_type : uint8_t
 {
-    begin_array,
-    end_array,
-    begin_object,
-    end_object,
-    key,
-    string_value,
-    byte_string_value,
-    null_value,
-    bool_value,
-    int64_value,
-    uint64_value,
-    half_value,
-    double_value
+    key = 0,                // 0000
+    string_value = 1,       // 0001
+    byte_string_value = 2,  // 0010
+    null_value = 3,         // 0011
+    bool_value = 4,         // 0100
+    int64_value = 5,        // 0101
+    uint64_value = 6,       // 0110
+    half_value = 8,         // 1000
+    double_value = 9,       // 1001
+    begin_object = 13,      // 1101
+    end_object = 7,         // 0111    
+    begin_array = 14,       // 1110
+    end_array = 15          // 1111
 };
 
+inline bool is_begin_container(staj_event_type event_type) noexcept
+{
+    static const uint8_t mask{ uint8_t(staj_event_type::begin_object) & uint8_t(staj_event_type::begin_array) };
+    return (uint8_t(event_type) & mask) == mask;
+}
+
+inline bool is_end_container(staj_event_type event_type) noexcept
+{
+    static const uint8_t mask{ uint8_t(staj_event_type::end_object) & uint8_t(staj_event_type::end_array) };
+    return (uint8_t(event_type) & mask) == mask;
+}
+
 template <typename CharT>
 std::basic_ostream<CharT>& operator<<(std::basic_ostream<CharT>& os, staj_event_type tag)
 {