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

Clean up: Array to buffer as Buffer.fromArray, (not Array.buffer). #389

Merged
merged 9 commits into from
Jun 17, 2022
Merged

Clean up: Array to buffer as Buffer.fromArray, (not Array.buffer). #389

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a9a853e
array to buffer.
matthewhammer Jun 13, 2022
7e86242
experiment.
matthewhammer Jun 13, 2022
17ca208
experiment concluded.
matthewhammer Jun 13, 2022
2f73ed1
review comments.
matthewhammer Jun 15, 2022
9d59dcd
Merge branch 'master' of github.com:dfinity/motoko-base into array-to…
matthewhammer Jun 15, 2022
d8e5023
remove old impl (again); git goof.
matthewhammer Jun 15, 2022
f46bb90
review comments.
matthewhammer Jun 16, 2022
dd3e0d1
Update src/Buffer.mo
matthewhammer Jun 17, 2022
6602795
Update test/bufTest.mo
matthewhammer Jun 17, 2022
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
7 changes: 0 additions & 7 deletions src/Array.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,4 @@ module {
});
};

public func buffer<A>(xs : [A]) : Buffer.Buffer<A> {
let buff = Buffer.Buffer<A>(xs.size());
for (x in xs.vals()) {
buff.add(x)
};
buff
};
}
7 changes: 7 additions & 0 deletions src/Buffer.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,11 @@ module {
};
};

public func fromArray<A>(xs : [A]) : Buffer<A> {
let buff = Buffer<A>(xs.size());
for (x in xs.vals()) {
buff.add(x)
};
buff
};
}
5 changes: 0 additions & 5 deletions test/arrayTest.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,6 @@ let suite = Suite.suite("Array", [
"reverse",
Array.reverse<Nat>([0, 1, 2, 3]),
M.equals(T.array<Nat>(T.natTestable, [3, 2, 1, 0]))
),
Suite.test(
"buffer",
Array.buffer<Nat>([0, 1, 2, 3]).toArray(),
M.equals(T.array<Nat>(T.natTestable, [0, 1, 2, 3]))
)
]);

Expand Down
10 changes: 10 additions & 0 deletions test/bufTest.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import B "mo:base/Buffer";
import I "mo:base/Iter";
import O "mo:base/Option";

import Suite "mo:matchers/Suite";
import T "mo:matchers/Testable";
import M "mo:matchers/Matchers";

// test repeated growing
let a = B.Buffer<Nat>(3);
for (i in I.range(0, 123)) {
Expand Down Expand Up @@ -92,3 +96,9 @@ do {
assert (c.toArray().size() == 2);
assert (c.toVarArray().size() == 2);
};

Suite.test(
"fromArray",
B.fromArray<Nat>([0, 1, 2, 3]).toArray(),
M.equals(T.array<Nat>(T.natTestable, [0, 1, 2, 3]))
);