[Python-checkins] python/dist/src/Parser intrcheck.c, 2.44, 2.45 pgenmain.c, 2.28, 2.29 tokenizer.c, 2.73, 2.74

jackjansen at users.sourceforge.net jackjansen at users.sourceforge.net
Wed Nov 19 20:45:00 EST 2003


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

Modified Files:
	intrcheck.c pgenmain.c tokenizer.c 
Log Message:
Getting rid of all the code inside #ifdef macintosh too.


Index: intrcheck.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/intrcheck.c,v
retrieving revision 2.44
retrieving revision 2.45
diff -C2 -d -r2.44 -r2.45
*** intrcheck.c	12 Jan 2002 11:05:09 -0000	2.44
--- intrcheck.c	20 Nov 2003 01:44:58 -0000	2.45
***************
*** 93,104 ****
  
  
- #ifdef macintosh
- 
- /* The Mac interrupt code has moved to macglue.c */
- #define OK
- 
- #endif /* macintosh */
- 
- 
  #ifndef OK
  
--- 93,96 ----

Index: pgenmain.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/pgenmain.c,v
retrieving revision 2.28
retrieving revision 2.29
diff -C2 -d -r2.28 -r2.29
*** pgenmain.c	27 Oct 2002 01:59:21 -0000	2.28
--- pgenmain.c	20 Nov 2003 01:44:58 -0000	2.29
***************
*** 154,166 ****
  }
  
- #ifdef macintosh
- /* ARGSUSED */
- int
- guesstabsize(char *path)
- {
- 	return 4;
- }
- #endif
- 
  /* No-nonsense my_readline() for tokenizer.c */
  
--- 154,157 ----

Index: tokenizer.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/tokenizer.c,v
retrieving revision 2.73
retrieving revision 2.74
diff -C2 -d -r2.73 -r2.74
*** tokenizer.c	17 Feb 2003 18:31:57 -0000	2.73
--- tokenizer.c	20 Nov 2003 01:44:58 -0000	2.74
***************
*** 785,789 ****
  			}
  			tok->cur = tok->buf + cur;
- #ifndef macintosh
  			/* replace "\r\n" with "\n" */
  			/* For Mac we leave the \r, giving a syntax error */
--- 785,788 ----
***************
*** 794,798 ****
  				tok->inp = pt;
  			}
- #endif
  		}
  		if (tok->done != E_OK) {
--- 793,796 ----
***************
*** 1186,1198 ****
  	}
  	
- #ifdef macintosh
- 	if (c == '\r') {
- 		PySys_WriteStderr(
- 		  "File contains \\r characters (incorrect line endings?)\n");
- 		tok->done = E_TOKEN;
- 		tok->cur = tok->inp;
- 		return ERRORTOKEN;
- 	}
- #endif	
  	/* Period or number starting with period? */
  	if (c == '.') {
--- 1184,1187 ----





More information about the Python-checkins mailing list