summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/wp-syntax/geshi/geshi/cpp.php')
-rw-r--r--plugins/wp-syntax/geshi/geshi/cpp.php34
1 files changed, 22 insertions, 12 deletions
diff --git a/plugins/wp-syntax/geshi/geshi/cpp.php b/plugins/wp-syntax/geshi/geshi/cpp.php
index 42ab311c..89b69e91 100644
--- a/plugins/wp-syntax/geshi/geshi/cpp.php
+++ b/plugins/wp-syntax/geshi/geshi/cpp.php
@@ -7,13 +7,15 @@
* - M. Uli Kusterer (witness.of.teachtext@gmx.net)
* - Jack Lloyd (lloyd@randombit.net)
* Copyright: (c) 2004 Dennis Bayer, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1.0.8.11
+ * Release Version: 1.0.8.12
* Date Started: 2004/09/27
*
* C++ language file for GeSHi.
*
* CHANGES
* -------
+ * 2013/11/06
+ * - Added nullptr from c++11 & others
* 2008/05/23 (1.0.7.22)
* - Added description of extra language features (SF#1970248)
* 2004/XX/XX (1.0.2)
@@ -56,14 +58,18 @@ $language_data = array (
//Multiline-continued single-line comments
1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
//Multiline-continued preprocessor define
- 2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+ 2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+ //C++ 11 string literal extensions
+ 3 => '/(?:L|u8?|U)(?=")/',
+ //C++ 11 string literal extensions (raw)
+ 4 => '/R"([^()\s\\\\]*)\((?:(?!\)\\1").)*\)\\1"/ms'
),
'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
'QUOTEMARKS' => array("'", '"'),
'ESCAPE_CHAR' => '',
'ESCAPE_REGEXP' => array(
//Simple Single Char Escapes
- 1 => "#\\\\[abfnrtv\\\'\"?\n]#i",
+ 1 => "#\\\\[abfnrtv\\\'\"?\n]#",
//Hexadecimal Char Specs
2 => "#\\\\x[\da-fA-F]{2}#",
//Hexadecimal Char Specs
@@ -97,10 +103,13 @@ $language_data = array (
'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
'try', 'catch', 'inline', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
- 'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class'
+ 'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class', 'nullptr',
+ 'decltype', 'override', 'final', 'noexcept', 'alignas', 'alignof', 'noreturn',
+ 'constexpr', 'and', 'and_eq', 'asm', 'bitand', 'bitor', 'thread_local',
+ 'static_assert', 'compl', 'or', 'or_eq', 'xor', 'xor_eq', 'not', 'not_eq'
),
3 => array(
- 'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this',
+ 'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this', 'export',
'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
@@ -122,11 +131,12 @@ $language_data = array (
'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
),
4 => array(
- 'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
- 'register', 'short', 'shortint', 'signed', 'static', 'struct',
- 'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
- 'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
- 'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
+ 'auto', 'bool', 'char', 'char16_t', 'char32_t', 'const', 'double', 'float',
+ 'int', 'long', 'longint','register', 'short', 'shortint', 'signed',
+ 'static', 'struct', 'typedef', 'union', 'unsigned', 'void', 'volatile',
+ 'extern', 'jmp_buf','signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t',
+ 'FILE', 'fpos_t', 'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
+ 'mutable',
'int8', 'int16', 'int32', 'int64',
'uint8', 'uint16', 'uint32', 'uint64',
@@ -167,6 +177,8 @@ $language_data = array (
'COMMENTS' => array(
1 => 'color: #666666;',
2 => 'color: #339900;',
+ 3 => 'color: #FF0000;',
+ 4 => 'color: #FF0000;',
'MULTI' => 'color: #ff0000; font-style: italic;'
),
'ESCAPE_CHAR' => array(
@@ -236,5 +248,3 @@ $language_data = array (
)
)
);
-
-?> \ No newline at end of file