In QPDFParser access qpdf::Tokenizer directly

Remove remaining QPDFTokenizer private methods. Remove QPDFTokenizer privileged access to Tokenizer.

In QPDFParser access qpdf::Tokenizer directly
Remove remaining QPDFTokenizer private methods. Remove QPDFTokenizer privileged access to Tokenizer.
m-holger
1 parent 39bc2eb4
Showing 4 changed files with 14 additions and 55 deletions
include/qpdf/QPDFTokenizer.hh
libqpdf/QPDFTokenizer.cc
libqpdf/qpdf/QPDFParser.hh
libqpdf/qpdf/QPDFTokenizer_private.hh
@@ -206,23 +206,6 @@ class QPDFTokenizer
   private:
     friend class QPDFParser;
-    // Read a token from an input source. Context describes the context in which the token is being
-    // read and is used in the exception thrown if there is an error. After a token is read, the
-    // position of the input source returned by input->tell() points to just after the token, and
-    // the input source's "last offset" as returned by input->getLastOffset() points to the
-    // beginning of the token. Returns false if the token is bad or if scanning produced an error
-    // message for any reason.
-
-    bool nextToken(InputSource& input, std::string const& context, size_t max_len = 0);
-
-    // The following methods are only valid after nextToken has been called and until another
-    // QPDFTokenizer method is called. They allow the results of calling nextToken to be accessed
-    // without creating a Token, thus avoiding copying information that may not be needed.
-    inline token_type_e getType() const noexcept;
-    inline std::string const& getValue() const noexcept;
-    inline std::string const& getRawValue() const noexcept;
-    inline std::string const& getErrorMessage() const noexcept;
-
     QPDFTokenizer(QPDFTokenizer const&) = delete;
     QPDFTokenizer& operator=(QPDFTokenizer const&) = delete;
@@ -936,7 +936,13 @@ Tokenizer::getToken(Token&amp; token, bool&amp; unread_char, char&amp; ch)
 bool
 QPDFTokenizer::betweenTokens()
 {
-    return m->before_token;
+    return m->betweenTokens();
+}
+
+bool
+Tokenizer::betweenTokens()
+{
+    return before_token;
 }
 QPDFTokenizer::Token
@@ -986,12 +992,6 @@ Tokenizer::readToken(
 }
 bool
-QPDFTokenizer::nextToken(InputSource& input, std::string const& context, size_t max_len)
-{
-    return m->nextToken(input, context, max_len);
-}
-
-bool
 Tokenizer::nextToken(InputSource& input, std::string const& context, size_t max_len)
 {
     if (this->state != st_inline_image) {
@@ -3,6 +3,7 @@
 #include <qpdf/QPDFObjectHandle_private.hh>
 #include <qpdf/QPDFObject_private.hh>
+#include <qpdf/QPDFTokenizer_private.hh>
 #include <memory>
 #include <string>
@@ -20,7 +21,7 @@ class QPDFParser
         bool parse_pdf) :
         input(input),
         object_description(object_description),
-        tokenizer(tokenizer),
+        tokenizer(*tokenizer.m),
         decrypter(decrypter),
         context(context),
         description(
@@ -75,7 +76,7 @@ class QPDFParser
     void setDescription(std::shared_ptr<QPDFObject>& obj, qpdf_offset_t parsed_offset);
     InputSource& input;
     std::string const& object_description;
-    QPDFTokenizer& tokenizer;
+    qpdf::Tokenizer& tokenizer;
     QPDFObjectHandle::StringDecrypter* decrypter;
     QPDF* context;
     std::shared_ptr<QPDFObject::Description> description;
@@ -8,10 +8,10 @@ namespace qpdf
     class Tokenizer
     {
-        friend class ::QPDFTokenizer;
-
       public:
         Tokenizer();
+        Tokenizer(Tokenizer const&) = delete;
+        Tokenizer& operator=(Tokenizer const&) = delete;
         // Methods to support QPDFTokenizer. See QPDFTokenizer.hh for detail. Some of these are used
         // by Tokenizer internally but are not accessed directly by the rest of qpdf.
@@ -20,14 +20,13 @@ namespace qpdf
         void includeIgnorable();
         void presentCharacter(char ch);
         void presentEOF();
+        bool betweenTokens();
         // If a token is available, return true and initialize token with the token, unread_char
         // with whether or not we have to unread the last character, and if unread_char, ch with the
         // character to unread.
         bool getToken(QPDFTokenizer::Token& token, bool& unread_char, char& ch);
-        // Pull mode:
-
         // Read a token from an input source. Context describes the context in which the token is
         // being read and is used in the exception thrown if there is an error. After a token is
         // read, the position of the input source returned by input->tell() points to just after the
@@ -55,7 +54,6 @@ namespace qpdf
         void expectInlineImage(InputSource& input);
-      private:
         // Read a token from an input source. Context describes the context in which the token is
         // being read and is used in the exception thrown if there is an error. After a token is
         // read, the position of the input source returned by input->tell() points to just after the
@@ -73,9 +71,7 @@ namespace qpdf
         inline std::string const& getRawValue() const;
         inline std::string const& getErrorMessage() const;
-        Tokenizer(Tokenizer const&) = delete;
-        Tokenizer& operator=(Tokenizer const&) = delete;
-
+      private:
         bool isSpace(char);
         bool isDelimiter(char);
         void findEI(InputSource& input);
@@ -179,25 +175,4 @@ namespace qpdf
 } // namespace qpdf
-inline QPDFTokenizer::token_type_e
-QPDFTokenizer::getType() const noexcept
-{
-    return m->type;
-}
-inline std::string const&
-QPDFTokenizer::getValue() const noexcept
-{
-    return (m->type == tt_name || m->type == tt_string) ? m->val : m->raw_val;
-}
-inline std::string const&
-QPDFTokenizer::getRawValue() const noexcept
-{
-    return m->raw_val;
-}
-inline std::string const&
-QPDFTokenizer::getErrorMessage() const noexcept
-{
-    return m->error_message;
-}
-
 #endif // QPDFTOKENIZER_PRIVATE_HH