Filter Mods

- Changed split type, to improve filter support.
This commit is contained in:
Paul Beckingham 2012-05-21 08:14:16 -04:00
parent 665bc197dc
commit 9fe43611d1
2 changed files with 4 additions and 4 deletions

View file

@ -114,7 +114,7 @@ static struct
//static const char* non_word_chars = " +-*/%()=<>!~"; //static const char* non_word_chars = " +-*/%()=<>!~";
// Alias expansion limit. Any more would indicate some kind of error. // Alias expansion limit. Any more indicates some kind of error.
const int safetyValveDefault = 10; const int safetyValveDefault = 10;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -365,7 +365,7 @@ void A3::get_data_location (std::string& data)
} }
} }
// Keep scanning, because if there are multiple overrides, we want the last // Keep looping, because if there are multiple overrides, we want the last
// one to dominate. // one to dominate.
} }
} }
@ -445,7 +445,7 @@ void A3::apply_overrides ()
if (n.getLiteral ("rc.") && // rc. if (n.getLiteral ("rc.") && // rc.
n.getUntilOneOf (":=", name) && // xxx n.getUntilOneOf (":=", name) && // xxx
(n.skip (':') || n.skip ('='))) // [:=] (n.skip (':') || n.skip ('='))) // [:=]
{ {
n.getUntilEOS (value); // May be blank. n.getUntilEOS (value); // May be blank.
context.config.set (name, value); context.config.set (name, value);

View file

@ -85,7 +85,7 @@ int CmdCustom::execute (std::string& output)
// Prepend the argument list with those from the report filter. // Prepend the argument list with those from the report filter.
std::vector <std::string> filterArgs; std::vector <std::string> filterArgs;
split (filterArgs, reportFilter, ' '); splitq (filterArgs, reportFilter, ' ');
std::vector <std::string>::iterator arg; std::vector <std::string>::iterator arg;
for (arg = filterArgs.begin (); arg != filterArgs.end (); ++ arg) for (arg = filterArgs.begin (); arg != filterArgs.end (); ++ arg)
context.a3.capture_first (*arg); context.a3.capture_first (*arg);