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

Lexer: Fixed /from/to/g detection at EOS

Browse source
This commit is contained in:
Paul Beckingham 2015-03-29 22:56:34 -04:00
parent 8b863c9764
commit 5af3f71ac5
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Lexer.cpp
View file

@ -829,7 +829,7 @@ bool Lexer::isPath (std::string& token, Lexer::Type& type)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Lexer::Type::substitution // Lexer::Type::substitution
// / <unquoted-string> / <unquoted-string> / [g] // / <unquoted-string> / <unquoted-string> / [g] <EOS> | <isWhiteSpace>
bool Lexer::isSubstitution (std::string& token, Lexer::Type& type) bool Lexer::isSubstitution (std::string& token, Lexer::Type& type)
{ {
std::size_t marker = _cursor; std::size_t marker = _cursor;
@ -845,8 +845,9 @@ bool Lexer::isSubstitution (std::string& token, Lexer::Type& type)
if (_text[_cursor] == 'g') if (_text[_cursor] == 'g')
++_cursor; ++_cursor;
// Lookahread: <isWhitespace> // Lookahread: <EOS> | <isWhitespace>
if (isWhitespace (_text[_cursor])) if (_text[_cursor] == '\0' ||
isWhitespace (_text[_cursor]))
{ {
token = _text.substr (marker, _cursor - marker); token = _text.substr (marker, _cursor - marker);
type = Lexer::Type::substitution; type = Lexer::Type::substitution;
@ -861,7 +862,7 @@ bool Lexer::isSubstitution (std::string& token, Lexer::Type& type)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Lexer::Type::pattern // Lexer::Type::pattern
// / <unquoted-string> / // / <unquoted-string> / <EOS> | <isWhiteSpace>
bool Lexer::isPattern (std::string& token, Lexer::Type& type) bool Lexer::isPattern (std::string& token, Lexer::Type& type)
{ {
std::size_t marker = _cursor; std::size_t marker = _cursor;