Skip to content

Commit fa9fb1f

Browse files
committed
Remove unused flag functions in ParseEngine
1 parent c642888 commit fa9fb1f

2 files changed

Lines changed: 10 additions & 13 deletions

File tree

src/c4/yml/parse_engine.def.hpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3921,8 +3921,9 @@ csubstr ParseEngine<EventHandler>::_maybe_filter_val_scalar_folded(ScannedBlock
39213921
#ifdef RYML_DBG // !!! <----------------------------------
39223922

39233923
template<class EventHandler>
3924-
void ParseEngine<EventHandler>::add_flags(ParserFlag_t on, ParserState * s)
3924+
void ParseEngine<EventHandler>::add_flags(ParserFlag_t on)
39253925
{
3926+
ParserState *s = m_evt_handler->m_curr;
39263927
char buf1_[64], buf2_[64], buf3_[64];
39273928
csubstr buf1 = detail::_parser_flags_to_str(buf1_, on);
39283929
csubstr buf2 = detail::_parser_flags_to_str(buf2_, s->flags);
@@ -3932,8 +3933,9 @@ void ParseEngine<EventHandler>::add_flags(ParserFlag_t on, ParserState * s)
39323933
}
39333934

39343935
template<class EventHandler>
3935-
void ParseEngine<EventHandler>::addrem_flags(ParserFlag_t on, ParserFlag_t off, ParserState * s)
3936+
void ParseEngine<EventHandler>::addrem_flags(ParserFlag_t on, ParserFlag_t off)
39363937
{
3938+
ParserState *s = m_evt_handler->m_curr;
39373939
char buf1_[64], buf2_[64], buf3_[64], buf4_[64];
39383940
csubstr buf1 = detail::_parser_flags_to_str(buf1_, on);
39393941
csubstr buf2 = detail::_parser_flags_to_str(buf2_, off);
@@ -3946,8 +3948,9 @@ void ParseEngine<EventHandler>::addrem_flags(ParserFlag_t on, ParserFlag_t off,
39463948
}
39473949

39483950
template<class EventHandler>
3949-
void ParseEngine<EventHandler>::rem_flags(ParserFlag_t off, ParserState * s)
3951+
void ParseEngine<EventHandler>::rem_flags(ParserFlag_t off)
39503952
{
3953+
ParserState *s = m_evt_handler->m_curr;
39513954
char buf1_[64], buf2_[64], buf3_[64];
39523955
csubstr buf1 = detail::_parser_flags_to_str(buf1_, off);
39533956
csubstr buf2 = detail::_parser_flags_to_str(buf2_, s->flags);

src/c4/yml/parse_engine.hpp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -608,19 +608,13 @@ class ParseEngine
608608
static C4_ALWAYS_INLINE bool has_none(ParserFlag_t f, ParserState const* C4_RESTRICT s) noexcept { return (s->flags & f) == 0; }
609609

610610
#ifndef RYML_DBG
611-
C4_ALWAYS_INLINE static void add_flags(ParserFlag_t on, ParserState *C4_RESTRICT s) noexcept { s->flags |= on; }
612-
C4_ALWAYS_INLINE static void addrem_flags(ParserFlag_t on, ParserFlag_t off, ParserState *C4_RESTRICT s) noexcept { _RYML_ASSERT_BASIC((on & off) == 0); s->flags &= ~off; s->flags |= on; }
613-
C4_ALWAYS_INLINE static void rem_flags(ParserFlag_t off, ParserState *C4_RESTRICT s) noexcept { s->flags &= ~off; }
614611
C4_ALWAYS_INLINE void add_flags(ParserFlag_t on) noexcept { m_evt_handler->m_curr->flags |= on; }
615-
C4_ALWAYS_INLINE void addrem_flags(ParserFlag_t on, ParserFlag_t off) noexcept { _RYML_ASSERT_BASIC((on & off) == 0); m_evt_handler->m_curr->flags &= ~off; m_evt_handler->m_curr->flags |= on; }
612+
C4_ALWAYS_INLINE void addrem_flags(ParserFlag_t on, ParserFlag_t off) noexcept { m_evt_handler->m_curr->flags &= ~off; m_evt_handler->m_curr->flags |= on; }
616613
C4_ALWAYS_INLINE void rem_flags(ParserFlag_t off) noexcept { m_evt_handler->m_curr->flags &= ~off; }
617614
#else
618-
static void add_flags(ParserFlag_t on, ParserState *C4_RESTRICT s);
619-
static void addrem_flags(ParserFlag_t on, ParserFlag_t off, ParserState *C4_RESTRICT s);
620-
static void rem_flags(ParserFlag_t off, ParserState *C4_RESTRICT s);
621-
C4_ALWAYS_INLINE void add_flags(ParserFlag_t on) noexcept { add_flags(on, m_evt_handler->m_curr); }
622-
C4_ALWAYS_INLINE void addrem_flags(ParserFlag_t on, ParserFlag_t off) noexcept { addrem_flags(on, off, m_evt_handler->m_curr); }
623-
C4_ALWAYS_INLINE void rem_flags(ParserFlag_t off) noexcept { rem_flags(off, m_evt_handler->m_curr); }
615+
C4_ALWAYS_INLINE void add_flags(ParserFlag_t on);
616+
C4_ALWAYS_INLINE void addrem_flags(ParserFlag_t on, ParserFlag_t off);
617+
C4_ALWAYS_INLINE void rem_flags(ParserFlag_t off);
624618
#endif
625619

626620
private:

0 commit comments

Comments
 (0)