Add operator detecting for c/cpp

CHANGES.md

@@ -27,6 +27,8 @@ Core Grammars:
 - fix(swift) ensure keyword attributes highlight correctly [Bradley Mackey][]
 - fix(types) fix interface LanguageDetail > keywords [Patrick Chiu]
 - enh(java) add `goto` to be recognized as a keyword in Java [Alvin Joy][]
+- enh(cpp) add operator detecting [TOMWT-qwq][]
+- fix(cpp) fix `FUNCTION_TITLE` not matching defining operator [TOMWT-qwq][]
 
 New Grammars:
 

src/highlight.js

@@ -1013,6 +1013,7 @@ const HLJS = function(hljs) {
   hljs.versionString = packageJSON.version;
 
   hljs.regex = {
+    escape: regex.escape,
     concat: regex.concat,
     lookahead: regex.lookahead,
     either: regex.either,

src/languages/c.js

@@ -63,6 +63,54 @@ export default function(hljs) {
     ],
     relevance: 0
   };
+
+  const OPERATORS = [
+    '::',
+    '->',
+    '+=',
+    '-=',
+    '*=',
+    '/=',
+    '%=',
+    '&=',
+    '|=',
+    '^=',
+    '<<=',
+    '>>=',
+    '++',
+    '--',
+    '<<',
+    '>>',
+    '&&',
+    '||',
+    '<=>',
+    '==',
+    '!=',
+    '<=',
+    '>=',
+    '~',
+    '!',
+    '%',
+    '^',
+    '&',
+    '|',
+    '*',
+    '<',
+    '>',
+    '/',
+    '-',
+    '+',
+    '?',
+    ':',
+    '=',
+  ];
+  const OPERATOR_RE = regex.either(...OPERATORS.map(x => regex.escape(x)));
+
+  const OPERATOR = {
+    scope: 'operator',
+    match: OPERATOR_RE,
+    relevance: 0
+  };
 
   const PREPROCESSOR = {
     className: 'meta',
@@ -82,7 +130,8 @@ export default function(hljs) {
         begin: /<.*?>/
       },
       C_LINE_COMMENT_MODE,
-      hljs.C_BLOCK_COMMENT_MODE
+      hljs.C_BLOCK_COMMENT_MODE,
+      OPERATOR,
     ]
   };
 
@@ -183,6 +232,7 @@ export default function(hljs) {
     TYPES,
     C_LINE_COMMENT_MODE,
     hljs.C_BLOCK_COMMENT_MODE,
+    OPERATOR,
     NUMBERS,
     STRINGS
   ];
