Skip to content
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.

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

arr.insertとarr.removeを追加 #654

Merged
merged 4 commits into from
May 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- シンタックスエラーなどの位置情報を修正
- `arr.reduce`が空配列に対して初期値なしで呼び出された時、正式にエラーを出すよう
- `str.pad_start`,`str.pad_end`を追加
- `arr.insert`,`arr.remove`を追加

# 0.18.0
- `Core:abort`でプログラムを緊急停止できるように
Expand Down
12 changes: 12 additions & 0 deletions docs/primitive-props.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,18 @@ _fromIndex_ および _toIndex_ に関する挙動は`arr.slice`に準拠しま
`arr.copy`同様シャローコピーであり、配列やオブジェクトの参照は維持されます。
_times_ には0以上の整数値を指定します。それ以外ではエラーになります。

### @(_v_: arr).insert(_index_: num, _item_: value): null
**【この操作は配列を書き換えます】**
配列の _index_ の位置に _item_ を挿入します。\
_index_ が負の場合は末尾から数えます。\
_index_ が最後の要素より後の場合は末尾に追加します。

### @(_v_: arr).remove(_index_: num): value | null
**【この操作は配列を書き換えます】**
配列から _index_ の位置の要素を取り除き、その要素を返します。\
_index_ が負の場合は末尾から数えます。\
_index_ が最後の要素より後の場合は取り除かず、`null`を返します。

### @(_v_: arr).every(_func_: @(_item_: value, _index_: num) { bool }): bool
配列の全ての要素に対して _func_ が true を返す時のみ true 返します。空配列には常に true を返します。

Expand Down
17 changes: 17 additions & 0 deletions src/interpreter/primitive-props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
split: (target: VStr): VFn => FN_NATIVE(async ([splitter], _opts) => {
if (splitter) assertString(splitter);
if (splitter) {
return ARR(target.value.split(splitter ? splitter.value : '').map(s => STR(s)));

Check warning on line 89 in src/interpreter/primitive-props.ts

View workflow job for this annotation

GitHub Actions / lint

Unnecessary conditional, value is always truthy
} else {
return ARR(toArray(target.value).map(s => STR(s)));
}
Expand Down Expand Up @@ -316,6 +316,23 @@
}
return FALSE;
}),

insert: (target: VArr): VFn => FN_NATIVE(async ([index, item], opts) => {
assertNumber(index);
expectAny(item);

target.value.splice(index.value, 0, item);

return NULL;
}),

remove: (target: VArr): VFn => FN_NATIVE(async ([index], opts) => {
assertNumber(index);

const removed = target.value.splice(index.value, 1);

return removed[0] ?? NULL;
}),
},

error: {
Expand Down
38 changes: 38 additions & 0 deletions test/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2960,6 +2960,44 @@ describe('primitive props', () => {
FALSE,
]));
});

test.concurrent('insert', async () => {
const res = await exe(`
let arr1 = [0, 1, 2]
let res = []
res.push(arr1.insert(3, 10)) // [0, 1, 2, 10]
res.push(arr1.insert(2, 20)) // [0, 1, 20, 2, 10]
res.push(arr1.insert(0, 30)) // [30, 0, 1, 20, 2, 10]
res.push(arr1.insert(-1, 40)) // [30, 0, 1, 20, 2, 40, 10]
res.push(arr1.insert(-4, 50)) // [30, 0, 1, 50, 20, 2, 40, 10]
res.push(arr1.insert(100, 60)) // [30, 0, 1, 50, 20, 2, 40, 10, 60]
res.push(arr1)
<: res
`);
eq(res, ARR([
NULL, NULL, NULL, NULL, NULL, NULL,
ARR([NUM(30), NUM(0), NUM(1), NUM(50), NUM(20), NUM(2), NUM(40), NUM(10), NUM(60)])
]));
});

test.concurrent('remove', async () => {
const res = await exe(`
let arr1 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
let res = []
res.push(arr1.remove(9)) // 9 [0, 1, 2, 3, 4, 5, 6, 7, 8]
res.push(arr1.remove(3)) // 3 [0, 1, 2, 4, 5, 6, 7, 8]
res.push(arr1.remove(0)) // 0 [1, 2, 4, 5, 6, 7, 8]
res.push(arr1.remove(-1)) // 8 [1, 2, 4, 5, 6, 7]
res.push(arr1.remove(-5)) // 2 [1, 4, 5, 6, 7]
res.push(arr1.remove(100)) // null [1, 4, 5, 6, 7]
res.push(arr1)
<: res
`);
eq(res, ARR([
NUM(9), NUM(3), NUM(0), NUM(8), NUM(2), NULL,
ARR([NUM(1), NUM(4), NUM(5), NUM(6), NUM(7)])
]));
});
});
});

Expand Down
Loading