mirror of
https://github.com/google/blockly.git
synced 2026-01-04 15:40:08 +01:00
* fix(build): Restore erroneously-deleted filter function This was deleted in PR #7406 as it was mainly being used to filter core/ vs. test/mocha/ deps into separate deps files - but it turns out also to be used for filtering error messages too. Oops. * refactor(tests): Migrate advanced compilation test to ES Modules * refactor(build): Migrate main.js to TypeScript This turns out to be pretty straight forward, even if it would cause crashing if one actually tried to import this module instead of just feeding it to Closure Compiler. * chore(build): Remove goog.declareModuleId calls Replace goog.declareModuleId calls with a comment recording the former module ID for posterity (or at least until we decide how to reformat the renamings file. * chore(tests): Delete closure/goog/* For the moment we still need something to serve as base.js for the benefit of closure-make-deps, so we keep a vestigial base.js around, containing only the @provideGoog declaration. * refactor(build): Remove vestigial base.js By changing slightly the command line arguments to closure-make-deps and closure-calculate-chunks the need to have any base.js is eliminated. * chore: Typo fix for PR #7415
135 lines
4.6 KiB
JavaScript
135 lines
4.6 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2012 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Generating Python for procedure blocks.
|
|
*/
|
|
|
|
// Former goog.module ID: Blockly.Python.procedures
|
|
|
|
import * as Variables from '../../core/variables.js';
|
|
import {NameType} from '../../core/names.js';
|
|
import {Order} from './python_generator.js';
|
|
|
|
|
|
export function procedures_defreturn(block, generator) {
|
|
// Define a procedure with a return value.
|
|
// First, add a 'global' statement for every variable that is not shadowed by
|
|
// a local parameter.
|
|
const globals = [];
|
|
const workspace = block.workspace;
|
|
const usedVariables = Variables.allUsedVarModels(workspace) || [];
|
|
for (let i = 0, variable; (variable = usedVariables[i]); i++) {
|
|
const varName = variable.name;
|
|
if (block.getVars().indexOf(varName) === -1) {
|
|
globals.push(generator.nameDB_.getName(varName, NameType.VARIABLE));
|
|
}
|
|
}
|
|
// Add developer variables.
|
|
const devVarList = Variables.allDeveloperVariables(workspace);
|
|
for (let i = 0; i < devVarList.length; i++) {
|
|
globals.push(
|
|
generator.nameDB_.getName(
|
|
devVarList[i], NameType.DEVELOPER_VARIABLE));
|
|
}
|
|
|
|
const globalString = globals.length ?
|
|
generator.INDENT + 'global ' + globals.join(', ') + '\n' :
|
|
'';
|
|
const funcName =
|
|
generator.nameDB_.getName(
|
|
block.getFieldValue('NAME'), NameType.PROCEDURE);
|
|
let xfix1 = '';
|
|
if (generator.STATEMENT_PREFIX) {
|
|
xfix1 += generator.injectId(generator.STATEMENT_PREFIX, block);
|
|
}
|
|
if (generator.STATEMENT_SUFFIX) {
|
|
xfix1 += generator.injectId(generator.STATEMENT_SUFFIX, block);
|
|
}
|
|
if (xfix1) {
|
|
xfix1 = generator.prefixLines(xfix1, generator.INDENT);
|
|
}
|
|
let loopTrap = '';
|
|
if (generator.INFINITE_LOOP_TRAP) {
|
|
loopTrap = generator.prefixLines(
|
|
generator.injectId(generator.INFINITE_LOOP_TRAP, block),
|
|
generator.INDENT);
|
|
}
|
|
let branch = generator.statementToCode(block, 'STACK');
|
|
let returnValue =
|
|
generator.valueToCode(block, 'RETURN', Order.NONE) || '';
|
|
let xfix2 = '';
|
|
if (branch && returnValue) {
|
|
// After executing the function body, revisit this block for the return.
|
|
xfix2 = xfix1;
|
|
}
|
|
if (returnValue) {
|
|
returnValue = generator.INDENT + 'return ' + returnValue + '\n';
|
|
} else if (!branch) {
|
|
branch = generator.PASS;
|
|
}
|
|
const args = [];
|
|
const variables = block.getVars();
|
|
for (let i = 0; i < variables.length; i++) {
|
|
args[i] = generator.nameDB_.getName(variables[i], NameType.VARIABLE);
|
|
}
|
|
let code = 'def ' + funcName + '(' + args.join(', ') + '):\n' + globalString +
|
|
xfix1 + loopTrap + branch + xfix2 + returnValue;
|
|
code = generator.scrub_(block, code);
|
|
// Add % so as not to collide with helper functions in definitions list.
|
|
generator.definitions_['%' + funcName] = code;
|
|
return null;
|
|
};
|
|
|
|
// Defining a procedure without a return value uses the same generator as
|
|
// a procedure with a return value.
|
|
export const procedures_defnoreturn = procedures_defreturn;
|
|
|
|
export function procedures_callreturn(block, generator) {
|
|
// Call a procedure with a return value.
|
|
const funcName =
|
|
generator.nameDB_.getName(
|
|
block.getFieldValue('NAME'), NameType.PROCEDURE);
|
|
const args = [];
|
|
const variables = block.getVars();
|
|
for (let i = 0; i < variables.length; i++) {
|
|
args[i] =
|
|
generator.valueToCode(block, 'ARG' + i, Order.NONE) || 'None';
|
|
}
|
|
const code = funcName + '(' + args.join(', ') + ')';
|
|
return [code, Order.FUNCTION_CALL];
|
|
};
|
|
|
|
export function procedures_callnoreturn(block, generator) {
|
|
// Call a procedure with no return value.
|
|
// Generated code is for a function call as a statement is the same as a
|
|
// function call as a value, with the addition of line ending.
|
|
const tuple = generator.forBlock['procedures_callreturn'](block, generator);
|
|
return tuple[0] + '\n';
|
|
};
|
|
|
|
export function procedures_ifreturn(block, generator) {
|
|
// Conditionally return value from a procedure.
|
|
const condition =
|
|
generator.valueToCode(block, 'CONDITION', Order.NONE) || 'False';
|
|
let code = 'if ' + condition + ':\n';
|
|
if (generator.STATEMENT_SUFFIX) {
|
|
// Inject any statement suffix here since the regular one at the end
|
|
// will not get executed if the return is triggered.
|
|
code += generator.prefixLines(
|
|
generator.injectId(
|
|
generator.STATEMENT_SUFFIX, block), generator.INDENT);
|
|
}
|
|
if (block.hasReturnValue_) {
|
|
const value =
|
|
generator.valueToCode(block, 'VALUE', Order.NONE) || 'None';
|
|
code += generator.INDENT + 'return ' + value + '\n';
|
|
} else {
|
|
code += generator.INDENT + 'return\n';
|
|
}
|
|
return code;
|
|
};
|