From 9992e9fba8050f891ed1f2c009c2284541f67375 Mon Sep 17 00:00:00 2001
From: Xaver Hellauer <software@hellauer.bayern>
Date: Tue, 2 Feb 2016 20:03:25 +0100
Subject: [PATCH] alignof and alignas keywords

alignof and alignas are official C++ keywords, further I moved one function definition from the C file to the C++ because it has caused wrong highlighting for C (friend and override are not C keywords). .H files are now also C++ file types.
---
 extensions/cpp/syntaxes/c++.plist | 72 ++++++++++++++++++++++++++++---
 1 file changed, 66 insertions(+), 6 deletions(-)

diff --git a/extensions/cpp/syntaxes/c++.plist b/extensions/cpp/syntaxes/c++.plist
index e846dc23184..6a76b757ec6 100644
--- a/extensions/cpp/syntaxes/c++.plist
+++ b/extensions/cpp/syntaxes/c++.plist
@@ -16,6 +16,7 @@
 		<string>hh</string>
 		<string>hpp</string>
 		<string>h++</string>
+		<string>H</string>
 	</array>
 	<key>firstLineMatch</key>
 	<string>-\*- C\+\+ -\*-</string>
@@ -29,10 +30,6 @@
 			<key>include</key>
 			<string>#special_block</string>
 		</dict>
-		<dict>
-			<key>include</key>
-			<string>source.c</string>
-		</dict>
 		<dict>
 			<key>match</key>
 			<string>\b(friend|explicit|virtual)\b</string>
@@ -85,7 +82,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq)\b</string>
+			<string>\b(alignof|alignas|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq)\b</string>
 			<key>name</key>
 			<string>keyword.operator.c++</string>
 		</dict>
@@ -97,7 +94,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(constexpr|export|mutable|typename|thread_local|noexcept)\b</string>
+			<string>\b(constexpr|export|mutable|typename|thread_local)\b</string>
 			<key>name</key>
 			<string>storage.modifier.c++</string>
 		</dict>
@@ -185,6 +182,69 @@
 				</dict>
 			</array>
 		</dict>
+        <dict>
+			<key>begin</key>
+			<string>(?x)
+    		(?:  ^                                 # begin-of-line
+    		  |
+    		     (?: (?= \s )           (?&lt;!else|new|return) (?&lt;=\w)      #  or word + space before name
+    		       | (?= \s*[A-Za-z_] ) (?&lt;!&amp;&amp;)       (?&lt;=[*&amp;&gt;])   #  or type modifier before name
+    		     )
+    		)
+    		(\s*) (?!(while|for|do|if|else|switch|catch|enumerate|return|sizeof|[cr]?iterate)\s*\()
+    		(
+    			(?: [A-Za-z_][A-Za-z0-9_]*+ | :: )++ |                  # actual name
+    			(?: (?&lt;=operator) (?: [-*&amp;&lt;&gt;=+!]+ | \(\) | \[\] ) )  # if it is a C++ operator
+    		)
+    		 \s*(?=\()</string>
+			<key>beginCaptures</key>
+			<dict>
+				<key>1</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.whitespace.function.leading.c</string>
+				</dict>
+				<key>3</key>
+				<dict>
+					<key>name</key>
+					<string>entity.name.function.c</string>
+				</dict>
+				<key>4</key>
+				<dict>
+					<key>name</key>
+					<string>punctuation.definition.parameters.c</string>
+				</dict>
+			</dict>
+			<key>end</key>
+			<string>(?&lt;=\})|(?=#)|(;)</string>
+			<key>name</key>
+			<string>meta.function.c++</string>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#comments</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#parens</string>
+				</dict>
+        		<dict>
+					<key>match</key>
+					<string>\b(const|final|override|noexcept)\b</string>
+					<key>name</key>
+					<string>storage.modifier.$1.c++</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#block</string>
+				</dict>
+			</array>
+		</dict>
+        <dict>
+			<key>include</key>
+			<string>source.c</string>
+		</dict>
 	</array>
 	<key>repository</key>
 	<dict>