C++: Added support for default comparison operator (#2426)

RunDevelopment · web-flow · commit 8e9d161cdd01 · 2020-06-28T02:00:03.000+02:00
diff --git a/components/prism-cpp.js b/components/prism-cpp.js
@@ -5,7 +5,7 @@
 	Prism.languages.cpp = Prism.languages.extend('c', {
 		'class-name': [
 			{
-				pattern: RegExp(/(\b(?:class|enum|struct|typename)\s+)(?!<keyword>)\w+/.source
+				pattern: RegExp(/(\b(?:class|concept|enum|struct|typename)\s+)(?!<keyword>)\w+/.source
 					.replace(/<keyword>/g, function () { return keyword.source; })),
 				lookbehind: true
 			},
@@ -17,19 +17,16 @@
 			// This will capture the class name before destructors like:
 			//   Foo::~Foo() {}
 			/\b[A-Z_]\w*(?=\s*::\s*~\w+\s*\()/i,
-			{
-				// This also intends to capture the class name of method implementations but here the class has template
-				// parameters, so it can't be a namespace (until C++ adds generic namespaces).
-				pattern: /\w+(?=\s*<(?:[^<>]|<(?:[^<>]|<[^<>]*>)*>)*>\s*::\s*\w+\s*\()/,
-				inside: null // see below
-			}
+			// This also intends to capture the class name of method implementations but here the class has template
+			// parameters, so it can't be a namespace (until C++ adds generic namespaces).
+			/\w+(?=\s*<(?:[^<>]|<(?:[^<>]|<[^<>]*>)*>)*>\s*::\s*\w+\s*\()/
 		],
 		'keyword': keyword,
 		'number': {
 			pattern: /(?:\b0b[01']+|\b0x(?:[\da-f']+\.?[\da-f']*|\.[\da-f']+)(?:p[+-]?[\d']+)?|(?:\b[\d']+\.?[\d']*|\B\.[\d']+)(?:e[+-]?[\d']+)?)[ful]*/i,
 			greedy: true
 		},
-		'operator': />>=?|<<=?|->|([-+&|:])\1|[?:~]|[-+*/%&|^!=<>]=?|\b(?:and|and_eq|bitand|bitor|not|not_eq|or|or_eq|xor|xor_eq)\b/,
+		'operator': />>=?|<<=?|->|([-+&|:])\1|[?:~]|<=>|[-+*/%&|^!=<>]=?|\b(?:and|and_eq|bitand|bitor|not|not_eq|or|or_eq|xor|xor_eq)\b/,
 		'boolean': /\b(?:true|false)\b/
 	});
 
diff --git a/components/prism-cpp.min.js b/components/prism-cpp.min.js
diff --git a/tests/languages/cpp/class-name_feature.test b/tests/languages/cpp/class-name_feature.test
@@ -1,5 +1,6 @@
 class Foo
 class Foo_bar
+concept Foo_bar
 struct foo
 enum bar
 enum class FooBar
@@ -14,6 +15,7 @@ void Foo<int>::bar() {}
 [
 	["keyword", "class"], ["class-name", "Foo"],
 	["keyword", "class"], ["class-name", "Foo_bar"],
+	["keyword", "concept"], ["class-name", "Foo_bar"],
 	["keyword", "struct"], ["class-name", "foo"],
 	["keyword", "enum"], ["class-name", "bar"],
 	["keyword", "enum"], ["keyword", "class"], ["class-name", "FooBar"],
diff --git a/tests/languages/cpp/operator_feature.test b/tests/languages/cpp/operator_feature.test
@@ -5,7 +5,7 @@
 ! && ||
 -> ::
 ? :
-= == != < > <= >=
+= == != < > <= >= <=>
 and and_eq bitand bitor not not_eq or or_eq xor xor_eq
 
 ----------------------------------------------------
@@ -55,6 +55,7 @@ and and_eq bitand bitor not not_eq or or_eq xor xor_eq
 	["operator", ">"],
 	["operator", "<="],
 	["operator", ">="],
+	["operator", "<=>"],
 
 	["operator", "and"],
 	["operator", "and_eq"],
