[Python-checkins] python/dist/src/Modules itertoolsmodule.c, 1.33, 1.34

Thu Jul 15 07:32:50 CEST 2004

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24565
Modified Files:
	itertoolsmodule.c 
Log Message:
Exercise Jim's VISIT macro.
Index: itertoolsmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/itertoolsmodule.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** itertoolsmodule.c	8 May 2004 19:49:42 -0000	1.33
--- itertoolsmodule.c	15 Jul 2004 05:32:47 -0000	1.34
***************
*** 65,95 ****
 groupby_traverse(groupbyobject *gbo, visitproc visit, void *arg)
 {
! 	int err;
! 
! 	if (gbo->it) {
! 		err = visit(gbo->it, arg);
! 		if (err)
! 			return err;
! 	}
! 	if (gbo->keyfunc) {
! 		err = visit(gbo->keyfunc, arg);
! 		if (err)
! 			return err;
! 	}
! 	if (gbo->tgtkey) {
! 		err = visit(gbo->tgtkey, arg);
! 		if (err)
! 			return err;
! 	}
! 	if (gbo->currkey) {
! 		err = visit(gbo->currkey, arg);
! 		if (err)
! 			return err;
! 	}
! 	if (gbo->currvalue) {
! 		err = visit(gbo->currvalue, arg);
! 		if (err)
! 			return err;
! 	}
 	return 0;
 }
--- 65,73 ----
 groupby_traverse(groupbyobject *gbo, visitproc visit, void *arg)
 {
! 	Py_VISIT(gbo->it);
! 	Py_VISIT(gbo->keyfunc);
! 	Py_VISIT(gbo->tgtkey);
! 	Py_VISIT(gbo->currkey);
! 	Py_VISIT(gbo->currvalue);
 	return 0;
 }
***************
*** 672,687 ****
 cycle_traverse(cycleobject *lz, visitproc visit, void *arg)
 {
! 	int err;
! 
! 	if (lz->it) {
! 		err = visit(lz->it, arg);
! 		if (err)
! 			return err;
! 	}
! 	if (lz->saved) {
! 		err = visit(lz->saved, arg);
! 		if (err)
! 			return err;
! 	}
 	return 0;
 }
--- 650,655 ----
 cycle_traverse(cycleobject *lz, visitproc visit, void *arg)
 {
! 	Py_VISIT(lz->it);
! 	Py_VISIT(lz->saved);
 	return 0;
 }
***************
*** 821,836 ****
 dropwhile_traverse(dropwhileobject *lz, visitproc visit, void *arg)
 {
! 	int err;
! 
! 	if (lz->it) {
! 		err = visit(lz->it, arg);
! 		if (err)
! 			return err;
! 	}
! 	if (lz->func) {
! 		err = visit(lz->func, arg);
! 		if (err)
! 			return err;
! 	}
 	return 0;
 }
--- 789,794 ----
 dropwhile_traverse(dropwhileobject *lz, visitproc visit, void *arg)
 {
! 	Py_VISIT(lz->it);
! 	Py_VISIT(lz->func);
 	return 0;
 }
***************
*** 972,987 ****
 takewhile_traverse(takewhileobject *lz, visitproc visit, void *arg)
 {
! 	int err;
! 
! 	if (lz->it) {
! 		err = visit(lz->it, arg);
! 		if (err)
! 			return err;
! 	}
! 	if (lz->func) {
! 		err = visit(lz->func, arg);
! 		if (err)
! 			return err;
! 	}
 	return 0;
 }
--- 930,935 ----
 takewhile_traverse(takewhileobject *lz, visitproc visit, void *arg)
 {
! 	Py_VISIT(lz->it);
! 	Py_VISIT(lz->func);
 	return 0;
 }
***************
*** 1168,1173 ****
 islice_traverse(isliceobject *lz, visitproc visit, void *arg)
 {
! 	if (lz->it)
! 		return visit(lz->it, arg);
 	return 0;
 }
--- 1116,1120 ----
 islice_traverse(isliceobject *lz, visitproc visit, void *arg)
 {
! 	Py_VISIT(lz->it);
 	return 0;
 }
