xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regex: Tweak definition of character class and control escape tables

Browse Source
This commit is contained in:
Maxime Coste 2017-10-09 18:38:34 +08:00
parent df73b71dfc
commit 74ed102cab
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/regex_impl.cc
View File

@ -489,30 +489,32 @@ private:
Iterator m_pos; Iterator m_pos;
bool m_ignore_case = false; bool m_ignore_case = false;
struct CharacterClassEscape { static constexpr struct CharacterClassEscape {
Codepoint cp; Codepoint cp;
const char* ctype; const char* ctype;
StringView additional_chars; StringView additional_chars;
bool neg; bool neg;
} character_class_escapes[] = {
{ 'd', "digit", "", false },
{ 'w', "alnum", "_", false },
{ 's', "space", "", false },
{ 'h', nullptr, " \t", false },
}; };
static const CharacterClassEscape character_class_escapes[4];
struct ControlEscape { Codepoint name; Codepoint value; }; static constexpr struct ControlEscape {
static const ControlEscape control_escapes[5]; Codepoint name;
Codepoint value;
} control_escapes[] = {
{ 'f', '\f' },
{ 'n', '\n' },
{ 'r', '\r' },
{ 't', '\t' },
{ 'v', '\v' }
};
}; };
// For some reason Gcc fails to link if this is constexpr constexpr RegexParser::CharacterClassEscape RegexParser::character_class_escapes[];
const RegexParser::CharacterClassEscape RegexParser::character_class_escapes[4] = { constexpr RegexParser::ControlEscape RegexParser::control_escapes[];
{ 'd', "digit", "", false },
{ 'w', "alnum", "_", false },
{ 's', "space", "", false },
{ 'h', nullptr, " \t", false },
};
const RegexParser::ControlEscape RegexParser::control_escapes[5] = {
{ 'f', '\f' }, { 'n', '\n' }, { 'r', '\r' }, { 't', '\t' }, { 'v', '\v' }
};
struct RegexCompiler struct RegexCompiler
{ {