GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-29 17:07:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Lexer2

Browse source 
- Improved ::isUUID lexing.
This commit is contained in:
Paul Beckingham 2015-02-20 12:13:11 -08:00
parent 66d5a8ba3d
commit 1128ad8259
2 changed files with 8 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/Lexer2.cpp
View file

@ -69,7 +69,6 @@ bool Lexer2::token (std::string& token, Lexer2::Type& type)
if (isString (token, type, '\'') || if (isString (token, type, '\'') ||
isString (token, type, '"') || isString (token, type, '"') ||
isUUID (token, type) || isUUID (token, type) ||
isPartialUUID (token, type) ||
isHexNumber (token, type) || isHexNumber (token, type) ||
isNumber (token, type) || isNumber (token, type) ||
isSeparator (token, type) || isSeparator (token, type) ||
@ -387,67 +386,18 @@ bool Lexer2::isString (std::string& token, Lexer2::Type& type, int quote)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Lexer2::Type::uuid // Lexer2::Type::uuid
// XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX // XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
// XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXX
// XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX
// XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXX
// ...
// XXXXXXXX-XX
// XXXXXXXX-X
// XXXXXXXX-
// XXXXXXXX
bool Lexer2::isUUID (std::string& token, Lexer2::Type& type) bool Lexer2::isUUID (std::string& token, Lexer2::Type& type)
{ {
std::size_t marker = _cursor; std::size_t marker = _cursor;
if (_eos - marker >= 36)
{
if (isHexDigit (_text[marker + 0]) &&
isHexDigit (_text[marker + 1]) &&
isHexDigit (_text[marker + 2]) &&
isHexDigit (_text[marker + 3]) &&
isHexDigit (_text[marker + 4]) &&
isHexDigit (_text[marker + 5]) &&
isHexDigit (_text[marker + 6]) &&
isHexDigit (_text[marker + 7]) &&
_text[marker + 8] == '-' &&
isHexDigit (_text[marker + 9]) &&
isHexDigit (_text[marker + 10]) &&
isHexDigit (_text[marker + 11]) &&
isHexDigit (_text[marker + 12]) &&
_text[marker + 13] == '-' &&
isHexDigit (_text[marker + 14]) &&
isHexDigit (_text[marker + 15]) &&
isHexDigit (_text[marker + 16]) &&
isHexDigit (_text[marker + 17]) &&
_text[marker + 18] == '-' &&
isHexDigit (_text[marker + 19]) &&
isHexDigit (_text[marker + 20]) &&
isHexDigit (_text[marker + 20]) &&
isHexDigit (_text[marker + 20]) &&
_text[marker + 23] == '-' &&
isHexDigit (_text[marker + 24]) &&
isHexDigit (_text[marker + 25]) &&
isHexDigit (_text[marker + 26]) &&
isHexDigit (_text[marker + 27]) &&
isHexDigit (_text[marker + 28]) &&
isHexDigit (_text[marker + 29]) &&
isHexDigit (_text[marker + 30]) &&
isHexDigit (_text[marker + 31]) &&
isHexDigit (_text[marker + 32]) &&
isHexDigit (_text[marker + 33]) &&
isHexDigit (_text[marker + 34]) &&
isHexDigit (_text[marker + 35]))
{
marker += 36;
token = _text.substr (_cursor, marker - _cursor);
type = Lexer2::Type::uuid;
_cursor = marker;
return true;
}
}
return false;
}
////////////////////////////////////////////////////////////////////////////////
// Lexer2::Type::uuid
// XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
bool Lexer2::isPartialUUID (std::string& token, Lexer2::Type& type)
{
std::size_t marker = _cursor;
std::size_t i = 0; std::size_t i = 0;
for (; i < 36 && marker + i < _eos; i++) for (; i < 36 && marker + i < _eos; i++)
{ {

1
src/Lexer2.h
View file

@ -76,7 +76,6 @@ public:
// Classifiers. // Classifiers.
bool isString (std::string&, Lexer2::Type&, int quote); bool isString (std::string&, Lexer2::Type&, int quote);
bool isUUID (std::string&, Lexer2::Type&); bool isUUID (std::string&, Lexer2::Type&);
bool isPartialUUID (std::string&, Lexer2::Type&);
bool isNumber (std::string&, Lexer2::Type&); bool isNumber (std::string&, Lexer2::Type&);
bool isHexNumber (std::string&, Lexer2::Type&); bool isHexNumber (std::string&, Lexer2::Type&);
bool isSeparator (std::string&, Lexer2::Type&); bool isSeparator (std::string&, Lexer2::Type&);