anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash when using msvc10's regex, seems boost's regex couldn't replaced by msvc's in ECMAScrip mode.

Browse Source 
Solution: use boost also for msvc10

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37832 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2011-03-02 21:28:36 +00:00
parent d2720fa200
commit 4620034eda
2 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/cmake/CMakeLists.txt
View File

@ -129,7 +129,7 @@ if(UNIX OR MINGW)
else() else()
if(MSVC10) if(MSVC10)
set(LYX_USE_TR1 1) set(LYX_USE_TR1 1)
set(LYX_USE_TR1_REGEX 1) #set(LYX_USE_TR1_REGEX 1) #TODO should we use it in ECMAScript mode?
endif() endif()
endif() endif()

53
src/support/regex.h
View File

@ -16,6 +16,46 @@
# ifdef _MSC_VER # ifdef _MSC_VER
# include <regex> # include <regex>
# define match_partial _Match_partial # define match_partial _Match_partial
namespace lyx {
// inheriting 'private' to see which functions are used and if there are
// other ECMAScrip defaults
class regex : private std::tr1::regex
{
public:
regex() {}
regex(const regex& rhs) : std::tr1::regex(rhs) {}
template<class T>
regex(T t) : std::tr1::regex(t, std::tr1::regex_constants::grep) {}
template<class T>
void assign(T t) { std::tr1::regex::assign(t, std::tr1::regex_constants::grep); }
template<class T, class V>
void assign(T t, V v) { std::tr1::regex::assign(t, v); }
const std::tr1::regex& toTr1() const { return *this; }
};
template<class T>
bool regex_match(T t, const regex& r) { return std::tr1::regex_match(t, r.toTr1()); }
template<class T, class V>
bool regex_match(T t, V v, const regex& r) { return std::tr1::regex_match(t, v, r.toTr1()); }
template<class T, class V, class U, class H>
bool regex_match(T t, V v, H h, const regex& r, U u) { return std::tr1::regex_match(t, v, h, r.toTr1(), u); }
template<class T, class V>
std::string regex_replace(T t, const regex& r, V v) { return std::tr1::regex_replace(t, r.toTr1(), v); }
//template<class T, class V, class U, class H>
//std::string regex_replace(T t, V v, U u, const regex& r, H h) { return std::tr1::regex_replace(t, v, u, r.toTr1(), h); }
template<class T>
bool regex_search(T t, const regex& r) { return std::tr1::regex_search(t, r.toTr1()); }
template<class T, class V>
bool regex_search(T t, V v, const regex& r) { return std::tr1::regex_search(t, v, r.toTr1()); }
template<class T, class V, class U>
bool regex_search(T t, V v, U u, const regex& r) { return std::tr1::regex_search(t, v, u, r.toTr1()); }
struct sregex_iterator : std::tr1::sregex_iterator
{
sregex_iterator() {}
template<class T, class V>
sregex_iterator(T t, V v, const regex& r) : std::tr1::sregex_iterator(t, v, r.toTr1()) {}
};
}
# else # else
# include <tr1/regex> # include <tr1/regex>
// TODO no match_partial in gcc, how to replace? // TODO no match_partial in gcc, how to replace?
@ -25,16 +65,19 @@
#else #else
# include <boost/regex.hpp> # include <boost/regex.hpp>
# define LR_NS boost # define LR_NS boost
namespace lyx {
using LR_NS::regex;
using LR_NS::regex_match;
using LR_NS::sregex_iterator;
}
#endif #endif
namespace lyx { namespace lyx {
using LR_NS::regex; using LR_NS::smatch;
using LR_NS::smatch;
using LR_NS::regex_replace; using LR_NS::regex_replace;
using LR_NS::basic_regex; using LR_NS::basic_regex;
using LR_NS::regex_error; using LR_NS::regex_error;
using LR_NS::regex_search; using LR_NS::regex_search;
using LR_NS::sregex_iterator;
using LR_NS::match_results; using LR_NS::match_results;
namespace regex_constants namespace regex_constants