From 591f6bfe4caaf0fd7c7100539fb572c800263a0d Mon Sep 17 00:00:00 2001 From: Neil Fraser Date: Wed, 24 Aug 2016 03:05:30 -0700 Subject: [PATCH] Revert "Remove apparently unneeded scrub on procedures." This reverts commit 2be214ca74f45c7829b9a32274c29f0adee40e6e. --- generators/dart/procedures.js | 1 + generators/javascript/procedures.js | 1 + generators/lua/procedures.js | 1 + generators/php/procedures.js | 1 + generators/python/procedures.js | 1 + 5 files changed, 5 insertions(+) diff --git a/generators/dart/procedures.js b/generators/dart/procedures.js index f6ceb945b..ad2550cc7 100644 --- a/generators/dart/procedures.js +++ b/generators/dart/procedures.js @@ -56,6 +56,7 @@ Blockly.Dart['procedures_defreturn'] = function(block) { } var code = returnType + ' ' + funcName + '(' + args.join(', ') + ') {\n' + branch + returnValue + '}'; + code = Blockly.Dart.scrub_(block, code); // Add % so as not to collide with helper functions in definitions list. Blockly.Dart.definitions_['%' + funcName] = code; return null; diff --git a/generators/javascript/procedures.js b/generators/javascript/procedures.js index 4b73e7a92..04845f9bd 100644 --- a/generators/javascript/procedures.js +++ b/generators/javascript/procedures.js @@ -55,6 +55,7 @@ Blockly.JavaScript['procedures_defreturn'] = function(block) { } var code = 'function ' + funcName + '(' + args.join(', ') + ') {\n' + branch + returnValue + '}'; + code = Blockly.JavaScript.scrub_(block, code); // Add % so as not to collide with helper functions in definitions list. Blockly.JavaScript.definitions_['%' + funcName] = code; return null; diff --git a/generators/lua/procedures.js b/generators/lua/procedures.js index 3efd4d9b2..b6d6cdda1 100644 --- a/generators/lua/procedures.js +++ b/generators/lua/procedures.js @@ -57,6 +57,7 @@ Blockly.Lua['procedures_defreturn'] = function(block) { } var code = 'function ' + funcName + '(' + args.join(', ') + ')\n' + branch + returnValue + 'end\n'; + code = Blockly.Lua.scrub_(block, code); // Add % so as not to collide with helper functions in definitions list. Blockly.Lua.definitions_['%' + funcName] = code; return null; diff --git a/generators/php/procedures.js b/generators/php/procedures.js index 103f4c193..2131bebde 100644 --- a/generators/php/procedures.js +++ b/generators/php/procedures.js @@ -69,6 +69,7 @@ Blockly.PHP['procedures_defreturn'] = function(block) { } var code = 'function ' + funcName + '(' + args.join(', ') + ') {\n' + globals + branch + returnValue + '}'; + code = Blockly.PHP.scrub_(block, code); // Add % so as not to collide with helper functions in definitions list. Blockly.PHP.definitions_['%' + funcName] = code; return null; diff --git a/generators/python/procedures.js b/generators/python/procedures.js index fb3bba6c2..fa938ef0f 100644 --- a/generators/python/procedures.js +++ b/generators/python/procedures.js @@ -71,6 +71,7 @@ Blockly.Python['procedures_defreturn'] = function(block) { } var code = 'def ' + funcName + '(' + args.join(', ') + '):\n' + globals + branch + returnValue; + code = Blockly.Python.scrub_(block, code); // Add % so as not to collide with helper functions in definitions list. Blockly.Python.definitions_['%' + funcName] = code; return null;