#ifndef LYX_REGEXP_H
#define LYX_REGEXP_H
-#include "config.h"
-
-
-#define LYX_REGEX_TO_LYX(X) \
- using X::regex; \
- using X::smatch; \
- using X::regex_replace; \
- using X::basic_regex; \
- using X::regex_error; \
- using X::regex_search; \
- using X::sregex_iterator; \
- using X::match_results; \
- \
- namespace regex_constants \
- { \
- using namespace X::regex_constants; \
- using X::regex_constants::match_flag_type; \
- } \
-
-
-
-#if defined(LYX_USE_TR1) && defined(LYX_USE_TR1_REGEX)
-
-#ifdef _MSC_VER
-#include <regex>
-#define match_partial _Match_partial
+#ifdef LYX_USE_STD_REGEX
+# include <regex>
+// <regex> in gcc is unusable in versions less than 4.9.0
+// see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
+# define LR_NS std
#else
-#include <tr1/regex>
-// TODO no match_partial in gcc, how to replace?
-#define match_partial match_default
+# include <boost/regex.hpp>
+# define LR_NS boost
#endif
-namespace lyx
+namespace lyx {
+using LR_NS::regex;
+using LR_NS::regex_match;
+using LR_NS::regex_replace;
+using LR_NS::regex_search;
+using LR_NS::sregex_iterator;
+using LR_NS::smatch;
+using LR_NS::basic_regex;
+using LR_NS::regex_error;
+using LR_NS::match_results;
+
+namespace regex_constants
{
- LYX_REGEX_TO_LYX(std::tr1);
-}
-
-#else
+using namespace LR_NS::regex_constants;
+using LR_NS::regex_constants::match_flag_type;
+} // namespace regex_constants
-#include "boost/regex.hpp"
+} // namespace lyx
-namespace lyx
-{
- LYX_REGEX_TO_LYX(boost);
-}
+#undef LR_NS
+#ifdef LYX_USE_STD_REGEX
+// Match Begin and End of String when using ECMAScript (default std::regex)
+#define REGEX_BOS "^"
+#define REGEX_EOS "$"
+#else
+// Match Begin and End of String when using Perl RE (default boost::regex)
+#define REGEX_BOS "\\`"
+#define REGEX_EOS "\\'"
#endif
-
#endif