From 67fb1e9be4111d3172ca23f27f930858da97979f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 24 Jul 2011 16:44:05 -0400
Subject: [PATCH] Expression reboot

- Downgraded A3::extract_words to return a simple vector of strings.
  Any more is unnecessary.
---
 src/A3.cpp               | 8 ++++----
 src/A3.h                 | 2 +-
 src/commands/Command.cpp | 3 ---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/A3.cpp b/src/A3.cpp
index dea99cb05..5327e824a 100644
--- a/src/A3.cpp
+++ b/src/A3.cpp
@@ -574,13 +574,13 @@ const A3 A3::extract_modifications () const
       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;
   for (arg = this->begin (); arg != this->end (); ++arg)
   {
@@ -592,7 +592,7 @@ const A3 A3::extract_words () const
       ;
 
     else
-      words.push_back (*arg);
+      words.push_back (arg->_raw);
   }
 
   return words;
diff --git a/src/A3.h b/src/A3.h
index 6bb90c7d8..646c3dd7a 100644
--- a/src/A3.h
+++ b/src/A3.h
@@ -101,7 +101,7 @@ public:
 
   const A3 extract_filter () 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;
 
diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp
index 6c76e6e16..b755c7428 100644
--- a/src/commands/Command.cpp
+++ b/src/commands/Command.cpp
@@ -304,9 +304,6 @@ void Command::filter (std::vector <Task>& output)
 
   A3 mods = context.a3.extract_modifications ();
   mods.dump ("extract_modifications");
-
-  A3 words = context.a3.extract_words ();
-  words.dump ("extract_words");
 /**/
 
   Arguments f;