From c08bb0ec0208683ecd0ad89c3d46d4d66b938fbd Mon Sep 17 00:00:00 2001 From: m-holger Date: Thu, 18 Aug 2022 13:13:19 +0100 Subject: Remove QPDFTokenizer::Members --- include/qpdf/QPDFTokenizer.hh | 59 +++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 36 deletions(-) (limited to 'include') diff --git a/include/qpdf/QPDFTokenizer.hh b/include/qpdf/QPDFTokenizer.hh index 2187f21e..f1e10d3f 100644 --- a/include/qpdf/QPDFTokenizer.hh +++ b/include/qpdf/QPDFTokenizer.hh @@ -211,42 +211,29 @@ class QPDFTokenizer st_token_ready }; - class Members - { - friend class QPDFTokenizer; - - public: - QPDF_DLL - ~Members() = default; - - private: - Members(); - Members(Members const&) = delete; - void reset(); - - // Lexer state - state_e state; - - bool allow_eof; - bool include_ignorable; - - // Current token accumulation - token_type_e type; - std::string val; - std::string raw_val; - std::string error_message; - bool unread_char; - char char_to_unread; - size_t inline_image_bytes; - - // State for strings - int string_depth; - bool string_ignoring_newline; - char bs_num_register[4]; - bool last_char_was_bs; - bool last_char_was_cr; - }; - std::shared_ptr m; + void reset(); + + // Lexer state + state_e state; + + bool allow_eof; + bool include_ignorable; + + // Current token accumulation + token_type_e type; + std::string val; + std::string raw_val; + std::string error_message; + bool unread_char; + char char_to_unread; + size_t inline_image_bytes; + + // State for strings + int string_depth; + bool string_ignoring_newline; + char bs_num_register[4]; + bool last_char_was_bs; + bool last_char_was_cr; }; #endif // QPDFTOKENIZER_HH -- cgit v1.2.3-70-g09d2