diff --git a/src/Statement.cc b/src/Statement.cc index 888af54b7645c071497ad964e60500f001f7b939..92dd886989a80b13ea5df41324ebbaae05ee5da6 100644 --- a/src/Statement.cc +++ b/src/Statement.cc @@ -54,8 +54,8 @@ NativeStatement::writeOutput(ostream &output, const string &basename, bool minim { using namespace boost::xpressive; string date_regex = R"((-?\d+([YyAa]|[Mm]([1-9]|1[0-2])|[Qq][1-4])))"; - sregex regex_lookbehind = sregex::compile(R"((?<!\$|\d|[a-zA-Z_]|\'))" + date_regex); - sregex regex_dollar = sregex::compile(R"((\$))"+date_regex); + sregex regex_lookbehind = sregex::compile(R"((?<!\$|[a-zA-Z_]|-|'))" + date_regex); + sregex regex_dollar = sregex::compile(R"((\$))" + date_regex); string ns = regex_replace(native_statement, regex_lookbehind, "dates('$&')"); ns = regex_replace(ns, regex_dollar, "$2"); //replace $DATE with DATE