From ea3f0e8567bad605e4435cf8613be6cc260df539 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Fri, 26 Aug 2011 02:00:41 -0400 Subject: [PATCH] Bug #819 - Patch applied to fix problem with parsing, where this: aa'a is parsed as aa 'a Signed-off-by: Paul Beckingham --- src/A3.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/A3.cpp b/src/A3.cpp index d927484fc..9e776d10f 100644 --- a/src/A3.cpp +++ b/src/A3.cpp @@ -819,24 +819,16 @@ const A3 A3::tokenize (const A3& input) const found_something_after_sequence = true; } - else if (n.getName (s) || - n.getWord (s)) - { - if (Date::valid (s)) - output.push_back (Arg (s, Arg::type_date, Arg::cat_literal)); - else - output.push_back (Arg (s, Arg::type_string, Arg::cat_literal)); - - if (found_sequence) - found_something_after_sequence = true; - } - else { if (! n.getUntilWS (s)) n.getUntilEOS (s); - output.push_back (Arg (s, Arg::type_string, Arg::cat_literal)); + if (Date::valid (s)) + output.push_back (Arg (s, Arg::type_date, Arg::cat_literal)); + else + output.push_back (Arg (s, Arg::type_string, Arg::cat_literal)); + if (found_sequence) found_something_after_sequence = true; }