diff options
author | Benny Baumann <BenBE@geshi.org> | 2020-11-17 01:27:27 +0100 |
---|---|---|
committer | BenBE <BenBE@geshi.org> | 2020-11-17 08:06:02 +0100 |
commit | a94fd87b05aa23d453d6e238746b5a55e75544bd (patch) | |
tree | 83c455f7aef55b120e6360bed623eaae76ce379f /Vector.c | |
parent | 307c34b028d353154aa268eceb38e0331c8275cf (diff) |
Avoid calling Object_isA from inside Vector_isConsistent
Diffstat (limited to 'Vector.c')
-rw-r--r-- | Vector.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -48,16 +48,16 @@ void Vector_delete(Vector* this) { static bool Vector_isConsistent(const Vector* this) { assert(this->items <= this->arraySize); + if (this->owner) { for (int i = 0; i < this->items; i++) { - if (this->array[i] && !Object_isA(this->array[i], this->type)) { + if (!this->array[i]) { return false; } } - return true; - } else { - return true; } + + return true; } unsigned int Vector_count(const Vector* this) { @@ -71,10 +71,10 @@ unsigned int Vector_count(const Vector* this) { return items; } -Object* Vector_get(Vector* this, int idx) { +Object* Vector_get(const Vector* this, int idx) { assert(idx >= 0 && idx < this->items); - assert(Vector_isConsistent(this)); assert(this->array[idx]); + assert(Object_isA(this->array[idx], this->type)); return this->array[idx]; } |