From ea00f2042552fd8a525c74e9e755426aa58a526d Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Wed, 21 May 2014 23:47:02 -0400 Subject: [PATCH] A3t - When a pattern or UUID is found, quote the literal. --- src/A3t.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/A3t.cpp b/src/A3t.cpp index 56860290b..2371c8ac9 100644 --- a/src/A3t.cpp +++ b/src/A3t.cpp @@ -538,7 +538,10 @@ const std::string A3t::getFilterExpression () if (sequence != "") sequence += " "; - sequence += (*b)->attribute ("raw"); + if ((*b)->hasTag ("STRING")) + sequence += "'" + (*b)->attribute ("raw") + "'"; + else + sequence += (*b)->attribute ("raw"); } } else @@ -546,7 +549,10 @@ const std::string A3t::getFilterExpression () if (sequence != "") sequence += " "; - sequence += (*i)->attribute ("raw"); + if ((*i)->hasTag ("STRING")) + sequence += "'" + (*i)->attribute ("raw") + "'"; + else + sequence += (*i)->attribute ("raw"); } } } @@ -611,6 +617,7 @@ void A3t::findPattern () branch = (*i)->addBranch (new Tree ("argPat")); branch->attribute ("raw", pattern); + branch->tag ("STRING"); } } } @@ -1172,7 +1179,7 @@ void A3t::findUUIDList () branch->tag ("OP"); branch = (*i)->addBranch (new Tree ("argSeq")); - branch->attribute ("raw", *u); + branch->attribute ("raw", "'" + *u + "'"); } branch = (*i)->addBranch (new Tree ("argSeq"));