Rename Push_VArray to Push_All
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/5b017ee3 Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/5b017ee3 Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/5b017ee3 Branch: refs/heads/master Commit: 5b017ee399667d17521e321f00e40b4e5667b074 Parents: 35f8fbf Author: Nick Wellnhofer <[email protected]> Authored: Sun Apr 26 13:58:21 2015 +0200 Committer: Nick Wellnhofer <[email protected]> Committed: Sun Apr 26 19:39:58 2015 +0200 ---------------------------------------------------------------------- runtime/core/Clownfish/Test/TestVArray.c | 20 ++++++++++---------- runtime/core/Clownfish/VArray.c | 2 +- runtime/core/Clownfish/VArray.cfh | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/5b017ee3/runtime/core/Clownfish/Test/TestVArray.c ---------------------------------------------------------------------- diff --git a/runtime/core/Clownfish/Test/TestVArray.c b/runtime/core/Clownfish/Test/TestVArray.c index 7b35549..bbe4573 100644 --- a/runtime/core/Clownfish/Test/TestVArray.c +++ b/runtime/core/Clownfish/Test/TestVArray.c @@ -268,7 +268,7 @@ test_Excise(TestBatchRunner *runner) { } static void -test_Push_VArray(TestBatchRunner *runner) { +test_Push_All(TestBatchRunner *runner) { VArray *wanted = VA_new(0); VArray *got = VA_new(0); VArray *scratch = VA_new(0); @@ -281,12 +281,12 @@ test_Push_VArray(TestBatchRunner *runner) { for (i = 20; i < 40; i++) { VA_Push(scratch, (Obj*)Str_newf("%u32", i)); } VA_Push(scratch, NULL); - VA_Push_VArray(got, scratch); - TEST_TRUE(runner, VA_Equals(wanted, (Obj*)got), "Push_VArray"); + VA_Push_All(got, scratch); + TEST_TRUE(runner, VA_Equals(wanted, (Obj*)got), "Push_All"); - VA_Push_VArray(got, empty); + VA_Push_All(got, empty); TEST_TRUE(runner, VA_Equals(wanted, (Obj*)got), - "Push_VArray with empty array"); + "Push_All with empty array"); DECREF(wanted); DECREF(got); @@ -383,7 +383,7 @@ S_overflow_Insert(void *context) { } static void -S_overflow_Push_VArray(void *context) { +S_overflow_Push_All(void *context) { UNUSED_VAR(context); VArray *array = VA_new(0); array->cap = 1000000000; @@ -391,7 +391,7 @@ S_overflow_Push_VArray(void *context) { VArray *other = VA_new(0); other->cap = SIZE_MAX - array->cap + 1; other->size = other->cap; - VA_Push_VArray(array, other); + VA_Push_All(array, other); } static void @@ -419,8 +419,8 @@ test_exceptions(TestBatchRunner *runner) { "Push throws on overflow"); S_test_exception(runner, S_overflow_Insert, "Insert throws on overflow"); - S_test_exception(runner, S_overflow_Push_VArray, - "Push_VArray throws on overflow"); + S_test_exception(runner, S_overflow_Push_All, + "Push_All throws on overflow"); S_test_exception(runner, S_overflow_Store, "Store throws on overflow"); } @@ -551,7 +551,7 @@ TestVArray_Run_IMP(TestVArray *self, TestBatchRunner *runner) { test_Delete(runner); test_Resize(runner); test_Excise(runner); - test_Push_VArray(runner); + test_Push_All(runner); test_Slice(runner); test_Clone_and_Shallow_Copy(runner); test_exceptions(runner); http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/5b017ee3/runtime/core/Clownfish/VArray.c ---------------------------------------------------------------------- diff --git a/runtime/core/Clownfish/VArray.c b/runtime/core/Clownfish/VArray.c index 408cd98..312e52e 100644 --- a/runtime/core/Clownfish/VArray.c +++ b/runtime/core/Clownfish/VArray.c @@ -105,7 +105,7 @@ VA_Push_IMP(VArray *self, Obj *element) { } void -VA_Push_VArray_IMP(VArray *self, VArray *other) { +VA_Push_All_IMP(VArray *self, VArray *other) { SI_grow_and_oversize(self, self->size, other->size); for (size_t i = 0, tick = self->size; i < other->size; i++, tick++) { Obj *elem = VA_Fetch(other, i); http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/5b017ee3/runtime/core/Clownfish/VArray.cfh ---------------------------------------------------------------------- diff --git a/runtime/core/Clownfish/VArray.cfh b/runtime/core/Clownfish/VArray.cfh index a506311..41ced30 100644 --- a/runtime/core/Clownfish/VArray.cfh +++ b/runtime/core/Clownfish/VArray.cfh @@ -53,7 +53,7 @@ class Clownfish::VArray nickname VA inherits Clownfish::Obj { /** Push all the elements of another VArray onto the end of this one. */ void - Push_VArray(VArray *self, VArray *other); + Push_All(VArray *self, VArray *other); /** Pop an item off of the end of a VArray. */
