summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2016-03-13 11:47:46 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2016-03-13 11:47:46 +0100
commit92a8e56ccd8d3aee05db9c7a821b24382528c674 (patch)
tree9d74519e6af6ddb22df3c3be2d2a3e532ff76868
parent26127899acf888a1888195c8b50c4603167e2808 (diff)
downloadcoderay-92a8e56ccd8d3aee05db9c7a821b24382528c674.tar.gz
Small changes to grouping of new C++11 keywords
* lib/coderay/scanners/cpp.rb:
-rw-r--r--lib/coderay/scanners/cpp.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/coderay/scanners/cpp.rb b/lib/coderay/scanners/cpp.rb
index b0ffc06..50a25b7 100644
--- a/lib/coderay/scanners/cpp.rb
+++ b/lib/coderay/scanners/cpp.rb
@@ -15,7 +15,7 @@ module Scanners
'and', 'and_eq', 'asm', 'bitand', 'bitor', 'break',
'case', 'catch', 'class', 'compl', 'const_cast',
'continue', 'default', 'delete', 'do', 'dynamic_cast', 'else',
- 'enum', 'export', 'for', 'goto', 'if', 'namespace', 'new',
+ 'enum', 'export', 'final', 'for', 'goto', 'if', 'namespace', 'new',
'not', 'not_eq', 'or', 'or_eq', 'reinterpret_cast', 'return',
'sizeof', 'static_assert', 'static_cast', 'struct', 'switch',
'template', 'throw', 'try', 'typedef', 'typeid', 'typename', 'union',
@@ -24,19 +24,19 @@ module Scanners
PREDEFINED_TYPES = [
'bool', 'char', 'char16_t', 'char32_t', 'double', 'float',
- 'int', 'long', 'nullptr' 'short', 'signed', 'unsigned',
+ 'int', 'long', 'short', 'signed', 'unsigned',
'wchar_t', 'string',
] # :nodoc:
PREDEFINED_CONSTANTS = [
'false', 'true',
- 'EOF', 'NULL',
+ 'EOF', 'NULL', 'nullptr'
] # :nodoc:
PREDEFINED_VARIABLES = [
'this',
] # :nodoc:
DIRECTIVES = [
'alignas', 'alignof', 'auto', 'const', 'constexpr', 'decltype', 'explicit',
- 'extern', 'final', 'friend', 'inline', 'mutable', 'noexcept', 'operator',
+ 'extern', 'friend', 'inline', 'mutable', 'noexcept', 'operator',
'override', 'private', 'protected', 'public', 'register', 'static',
'thread_local', 'using', 'virtual', 'void', 'volatile',
] # :nodoc: