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

Task: Removed unnecessary chomp in ::parse

Browse source
This commit is contained in:
Paul Beckingham 2015-11-01 19:14:41 -05:00
parent 2aa3163451
commit ee9d303b10
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Task.cpp
View file

@ -579,27 +579,20 @@ bool Task::is_overdue () const
// //
void Task::parse (const std::string& input) void Task::parse (const std::string& input)
{ {
// TODO Is this simply a 'chomp'?
std::string copy;
if (input[input.length () - 1] == '\n')
copy = input.substr (0, input.length () - 1);
else
copy = input;
try try
{ {
// File format version 4, from 2009-5-16 - now, v1.7.1+ // File format version 4, from 2009-5-16 - now, v1.7.1+
// This is the parse format tried first, because it is most used. // This is the parse format tried first, because it is most used.
clear (); clear ();
if (copy[0] == '[') if (input[0] == '[')
{ {
Nibbler n (copy); Nibbler n (input);
std::string line; std::string line;
if (n.skip ('[') && if (n.skip ('[') &&
n.getUntil (']', line) && n.getUntil (']', line) &&
n.skip (']') && n.skip (']') &&
n.depleted ()) (n.skip ('\n') || n.depleted ()))
{ {
if (line.length () == 0) if (line.length () == 0)
throw std::string (STRING_RECORD_EMPTY); throw std::string (STRING_RECORD_EMPTY);
@ -630,15 +623,15 @@ void Task::parse (const std::string& input)
throw std::string (STRING_RECORD_JUNK_AT_EOL); throw std::string (STRING_RECORD_JUNK_AT_EOL);
} }
} }
else if (copy[0] == '{') else if (input[0] == '{')
parseJSON (copy); parseJSON (input);
else else
throw std::string (STRING_RECORD_NOT_FF4); throw std::string (STRING_RECORD_NOT_FF4);
} }
catch (const std::string&) catch (const std::string&)
{ {
parseLegacy (copy); parseLegacy (input);
} }
recalc_urgency = true; recalc_urgency = true;