***************
*** 1310,1325 ****
 starmap_traverse(starmapobject *lz, visitproc visit, void *arg)
 {
! 	int err;
! 
! 	if (lz->it) {
! 		err = visit(lz->it, arg);
! 		if (err)
! 			return err;
! 	}
! 	if (lz->func) {
! 		err = visit(lz->func, arg);
! 		if (err)
! 			return err;
! 	}
 	return 0;
 }
--- 1257,1262 ----
 starmap_traverse(starmapobject *lz, visitproc visit, void *arg)
 {
! 	Py_VISIT(lz->it);
! 	Py_VISIT(lz->func);
 	return 0;
 }
***************
*** 1463,1478 ****
 imap_traverse(imapobject *lz, visitproc visit, void *arg)
 {
! 	int err;
! 
! 	if (lz->iters) {
! 		err = visit(lz->iters, arg);
! 		if (err)
! 			return err;
! 	}
! 	if (lz->func) {
! 		err = visit(lz->func, arg);
! 		if (err)
! 			return err;
! 	}
 	return 0;
 }
--- 1400,1405 ----
 imap_traverse(imapobject *lz, visitproc visit, void *arg)
 {
! 	Py_VISIT(lz->iters);
! 	Py_VISIT(lz->func);
 	return 0;
 }
***************
*** 1649,1654 ****
 chain_traverse(chainobject *lz, visitproc visit, void *arg)
 {
! 	if (lz->ittuple)
! 		return visit(lz->ittuple, arg);
 	return 0;
 }
--- 1576,1580 ----
 chain_traverse(chainobject *lz, visitproc visit, void *arg)
 {
! 	Py_VISIT(lz->ittuple);
 	return 0;
 }
***************
*** 1779,1794 ****
 ifilter_traverse(ifilterobject *lz, visitproc visit, void *arg)
 {
! 	int err;
! 
! 	if (lz->it) {
! 		err = visit(lz->it, arg);
! 		if (err)
! 			return err;
! 	}
! 	if (lz->func) {
! 		err = visit(lz->func, arg);
! 		if (err)
! 			return err;
! 	}
 	return 0;
 }
--- 1705,1710 ----
 ifilter_traverse(ifilterobject *lz, visitproc visit, void *arg)
 {
! 	Py_VISIT(lz->it);
! 	Py_VISIT(lz->func);
 	return 0;
 }
***************
*** 1930,1945 ****
 ifilterfalse_traverse(ifilterfalseobject *lz, visitproc visit, void *arg)
 {
! 	int err;
! 
! 	if (lz->it) {
! 		err = visit(lz->it, arg);
! 		if (err)
! 			return err;
! 	}
! 	if (lz->func) {
! 		err = visit(lz->func, arg);
! 		if (err)
! 			return err;
! 	}
 	return 0;
 }
--- 1846,1851 ----
 ifilterfalse_traverse(ifilterfalseobject *lz, visitproc visit, void *arg)
 {
! 	Py_VISIT(lz->it);
! 	Py_VISIT(lz->func);
 	return 0;
 }
***************
*** 2200,2215 ****
 izip_traverse(izipobject *lz, visitproc visit, void *arg)
 {
! 	int err;
! 
! 	if (lz->ittuple) {
! 		err = visit(lz->ittuple, arg);
! 		if (err)
! 			return err;
! 	}
! 	if (lz->result) {
! 		err = visit(lz->result, arg);
! 		if (err)
! 			return err;
! 	}
 	return 0;
 }
--- 2106,2111 ----
 izip_traverse(izipobject *lz, visitproc visit, void *arg)
 {
! 	Py_VISIT(lz->ittuple);
! 	Py_VISIT(lz->result);
 	return 0;
 }
***************
*** 2358,2363 ****
 repeat_traverse(repeatobject *ro, visitproc visit, void *arg)
 {
! 	if (ro->element)
! 		return visit(ro->element, arg);
 	return 0;
 }
--- 2254,2258 ----
 repeat_traverse(repeatobject *ro, visitproc visit, void *arg)
 {
! 	Py_VISIT(ro->element);
 	return 0;
 }