From e564827be702cf5c68ef624247aee817abf5c13f Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 18 Jul 2011 23:35:35 -0400 Subject: [PATCH] Expressions - Added recognition of individial words to the tokenize method. --- src/Arguments.cpp | 2 +- src/Expression.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Arguments.cpp b/src/Arguments.cpp index 4d4d3a605..5e8878163 100644 --- a/src/Arguments.cpp +++ b/src/Arguments.cpp @@ -150,7 +150,7 @@ void Arguments::capture (int argc, const char** argv) { for (int i = 0; i < argc; ++i) { - // The "i != 0" guarantees that argv[0] does not get split, because it may + // The "i &&" guarantees that argv[0] does not get split, because it may // be an absolute path, and Expression::expand_tokens would make a dog's // dinner out of it. std::vector parts; diff --git a/src/Expression.cpp b/src/Expression.cpp index 7bf5cb4f7..1d1822369 100644 --- a/src/Expression.cpp +++ b/src/Expression.cpp @@ -647,6 +647,9 @@ void Expression::tokenize ( else if (n.getDate (date_format, t)) tokens.push_back (Triple (Date (t).toString (date_format), "date", category)); + else if (n.getWord (s)) + tokens.push_back (Triple (s, "rvalue", category)); + else { if (! n.getUntilWS (s))