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

Merge branch 'master' of https://github.com/FloatingGhost/CyberChef into FloatingGhost-master

Browse source
This commit is contained in:
n1474335 2017-04-11 14:38:29 +00:00
commit a840504b3d
1 changed files with 37 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/core/operations/Code.js
View file

@ -225,25 +225,20 @@ const Code = {
regexes.lastIndex = m.index; regexes.lastIndex = m.index;
} }
// Create newlines after ; code = code
code = code.replace(/;/g, ";\n"); // Create newlines after ;
.replace(/;/g, ";\n")
// Create newlines after { and around } // Create newlines after { and around }
code = code.replace(/{/g, "{\n"); .replace(/{/g, "{\n")
code = code.replace(/}/g, "\n}\n"); .replace(/}/g, "\n}\n")
// Remove carriage returns
// Remove carriage returns .replace(/\r/g, "")
code = code.replace(/\r/g, ""); // Remove all indentation
.replace(/^\s+/g, "")
// Remove all indentation .replace(/\n\s+/g, "\n")
code = code.replace(/^\s+/g, ""); // Remove trailing spaces
code = code.replace(/\n\s+/g, "\n"); .replace(/\s*$/g, "")
.replace(/\n{/g, "{");
// Remove trailing spaces
code = code.replace(/\s*$/g, "");
// Remove newlines before {
code = code.replace(/\n{/g, "{");
// Indent // Indent
var i = 0, var i = 0,
@ -266,30 +261,29 @@ const Code = {
i++; i++;
} }
// Add strategic spaces code = code
code = code.replace(/\s*([!<>=+-/*]?)=\s*/g, " $1= "); // Add strategic spaces
code = code.replace(/\s*<([=]?)\s*/g, " <$1 "); .replace(/\s*([!<>=+-/*]?)=\s*/g, " $1= ")
code = code.replace(/\s*>([=]?)\s*/g, " >$1 "); .replace(/\s*<([=]?)\s*/g, " <$1 ")
code = code.replace(/([^+])\+([^+=])/g, "$1 + $2"); .replace(/\s*>([=]?)\s*/g, " >$1 ")
code = code.replace(/([^-])-([^-=])/g, "$1 - $2"); .replace(/([^+])\+([^+=])/g, "$1 + $2")
code = code.replace(/([^*])\*([^*=])/g, "$1 * $2"); .replace(/([^-])-([^-=])/g, "$1 - $2")
code = code.replace(/([^/])\/([^/=])/g, "$1 / $2"); .replace(/([^*])\*([^*=])/g, "$1 * $2")
code = code.replace(/\s*,\s*/g, ", "); .replace(/([^/])\/([^/=])/g, "$1 / $2")
code = code.replace(/\s*{/g, " {"); .replace(/\s*,\s*/g, ", ")
code = code.replace(/}\n/g, "}\n\n"); .replace(/\s*{/g, " {")
.replace(/}\n/g, "}\n\n")
// Just... don't look at this // I was told not to look at this.
code = code.replace(/(if|for|while|with|elif|elseif)\s*\(([^\n]*)\)\s*\n([^{])/gim, "$1 ($2)\n $3"); // I looked anyhow.
code = code.replace(/(if|for|while|with|elif|elseif)\s*\(([^\n]*)\)([^{])/gim, "$1 ($2) $3"); .replace(/(if|for|while|with|elif|elseif)\s*\(([^\n]*)\)\s*\n([^{])/gim, "$1 ($2)\n $3")
code = code.replace(/else\s*\n([^{])/gim, "else\n $1"); .replace(/(if|for|while|with|elif|elseif)\s*\(([^\n]*)\)([^{])/gim, "$1 ($2) $3")
code = code.replace(/else\s+([^{])/gim, "else $1"); .replace(/else\s*\n([^{])/gim, "else\n $1")
.replace(/else\s+([^{])/gim, "else $1")
// Remove strategic spaces // Remove strategic spaces
code = code.replace(/\s+;/g, ";"); .replace(/\s+;/g, ";")
code = code.replace(/\{\s+\}/g, "{}"); .replace(/\{\s+\}/g, "{}")
code = code.replace(/\[\s+\]/g, "[]"); .replace(/\[\s+\]/g, "[]")
code = code.replace(/}\s*(else|catch|except|finally|elif|elseif|else if)/gi, "} $1"); .replace(/}\s*(else|catch|except|finally|elif|elseif|else if)/gi, "} $1");
// Replace preserved tokens // Replace preserved tokens
var ptokens = /###preservedToken(\d+)###/g; var ptokens = /###preservedToken(\d+)###/g;