From 9fe43611d18fa81c33164ff050d9b51baa2e9b2d Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 21 May 2012 08:14:16 -0400 Subject: [PATCH] Filter Mods - Changed split type, to improve filter support. --- src/A3.cpp | 6 +++--- src/commands/CmdCustom.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/A3.cpp b/src/A3.cpp index a1bfab382..c0b056974 100644 --- a/src/A3.cpp +++ b/src/A3.cpp @@ -114,7 +114,7 @@ static struct //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; //////////////////////////////////////////////////////////////////////////////// @@ -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. } } @@ -445,7 +445,7 @@ void A3::apply_overrides () if (n.getLiteral ("rc.") && // rc. n.getUntilOneOf (":=", name) && // xxx (n.skip (':') || n.skip ('='))) // [:=] - { + { n.getUntilEOS (value); // May be blank. context.config.set (name, value); diff --git a/src/commands/CmdCustom.cpp b/src/commands/CmdCustom.cpp index 1fc67f3a0..3dae34484 100644 --- a/src/commands/CmdCustom.cpp +++ b/src/commands/CmdCustom.cpp @@ -85,7 +85,7 @@ int CmdCustom::execute (std::string& output) // Prepend the argument list with those from the report filter. std::vector filterArgs; - split (filterArgs, reportFilter, ' '); + splitq (filterArgs, reportFilter, ' '); std::vector ::iterator arg; for (arg = filterArgs.begin (); arg != filterArgs.end (); ++ arg) context.a3.capture_first (*arg);