Merge pull request #194 from smalruby/fix_list_index

fix list index.

Author: takaokouji

src/lib/ruby-generator/data.js

@@ -36,6 +36,14 @@ export default function (Generator) {
         return `list(${Generator.quote_(list)})`;
     };
 
+    const getListIndex = function (block) {
+        const index = Generator.valueToCode(block, 'INDEX', Generator.ORDER_NONE) || 1;
+        if (index === '0') {
+            return 1;
+        }
+        return index;
+    };
+
     Generator.data_listcontents = function (block) {
         const list = getListName(block);
         return [list, Generator.ORDER_COLLECTION];
@@ -48,7 +56,7 @@ export default function (Generator) {
     };
 
     Generator.data_deleteoflist = function (block) {
-        const index = Generator.valueToCode(block, 'INDEX', Generator.ORDER_NONE) - 1 || 0;
+        const index = getListIndex(block);
         const list = getListName(block);
         return `${list}.delete_at(${Generator.nosToCode(index)})\n`;
     };
@@ -59,21 +67,21 @@ export default function (Generator) {
     };
 
     Generator.data_insertatlist = function (block) {
-        const index = Generator.valueToCode(block, 'INDEX', Generator.ORDER_NONE) - 1 || 0;
+        const index = getListIndex(block);
         const item = Generator.valueToCode(block, 'ITEM', Generator.ORDER_NONE) || '0';
         const list = getListName(block);
         return `${list}.insert(${index}, ${Generator.nosToCode(item)})\n`;
     };
 
     Generator.data_replaceitemoflist = function (block) {
-        const index = Generator.valueToCode(block, 'INDEX', Generator.ORDER_INDEX) - 1 || 0;
+        const index = getListIndex(block);
         const item = Generator.valueToCode(block, 'ITEM', Generator.ORDER_NONE) || '0';
         const list = getListName(block);
         return `${list}[${index}] = ${Generator.nosToCode(item)}\n`;
     };
 
     Generator.data_itemoflist = function (block) {
-        const index = Generator.valueToCode(block, 'INDEX', Generator.ORDER_INDEX) - 1 || 0;
+        const index = getListIndex(block);
         const list = getListName(block);
         return [`${list}[${index}]`, Generator.ORDER_FUNCTION_CAL];
     };