[Python-checkins] CVS: python/dist/src/Parser myreadline.c,2.17,2.18 parsetok.c,2.17,2.18 pgenmain.c,2.16,2.17 tokenizer.c,2.41,2.42

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Parser
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6150

Modified Files:
	myreadline.c parsetok.c pgenmain.c tokenizer.c 
Log Message:
Trent Mick: familiar simple Win64 patches

Index: myreadline.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/myreadline.c,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -r2.17 -r2.18
*** myreadline.c	2000/05/03 23:44:37	2.17
--- myreadline.c	2000/06/28 22:00:02	2.18
***************
*** 87,91 ****
  	char *prompt;
  {
! 	int n;
  	char *p;
  	n = 100;
--- 87,91 ----
  	char *prompt;
  {
! 	size_t n;
  	char *p;
  	n = 100;
***************
*** 96,100 ****
  		fprintf(stderr, "%s", prompt);
  	fflush(stderr);
! 	switch (my_fgets(p, n, stdin)) {
  	case 0: /* Normal case */
  		break;
--- 96,100 ----
  		fprintf(stderr, "%s", prompt);
  	fflush(stderr);
! 	switch (my_fgets(p, (int)n, stdin)) {
  	case 0: /* Normal case */
  		break;
***************
*** 117,125 ****
  	n = strlen(p);
  	while (n > 0 && p[n-1] != '\n') {
! 		int incr = n+2;
  		p = PyMem_REALLOC(p, n + incr);
  		if (p == NULL)
  			return NULL;
! 		if (my_fgets(p+n, incr, stdin) != 0)
  			break;
  		n += strlen(p+n);
--- 117,128 ----
  	n = strlen(p);
  	while (n > 0 && p[n-1] != '\n') {
! 		size_t incr = n+2;
  		p = PyMem_REALLOC(p, n + incr);
  		if (p == NULL)
  			return NULL;
! 		if (incr > INT_MAX) {
! 			PyErr_SetString(PyExc_OverflowError, "input line too long");
! 		}
! 		if (my_fgets(p+n, (int)incr, stdin) != 0)
  			break;
  		n += strlen(p+n);

Index: parsetok.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/parsetok.c,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -r2.17 -r2.18
*** parsetok.c	2000/06/28 20:54:53	2.17
--- parsetok.c	2000/06/28 22:00:02	2.18
***************
*** 137,141 ****
  		char *a, *b;
  		int type;
! 		int len;
  		char *str;
  
--- 137,141 ----
  		char *a, *b;
  		int type;
! 		size_t len;
  		char *str;
  
***************
*** 185,189 ****
  		err_ret->offset = tok->cur - tok->buf;
  		if (tok->buf != NULL) {
! 			int len = tok->inp - tok->buf;
  			err_ret->text = PyMem_NEW(char, len + 1);
  			if (err_ret->text != NULL) {
--- 185,189 ----
  		err_ret->offset = tok->cur - tok->buf;
  		if (tok->buf != NULL) {
! 			size_t len = tok->inp - tok->buf;
  			err_ret->text = PyMem_NEW(char, len + 1);
  			if (err_ret->text != NULL) {

Index: pgenmain.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/pgenmain.c,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -r2.16 -r2.17
*** pgenmain.c	2000/05/03 23:44:37	2.16
--- pgenmain.c	2000/06/28 22:00:02	2.17
***************
*** 128,132 ****
  			err.error, err.lineno);
  		if (err.text != NULL) {
! 			int i;
  			fprintf(stderr, "%s", err.text);
  			i = strlen(err.text);
--- 128,132 ----
  			err.error, err.lineno);
  		if (err.text != NULL) {
! 			size_t i;
  			fprintf(stderr, "%s", err.text);
  			i = strlen(err.text);
***************
*** 196,200 ****
  	char *prompt;
  {
! 	int n = 1000;
  	char *p = PyMem_MALLOC(n);
  	char *q;
--- 196,200 ----
  	char *prompt;
  {
! 	size_t n = 1000;
  	char *p = PyMem_MALLOC(n);
  	char *q;

Index: tokenizer.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/tokenizer.c,v
retrieving revision 2.41
retrieving revision 2.42
diff -C2 -r2.41 -r2.42
*** tokenizer.c	2000/05/03 23:44:37	2.41
--- tokenizer.c	2000/06/28 22:00:02	2.42
***************
*** 224,230 ****
  			}
  			else if (tok->start != NULL) {
! 				int start = tok->start - tok->buf;
! 				int oldlen = tok->cur - tok->buf;
! 				int newlen = oldlen + strlen(new);
  				char *buf = tok->buf;
  				PyMem_RESIZE(buf, char, newlen+1);
--- 224,230 ----
  			}
  			else if (tok->start != NULL) {
! 				size_t start = tok->start - tok->buf;
! 				size_t oldlen = tok->cur - tok->buf;
! 				size_t newlen = oldlen + strlen(new);
  				char *buf = tok->buf;
  				PyMem_RESIZE(buf, char, newlen+1);