mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

CharacterFunctions: Add new function to move pointer past whitespace

Browse source
This commit is contained in:
reuk 2021-02-17 13:01:01 +00:00
parent dc6b4ee43f
commit 64b9366e8f
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
17 changed files with 46 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/Assets/WavefrontObjParser.h
View file

@ -143,7 +143,7 @@ private:
static float parseFloat (String::CharPointerType& t)
{
t = t.findEndOfWhitespace();
t.incrementToEndOfWhitespace();
return (float) CharacterFunctions::readDoubleValue (t);
}
@ -211,7 +211,7 @@ private:
{
TripleIndex i;
t = t.findEndOfWhitespace();
t.incrementToEndOfWhitespace();
i.vertexIndex = t.getIntValue32() - 1;
t = findEndOfFaceToken (t);

4
extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.cpp
View file

@ -123,12 +123,12 @@ StringPairArray parsePreprocessorDefs (const String& text)
while (! s.isEmpty())
{
String token, value;
s = s.findEndOfWhitespace();
s.incrementToEndOfWhitespace();
while ((! s.isEmpty()) && *s != '=' && ! s.isWhitespace())
token << s.getAndAdvance();
s = s.findEndOfWhitespace();
s.incrementToEndOfWhitespace();
if (*s == '=')
{

4
extras/Projucer/Source/Utility/Helpers/jucer_TranslationHelpers.h
View file

@ -48,7 +48,7 @@ struct TranslationHelpers
break;
p += 5;
p = p.findEndOfWhitespace();
p.incrementToEndOfWhitespace();
if (*p == '(')
{
@ -63,7 +63,7 @@ struct TranslationHelpers
static void parseStringLiteral (String::CharPointerType& p, MemoryOutputStream& out) noexcept
{
p = p.findEndOfWhitespace();
p.incrementToEndOfWhitespace();
if (p.getAndAdvance() == '"')
{

2
modules/juce_blocks_basics/littlefoot/juce_LittleFootCompiler.h
View file

@ -272,7 +272,7 @@ private:
{
for (;;)
{
p = p.findEndOfWhitespace();
p.incrementToEndOfWhitespace();
if (*p == '/')
{

2
modules/juce_core/javascript/juce_Javascript.cpp
View file

@ -940,7 +940,7 @@ struct JavascriptEngine::RootObject : public DynamicObject
{
for (;;)
{
p = p.findEndOfWhitespace();
p.incrementToEndOfWhitespace();
if (*p == '/')
{

10
modules/juce_core/maths/juce_Expression.cpp
View file

@ -699,7 +699,7 @@ struct Expression::Helpers
bool readOperator (const char* ops, char* const opType = nullptr) noexcept
{
text = text.findEndOfWhitespace();
text.incrementToEndOfWhitespace();
while (*ops != 0)
{
@ -719,7 +719,7 @@ struct Expression::Helpers
bool readIdentifier (String& identifier) noexcept
{
text = text.findEndOfWhitespace();
text.incrementToEndOfWhitespace();
auto t = text;
int numChars = 0;
@ -747,21 +747,21 @@ struct Expression::Helpers
Term* readNumber() noexcept
{
text = text.findEndOfWhitespace();
text.incrementToEndOfWhitespace();
auto t = text;
bool isResolutionTarget = (*t == '@');
if (isResolutionTarget)
{
++t;
t = t.findEndOfWhitespace();
t.incrementToEndOfWhitespace();
text = t;
}
if (*t == '-')
{
++t;
t = t.findEndOfWhitespace();
t.incrementToEndOfWhitespace();
}
if (isDecimalDigit (*t) || (*t == '.' && isDecimalDigit (t[1])))

3
modules/juce_core/text/juce_CharPointer_ASCII.h
View file

@ -350,6 +350,9 @@ public:
/** Returns the first non-whitespace character in the string. */
CharPointer_ASCII findEndOfWhitespace() const noexcept { return CharacterFunctions::findEndOfWhitespace (*this); }
/** Move this pointer to the first non-whitespace character in the string. */
void incrementToEndOfWhitespace() noexcept { CharacterFunctions::incrementToEndOfWhitespace (*this); }
/** Returns true if the given unicode character can be represented in this encoding. */
static bool canRepresent (juce_wchar character) noexcept
{

3
modules/juce_core/text/juce_CharPointer_UTF16.h
View file

@ -426,6 +426,9 @@ public:
/** Returns the first non-whitespace character in the string. */
CharPointer_UTF16 findEndOfWhitespace() const noexcept { return CharacterFunctions::findEndOfWhitespace (*this); }
/** Move this pointer to the first non-whitespace character in the string. */
void incrementToEndOfWhitespace() noexcept { CharacterFunctions::incrementToEndOfWhitespace (*this); }
/** Returns true if the given unicode character can be represented in this encoding. */
static bool canRepresent (juce_wchar character) noexcept
{

3
modules/juce_core/text/juce_CharPointer_UTF32.h
View file

@ -341,6 +341,9 @@ public:
/** Returns the first non-whitespace character in the string. */
CharPointer_UTF32 findEndOfWhitespace() const noexcept { return CharacterFunctions::findEndOfWhitespace (*this); }
/** Move this pointer to the first non-whitespace character in the string. */
void incrementToEndOfWhitespace() noexcept { CharacterFunctions::incrementToEndOfWhitespace (*this); }
/** Returns true if the given unicode character can be represented in this encoding. */
static bool canRepresent (juce_wchar character) noexcept
{

3
modules/juce_core/text/juce_CharPointer_UTF8.h
View file

@ -483,6 +483,9 @@ public:
/** Returns the first non-whitespace character in the string. */
CharPointer_UTF8 findEndOfWhitespace() const noexcept { return CharacterFunctions::findEndOfWhitespace (*this); }
/** Move this pointer to the first non-whitespace character in the string. */
void incrementToEndOfWhitespace() noexcept { CharacterFunctions::incrementToEndOfWhitespace (*this); }
/** Returns true if the given unicode character can be represented in this encoding. */
static bool canRepresent (juce_wchar character) noexcept
{

17
modules/juce_core/text/juce_CharacterFunctions.h
View file

@ -794,6 +794,19 @@ public:
return -1;
}
/** Increments a pointer until it points to the first non-whitespace character
in a string.
If the string contains only whitespace, the pointer will point to the
string's null terminator.
*/
template <typename Type>
static void incrementToEndOfWhitespace (Type& text) noexcept
{
while (text.isWhitespace())
++text;
}
/** Returns a pointer to the first non-whitespace character in a string.
If the string contains only whitespace, this will return a pointer
to its null terminator.
@ -801,9 +814,7 @@ public:
template <typename Type>
static Type findEndOfWhitespace (Type text) noexcept
{
while (text.isWhitespace())
++text;
incrementToEndOfWhitespace (text);
return text;
}

2
modules/juce_core/xml/juce_XmlDocument.cpp
View file

@ -291,7 +291,7 @@ void XmlDocument::skipNextWhiteSpace()
{
for (;;)
{
input = input.findEndOfWhitespace();
input.incrementToEndOfWhitespace();
if (input.isEmpty())
{

2
modules/juce_graphics/geometry/juce_Path.cpp
View file

@ -37,7 +37,7 @@ namespace PathHelpers
static String nextToken (String::CharPointerType& t)
{
t = t.findEndOfWhitespace();
t.incrementToEndOfWhitespace();
auto start = t;
size_t numChars = 0;

4
modules/juce_gui_basics/drawables/juce_SVGParser.cpp
View file

@ -415,7 +415,7 @@ public:
case 'z':
path.closeSubPath();
last = last2 = subpathStart;
d = d.findEndOfWhitespace();
d.incrementToEndOfWhitespace();
currentCommand = 'M';
break;
@ -755,7 +755,7 @@ private:
dashLengths.add (value);
t = t.findEndOfWhitespace();
t.incrementToEndOfWhitespace();
if (*t == ',')
++t;

2
modules/juce_gui_basics/positioning/juce_RelativePoint.cpp
View file

@ -30,7 +30,7 @@ namespace RelativePointHelpers
{
inline void skipComma (String::CharPointerType& s)
{
s = s.findEndOfWhitespace();
s.incrementToEndOfWhitespace();
if (*s == ',')
++s;

2
modules/juce_gui_basics/positioning/juce_RelativeRectangle.cpp
View file

@ -30,7 +30,7 @@ namespace RelativeRectangleHelpers
{
inline void skipComma (String::CharPointerType& s)
{
s = s.findEndOfWhitespace();
s.incrementToEndOfWhitespace();
if (*s == ',')
++s;

2
modules/juce_gui_extra/misc/juce_LiveConstantEditor.cpp
View file

@ -213,7 +213,7 @@ void LivePropertyEditorBase::findOriginalValueInCode()
}
p += (int) (sizeof ("JUCE_LIVE_CONSTANT") - 1);
p = p.findEndOfWhitespace();
p.incrementToEndOfWhitespace();
if (! CharacterFunctions::find (p, CharPointer_ASCII ("JUCE_LIVE_CONSTANT")).isEmpty())
{