From de518c82717f8d07a6721e01200deb2437335a5d Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 8 Feb 2011 19:24:13 +0100 Subject: Make iteration work --- src/reflist.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/reflist.c b/src/reflist.c index 4b08b3af..20021ed3 100644 --- a/src/reflist.c +++ b/src/reflist.c @@ -432,7 +432,7 @@ Reflection *first_refl(RefList *list, RefListIterator **piter) return NULL; } - refl = iter->stack[iter->stack_ptr--]; + refl = iter->stack[--iter->stack_ptr]; return refl; @@ -442,11 +442,15 @@ Reflection *first_refl(RefList *list, RefListIterator **piter) Reflection *next_refl(Reflection *refl, RefListIterator *iter) { + int returned = 1; + do { - refl = refl->child[1];; + if ( returned ) refl = refl->child[1]; + returned = 0; if ( refl != NULL ) { + iter->stack[iter->stack_ptr++] = refl; if ( iter->stack_ptr == iter->stack_size ) { iter->stack_size += 32; @@ -455,15 +459,15 @@ Reflection *next_refl(Reflection *refl, RefListIterator *iter) } refl = refl->child[0]; continue; + } if ( iter->stack_ptr == 0 ) { free(iter->stack); free(iter); return NULL; } - refl = iter->stack[iter->stack_ptr--]; - return refl; + return iter->stack[--iter->stack_ptr]; } while ( 1 ); } -- cgit v1.2.3