add temporary code to dump btree contents on assertion failure described

2001-10-22  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment):
	add temporary code to dump btree contents on assertion failure
	described in #62656

	* gtk/gtktextbtree.c (ensure_end_iter_segment): add some
	assertions that we're getting the right end iter segment

	* gtk/gtktextiter.c (_gtk_text_iter_forward_indexable_segment):
	verify that we aren't on the end iterator after moving
	forward one segment - fixes return value in an obscure case.
	Also, some trivial code cleanup/rearranging.

1 files changed, 6 insertions, 7 deletions

diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 97fc4b4ad6..501b077fab 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -1976,7 +1976,7 @@ _gtk_text_iter_forward_indexable_segment (GtkTextIter *iter)
 
       check_invariants (iter);
 
-      return TRUE;
+      return !gtk_text_iter_is_end (iter);
     }
   else
     {
@@ -1995,21 +1995,20 @@ _gtk_text_iter_forward_indexable_segment (GtkTextIter *iter)
 
           check_invariants (iter);
 
-          if (gtk_text_iter_is_end (iter))
-            return FALSE;
-          else
-            return TRUE;
+          return !gtk_text_iter_is_end (iter);
         }
       else
         {
           /* End of buffer */
+          
+          check_invariants (iter);
 
           g_assert (!_gtk_text_line_is_last (real->line, real->tree));
           g_assert (_gtk_text_line_contains_end_iter (real->line, real->tree));
+          if (!gtk_text_iter_is_end (iter))
+            _gtk_text_btree_spew (_gtk_text_iter_get_btree (iter));              
           g_assert (gtk_text_iter_is_end (iter));
           
-          check_invariants (iter);
-
           return FALSE;
         }
     }