[Python-checkins] python/dist/src/Parser parsetok.c,2.33,2.34 tokenizer.c,2.69,2.70 tokenizer.h,2.19,2.20

[loewis@users.sourceforge.net]

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

Modified Files:
	parsetok.c tokenizer.c tokenizer.h 
Log Message:
Constify filenames and scripts. Fixes #651362.


Index: parsetok.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/parsetok.c,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -d -r2.33 -r2.34
*** parsetok.c	4 Aug 2002 17:29:52 -0000	2.33
--- parsetok.c	11 Dec 2002 14:04:58 -0000	2.34
***************
*** 16,24 ****
  /* Forward */
  static node *parsetok(struct tok_state *, grammar *, int, perrdetail *, int);
! static void initerr(perrdetail *err_ret, char* filename);
  
  /* Parse input coming from a string.  Return error code, print some errors. */
  node *
! PyParser_ParseString(char *s, grammar *g, int start, perrdetail *err_ret)
  {
  	return PyParser_ParseStringFlags(s, g, start, err_ret, 0);
--- 16,24 ----
  /* Forward */
  static node *parsetok(struct tok_state *, grammar *, int, perrdetail *, int);
! static void initerr(perrdetail *err_ret, const char* filename);
  
  /* Parse input coming from a string.  Return error code, print some errors. */
  node *
! PyParser_ParseString(const char *s, grammar *g, int start, perrdetail *err_ret)
  {
  	return PyParser_ParseStringFlags(s, g, start, err_ret, 0);
***************
*** 26,30 ****
  
  node *
! PyParser_ParseStringFlags(char *s, grammar *g, int start,
  		          perrdetail *err_ret, int flags)
  {
--- 26,30 ----
  
  node *
! PyParser_ParseStringFlags(const char *s, grammar *g, int start,
  		          perrdetail *err_ret, int flags)
  {
***************
*** 34,38 ****
  
  node *
! PyParser_ParseStringFlagsFilename(char *s, char *filename,
  			  grammar *g, int start,
  		          perrdetail *err_ret, int flags)
--- 34,38 ----
  
  node *
! PyParser_ParseStringFlagsFilename(const char *s, const char *filename,
  			  grammar *g, int start,
  		          perrdetail *err_ret, int flags)
***************
*** 61,65 ****
  
  node *
! PyParser_ParseFile(FILE *fp, char *filename, grammar *g, int start,
  		   char *ps1, char *ps2, perrdetail *err_ret)
  {
--- 61,65 ----
  
  node *
! PyParser_ParseFile(FILE *fp, const char *filename, grammar *g, int start,
  		   char *ps1, char *ps2, perrdetail *err_ret)
  {
***************
*** 69,73 ****
  
  node *
! PyParser_ParseFileFlags(FILE *fp, char *filename, grammar *g, int start,
  			char *ps1, char *ps2, perrdetail *err_ret, int flags)
  {
--- 69,73 ----
  
  node *
! PyParser_ParseFileFlags(FILE *fp, const char *filename, grammar *g, int start,
  			char *ps1, char *ps2, perrdetail *err_ret, int flags)
  {
***************
*** 202,206 ****
  
  static void
! initerr(perrdetail *err_ret, char* filename)
  {
  	err_ret->error = E_OK;
--- 202,206 ----
  
  static void
! initerr(perrdetail *err_ret, const char* filename)
  {
  	err_ret->error = E_OK;

Index: tokenizer.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/tokenizer.c,v
retrieving revision 2.69
retrieving revision 2.70
diff -C2 -d -r2.69 -r2.70
*** tokenizer.c	2 Nov 2002 20:43:25 -0000	2.69
--- tokenizer.c	11 Dec 2002 14:04:58 -0000	2.70
***************
*** 387,391 ****
  	PyObject *reader, *stream, *readline;
  
! 	stream = PyFile_FromFile(tok->fp, tok->filename, "rb", NULL);
  	if (stream == NULL)
  		return 0;
--- 387,392 ----
  	PyObject *reader, *stream, *readline;
  
! 	/* XXX: constify filename argument. */
! 	stream = PyFile_FromFile(tok->fp, (char*)tok->filename, "rb", NULL);
  	if (stream == NULL)
  		return 0;
***************
*** 592,596 ****
  
  struct tok_state *
! PyTokenizer_FromString(char *str)
  {
  	struct tok_state *tok = tok_new();
--- 593,597 ----
  
  struct tok_state *
! PyTokenizer_FromString(const char *str)
  {
  	struct tok_state *tok = tok_new();
***************
*** 600,604 ****
  	if (str == NULL)
  		return NULL;
! 	tok->buf = tok->cur = tok->end = tok->inp = str;
  	return tok;
  }
--- 601,606 ----
  	if (str == NULL)
  		return NULL;
! 	/* XXX: constify members. */
! 	tok->buf = tok->cur = tok->end = tok->inp = (char*)str;
  	return tok;
  }

Index: tokenizer.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/tokenizer.h,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -d -r2.19 -r2.20
*** tokenizer.h	3 Sep 2002 11:52:44 -0000	2.19
--- tokenizer.h	11 Dec 2002 14:04:58 -0000	2.20
***************
*** 35,39 ****
  			/* Used to allow free continuations inside them */
  	/* Stuff for checking on different tab sizes */
! 	char *filename;	/* For error messages */
  	int altwarning;	/* Issue warning if alternate tabs don't match */
  	int alterror;	/* Issue error if alternate tabs don't match */
--- 35,39 ----
  			/* Used to allow free continuations inside them */
  	/* Stuff for checking on different tab sizes */
! 	const char *filename;	/* For error messages */
  	int altwarning;	/* Issue warning if alternate tabs don't match */
  	int alterror;	/* Issue error if alternate tabs don't match */
***************
*** 55,59 ****
  };
  
! extern struct tok_state *PyTokenizer_FromString(char *);
  extern struct tok_state *PyTokenizer_FromFile(FILE *, char *, char *);
  extern void PyTokenizer_Free(struct tok_state *);
--- 55,59 ----
  };
  
! extern struct tok_state *PyTokenizer_FromString(const char *);
  extern struct tok_state *PyTokenizer_FromFile(FILE *, char *, char *);
  extern void PyTokenizer_Free(struct tok_state *);