gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch '2.4.2' into lexer2

Browse Source
This commit is contained in:
Paul Beckingham
2015-02-22 14:46:30 -05:00
parent 9898aa15b5 0891ed4b57
commit e1c0d5b130
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@
(thanks to Renato Alves). (thanks to Renato Alves).
- Eliminated some code that is not UTF8-safe. - Eliminated some code that is not UTF8-safe.
- Removed pthreads linkage. - Removed pthreads linkage.
- Closed dangling pipes in execute (), resolving problems when a hook script
forks (thanks to Jens Erat).
------ current release --------------------------- ------ current release ---------------------------

3
src/Lexer2.cpp
View File

@@ -770,7 +770,8 @@ bool Lexer2::isPath (std::string& token, Lexer2::Type& type)
else else
break; break;
if (! isWhitespace (_text[marker]) && if (_text[marker] &&
! isWhitespace (_text[marker]) &&
_text[marker] != '/') _text[marker] != '/')
{ {
utf8_next_char (_text, marker); utf8_next_char (_text, marker);

6
test/eval.t.cpp
View File

@@ -137,9 +137,9 @@ int main (int argc, char** argv)
t.is (result.get_integer (), 7, "infix '2*3+1' --> 7"); t.is (result.get_integer (), 7, "infix '2*3+1' --> 7");
// TW-1254 - Unary minus support. // TW-1254 - Unary minus support.
e.evaluateInfixExpression ("2--3", result); e.evaluateInfixExpression ("2- -3", result);
t.is (result.type (), Variant::type_integer, "infix '2--3' --> integer"); t.is (result.type (), Variant::type_integer, "infix '2- -3' --> integer");
t.is (result.get_integer (), 5, "infix '2--3' --> 5"); t.is (result.get_integer (), 5, "infix '2- -3' --> 5");
//e.debug (); //e.debug ();
e.evaluateInfixExpression ("!false", result); e.evaluateInfixExpression ("!false", result);