From d7050d0ec0313a05a60493b3e461abffe5c10fc6 Mon Sep 17 00:00:00 2001 From: Hankun Lin <50829219+Linhk1606@users.noreply.github.com> Date: Thu, 7 May 2020 16:03:38 +0800 Subject: [PATCH 1/5] add some c++ built-ins --- src/languages/c-like.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/c-like.js b/src/languages/c-like.js index fb3a70c2af..d3ff9222c0 100644 --- a/src/languages/c-like.js +++ b/src/languages/c-like.js @@ -106,8 +106,8 @@ export default function(hljs) { 'atomic_ullong new throw return ' + 'and and_eq bitand bitor compl not not_eq or or_eq xor xor_eq', built_in: 'std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream ' + - 'auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set ' + - 'unordered_map unordered_multiset unordered_multimap array shared_ptr abort terminate abs acos ' + + 'auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set ' + + 'unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos ' + 'asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp ' + 'fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper ' + 'isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow ' + From d44eb50e0b5556555b746cf842d0f36d33fe9041 Mon Sep 17 00:00:00 2001 From: Lin <50829219+Linhk1606@users.noreply.github.com> Date: Fri, 8 May 2020 09:58:05 +0800 Subject: [PATCH 2/5] Update CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 948397d522..5f5d44707f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,6 +24,7 @@ Language Improvements: - enh(typescript/javascript/coffeescript/livescript) derive ECMAscript keywords from a common foudation (#2518) [Josh Goebel][] - enh(typescript) add setInterval, setTimeout, clearInterval, clearTimeout (#2514) [Josh Goebel][] - enh(javascript) add setInterval, setTimeout, clearInterval, clearTimeout (#2514) [Vania Kucher][] +- enh(cpp) add pair, make_pair, priority_queue as built-ins (#2538) [Linhk1606][] - fix(javascript) prevent `set` keyword conflicting with setTimeout, etc. (#2514) [Vania Kucher][] - fix(cpp) Fix highlighting of unterminated raw strings (#2261) [David Benjamin][] - fix(javascript) `=>` function with nested `()` in params now works (#2502) [Josh Goebel][] From 622e53c58b23a3d72aad72a0c29404663dfb9773 Mon Sep 17 00:00:00 2001 From: Lin <50829219+Linhk1606@users.noreply.github.com> Date: Fri, 8 May 2020 09:59:32 +0800 Subject: [PATCH 3/5] Update CHANGES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 5f5d44707f..b1433da0e2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,7 +24,7 @@ Language Improvements: - enh(typescript/javascript/coffeescript/livescript) derive ECMAscript keywords from a common foudation (#2518) [Josh Goebel][] - enh(typescript) add setInterval, setTimeout, clearInterval, clearTimeout (#2514) [Josh Goebel][] - enh(javascript) add setInterval, setTimeout, clearInterval, clearTimeout (#2514) [Vania Kucher][] -- enh(cpp) add pair, make_pair, priority_queue as built-ins (#2538) [Linhk1606][] +- enh(cpp) add pair, make_pair, priority_queue as built-ins (#2538) [Hankun Lin][] - fix(javascript) prevent `set` keyword conflicting with setTimeout, etc. (#2514) [Vania Kucher][] - fix(cpp) Fix highlighting of unterminated raw strings (#2261) [David Benjamin][] - fix(javascript) `=>` function with nested `()` in params now works (#2502) [Josh Goebel][] From 7de4093c688bea718fd22535f42fdb5a08b83bb9 Mon Sep 17 00:00:00 2001 From: Lin <50829219+Linhk1606@users.noreply.github.com> Date: Fri, 8 May 2020 10:01:31 +0800 Subject: [PATCH 4/5] Update CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index b1433da0e2..b1ca44ec0c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -35,6 +35,7 @@ Language Improvements: [Peter Plantinga]: https://github.com/pplantinga [David Benjamin]: https://github.com/davidben [Vania Kucher]: https://github.com/qWici +[Hankun Lin]: https://github.com/Linhk1606 ## Version 10.0.2 From e3dcefdf82c61ec739763e87f48a39a67ba97307 Mon Sep 17 00:00:00 2001 From: Josh Goebel Date: Thu, 7 May 2020 22:02:54 -0400 Subject: [PATCH 5/5] Update CHANGES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index b1ca44ec0c..65b4771d18 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,7 +24,7 @@ Language Improvements: - enh(typescript/javascript/coffeescript/livescript) derive ECMAscript keywords from a common foudation (#2518) [Josh Goebel][] - enh(typescript) add setInterval, setTimeout, clearInterval, clearTimeout (#2514) [Josh Goebel][] - enh(javascript) add setInterval, setTimeout, clearInterval, clearTimeout (#2514) [Vania Kucher][] -- enh(cpp) add pair, make_pair, priority_queue as built-ins (#2538) [Hankun Lin][] +- enh(cpp) add `pair`, `make_pair`, `priority_queue` as built-ins (#2538) [Hankun Lin][] - fix(javascript) prevent `set` keyword conflicting with setTimeout, etc. (#2514) [Vania Kucher][] - fix(cpp) Fix highlighting of unterminated raw strings (#2261) [David Benjamin][] - fix(javascript) `=>` function with nested `()` in params now works (#2502) [Josh Goebel][]