mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-23 00:06:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update hexadecimal sort after review

Browse source 
- Use Array.map instead of for-loop
- Add test case
This commit is contained in:
Chris van Marle 2018-10-12 15:39:06 +02:00
parent 3b3c27072f
commit ba24e12454
2 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/core/operations/Sort.mjs
View file

@ -143,22 +143,18 @@ class Sort extends Operation {
* @returns {number}
*/
static _hexadecimalSort(a, b) {
const a_ = a.split(/([^\da-f]+)/i),
let a_ = a.split(/([^\da-f]+)/i),
b_ = b.split(/([^\da-f]+)/i);
for (let i = 0; i < a_.length; ++i) {
const t = parseInt(a_[i], 16);
if (!isNaN(t)) {
a_[i] = t;
}
}
a_ = a_.map(v => {
const t = parseInt(v, 16);
return isNaN(t) ? v : t;
});
for (let i = 0; i < b_.length; ++i) {
const t = parseInt(b_[i], 16);
if (!isNaN(t)) {
b_[i] = t;
}
}
b_ = b_.map(v => {
const t = parseInt(v, 16);
return isNaN(t) ? v : t;
});
for (let i = 0; i < a_.length && i < b.length; ++i) {
if (isNaN(a_[i]) && !isNaN(b_[i])) return 1; // Numbers after non-numbers