GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Lexer: Collapsed two ::isString calls into one

Browse source
This commit is contained in:
Paul Beckingham 2015-07-06 16:39:08 -04:00
parent 7a6d546a0d
commit 1fed8c55f1
2 changed files with 39 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/Lexer.cpp
View file

@ -73,24 +73,23 @@ bool Lexer::token (std::string& token, Lexer::Type& type)
// - path < substitution < pattern // - path < substitution < pattern
// - set < number // - set < number
// - word last // - word last
if (isString (token, type, '\'') || if (isString (token, type, "'\"") ||
isString (token, type, '"') || isDate (token, type) ||
isDate (token, type) || isDuration (token, type) ||
isDuration (token, type) || isURL (token, type) ||
isURL (token, type) || isPair (token, type) ||
isPair (token, type) || isSet (token, type) ||
isSet (token, type) || isDOM (token, type) ||
isDOM (token, type) || isUUID (token, type) ||
isUUID (token, type) || isHexNumber (token, type) ||
isHexNumber (token, type) || isNumber (token, type) ||
isNumber (token, type) || isSeparator (token, type) ||
isSeparator (token, type) || isTag (token, type) ||
isTag (token, type) || isPath (token, type) ||
isPath (token, type) || isSubstitution (token, type) ||
isSubstitution (token, type) || isPattern (token, type) ||
isPattern (token, type) || isOperator (token, type) ||
isOperator (token, type) || isIdentifier (token, type) ||
isIdentifier (token, type) ||
isWord (token, type)) isWord (token, type))
return true; return true;
@ -369,12 +368,24 @@ int Lexer::hexToInt (int c0, int c1, int c2, int c3)
// '|" // '|"
// [ U+XXXX | \uXXXX | \" | \' | \\ | \/ | \b | \f | \n | \r | \t | . ] // [ U+XXXX | \uXXXX | \" | \' | \\ | \/ | \b | \f | \n | \r | \t | . ]
// '|" // '|"
bool Lexer::isString (std::string& token, Lexer::Type& type, int quote) bool Lexer::isString (std::string& token, Lexer::Type& type, const std::string& quotes)
{ {
std::size_t marker = _cursor; std::size_t marker = _cursor;
if (_text[marker] == quote) /*
if (readWord (_text, quotes, marker, token))
{ {
type = Lexer::Type::string;
_cursor = marker;
return true;
}
return false;
*/
if (quotes.find (_text[marker]) != std::string::npos)
{
int quote = _text[marker];
token = _text.substr (marker++, 1); token = _text.substr (marker++, 1);
int c; int c;
@ -738,8 +749,7 @@ bool Lexer::isPair (std::string& token, Lexer::Type& type)
{ {
_cursor++; _cursor++;
if (isString (ignoredToken, ignoredType, '\'') || if (isString (ignoredToken, ignoredType, "'\"") ||
isString (ignoredToken, ignoredType, '"') ||
isContiguous (ignoredToken, ignoredType)) isContiguous (ignoredToken, ignoredType))
{ {
token = _text.substr (marker, _cursor - marker); token = _text.substr (marker, _cursor - marker);
@ -755,10 +765,9 @@ bool Lexer::isPair (std::string& token, Lexer::Type& type)
{ {
_cursor++; _cursor++;
if (isString (ignoredToken, ignoredType, '\'') || if (isString (ignoredToken, ignoredType, "'\"") ||
isString (ignoredToken, ignoredType, '"') || isContiguous (ignoredToken, ignoredType) ||
isContiguous (ignoredToken, ignoredType) || _eos == _cursor ||
_eos == _cursor ||
_text[_cursor] == ' ') _text[_cursor] == ' ')
{ {
token = _text.substr (marker, _cursor - marker); token = _text.substr (marker, _cursor - marker);
@ -920,11 +929,11 @@ bool Lexer::isSubstitution (std::string& token, Lexer::Type& type)
std::string extractedToken; std::string extractedToken;
Lexer::Type extractedType; Lexer::Type extractedType;
if (isString (extractedToken, extractedType, '/')) if (isString (extractedToken, extractedType, "/"))
{ {
--_cursor; // Step back over the '/'. --_cursor; // Step back over the '/'.
if (isString (extractedToken, extractedType, '/')) if (isString (extractedToken, extractedType, "/"))
{ {
if (_text[_cursor] == 'g') if (_text[_cursor] == 'g')
++_cursor; ++_cursor;
@ -953,7 +962,7 @@ bool Lexer::isPattern (std::string& token, Lexer::Type& type)
std::string extractedToken; std::string extractedToken;
Lexer::Type extractedType; Lexer::Type extractedType;
if (isString (extractedToken, extractedType, '/') && if (isString (extractedToken, extractedType, "/") &&
(_text[_cursor] == '\0' || (_text[_cursor] == '\0' ||
isWhitespace (_text[_cursor]))) isWhitespace (_text[_cursor])))
{ {

2
src/Lexer.h
View file

@ -85,7 +85,7 @@ public:
bool isEOS () const; bool isEOS () const;
// Stream Classifiers. // Stream Classifiers.
bool isString (std::string&, Lexer::Type&, int quote); bool isString (std::string&, Lexer::Type&, const std::string&);
bool isDate (std::string&, Lexer::Type&); bool isDate (std::string&, Lexer::Type&);
bool isDuration (std::string&, Lexer::Type&); bool isDuration (std::string&, Lexer::Type&);
bool isUUID (std::string&, Lexer::Type&); bool isUUID (std::string&, Lexer::Type&);