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.

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

Jump to bottom

[bytes] fix bytesFindIndex and bytesFindLastIndex #381

Merged
merged 5 commits into from
May 7, 2019
Merged

[bytes] fix bytesFindIndex and bytesFindLastIndex #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe9d5b4
[bytes] edit test cases to fail
arcatdmz May 5, 2019
1251423
[bytes] fix bugs in bytesFind(Last)?Index
arcatdmz May 5, 2019
4df88fb
[bytes] apply prettier
arcatdmz May 5, 2019
6abef85
[byetes] revert "edit test cases to fail"
arcatdmz May 6, 2019
17679af
[bytes] add tests
arcatdmz May 6, 2019
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
14 changes: 8 additions & 6 deletions bytes/bytes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ export function bytesFindIndex(a: Uint8Array, pat: Uint8Array): number {
for (let i = 0; i < a.length; i++) {
if (a[i] !== s) continue;
const pin = i;
let matched = 1;
let matched = 1,
j = i;
while (matched < pat.length) {
i++;
if (a[i] !== pat[i - pin]) {
j++;
if (a[j] !== pat[j - pin]) {
break;
}
matched++;
Expand All @@ -27,10 +28,11 @@ export function bytesFindLastIndex(a: Uint8Array, pat: Uint8Array): number {
for (let i = a.length - 1; i >= 0; i--) {
if (a[i] !== e) continue;
const pin = i;
let matched = 1;
let matched = 1,
j = i;
while (matched < pat.length) {
i--;
if (a[i] !== pat[pat.length - 1 - (pin - i)]) {
j--;
if (a[j] !== pat[pat.length - 1 - (pin - j)]) {
break;
}
matched++;
Expand Down
15 changes: 14 additions & 1 deletion bytes/bytes_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,19 @@ import {
import { test } from "../testing/mod.ts";
import { assertEquals } from "../testing/asserts.ts";

test(function bytesBytesFindIndex(): void {
test(function bytesBytesFindIndex1(): void {
const i = bytesFindIndex(
new Uint8Array([1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 3]),
new Uint8Array([0, 1, 2])
);
assertEquals(i, 2);
});

test(function bytesBytesFindIndex2(): void {
const i = bytesFindIndex(new Uint8Array([0, 0, 1]), new Uint8Array([0, 1]));
assertEquals(i, 1);
});

test(function bytesBytesFindLastIndex1(): void {
const i = bytesFindLastIndex(
new Uint8Array([0, 1, 2, 0, 1, 2, 0, 1, 3]),
Expand All @@ -23,6 +28,14 @@ test(function bytesBytesFindLastIndex1(): void {
assertEquals(i, 3);
});

test(function bytesBytesFindLastIndex2(): void {
const i = bytesFindLastIndex(
new Uint8Array([0, 1, 1]),
new Uint8Array([0, 1])
);
assertEquals(i, 0);
});

test(function bytesBytesBytesEqual(): void {
const v = bytesEqual(
new Uint8Array([0, 1, 2, 3]),
Expand Down