From 025329b6a2ecb8ddee3022d6a73344f862f0d326 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 24 Feb 2012 15:06:44 -0500
Subject: Add LLStringUtil::getTokens() overload handling quoted substrings. We
 didn't have any tokenizer suitable for scanning something like a bash command
 line. We do have a couple hacks, e.g. LLExternalEditor::tokenize() and
 LLCommandLineParser::parseCommandLineString(). Both try to work around
 boost::tokenizer limitations; but existing boost::tokenizer support just
 doesn't address this case. Neither of the above is available as a general
 scanner anyway, and parseCommandLineString() fails outright when passed "".
 New getTokens() also distinguishes between "drop delimiters" (e.g. space,
 return, newline) to be discarded from the token stream, versus "keep
 delimiters" (e.g. "+-*/") to be returned as tokens in their own right.
 There's an overload that honors escapes and a more efficient one that
 doesn't; each has a convenience overload that returns the scanned string
 vector rather than requiring a separate declaration. Tweak and comment older
 getTokens() implementation. Add unit tests for both old and new getTokens()
 implementations. Break out StringVec and std::ostream << StringVec from
 indra/llcommon/tests/listener.h to StringVec.h: that's coming in handy for a
 number of different TUT test sources.

---
 indra/llcommon/tests/listener.h | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'indra/llcommon/tests/listener.h')

diff --git a/indra/llcommon/tests/listener.h b/indra/llcommon/tests/listener.h
index dcdb2412be..9c5c18a150 100644
--- a/indra/llcommon/tests/listener.h
+++ b/indra/llcommon/tests/listener.h
@@ -30,6 +30,8 @@
 #define LL_LISTENER_H
 
 #include "llsd.h"
+#include "llevents.h"
+#include "tests/StringVec.h"
 #include <iostream>
 
 /*****************************************************************************
@@ -133,24 +135,7 @@ struct Collect
         return false;
     }
     void clear() { result.clear(); }
-    typedef std::vector<std::string> StringList;
-    StringList result;
+    StringVec result;
 };
 
-std::ostream& operator<<(std::ostream& out, const Collect::StringList& strings)
-{
-    out << '(';
-    Collect::StringList::const_iterator begin(strings.begin()), end(strings.end());
-    if (begin != end)
-    {
-        out << '"' << *begin << '"';
-        while (++begin != end)
-        {
-            out << ", \"" << *begin << '"';
-        }
-    }
-    out << ')';
-    return out;
-}
-
 #endif /* ! defined(LL_LISTENER_H) */
-- 
cgit v1.2.3