From 1d298c9068f2e862dc55db69730a90088411e4ee Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Thu, 24 Apr 2014 12:17:28 -0400 Subject: [PATCH] A3t - Implemented A3t::getWords, to replace A3::extract_words. --- src/A3t.cpp | 18 ++++++++++++++++++ src/A3t.h | 3 +-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/A3t.cpp b/src/A3t.cpp index f49dc3cc9..b4676cf59 100644 --- a/src/A3t.cpp +++ b/src/A3t.cpp @@ -584,6 +584,24 @@ const std::string A3t::getFilterExpression () const return filter; } +//////////////////////////////////////////////////////////////////////////////// +const std::vector A3t::getWords () const +{ + std::vector words; + std::vector ::const_iterator i; + for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i) + { + if (! (*i)->hasTag ("BINARY") && + ! (*i)->hasTag ("RC") && + ! (*i)->hasTag ("CONFIG") && + ! (*i)->hasTag ("CMD") && + ! (*i)->hasTag ("TERMINATOR")) + words.push_back ((*i)->attribute ("raw")); + } + + return words; +} + //////////////////////////////////////////////////////////////////////////////// // /pattern/ void A3t::findPattern () diff --git a/src/A3t.h b/src/A3t.h index 7b6d014c6..b92a9231e 100644 --- a/src/A3t.h +++ b/src/A3t.h @@ -57,8 +57,7 @@ public: Tree* captureFirst (const std::string&); const std::string getFilterExpression () const; - - // TODO Extract words + const std::vector getWords () const; // TODO Extract modifications private: