fix(c,cpp): Allow declaring multiple functions and parenthetical init…

…ializers (#3155) Co-authored-by: Josh Goebel <me@joshgoebel.com>
highlightjs · Apr 22, 2021 · 570bbd5 · 570bbd5
1 parent 3ff2bdb
commit 570bbd5
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -84,6 +84,7 @@ Grammars:
 - enh(haskell) add support for BinaryLiterals (#3150) [Martijn Bastiaan][]
 - enh(haskell) add support for NumericUnderscores (#3150) [Martijn Bastiaan][]
 - enh(haskell) add support for HexFloatLiterals (#3150) [Martijn Bastiaan][]
+- fix(c,cpp) allow declaring multiple functions and (for C++) parenthetical initializers (#3155) [Erik Demaine][]
 
 New Languages:
 
@@ -869,6 +870,7 @@ Language Improvements:
 [Mike Schall]: https://github.com/schallm
 [Kirill Saksin]: https://github.com/saksmt
 [Samia Ali]:https://github.com/samiaab1990
+[Erik Demaine]:https://github.com/edemaine
 
 
 ## Version 9.16.2

diff --git a/src/languages/c.js b/src/languages/c.js
@@ -255,6 +255,12 @@ export default function(hljs) {
         ],
         relevance: 0
       },
+      // allow for multiple declarations, e.g.:
+      // extern void f(int), g(char);
+      {
+        relevance: 0,
+        match: /,/
+      },
       {
         className: 'params',
         begin: /\(/,

diff --git a/src/languages/cpp.js b/src/languages/cpp.js
@@ -330,6 +330,12 @@ export default function(hljs) {
           NUMBERS
         ]
       },
+      // allow for multiple declarations, e.g.:
+      // extern void f(int), g(char);
+      {
+        relevance: 0,
+        match: /,/
+      },
       {
         className: 'params',
         begin: /\(/,

diff --git a/test/markup/cpp/function-declarations.expect.txt b/test/markup/cpp/function-declarations.expect.txt
@@ -21,3 +21,5 @@
 
 <span class="hljs-function"><span class="hljs-keyword">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-keyword">void</span> <span class="hljs-title">f</span><span class="hljs-params">(<span class="hljs-keyword">int</span>)</span>, <span class="hljs-title">g</span><span class="hljs-params">(<span class="hljs-keyword">char</span>)</span></span>;
diff --git a/test/markup/cpp/function-declarations.txt b/test/markup/cpp/function-declarations.txt
@@ -21,3 +21,5 @@ test();
 
 void A(): a(10) {}
 explicit A(): a(10) {}
+
+extern void f(int), g(char);
diff --git a/test/markup/cpp/initializers.expect.txt b/test/markup/cpp/initializers.expect.txt
@@ -0,0 +1,2 @@
+<span class="hljs-function">string <span class="hljs-title">a</span><span class="hljs-params">(<span class="hljs-string">&quot;hello&quot;</span>)</span>, <span class="hljs-title">b</span><span class="hljs-params">(<span class="hljs-string">&quot;world&quot;</span>)</span></span>;
+<span class="hljs-function">vector&lt;<span class="hljs-keyword">int</span>&gt; <span class="hljs-title">u</span><span class="hljs-params">(<span class="hljs-number">1</span>)</span>, <span class="hljs-title">v</span><span class="hljs-params">(<span class="hljs-number">2</span>)</span></span>;
diff --git a/test/markup/cpp/initializers.txt b/test/markup/cpp/initializers.txt
@@ -0,0 +1,2 @@
+string a("hello"), b("world");
+vector<int> u(1), v(2);