Add helper to dbgprint maybe null strings

Author: biojppm

src/c4/yml/detail/dbgprint.hpp

@@ -118,6 +118,24 @@ inline C4_NO_INLINE void __c4presc(const char *s, size_t len, bool keep_newlines
     __c4presc(csubstr(s, len), keep_newlines);
 }
 
+struct _maybe_null_str
+{
+    csubstr s;
+    _maybe_null_str(csubstr s_) noexcept : s(s_) {}
+};
+// LCOV_EXCL_START
+inline C4_NO_INLINE size_t to_chars(substr buf, _maybe_null_str const& v)
+{
+    return c4::format(buf, v.s.str ? v.s : csubstr("(out of size)"));
+}
+// LCOV_EXCL_STOP
+template<class SinkPfn>
+C4_NO_INLINE size_t dump(SinkPfn &&sinkfn, substr /*buf*/, _maybe_null_str const& v)
+{
+    std::forward<SinkPfn>(sinkfn)(v.s.str ? v.s : csubstr("(out of size)"));
+    return 0; // no space needed in the buffer
+}
+
 /** print string as [{s.len}]~~~{s}~~~ */
 struct _prs
 {
@@ -205,6 +223,7 @@ C4_NO_INLINE size_t dump(SinkPfn &&sinkfn, substr buf, _prs const& v)
     }
     return sz; // we require this space in the buffer
 }
+
 } // namespace yml
 } // namespace c4
 

src/c4/yml/parse_engine.def.hpp

@@ -4327,7 +4327,7 @@ void ParseEngine<EventHandler>::_add_annotation(Annotation *C4_RESTRICT dst, csu
 template<class EventHandler>
 void ParseEngine<EventHandler>::_add_annotation(Annotation *C4_RESTRICT dst, csubstr str, size_t indentation, size_t line)
 {
-    _c4dbgpf("store annotation[{}]: '{}' indentation={} line={}", dst->num_entries, str.str ? str : csubstr("(arena full)"), indentation, line);
+    _c4dbgpf("store annotation[{}]: '{}' indentation={} line={}", dst->num_entries, _maybe_null_str(str), indentation, line);
     _RYML_ASSERT_PARSE_(m_evt_handler->m_stack.m_callbacks, dst->num_entries < C4_COUNTOF(dst->annotations), m_evt_handler->m_curr->pos); // NOLINT(bugprone-sizeof-expression)
     if(C4_UNLIKELY(dst->num_entries && dst->annotations[0].line == line))
     {
@@ -4343,7 +4343,7 @@ void ParseEngine<EventHandler>::_add_annotation(Annotation *C4_RESTRICT dst, csu
 template<class EventHandler>
 void ParseEngine<EventHandler>::_add_annotation(Annotation *C4_RESTRICT dst, csubstr str, size_t indentation, size_t line, csubstr orig)
 {
-    _c4dbgpf("store annotation[{}]: '{}'->'{}' indentation={} line={}", dst->num_entries, orig, str.str ? str : csubstr("(arena full)"), indentation, line);
+    _c4dbgpf("store annotation[{}]: '{}'->'{}' indentation={} line={}", dst->num_entries, orig, _maybe_null_str(str), indentation, line);
     _RYML_ASSERT_PARSE_(m_evt_handler->m_stack.m_callbacks, dst->num_entries < C4_COUNTOF(dst->annotations), m_evt_handler->m_curr->pos); // NOLINT(bugprone-sizeof-expression)
     if(C4_UNLIKELY(dst->num_entries && dst->annotations[0].line == line))
     {
@@ -4677,7 +4677,7 @@ csubstr ParseEngine<EventHandler>::_resolve_tag(csubstr tag)
             _c4assert(!ttag.str || ttag.is_sub(m_evt_handler->arena()));
         }
     }
-    _c4dbgpf("resolved tag: {} -->  [{}]~~~{}~~~", _prs(tag), ttag.len, ttag.str ? ttag : csubstr("(out of size)"));
+    _c4dbgpf("resolved tag: {} -->  [{}]~~~{}~~~", _prs(tag), ttag.len, _maybe_null_str(ttag));
     _c4assert(ttag.len > 0);
     // cache the hard-earned result!
     m_evt_handler->tag_cache().add(tag, ttag, m_evt_handler->m_curr_doc, ret.pos);
@@ -8261,7 +8261,7 @@ uint32_t ParseEngine<EventHandler>::_get_annotations_same_line(csubstr token_sou
     {
         _c4dbgpf("there are {} pending annotations: {} anchors + {} tags", total, m_pending_anchors.num_entries, m_pending_tags.num_entries);
         auto valid_if_same_line = [this](EntryPtr entry){
-            _c4dbgpf("pending: {} indent={} line={} vs currline={}", entry->str, entry->indentation, entry->line, m_evt_handler->m_curr->pos.line);
+            _c4dbgpf("pending: {} indent={} line={} vs currline={}", _maybe_null_str(entry->str), entry->indentation, entry->line, m_evt_handler->m_curr->pos.line);
             return (entry->line == m_evt_handler->m_curr->pos.line) ? entry : nullptr;
         };
         // now select annotations only on the same line
@@ -8290,14 +8290,14 @@ uint32_t ParseEngine<EventHandler>::_get_annotations_same_line(csubstr token_sou
         // assign to first
         first = get_first_on_same_line(nullptr);
         _c4assert(first);
-        _c4dbgpf("first annotation: {} indent={} line={}", first->str, first->indentation, first->line);
+        _c4dbgpf("first annotation: {} indent={} line={}", _maybe_null_str(first->str), first->indentation, first->line);
         if(total > 1)
         {
             _c4assert(total == 2);
             // assign to second
             second = get_first_on_same_line(first);
             _c4assert(second);
-            _c4dbgpf("second annotation: {} indent={} line={}", second->str, second->indentation, second->line);
+            _c4dbgpf("second annotation: {} indent={} line={}", _maybe_null_str(second->str), second->indentation, second->line);
         }
         auto extract_string = [&](EntryPtr e){
             // tags can be null when the arena ran out of space
@@ -8307,7 +8307,7 @@ uint32_t ParseEngine<EventHandler>::_get_annotations_same_line(csubstr token_sou
                 _c4assert(tag.str);
                 _c4assert(tag.len);
                 _c4assert(tag.is_sub(token_soup));
-                _c4dbgpf("tag: {} -> {}", e->str.str ? e->str : csubstr("(out of size)"), tag);
+                _c4dbgpf("tag: {} -> {}", _maybe_null_str(e->str), tag);
                 return tag;
             }
             csubstr anchor = e->str;

src/c4/yml/tag.cpp

@@ -603,7 +603,7 @@ void TagCache::add(csubstr tag, csubstr resolved, id_type doc_id, const_iterator
     ptr[pos].tag = tag;
     ptr[pos].resolved = resolved;
     ptr[pos].doc_id = doc_id;
-    _c4dbgpf("tagcache: add entry @pos={}:  docid={}  {}->{}", pos, doc_id, tag, (resolved.str ? resolved : csubstr("(out of size)")));
+    _c4dbgpf("tagcache: add entry @pos={}:  docid={}  {}->{}", pos, doc_id, tag, _maybe_null_str(resolved));
 }
 
 } // namespace yml