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

Expression reboot

Browse source 
- Downgraded A3::extract_words to return a simple vector of strings.
  Any more is unnecessary.
This commit is contained in:
Paul Beckingham 2011-07-24 16:44:05 -04:00
parent b30b187b4c
commit 67fb1e9be4
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/A3.cpp
View file

@ -574,13 +574,13 @@ const A3 A3::extract_modifications () const
mods.push_back (*arg); mods.push_back (*arg);
} }
return mods; return tokenize (mods);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
const A3 A3::extract_words () const const std::vector <std::string> A3::extract_words () const
{ {
A3 words; std::vector <std::string> words;
std::vector <Arg>::const_iterator arg; std::vector <Arg>::const_iterator arg;
for (arg = this->begin (); arg != this->end (); ++arg) for (arg = this->begin (); arg != this->end (); ++arg)
{ {
@ -592,7 +592,7 @@ const A3 A3::extract_words () const
; ;
else else
words.push_back (*arg); words.push_back (arg->_raw);
} }
return words; return words;

2
src/A3.h
View file

@ -101,7 +101,7 @@ public:
const A3 extract_filter () const; const A3 extract_filter () const;
const A3 extract_modifications () const; const A3 extract_modifications () const;
const A3 extract_words () const; const std::vector <std::string> extract_words () const;
const A3 tokenize (const A3&) const; const A3 tokenize (const A3&) const;

3
src/commands/Command.cpp
View file

@ -304,9 +304,6 @@ void Command::filter (std::vector <Task>& output)
A3 mods = context.a3.extract_modifications (); A3 mods = context.a3.extract_modifications ();
mods.dump ("extract_modifications"); mods.dump ("extract_modifications");
A3 words = context.a3.extract_words ();
words.dump ("extract_words");
/**/ /**/
Arguments f; Arguments f;