From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 13 Dec 2013 15:49:39 +0000 (+0100)
Subject: Implemented more Tokenizer methods and unit tests
X-Git-Tag: merge-candidate-3-v1~506^2~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2891eef963073cc6c973a9158bfa76d4493cefa;p=thirdparty%2Fsquid.git

Implemented more Tokenizer methods and unit tests
---

diff --git a/src/parser/Tokenizer.cc b/src/parser/Tokenizer.cc
index e0805621db..716b204a5b 100644
--- a/src/parser/Tokenizer.cc
+++ b/src/parser/Tokenizer.cc
@@ -3,6 +3,34 @@
 
 namespace Parser {
 
+SBuf::size_type
+Tokenizer::findPrefixLen(const CharacterSet& tokenChars)
+{
+    SBuf::size_type prefixLen = 0;
+    const SBuf::size_type len = buf_.length();
+    while (prefixLen < len) {
+        if (!tokenChars[buf_[prefixLen]])
+            break;
+        ++prefixLen;
+    }
+    return prefixLen;
+}
+
+SBuf::size_type
+Tokenizer::findFirstOf(const CharacterSet& tokenChars)
+{
+    SBuf::size_type s = 0;
+    const SBuf::size_type len = buf_.length();
+    bool found = false;
+    while (s < len) {
+        if (tokenChars[buf_[prefixLen]]) {
+            found = true;
+            break;
+        }
+        ++s;
+    }
+}
+
 bool
 Tokenizer::token(SBuf &returnedToken, const CharacterSet &whitespace)
 {
@@ -13,13 +41,7 @@ Tokenizer::token(SBuf &returnedToken, const CharacterSet &whitespace)
 bool
 Tokenizer::prefix(SBuf &returnedToken, const CharacterSet &tokenChars)
 {
-    SBuf::size_type prefixLen = 0;
-    const SBuf::size_type len=buf_.length();
-    while (prefixLen < len) {
-        if (!tokenChars[buf_[prefixLen]])
-            break;
-        ++prefixLen;
-    }
+    SBuf::size_type prefixLen = findPrefixLen(tokenChars);
     if (prefixLen == 0)
         return false;
     returnedToken = buf_.consume(prefixLen);
@@ -29,21 +51,30 @@ Tokenizer::prefix(SBuf &returnedToken, const CharacterSet &tokenChars)
 bool
 Tokenizer::skip(const CharacterSet &tokenChars)
 {
-    //TODO
-    return false;
+    SBuf::size_type prefixLen = findPrefixLen(tokenChars);
+    if (prefixLen == 0)
+        return false;
+    buf_.consume(prefixLen);
+    return true;
 }
 
 bool
 Tokenizer::skip(const SBuf &tokenToSkip)
 {
-    //TODO
+    if (buf_.startsWith(tokenToSkip)) {
+        buf_.consume(tokenToSkip.length());
+        return true;
+    }
     return false;
 }
 
 bool
 Tokenizer::skip(const char tokenChar)
 {
-    //TODO
+    if (buf_[0] == tokenChar) {
+        buf_.consume(1);
+        return true;
+    }
     return false;
 }
 } /* namespace Parser */
diff --git a/src/parser/Tokenizer.h b/src/parser/Tokenizer.h
index 3f01ed9a86..66a78460b7 100644
--- a/src/parser/Tokenizer.h
+++ b/src/parser/Tokenizer.h
@@ -38,6 +38,11 @@ public:
    /// Skips a given character (a token).
    bool skip(const char tokenChar);
 
+protected:
+    //obtain the length of the longest prefix in buf_ only made of chars in tokenChars
+    SBuf::size_type findPrefixLen(const CharacterSet& tokenChars);
+    SBuf::size_type findFirstOf(const CharacterSet& tokenChars);
+
 private:
    SBuf buf_; ///< yet unparsed input
 };
diff --git a/src/parser/testTokenizer.cc b/src/parser/testTokenizer.cc
index 2efd183115..afb6d754d1 100644
--- a/src/parser/testTokenizer.cc
+++ b/src/parser/testTokenizer.cc
@@ -53,6 +53,30 @@ testTokenizer::testTokenizerPrefix()
 void
 testTokenizer::testTokenizerSkip()
 {
+    Parser::Tokenizer t(text);
+    SBuf s;
+
+    // first scenario: patterns match
+    // prep for test
+    CPPUNIT_ASSERT(t.prefix(s,alpha));
+    CPPUNIT_ASSERT_EQUAL(SBuf("GET"),s);
+
+    // test skip testing character set
+    CPPUNIT_ASSERT(t.skip(whitespace));
+    // check that skip was right
+    CPPUNIT_ASSERT(t.prefix(s,alpha));
+    CPPUNIT_ASSERT_EQUAL(SBuf("http"),s);
+
+    //check skip prefix
+    CPPUNIT_ASSERT(t.skip(SBuf("://")));
+    // verify
+    CPPUNIT_ASSERT(t.prefix(s,alpha));
+    CPPUNIT_ASSERT_EQUAL(SBuf("resource"),s);
+
+    // no skip
+    CPPUNIT_ASSERT(!t.skip(alpha));
+    CPPUNIT_ASSERT(!t.skip(SBuf("://")));
+    CPPUNIT_ASSERT(!t.skip('a'));
 
 }