[libgee] Split asserts in ArrayList
- From: Didier 'Ptitjes' Villevalois <dvillevalois src gnome org>
- To: svn-commits-list gnome org
- Subject: [libgee] Split asserts in ArrayList
- Date: Sun, 19 Jul 2009 21:55:12 +0000 (UTC)
commit d4169867b8d9d1a7d3b752c6f642c7853ca41e8a
Author: Julien Fontanet <julien fontanet isonoe net>
Date: Sun Jul 19 23:50:45 2009 +0200
Split asserts in ArrayList
Signed-off-by: Didier 'Ptitjes <ptitjes free fr>
gee/arraylist.vala | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/gee/arraylist.vala b/gee/arraylist.vala
index 38b6086..0c720fa 100644
--- a/gee/arraylist.vala
+++ b/gee/arraylist.vala
@@ -69,13 +69,15 @@ public class Gee.ArrayList<G> : Object, Iterable<G>, Collection<G>, List<G> {
}
public new G? get (int index) {
- assert (index >= 0 && index < _size);
+ assert (index >= 0);
+ assert (index < _size);
return _items[index];
}
public new void set (int index, G item) {
- assert (index >= 0 && index < _size);
+ assert (index >= 0);
+ assert (index < _size);
_items[index] = item;
}
@@ -90,7 +92,8 @@ public class Gee.ArrayList<G> : Object, Iterable<G>, Collection<G>, List<G> {
}
public void insert (int index, G item) {
- assert (index >= 0 && index <= _size);
+ assert (index >= 0);
+ assert (index <= _size);
if (_size == _items.length) {
grow_if_needed (1);
@@ -111,7 +114,8 @@ public class Gee.ArrayList<G> : Object, Iterable<G>, Collection<G>, List<G> {
}
public void remove_at (int index) {
- assert (index >= 0 && index < _size);
+ assert (index >= 0);
+ assert (index < _size);
_items[index] = null;
@@ -131,7 +135,7 @@ public class Gee.ArrayList<G> : Object, Iterable<G>, Collection<G>, List<G> {
public List<G>? slice (int start, int stop) {
return_val_if_fail (start <= stop, null);
return_val_if_fail (start >= 0, null);
- return_val_if_fail (stop <= this.size, null);
+ return_val_if_fail (stop <= _size, null);
var slice = new ArrayList<G> (this._equal_func);
for (int i = start; i < stop; i++) {
@@ -142,7 +146,9 @@ public class Gee.ArrayList<G> : Object, Iterable<G>, Collection<G>, List<G> {
}
private void shift (int start, int delta) {
- assert (start >= 0 && start <= _size && start >= -delta);
+ assert (start >= 0);
+ assert (start <= _size);
+ assert (start >= -delta);
_items.move (start, start + delta, _size - start);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]