[Python-checkins] python/dist/src/Parser tokenizer.c,2.63,2.64

montanaro@users.sourceforge.net montanaro@users.sourceforge.net
Wed, 14 Aug 2002 18:20:18 -0700


Update of /cvsroot/python/python/dist/src/Parser
In directory usw-pr-cvs1:/tmp/cvs-serv15875/Parser

Modified Files:
	tokenizer.c 
Log Message:
provide less mysterious error messages when seeing end-of-line in
single-quoted strings or end-of-file in triple-quoted strings.
closes patch 586561.


Index: tokenizer.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/tokenizer.c,v
retrieving revision 2.63
retrieving revision 2.64
diff -C2 -d -r2.63 -r2.64
*** tokenizer.c	7 Aug 2002 15:18:56 -0000	2.63
--- tokenizer.c	15 Aug 2002 01:20:16 -0000	2.64
***************
*** 1277,1281 ****
  			if (c == '\n') {
  				if (!triple) {
! 					tok->done = E_TOKEN;
  					tok_backup(tok, c);
  					return ERRORTOKEN;
--- 1277,1281 ----
  			if (c == '\n') {
  				if (!triple) {
! 					tok->done = E_EOLS;
  					tok_backup(tok, c);
  					return ERRORTOKEN;
***************
*** 1284,1288 ****
  			}
  			else if (c == EOF) {
! 				tok->done = E_TOKEN;
  				tok->cur = tok->inp;
  				return ERRORTOKEN;
--- 1284,1291 ----
  			}
  			else if (c == EOF) {
! 				if (triple)
! 					tok->done = E_EOFS;
! 				else
! 					tok->done = E_EOLS;
  				tok->cur = tok->inp;
  				return ERRORTOKEN;
***************
*** 1306,1310 ****
  				c = tok_nextc(tok);
  				if (c == EOF) {
! 					tok->done = E_TOKEN;
  					tok->cur = tok->inp;
  					return ERRORTOKEN;
--- 1309,1313 ----
  				c = tok_nextc(tok);
  				if (c == EOF) {
! 					tok->done = E_EOLS;
  					tok->cur = tok->inp;
  					return ERRORTOKEN;