Skip to content

fix list index. #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2019
Merged

fix list index. #194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/lib/ruby-generator/data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand All @@ -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`;
};
Expand All @@ -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];
};
Expand Down