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

Code Cleanup

Browse source 
- Eliminated Expression.{h,cpp}.  E9 now replaces it.
This commit is contained in:
Paul Beckingham 2011-07-25 23:53:41 -04:00
parent 879356fad2
commit ab8a6d9e88
6 changed files with 75 additions and 1169 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/commands/Command.cpp
View file

@ -30,7 +30,6 @@
#include <iostream>
#include <vector>
#include <stdlib.h>
#include <Expression.h>
#include <E9.h>
#include <Att.h>
#include <Timer.h>
@ -280,8 +279,7 @@ void Command::filter (std::vector <Task>& input, std::vector <Task>& output)
if (f.size ())
{
Expression e (f);
E9 expr (filt);
E9 e (filt);
std::vector <Task>::iterator task;
for (task = input.begin (); task != input.end (); ++task)
@ -310,8 +308,7 @@ void Command::filter (std::vector <Task>& output)
if (f.size ())
{
const std::vector <Task>& pending = context.tdb2.pending.get_tasks ();
Expression e (f);
E9 expr (filt);
E9 e (filt);
output.clear ();
std::vector <Task>::const_iterator task;
@ -429,9 +426,9 @@ void Command::modify_task (
if (Arguments::is_attribute (name, name)) // Canonicalize
{
// All values must be eval'd first.
Arguments fragment;
fragment.push_back (Triple (value, "exp", "attr"));
Expression e (fragment);
A3 fragment;
fragment.push_back (Arg (value, "attr"));
E9 e (fragment);
std::string result = e.evalExpression (task);
context.debug (std::string ("Eval '") + value + "' --> '" + result + "'");