@@ -193,7 +243,7 @@ export default function(hljs) {
     // `return some()`, `else if()`, `(x*sum(1, 2))`
     variants: [
       {
-        begin: /=/,
+        begin: regex.lookahead(/=/),
         end: /;/
       },
       {
@@ -252,6 +302,7 @@ export default function(hljs) {
         contains: [
           C_LINE_COMMENT_MODE,
           hljs.C_BLOCK_COMMENT_MODE,
+          OPERATOR,
           STRINGS,
           NUMBERS,
           TYPES,

src/languages/cpp.js

@@ -94,6 +94,56 @@ export default function(hljs) {
     relevance: 0
   };
 
+  const OPERATORS = [
+    '::',
+    '->',
+    '...',
+    '.',
+    '+=',
+    '-=',
+    '*=',
+    '/=',
+    '%=',
+    '&=',
+    '|=',
+    '^=',
+    '<<=',
+    '>>=',
+    '++',
+    '--',
+    '<<',
+    '>>',
+    '&&',
+    '||',
+    '<=>',
+    '==',
+    '!=',
+    '<=',
+    '>=',
+    '~',
+    '!',
+    '%',
+    '^',
+    '&',
+    '|',
+    '*',
+    '<',
+    '>',
+    '/',
+    '-',
+    '+',
+    '?',
+    ':',
+    '=',
+  ];
+  const OPERATOR_RE = regex.either(...OPERATORS.map(x => regex.escape(x)));
+
+  const OPERATOR = {
+    scope: 'operator',
+    match: OPERATOR_RE,
+    relevance: 0
+  };
+
   const PREPROCESSOR = {
     className: 'meta',
     begin: /#\s*[a-z]+\b/,
@@ -112,17 +162,25 @@ export default function(hljs) {
         begin: /<.*?>/
       },
       C_LINE_COMMENT_MODE,
-      hljs.C_BLOCK_COMMENT_MODE
+      hljs.C_BLOCK_COMMENT_MODE,
+      OPERATOR,
     ]
   };
 
   const TITLE_MODE = {
-    className: 'title',
-    begin: regex.optional(NAMESPACE_RE) + hljs.IDENT_RE,
+    scope: 'title',
+    keywords: "operator",
+    begin: regex.either(
+      regex.optional(NAMESPACE_RE) + hljs.IDENT_RE,
+      'operator\\s*' + OPERATOR_RE,
+    ),
     relevance: 0
   };
 
-  const FUNCTION_TITLE = regex.optional(NAMESPACE_RE) + hljs.IDENT_RE + '\\s*\\(';
+  const FUNCTION_TITLE = regex.either(
+    regex.optional(NAMESPACE_RE) + hljs.IDENT_RE + '\\s*\\(',
+    'operator\\s*' + OPERATOR_RE + '\\s*\\(',
+  );
 
   // https://en.cppreference.com/w/cpp/keyword
   const RESERVED_KEYWORDS = [
@@ -438,6 +496,7 @@ export default function(hljs) {
     CPP_PRIMITIVE_TYPES,
     C_LINE_COMMENT_MODE,
     hljs.C_BLOCK_COMMENT_MODE,
+    OPERATOR,
     NUMBERS,
     STRINGS
   ];
@@ -448,7 +507,7 @@ export default function(hljs) {
     // `return some()`, `else if()`, `(x*sum(1, 2))`
     variants: [
       {
-        begin: /=/,
+        begin: regex.lookahead(/=/),
         end: /;/
       },
       {
@@ -504,6 +563,7 @@ export default function(hljs) {
         begin: /:/,
         endsWithParent: true,
         contains: [
+          OPERATOR,
           STRINGS,
           NUMBERS
         ]
@@ -523,6 +583,7 @@ export default function(hljs) {
         contains: [
           C_LINE_COMMENT_MODE,
           hljs.C_BLOCK_COMMENT_MODE,
+          OPERATOR,
           STRINGS,
           NUMBERS,
           CPP_PRIMITIVE_TYPES,

test/markup/arduino/default.expect.txt

@@ -7,7 +7,7 @@
 
 <span class="hljs-comment">// Pin 13 has an LED connected on most Arduino boards.</span>
 <span class="hljs-comment">// give it a name:</span>
-<span class="hljs-type">int</span> led = <span class="hljs-number">13</span>;
+<span class="hljs-type">int</span> led <span class="hljs-operator">=</span> <span class="hljs-number">13</span>;
 
 <span class="hljs-comment">// the setup routine runs once when you press reset:</span>
 <span class="hljs-function"><span class="hljs-type">void</span> <span class="hljs-title">setup</span><span class="hljs-params">()</span> </span>{

test/markup/cpp/bitwise-keywords.expect.txt

@@ -1,8 +1,8 @@
-<span class="hljs-type">unsigned</span> <span class="hljs-type">char</span> a = <span class="hljs-number">0xFA</span>;
-<span class="hljs-type">unsigned</span> <span class="hljs-type">char</span> b = <span class="hljs-number">0x4C</span>;
+<span class="hljs-type">unsigned</span> <span class="hljs-type">char</span> a <span class="hljs-operator">=</span> <span class="hljs-number">0xFA</span>;
+<span class="hljs-type">unsigned</span> <span class="hljs-type">char</span> b <span class="hljs-operator">=</span> <span class="hljs-number">0x4C</span>;
 
-a = <span class="hljs-keyword">compl</span> b;
-a = <span class="hljs-keyword">not</span> b;
+a <span class="hljs-operator">=</span> <span class="hljs-keyword">compl</span> b;
+a <span class="hljs-operator">=</span> <span class="hljs-keyword">not</span> b;
 a <span class="hljs-keyword">and</span> b;
 a <span class="hljs-keyword">bitor</span> b;
 a <span class="hljs-keyword">or</span> b;
@@ -11,4 +11,4 @@ a <span class="hljs-keyword">bitand</span> b;
 a <span class="hljs-keyword">and_eq</span> b;
 a <span class="hljs-keyword">or_eq</span> b;
 a <span class="hljs-keyword">xor_eq</span> b;
-a <span class="hljs-keyword">not_eq</span> b;
+a <span class="hljs-keyword">not_eq</span> b;

test/markup/cpp/bugs.expect.txt

@@ -1,6 +1,6 @@
 <span class="hljs-comment">//4. 对角矩阵</span>
 <span class="hljs-comment">//4.1 构造对角矩阵</span>
 <span class="hljs-function">Eigen::VectorXd <span class="hljs-title">vector</span><span class="hljs-params">(<span class="hljs-number">5</span>)</span></span>;                <span class="hljs-comment">//构建5维向量</span>
-vector&lt;&lt;<span class="hljs-number">1</span>,<span class="hljs-number">2</span>,<span class="hljs-number">3</span>,<span class="hljs-number">4</span>,<span class="hljs-number">5</span>;                        <span class="hljs-comment">//向量赋值</span>
-<span class="hljs-function">Eigen::MatrixXd  <span class="hljs-title">C</span><span class="hljs-params">(vector.asDiagonal())</span></span>;  <span class="hljs-comment">//使用向量生成对角阵</span>
-std::cout &lt;&lt; <span class="hljs-string">&quot;\nC= \n&quot;</span> &lt;&lt; C &lt;&lt; std::endl;
+vector<span class="hljs-operator">&lt;&lt;</span><span class="hljs-number">1</span>,<span class="hljs-number">2</span>,<span class="hljs-number">3</span>,<span class="hljs-number">4</span>,<span class="hljs-number">5</span>;                        <span class="hljs-comment">//向量赋值</span>
+<span class="hljs-function">Eigen::MatrixXd  <span class="hljs-title">C</span><span class="hljs-params">(vector<span class="hljs-operator">.</span>asDiagonal())</span></span>;  <span class="hljs-comment">//使用向量生成对角阵</span>
+std::cout <span class="hljs-operator">&lt;&lt;</span> <span class="hljs-string">&quot;\nC= \n&quot;</span> <span class="hljs-operator">&lt;&lt;</span> C <span class="hljs-operator">&lt;&lt;</span> std::endl;

test/markup/cpp/expression-keywords.expect.txt

@@ -1,2 +1,2 @@
-<span class="hljs-type">double</span> x = <span class="hljs-built_in">exp</span>(<span class="hljs-built_in">log</span>(<span class="hljs-number">2</span>)); <span class="hljs-comment">// recognize built-ins</span>
+<span class="hljs-type">double</span> x <span class="hljs-operator">=</span> <span class="hljs-built_in">exp</span>(<span class="hljs-built_in">log</span>(<span class="hljs-number">2</span>)); <span class="hljs-comment">// recognize built-ins</span>
 <span class="hljs-keyword">return</span> <span class="hljs-number">0</span>;  <span class="hljs-comment">// recognize keyword that started the expression</span>

test/markup/cpp/function-declarations.expect.txt

@@ -2,7 +2,7 @@
 <span class="hljs-function"><span class="hljs-type">void</span> <span class="hljs-title">look_up_a_string_2</span><span class="hljs-params">()</span> </span>{ <span class="hljs-keyword">return</span> <span class="hljs-built_in">lookup2</span>(); }
 <span class="hljs-function"><span class="hljs-keyword">friend</span> <span class="hljs-type">void</span> <span class="hljs-title">A::showB</span><span class="hljs-params">(B x)</span> </span>{}
 <span class="hljs-function"><span class="hljs-keyword">friend</span> <span class="hljs-type">void</span> <span class="hljs-title">showB</span><span class="hljs-params">(B x)</span> </span>{}
-<span class="hljs-function"><span class="hljs-keyword">friend</span> <span class="hljs-type">void</span> <span class="hljs-title">showB</span><span class="hljs-params">(B::SomeType x)</span> </span>{}
+<span class="hljs-function"><span class="hljs-keyword">friend</span> <span class="hljs-type">void</span> <span class="hljs-title">showB</span><span class="hljs-params">(B<span class="hljs-operator">::</span>SomeType x)</span> </span>{}
 <span class="hljs-function"><span class="hljs-keyword">inline</span> <span class="hljs-type">int</span> <span class="hljs-title">add</span><span class="hljs-params">(<span class="hljs-type">int</span> a, <span class="hljs-type">int</span> b)</span> </span>{}
 <span class="hljs-function">int8t <span class="hljs-title">Get_Tile_Value</span><span class="hljs-params">()</span> </span>{}
 
@@ -15,11 +15,18 @@
 
 <span class="hljs-comment">// pack expansion in function arguments</span>
 <span class="hljs-function"><span class="hljs-keyword">template</span>&lt;<span class="hljs-keyword">typename</span> T...&gt;
-<span class="hljs-type">void</span> <span class="hljs-title">foo</span><span class="hljs-params">(T... args)</span> </span>{}
+<span class="hljs-type">void</span> <span class="hljs-title">foo</span><span class="hljs-params">(T<span class="hljs-operator">...</span> args)</span> </span>{}
 
 <span class="hljs-built_in">test</span>();
 
 <span class="hljs-function"><span class="hljs-type">void</span> <span class="hljs-title">A</span><span class="hljs-params">()</span>: a(<span class="hljs-number">10</span>) {</span>}
 <span class="hljs-function"><span class="hljs-keyword">explicit</span> <span class="hljs-title">A</span><span class="hljs-params">()</span>: a(<span class="hljs-number">10</span>) {</span>}
 
 <span class="hljs-function"><span class="hljs-keyword">extern</span> <span class="hljs-type">void</span> <span class="hljs-title">f</span><span class="hljs-params">(<span class="hljs-type">int</span>)</span>, <span class="hljs-title">g</span><span class="hljs-params">(<span class="hljs-type">char</span>)</span></span>;
+
+<span class="hljs-keyword">struct</span> <span class="hljs-title class_">test</span>{
+	<span class="hljs-type">int</span> a,b;
+	<span class="hljs-function"><span class="hljs-keyword">inline</span> <span class="hljs-title">test</span><span class="hljs-params">()</span>:a(<span class="hljs-number">1</span>),b(<span class="hljs-number">2llu</span>){</span>;a<span class="hljs-operator">+=</span>b<span class="hljs-operator">+=</span>a<span class="hljs-operator">^</span>b;;;}
+	<span class="hljs-function"><span class="hljs-keyword">inline</span> <span class="hljs-type">bool</span> <span class="hljs-title"><span class="hljs-keyword">operator</span></span>+<span class="hljs-params">(<span class="hljs-type">const</span> test<span class="hljs-operator">&amp;</span>kkk)</span><span class="hljs-type">const</span></span>{<span class="hljs-keyword">return</span> a<span class="hljs-operator">+</span>kkk<span class="hljs-operator">.</span>b;}
+};
+<span class="hljs-function"><span class="hljs-keyword">inline</span> <span class="hljs-type">void</span> <span class="hljs-title"><span class="hljs-keyword">operator</span></span>*</span>=(test<span class="hljs-operator">*</span>lll,test qqq){;;;<span class="hljs-operator">*</span>lll<span class="hljs-operator">+</span>qqq;}

test/markup/cpp/function-declarations.txt

@@ -23,3 +23,10 @@ void A(): a(10) {}
 explicit A(): a(10) {}
 
 extern void f(int), g(char);
+
+struct test{
+	int a,b;
+	inline test():a(1),b(2llu){;a+=b+=a^b;;;}
+	inline bool operator+(const test&kkk)const{return a+kkk.b;}
+};
+inline void operator*=(test*lll,test qqq){;;;*lll+qqq;}

test/markup/cpp/function-params.expect.txt

@@ -1,7 +1,7 @@
 <span class="hljs-function"><span class="hljs-type">int</span> <span class="hljs-title">f</span><span class="hljs-params">(
-    <span class="hljs-type">int</span> a = <span class="hljs-number">1</span>,
-    <span class="hljs-type">char</span>* b = <span class="hljs-string">&quot;2&quot;</span>, <span class="hljs-comment">// Line comment</span>
-    <span class="hljs-type">double</span> c = <span class="hljs-number">3.0</span>, <span class="hljs-comment">/* Block comment */</span>
+    <span class="hljs-type">int</span> a <span class="hljs-operator">=</span> <span class="hljs-number">1</span>,
+    <span class="hljs-type">char</span><span class="hljs-operator">*</span> b <span class="hljs-operator">=</span> <span class="hljs-string">&quot;2&quot;</span>, <span class="hljs-comment">// Line comment</span>
+    <span class="hljs-type">double</span> c <span class="hljs-operator">=</span> <span class="hljs-number">3.0</span>, <span class="hljs-comment">/* Block comment */</span>
     ARRAY(<span class="hljs-type">int</span>, <span class="hljs-number">5</span>) d,
-    <span class="hljs-type">void</span>* e __attribute__((unused))
+    <span class="hljs-type">void</span><span class="hljs-operator">*</span> e __attribute__((unused))
 )</span></span>;

test/markup/cpp/function-title.expect.txt

@@ -1,10 +1,10 @@
-<span class="hljs-function"><span class="hljs-type">int</span> <span class="hljs-title">main</span><span class="hljs-params">(<span class="hljs-type">int</span> argc, <span class="hljs-type">char</span>** argv)</span> </span>{
-  <span class="hljs-keyword">auto</span> a = std::<span class="hljs-built_in">make_unique</span>&lt;A&gt;();
-  B *b = <span class="hljs-keyword">new</span> <span class="hljs-built_in">B</span>();
-  <span class="hljs-type">int</span> c = c * <span class="hljs-built_in">sum</span>(<span class="hljs-number">1</span>, <span class="hljs-number">2</span>);
-  <span class="hljs-keyword">if</span> (a-&gt;<span class="hljs-built_in">check1</span>())
+<span class="hljs-function"><span class="hljs-type">int</span> <span class="hljs-title">main</span><span class="hljs-params">(<span class="hljs-type">int</span> argc, <span class="hljs-type">char</span><span class="hljs-operator">*</span><span class="hljs-operator">*</span> argv)</span> </span>{
+  <span class="hljs-keyword">auto</span> a <span class="hljs-operator">=</span> std<span class="hljs-operator">::</span><span class="hljs-built_in">make_unique</span><span class="hljs-operator">&lt;</span>A<span class="hljs-operator">&gt;</span>();
+  B <span class="hljs-operator">*</span>b <span class="hljs-operator">=</span> <span class="hljs-keyword">new</span> <span class="hljs-built_in">B</span>();
+  <span class="hljs-type">int</span> c <span class="hljs-operator">=</span> c <span class="hljs-operator">*</span> <span class="hljs-built_in">sum</span>(<span class="hljs-number">1</span>, <span class="hljs-number">2</span>);
+  <span class="hljs-keyword">if</span> (a<span class="hljs-operator">-&gt;</span><span class="hljs-built_in">check1</span>())
     <span class="hljs-keyword">return</span> <span class="hljs-number">3</span>;
-  <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> (a-&gt;<span class="hljs-built_in">check2</span>())
+  <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> (a<span class="hljs-operator">-&gt;</span><span class="hljs-built_in">check2</span>())
     <span class="hljs-keyword">return</span> <span class="hljs-number">4</span>;
-  <span class="hljs-keyword">return</span> a-&gt;<span class="hljs-built_in">result</span>();
+  <span class="hljs-keyword">return</span> a<span class="hljs-operator">-&gt;</span><span class="hljs-built_in">result</span>();
 }