mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-22 01:34:21 +00:00
Code Activity

String tokenisation clean-up.

Browse source
This commit is contained in:
Julian Storer 2011-03-14 10:00:26 +00:00
parent ed0ed361f0
commit eabc372ea9
6 changed files with 174 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/text/juce_StringArray.cpp
View file

@ -354,48 +354,25 @@ int StringArray::addTokens (const String& text, const String& breakCharacters, c
if (text.isNotEmpty())
{
bool insideQuotes = false;
juce_wchar currentQuoteChar = 0;
String::CharPointerType t (text.getCharPointer());
String::CharPointerType tokenStart (t);
int numChars = 0;
for (;;)
{
const juce_wchar c = t.getAndAdvance();
++numChars;
String::CharPointerType tokenEnd (CharacterFunctions::findEndOfToken (t,
breakCharacters.getCharPointer(),
quoteCharacters.getCharPointer()));
const bool isBreak = (c == 0) || ((! insideQuotes) && breakCharacters.containsChar (c));
if (! isBreak)
{
if (quoteCharacters.containsChar (c))
{
if (insideQuotes)
{
// only break out of quotes-mode if we find a matching quote to the
// one that we opened with..
if (currentQuoteChar == c)
insideQuotes = false;
}
else
{
insideQuotes = true;
currentQuoteChar = c;
}
}
}
else
{
add (String (tokenStart, numChars - 1));
++num;
tokenStart = t;
numChars = 0;
}
if (c == 0)
if (tokenEnd == t)
break;
add (String (t, tokenEnd));
++num;
t = tokenEnd;
if (t.isEmpty())
break;
++t;
}
}