Compare pointers explicitly against null using is and !is

[software/dgc/naive.git] / gc / list.d

diff --git a/gc/list.d b/gc/list.d
index 7c0af0bc7d701b20f25d27f38a376d8efc87e0b9..f11ff2c7aaec50a41bbb0c2e20b438d4f3c3e7fd 100644 (file)
--- a/gc/list.d
+++ b/gc/list.d
@@ -37,7 +37,7 @@ struct List
     Cell* find(bool delegate(Cell*) predicate)
     {
         auto cell = this.first;
     Cell* find(bool delegate(Cell*) predicate)
     {
         auto cell = this.first;

-        while (cell) {
+        while (cell !is null) {

             if (predicate(cell))
                 return cell;
             cell = cell.next;
             if (predicate(cell))
                 return cell;
             cell = cell.next;


@@ -75,12 +75,12 @@ struct List
     {
         Cell* prev = null;
         auto cell = this.first;
     {
         Cell* prev = null;
         auto cell = this.first;

-        while (cell) {
+        while (cell !is null) {

             if (predicate(cell)) {
             if (predicate(cell)) {

-                if (prev)
-                    prev.next = cell.next;
-                else
+                if (prev is null)

                     this.first = cell.next;
                     this.first = cell.next;

+                else
+                    prev.next = cell.next;

                 return cell;
             }
             prev = cell;
                 return cell;
             }
             prev = cell;


@@ -133,7 +133,7 @@ struct List
     {
         int result = 0;
         auto cell = this.first;
     {
         int result = 0;
         auto cell = this.first;

-        while (cell) {
+        while (cell !is null) {

             // this is necessary to allow removing a node while iterating
             auto next = cell.next;
             result = dg(cell);
             // this is necessary to allow removing a node while iterating
             auto next = cell.next;
             result = dg(cell);


@@ -156,7 +156,7 @@ private:
     unittest // List
     {
         List l;
     unittest // List
     {
         List l;

-        assert (l.first == null);
+        assert (l.first is null);

         assert (l.find(cast(void*) null) is null);
         assert (l.find(cast(void*) &l) is null);
         Cell[5] cells;
         assert (l.find(cast(void*) null) is null);
         assert (l.find(cast(void*) &l) is null);
         Cell[5] cells;