CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-11 10:57:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #285 from drigz/reswords

Browse Source 
Add missing comma to Lua reserved words
This commit is contained in:
Neil Fraser
2016-03-14 15:53:25 -07:00
parent 7b77527d57 37d3ecc304
commit be2626551f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
generators/lua.js
View File

@@ -45,7 +45,7 @@ Blockly.Lua = new Blockly.Generator('Lua');
*/
Blockly.Lua.addReservedWords(
// Special character
'_' +
'_,' +
// From theoriginalbit's script:
// https://github.com/espertus/blockly-lua/issues/6
'__inext,assert,bit,colors,colours,coroutine,disk,dofile,error,fs,' +

4
generators/lua/lists.js
View File

@@ -119,12 +119,12 @@ Blockly.Lua['lists_indexOf'] = function(block) {
* @private
* @param {string} listname Name of the list, used to calculate length.
* @param {string} where The method of indexing, selected by dropdown in Blockly
* @param {=string} opt_at The optional offset when indexing from start/end.
* @param {string=} opt_at The optional offset when indexing from start/end.
* @return {string} Index expression.
*/
Blockly.Lua.lists.getIndex_ = function(listname, where, opt_at) {
if (where == 'FIRST') {
return 1;
return '1';
} else if (where == 'FROM_END') {
return '#' + listname + ' + 1 - ' + opt_at;
} else if (where == 'LAST') {