[Python-checkins] CVS: python/dist/src/Python getargs.c,2.74,2.75

2001年10月26日 21:38:13 -0700

Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv5334/python/Python
Modified Files:
	getargs.c 
Log Message:
vgetargskeywords:
+ Renamed argslen to nargs.
+ Renamed kwlen to nkeywords. This one was especially confusing because
 kwlen wasn't the length of the kwlist argument, but of the keywords
 argument.
Index: getargs.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/getargs.c,v
retrieving revision 2.74
retrieving revision 2.75
diff -C2 -d -r2.74 -r2.75
*** getargs.c	2001年10月27日 04:33:41	2.74
--- getargs.c	2001年10月27日 04:38:11	2.75
***************
*** 1032,1037 ****
 	char *fname, *message;
 	int min, max;
! 	char *formatsave = format;
! 	int i, len, argslen, kwlen;
 	char *msg, *ks, **p;
 	int nkwds, pos, match, converted;
--- 1032,1037 ----
 	char *fname, *message;
 	int min, max;
! 	char *formatsave;
! 	int i, len, nargs, nkeywords;
 	char *msg, *ks, **p;
 	int nkwds, pos, match, converted;
***************
*** 1052,1055 ****
--- 1052,1056 ----
 	*/
 	fname = message = NULL;
+ 	formatsave = format;
 	min = -1;
 	max = 0;
***************
*** 1079,1087 ****
 	format = formatsave;
 
! 	argslen = PyTuple_GET_SIZE(args);
 
 	/* do a cursory check of the keywords just to see how many we got */
 
! 	kwlen = 0;
 	if (keywords) { 	
 		if (!PyDict_Check(keywords)) {
--- 1080,1088 ----
 	format = formatsave;
 
! 	nargs = PyTuple_GET_SIZE(args);
 
 	/* do a cursory check of the keywords just to see how many we got */
 
! 	nkeywords = 0;
 	if (keywords) { 	
 		if (!PyDict_Check(keywords)) {
***************
*** 1091,1095 ****
 			return 0;
 		}	
! 		kwlen = PyDict_Size(keywords);
 	}
 			
--- 1092,1096 ----
 			return 0;
 		}	
! 		nkeywords = PyDict_Size(keywords);
 	}
 			
***************
*** 1099,1103 ****
 
 	if (keywords) {
! 		for (i = 0; i < argslen; i++) {
 			char *thiskw = kwlist[i];
 			if (thiskw == NULL)
--- 1100,1104 ----
 
 	if (keywords) {
! 		for (i = 0; i < nargs; i++) {
 			char *thiskw = kwlist[i];
 			if (thiskw == NULL)
***************
*** 1124,1130 ****
 	 arguments */
 	
! 	len = argslen;
! 	if (keywords && argslen < min) {
! 		for (i = argslen; i < min; i++) {
 		 if (PyMapping_HasKeyString(keywords, kwlist[i])) {
 				len++;
--- 1125,1131 ----
 	 arguments */
 	
! 	len = nargs;
! 	if (keywords && nargs < min) {
! 		for (i = nargs; i < min; i++) {
 		 if (PyMapping_HasKeyString(keywords, kwlist[i])) {
 				len++;
***************
*** 1156,1160 ****
 	}
 	
! 	for (i = 0; i < argslen; i++) {
 		if (*format == '|')
 			format++;
--- 1157,1161 ----
 	}
 	
! 	for (i = 0; i < nargs; i++) {
 		if (*format == '|')
 			format++;
***************
*** 1192,1196 ****
 	
 	converted = 0;
! 	for (i = argslen; i < nkwds; i++) {
 		PyObject *item;
 		if (*format == '|')
--- 1193,1197 ----
 	
 	converted = 0;
! 	for (i = nargs; i < nkwds; i++) {
 		PyObject *item;
 		if (*format == '|')
***************
*** 1219,1223 ****
 	
 	pos = 0;
! 	if (converted < kwlen) {
 		while (PyDict_Next(keywords, &pos, &key, &value)) {
 			match = 0;
--- 1220,1224 ----
 	
 	pos = 0;
! 	if (converted < nkeywords) {
 		while (PyDict_Next(keywords, &pos, &key, &value)) {
 			match = 0;