chore: Convert == to === and != to !== where possible. (#5599)

This commit is contained in:
Neil Fraser
2021-10-15 09:17:04 -07:00
committed by GitHub
parent 7ac1e27cd6
commit c929b3015b
183 changed files with 1409 additions and 1409 deletions

View File

@@ -98,7 +98,7 @@ Blockly.PHP['lists_indexOf'] = function(block) {
var errorIndex = ' -1';
var indexAdjustment = '';
}
if (block.getFieldValue('END') == 'FIRST') {
if (block.getFieldValue('END') === 'FIRST') {
// indexOf
var functionName = Blockly.PHP.provideFunction_(
'indexOf',
@@ -135,34 +135,34 @@ Blockly.PHP['lists_getIndex'] = function(block) {
var where = block.getFieldValue('WHERE') || 'FROM_START';
switch (where) {
case 'FIRST':
if (mode == 'GET') {
if (mode === 'GET') {
var list = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_MEMBER) || 'array()';
var code = list + '[0]';
return [code, Blockly.PHP.ORDER_MEMBER];
} else if (mode == 'GET_REMOVE') {
} else if (mode === 'GET_REMOVE') {
var list = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || 'array()';
var code = 'array_shift(' + list + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
} else if (mode == 'REMOVE') {
} else if (mode === 'REMOVE') {
var list = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || 'array()';
return 'array_shift(' + list + ');\n';
}
break;
case 'LAST':
if (mode == 'GET') {
if (mode === 'GET') {
var list = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || 'array()';
var code = 'end(' + list + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
} else if (mode == 'GET_REMOVE') {
} else if (mode === 'GET_REMOVE') {
var list = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || 'array()';
var code = 'array_pop(' + list + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
} else if (mode == 'REMOVE') {
} else if (mode === 'REMOVE') {
var list = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || 'array()';
return 'array_pop(' + list + ');\n';
@@ -170,39 +170,39 @@ Blockly.PHP['lists_getIndex'] = function(block) {
break;
case 'FROM_START':
var at = Blockly.PHP.getAdjusted(block, 'AT');
if (mode == 'GET') {
if (mode === 'GET') {
var list = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_MEMBER) || 'array()';
var code = list + '[' + at + ']';
return [code, Blockly.PHP.ORDER_MEMBER];
} else if (mode == 'GET_REMOVE') {
} else if (mode === 'GET_REMOVE') {
var list = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || 'array()';
var code = 'array_splice(' + list + ', ' + at + ', 1)[0]';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
} else if (mode == 'REMOVE') {
} else if (mode === 'REMOVE') {
var list = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || 'array()';
return 'array_splice(' + list + ', ' + at + ', 1);\n';
}
break;
case 'FROM_END':
if (mode == 'GET') {
if (mode === 'GET') {
var list = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || 'array()';
var at = Blockly.PHP.getAdjusted(block, 'AT', 1, true);
var code = 'array_slice(' + list + ', ' + at + ', 1)[0]';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
} else if (mode == 'GET_REMOVE' || mode == 'REMOVE') {
} else if (mode === 'GET_REMOVE' || mode === 'REMOVE') {
var list = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || 'array()';
var at = Blockly.PHP.getAdjusted(block, 'AT', 1, false,
Blockly.PHP.ORDER_SUBTRACTION);
code = 'array_splice(' + list +
', count(' + list + ') - ' + at + ', 1)[0]';
if (mode == 'GET_REMOVE') {
if (mode === 'GET_REMOVE') {
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
} else if (mode == 'REMOVE') {
} else if (mode === 'REMOVE') {
return code + ';\n';
}
}
@@ -210,7 +210,7 @@ Blockly.PHP['lists_getIndex'] = function(block) {
case 'RANDOM':
var list = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_NONE) || 'array()';
if (mode == 'GET') {
if (mode === 'GET') {
var functionName = Blockly.PHP.provideFunction_(
'lists_get_random_item',
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
@@ -219,7 +219,7 @@ Blockly.PHP['lists_getIndex'] = function(block) {
'}']);
code = functionName + '(' + list + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
} else if (mode == 'GET_REMOVE') {
} else if (mode === 'GET_REMOVE') {
var functionName = Blockly.PHP.provideFunction_(
'lists_get_remove_random_item',
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
@@ -230,7 +230,7 @@ Blockly.PHP['lists_getIndex'] = function(block) {
'}']);
code = functionName + '(' + list + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
} else if (mode == 'REMOVE') {
} else if (mode === 'REMOVE') {
var functionName = Blockly.PHP.provideFunction_(
'lists_remove_random_item',
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
@@ -265,11 +265,11 @@ Blockly.PHP['lists_setIndex'] = function(block) {
}
switch (where) {
case 'FIRST':
if (mode == 'SET') {
if (mode === 'SET') {
var list = Blockly.PHP.valueToCode(block, 'LIST',
Blockly.PHP.ORDER_MEMBER) || 'array()';
return list + '[0] = ' + value + ';\n';
} else if (mode == 'INSERT') {
} else if (mode === 'INSERT') {
var list = Blockly.PHP.valueToCode(block, 'LIST',
Blockly.PHP.ORDER_NONE) || 'array()';
return 'array_unshift(' + list + ', ' + value + ');\n';
@@ -278,7 +278,7 @@ Blockly.PHP['lists_setIndex'] = function(block) {
case 'LAST':
var list = Blockly.PHP.valueToCode(block, 'LIST',
Blockly.PHP.ORDER_NONE) || 'array()';
if (mode == 'SET') {
if (mode === 'SET') {
var functionName = Blockly.PHP.provideFunction_(
'lists_set_last_item',
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
@@ -286,17 +286,17 @@ Blockly.PHP['lists_setIndex'] = function(block) {
' $list[count($list) - 1] = $value;',
'}']);
return functionName + '(' + list + ', ' + value + ');\n';
} else if (mode == 'INSERT') {
} else if (mode === 'INSERT') {
return 'array_push(' + list + ', ' + value + ');\n';
}
break;
case 'FROM_START':
var at = Blockly.PHP.getAdjusted(block, 'AT');
if (mode == 'SET') {
if (mode === 'SET') {
var list = Blockly.PHP.valueToCode(block, 'LIST',
Blockly.PHP.ORDER_MEMBER) || 'array()';
return list + '[' + at + '] = ' + value + ';\n';
} else if (mode == 'INSERT') {
} else if (mode === 'INSERT') {
var list = Blockly.PHP.valueToCode(block, 'LIST',
Blockly.PHP.ORDER_NONE) || 'array()';
return 'array_splice(' + list + ', ' + at + ', 0, ' + value + ');\n';
@@ -306,7 +306,7 @@ Blockly.PHP['lists_setIndex'] = function(block) {
var list = Blockly.PHP.valueToCode(block, 'LIST',
Blockly.PHP.ORDER_NONE) || 'array()';
var at = Blockly.PHP.getAdjusted(block, 'AT', 1);
if (mode == 'SET') {
if (mode === 'SET') {
var functionName = Blockly.PHP.provideFunction_(
'lists_set_from_end',
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
@@ -314,7 +314,7 @@ Blockly.PHP['lists_setIndex'] = function(block) {
' $list[count($list) - $at] = $value;',
'}']);
return functionName + '(' + list + ', ' + at + ', ' + value + ');\n';
} else if (mode == 'INSERT') {
} else if (mode === 'INSERT') {
var functionName = Blockly.PHP.provideFunction_(
'lists_insert_from_end',
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
@@ -331,10 +331,10 @@ Blockly.PHP['lists_setIndex'] = function(block) {
var xVar = Blockly.PHP.nameDB_.getDistinctName(
'tmp_x', Blockly.VARIABLE_CATEGORY_NAME);
code += xVar + ' = rand(0, count(' + list + ')-1);\n';
if (mode == 'SET') {
if (mode === 'SET') {
code += list + '[' + xVar + '] = ' + value + ';\n';
return code;
} else if (mode == 'INSERT') {
} else if (mode === 'INSERT') {
code += 'array_splice(' + list + ', ' + xVar + ', 0, ' + value +
');\n';
return code;
@@ -350,10 +350,10 @@ Blockly.PHP['lists_getSublist'] = function(block) {
Blockly.PHP.ORDER_NONE) || 'array()';
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
if (where1 == 'FIRST' && where2 == 'LAST') {
if (where1 === 'FIRST' && where2 === 'LAST') {
var code = list;
} else if (list.match(/^\$\w+$/) ||
(where1 != 'FROM_END' && where2 == 'FROM_START')) {
(where1 !== 'FROM_END' && where2 === 'FROM_START')) {
// If the list is a simple value or doesn't require a call for length, don't
// generate a helper function.
switch (where1) {
@@ -453,7 +453,7 @@ Blockly.PHP['lists_sort'] = function(block) {
' "IGNORE_CASE" => "strcasecmp"',
' );',
' $sortCmp = $sortCmpFuncs[$type];',
' $list2 = $list;', // Clone list.
' $list2 = $list;', // Clone list.
' usort($list2, $sortCmp);',
' if ($direction == -1) {',
' $list2 = array_reverse($list2);',
@@ -472,12 +472,12 @@ Blockly.PHP['lists_split'] = function(block) {
var value_delim = Blockly.PHP.valueToCode(block, 'DELIM',
Blockly.PHP.ORDER_NONE) || '\'\'';
var mode = block.getFieldValue('MODE');
if (mode == 'SPLIT') {
if (mode === 'SPLIT') {
if (!value_input) {
value_input = '\'\'';
}
var functionName = 'explode';
} else if (mode == 'JOIN') {
} else if (mode === 'JOIN') {
if (!value_input) {
value_input = 'array()';
}

View File

@@ -62,7 +62,7 @@ Blockly.PHP['logic_compare'] = function(block) {
'GTE': '>='
};
var operator = OPERATORS[block.getFieldValue('OP')];
var order = (operator == '==' || operator == '!=') ?
var order = (operator === '==' || operator === '!=') ?
Blockly.PHP.ORDER_EQUALITY : Blockly.PHP.ORDER_RELATIONAL;
var argument0 = Blockly.PHP.valueToCode(block, 'A', order) || '0';
var argument1 = Blockly.PHP.valueToCode(block, 'B', order) || '0';
@@ -72,8 +72,8 @@ Blockly.PHP['logic_compare'] = function(block) {
Blockly.PHP['logic_operation'] = function(block) {
// Operations 'and', 'or'.
var operator = (block.getFieldValue('OP') == 'AND') ? '&&' : '||';
var order = (operator == '&&') ? Blockly.PHP.ORDER_LOGICAL_AND :
var operator = (block.getFieldValue('OP') === 'AND') ? '&&' : '||';
var order = (operator === '&&') ? Blockly.PHP.ORDER_LOGICAL_AND :
Blockly.PHP.ORDER_LOGICAL_OR;
var argument0 = Blockly.PHP.valueToCode(block, 'A', order);
var argument1 = Blockly.PHP.valueToCode(block, 'B', order);
@@ -83,7 +83,7 @@ Blockly.PHP['logic_operation'] = function(block) {
argument1 = 'false';
} else {
// Single missing arguments have no effect on the return value.
var defaultArgument = (operator == '&&') ? 'true' : 'false';
var defaultArgument = (operator === '&&') ? 'true' : 'false';
if (!argument0) {
argument0 = defaultArgument;
}
@@ -106,7 +106,7 @@ Blockly.PHP['logic_negate'] = function(block) {
Blockly.PHP['logic_boolean'] = function(block) {
// Boolean values true and false.
var code = (block.getFieldValue('BOOL') == 'TRUE') ? 'true' : 'false';
var code = (block.getFieldValue('BOOL') === 'TRUE') ? 'true' : 'false';
return [code, Blockly.PHP.ORDER_ATOMIC];
};

View File

@@ -47,7 +47,7 @@ Blockly.PHP['controls_repeat'] = Blockly.PHP['controls_repeat_ext'];
Blockly.PHP['controls_whileUntil'] = function(block) {
// Do while/until loop.
var until = block.getFieldValue('MODE') == 'UNTIL';
var until = block.getFieldValue('MODE') === 'UNTIL';
var argument0 = Blockly.PHP.valueToCode(block, 'BOOL',
until ? Blockly.PHP.ORDER_LOGICAL_NOT :
Blockly.PHP.ORDER_NONE) || 'false';
@@ -80,7 +80,7 @@ Blockly.PHP['controls_for'] = function(block) {
variable0 + (up ? ' <= ' : ' >= ') + argument1 + '; ' +
variable0;
var step = Math.abs(Number(increment));
if (step == 1) {
if (step === 1) {
code += up ? '++' : '--';
} else {
code += (up ? ' += ' : ' -= ') + step;

View File

@@ -20,9 +20,9 @@ Blockly.PHP['math_number'] = function(block) {
var code = Number(block.getFieldValue('NUM'));
var order = code >= 0 ? Blockly.PHP.ORDER_ATOMIC :
Blockly.PHP.ORDER_UNARY_NEGATION;
if (code == Infinity) {
if (code === Infinity) {
code = 'INF';
} else if (code == -Infinity) {
} else if (code === -Infinity) {
code = '-INF';
}
return [code, order];
@@ -51,18 +51,18 @@ Blockly.PHP['math_single'] = function(block) {
var operator = block.getFieldValue('OP');
var code;
var arg;
if (operator == 'NEG') {
if (operator === 'NEG') {
// Negation is a special case given its different operator precedence.
arg = Blockly.PHP.valueToCode(block, 'NUM',
Blockly.PHP.ORDER_UNARY_NEGATION) || '0';
if (arg[0] == '-') {
if (arg[0] === '-') {
// --3 is not legal in JS.
arg = ' ' + arg;
}
code = '-' + arg;
return [code, Blockly.PHP.ORDER_UNARY_NEGATION];
}
if (operator == 'SIN' || operator == 'COS' || operator == 'TAN') {
if (operator === 'SIN' || operator === 'COS' || operator === 'TAN') {
arg = Blockly.PHP.valueToCode(block, 'NUM',
Blockly.PHP.ORDER_DIVISION) || '0';
} else {
@@ -150,7 +150,7 @@ Blockly.PHP['math_number_property'] = function(block) {
Blockly.PHP.ORDER_MODULUS) || '0';
var dropdown_property = block.getFieldValue('PROPERTY');
var code;
if (dropdown_property == 'PRIME') {
if (dropdown_property === 'PRIME') {
// Prime is a special case as it is not a one-liner test.
var functionName = Blockly.PHP.provideFunction_(
'math_isPrime',

View File

@@ -24,7 +24,7 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
var variables = Blockly.Variables.allUsedVarModels(workspace) || [];
for (var i = 0, variable; variable = variables[i]; i++) {
var varName = variable.name;
if (block.getVars().indexOf(varName) == -1) {
if (block.getVars().indexOf(varName) === -1) {
globals.push(Blockly.PHP.nameDB_.getName(varName,
Blockly.VARIABLE_CATEGORY_NAME));
}

View File

@@ -24,21 +24,21 @@ Blockly.PHP['text'] = function(block) {
Blockly.PHP['text_multiline'] = function(block) {
// Text value.
var code = Blockly.PHP.multiline_quote_(block.getFieldValue('TEXT'));
var order = code.indexOf('.') != -1 ? Blockly.PHP.ORDER_STRING_CONCAT :
var order = code.indexOf('.') !== -1 ? Blockly.PHP.ORDER_STRING_CONCAT :
Blockly.PHP.ORDER_ATOMIC;
return [code, order];
};
Blockly.PHP['text_join'] = function(block) {
// Create a string made up of any number of elements of any type.
if (block.itemCount_ == 0) {
if (block.itemCount_ === 0) {
return ['\'\'', Blockly.PHP.ORDER_ATOMIC];
} else if (block.itemCount_ == 1) {
} else if (block.itemCount_ === 1) {
var element = Blockly.PHP.valueToCode(block, 'ADD0',
Blockly.PHP.ORDER_NONE) || '\'\'';
var code = element;
return [code, Blockly.PHP.ORDER_NONE];
} else if (block.itemCount_ == 2) {
} else if (block.itemCount_ === 2) {
var element0 = Blockly.PHP.valueToCode(block, 'ADD0',
Blockly.PHP.ORDER_STRING_CONCAT) || '\'\'';
var element1 = Blockly.PHP.valueToCode(block, 'ADD1',
@@ -90,7 +90,7 @@ Blockly.PHP['text_isEmpty'] = function(block) {
Blockly.PHP['text_indexOf'] = function(block) {
// Search the text for a substring.
var operator = block.getFieldValue('END') == 'FIRST' ?
var operator = block.getFieldValue('END') === 'FIRST' ?
'strpos' : 'strrpos';
var substring = Blockly.PHP.valueToCode(block, 'FIND',
Blockly.PHP.ORDER_NONE) || '\'\'';
@@ -104,7 +104,7 @@ Blockly.PHP['text_indexOf'] = function(block) {
var indexAdjustment = '';
}
var functionName = Blockly.PHP.provideFunction_(
block.getFieldValue('END') == 'FIRST' ?
block.getFieldValue('END') === 'FIRST' ?
'text_indexOf' : 'text_lastIndexOf',
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($text, $search) {',
@@ -119,7 +119,7 @@ Blockly.PHP['text_indexOf'] = function(block) {
Blockly.PHP['text_charAt'] = function(block) {
// Get letter at index.
var where = block.getFieldValue('WHERE') || 'FROM_START';
var textOrder = (where == 'RANDOM') ? Blockly.PHP.ORDER_NONE :
var textOrder = (where === 'RANDOM') ? Blockly.PHP.ORDER_NONE :
Blockly.PHP.ORDER_NONE;
var text = Blockly.PHP.valueToCode(block, 'VALUE', textOrder) || '\'\'';
switch (where) {
@@ -155,7 +155,7 @@ Blockly.PHP['text_getSubstring'] = function(block) {
var where2 = block.getFieldValue('WHERE2');
var text = Blockly.PHP.valueToCode(block, 'STRING',
Blockly.PHP.ORDER_NONE) || '\'\'';
if (where1 == 'FIRST' && where2 == 'LAST') {
if (where1 === 'FIRST' && where2 === 'LAST') {
var code = text;
return [code, Blockly.PHP.ORDER_NONE];
} else {
@@ -194,11 +194,11 @@ Blockly.PHP['text_changeCase'] = function(block) {
// Change capitalization.
var text = Blockly.PHP.valueToCode(block, 'TEXT',
Blockly.PHP.ORDER_NONE) || '\'\'';
if (block.getFieldValue('CASE') == 'UPPERCASE') {
if (block.getFieldValue('CASE') === 'UPPERCASE') {
var code = 'strtoupper(' + text + ')';
} else if (block.getFieldValue('CASE') == 'LOWERCASE') {
} else if (block.getFieldValue('CASE') === 'LOWERCASE') {
var code = 'strtolower(' + text + ')';
} else if (block.getFieldValue('CASE') == 'TITLECASE') {
} else if (block.getFieldValue('CASE') === 'TITLECASE') {
var code = 'ucwords(strtolower(' + text + '))';
}
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
@@ -235,7 +235,7 @@ Blockly.PHP['text_prompt_ext'] = function(block) {
Blockly.PHP.ORDER_NONE) || '\'\'';
}
var code = 'readline(' + msg + ')';
var toNumber = block.getFieldValue('TYPE') == 'NUMBER';
var toNumber = block.getFieldValue('TYPE') === 'NUMBER';
if (toNumber) {
code = 'floatval(' + code + ')';
}