Filters: tweaks colorize_cplusplus

This commit is contained in:
Maxime Coste 2011-10-04 19:08:34 +00:00
parent c8cf7bbaa9
commit f4743e08bd

View File

@ -30,23 +30,26 @@ void colorize_cplusplus(DisplayBuffer& display_buffer)
static boost::regex preprocessor("(?<=\\n)\\h*#\\h*[^\\n]*(?=\\n)");
colorize_regex(display_buffer, preprocessor, Color::Magenta);
static boost::regex strings("\"(\\\\\"|[^\"])*\"");
static boost::regex comments("//[^\\n]*\\n");
colorize_regex(display_buffer, comments, Color::Cyan);
static boost::regex strings("(?<!')\"(\\\\\"|[^\"])*\"");
colorize_regex(display_buffer, strings, Color::Magenta);
static boost::regex values("\\<(true|false|NULL|nullptr)\\>|-?\\d+[fdiu]?|'[^']*'");
static boost::regex values("\\<(true|false|NULL|nullptr)\\>|-?\\d+[fdiu]?|'[^']?'");
colorize_regex(display_buffer, values, Color::Red);
static boost::regex builtin_types("\\<(void|int|float|bool|size_t)\\>");
colorize_regex(display_buffer, builtin_types, Color::Yellow);
static boost::regex control_keywords("\\<(while|for|if|else|do|switch|case|default|goto|return|using|try|catch|throw)\\>");
static boost::regex control_keywords("\\<(while|for|if|else|do|switch|case|default|goto|break|continue|return|using|try|catch|throw)\\>");
colorize_regex(display_buffer, control_keywords, Color::Blue);
//static boost::regex operators("->|\\+|\\-|\\*|/|\\\\|\\&|\\|\\^|[<>=!+-]=|=|\\(|\\)|\\[|\\]|\\{|\\}|\\<(not|and|or|xor)\\>");
//colorize_regex(display_buffer, operators, Color::Green);
static boost::regex types_keywords("\\<(const|auto|namespace|static|volatile|class|struct|enum|union|public|protected|private)\\>");
colorize_regex(display_buffer, types_keywords, Color::Green);
static boost::regex comments("//[^\\n]*\\n");
colorize_regex(display_buffer, comments, Color::Cyan);
}
}