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 6

Code Cleanup

Browse source 
- Just found out about std::vector::back, after all these years.
This commit is contained in:
Paul Beckingham 2011-06-07 00:48:00 -04:00
parent d83b2d5e36
commit 7c910e46be
3 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Expression.cpp
View file

@ -52,8 +52,10 @@ Expression::~Expression ()
////////////////////////////////////////////////////////////////////////////////
bool Expression::eval (Task& task)
{
// TODO Duplicate the _postfix vector as the operating stack.
// TODO ...
std::vector <std::pair <std::string, std::string> >::iterator arg;
for (arg = _postfix.begin (); arg != _postfix.end (); ++arg)
{
}
return true;
}
@ -430,9 +432,9 @@ void Expression::to_postfix ()
else if (arg->first == ")")
{
while (op_stack.size () > 0 &&
op_stack[op_stack.size () - 1].first != "(")
op_stack.back ().first != "(")
{
_postfix.push_back (op_stack[op_stack.size () - 1]);
_postfix.push_back (op_stack.back ());
op_stack.pop_back ();
}
@ -451,11 +453,11 @@ void Expression::to_postfix ()
int precedence2;
char associativity2;
while (op_stack.size () > 0 &&
Arguments::is_operator (op_stack[op_stack.size () - 1].first, type2, precedence2, associativity2) &&
Arguments::is_operator (op_stack.back ().first, type2, precedence2, associativity2) &&
((associativity == 'l' && precedence <= precedence2) ||
(associativity == 'r' && precedence < precedence2)))
{
_postfix.push_back (op_stack[op_stack.size () - 1]);
_postfix.push_back (op_stack.back ());
op_stack.pop_back ();
}
@ -469,11 +471,11 @@ void Expression::to_postfix ()
while (op_stack.size () != 0)
{
if (op_stack[op_stack.size () - 1].first == "(" ||
op_stack[op_stack.size () - 1].first == ")")
if (op_stack.back ().first == "(" ||
op_stack.back ().first == ")")
throw std::string ("Mismatched parentheses in expression");
_postfix.push_back (op_stack[op_stack.size () - 1]);
_postfix.push_back (op_stack.back ());
op_stack.pop_back ();
}

4
src/commands/CmdBurndown.cpp
View file

@ -832,7 +832,7 @@ void Chart::calculateRates (std::vector <time_t>& sequence)
{
// If there are no current pending tasks, then it is meaningless to find
// rates or estimated completion date.
if (bars[sequence[sequence.size () - 1]].pending == 0)
if (bars[sequence.back ()].pending == 0)
return;
// Calculate how many items we have.
@ -936,7 +936,7 @@ void Chart::calculateRates (std::vector <time_t>& sequence)
// Estimate completion
if (fix_rate > find_rate)
{
int current_pending = bars[sequence[sequence.size () - 1]].pending;
int current_pending = bars[sequence.back ()].pending;
int remaining_days = (int) (current_pending / (fix_rate - find_rate));
Date now;

6
src/commands/CmdImport.cpp
View file

@ -235,7 +235,7 @@ std::string CmdImport::task_1_4_3 (const std::vector <std::string>& lines)
if (fields[f][0] != '\'' &&
fields[f][fields[f].length () - 1] == '\'')
{
modified[modified.size () - 1] += "," + fields[f];
modified.back () += "," + fields[f];
}
else
@ -391,7 +391,7 @@ std::string CmdImport::task_1_5_0 (const std::vector <std::string>& lines)
if (fields[f][0] != '\'' &&
fields[f][fields[f].length () - 1] == '\'')
{
modified[modified.size () - 1] += "," + fields[f];
modified.back () += "," + fields[f];
}
else
@ -552,7 +552,7 @@ std::string CmdImport::task_1_6_0 (const std::vector <std::string>& lines)
if (fields[f][0] != '\'' &&
fields[f][fields[f].length () - 1] == '\'')
{
modified[modified.size () - 1] += "," + fields[f];
modified.back () += "," + fields[f];
}
else