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

Merge branch 'no-var-rule' of https://github.com/graingert/CyberChef into graingert-no-var-rule

Browse source
This commit is contained in:
n1474335 2017-05-02 22:28:17 +01:00
commit d3377d56b4
65 changed files with 779 additions and 756 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/core/FlowControl.js
View file

@ -39,7 +39,7 @@ const FlowControl = {
* @returns {Object} The updated state of the recipe.
*/
runFork: function(state) {
var opList = state.opList,
let opList = state.opList,
inputType = opList[state.progress].inputType,
outputType = opList[state.progress].outputType,
input = state.dish.get(inputType),
@ -48,14 +48,15 @@ const FlowControl = {
mergeDelim = ings[1],
ignoreErrors = ings[2],
subOpList = [],
inputs = [];
inputs = [],
i;
if (input)
inputs = input.split(splitDelim);
// Create subOpList for each tranche to operate on
// (all remaining operations unless we encounter a Merge)
for (var i = state.progress + 1; i < opList.length; i++) {
for (i = state.progress + 1; i < opList.length; i++) {
if (opList[i].name === "Merge" && !opList[i].isDisabled()) {
break;
} else {
@ -63,7 +64,7 @@ const FlowControl = {
}
}
var recipe = new Recipe(),
let recipe = new Recipe(),
output = "",
progress = 0;
@ -71,7 +72,7 @@ const FlowControl = {
// Run recipe over each tranche
for (i = 0; i < inputs.length; i++) {
var dish = new Dish(inputs[i], inputType);
const dish = new Dish(inputs[i], inputType);
try {
progress = recipe.execute(dish, 0);
} catch (err) {
@ -127,7 +128,7 @@ const FlowControl = {
* @returns {Object} The updated state of the recipe.
*/
runJump: function(state) {
var ings = state.opList[state.progress].getIngValues(),
let ings = state.opList[state.progress].getIngValues(),
jumpNum = ings[0],
maxJumps = ings[1];
@ -156,7 +157,7 @@ const FlowControl = {
* @returns {Object} The updated state of the recipe.
*/
runCondJump: function(state) {
var ings = state.opList[state.progress].getIngValues(),
let ings = state.opList[state.progress].getIngValues(),
dish = state.dish,
regexStr = ings[0],
jumpNum = ings[1],