[Python-checkins] CVS: python/dist/src/Parser acceler.c,2.14,2.15 firstsets.c,2.9,2.10 grammar.c,2.15,2.16 intrcheck.c,2.32,2.33 listnode.c,2.11,2.12 myreadline.c,2.21,2.22 node.c,2.10,2.11 parser.c,2.13,2.14 parser.h,2.11,2.12 parsetok.c,2.20,2.21 pgen.c,2.14,2.15 pgen.h,2.11,2.12 pgenmain.c,2.19,2.20 printgrammar.c,2.10,2.11 tokenizer.c,2.44,2.45 tokenizer.h,2.14,2.15
Tim Peters
python-dev@python.org
Sat, 8 Jul 2000 20:09:59 -0700
- Previous message: [Python-checkins] CVS: python/dist/src/Tools/freeze makefreeze.py,1.10,1.11
- Next message: [Python-checkins] CVS: python/dist/src/Python bltinmodule.c,2.168,2.169 ceval.c,2.182,2.183 compile.c,2.113,2.114 errors.c,2.47,2.48 getargs.c,2.38,2.39 import.c,2.139,2.140 importdl.h,2.14,2.15 marshal.c,1.51,1.52 modsupport.c,2.47,2.48 pythonrun.c,2.100,2.101 sysmodule.c,2.68,2.69
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src/Parser
In directory slayer.i.sourceforge.net:/tmp/cvs-serv8264/python/dist/src/Parser
Modified Files:
acceler.c firstsets.c grammar.c intrcheck.c listnode.c
myreadline.c node.c parser.c parser.h parsetok.c pgen.c pgen.h
pgenmain.c printgrammar.c tokenizer.c tokenizer.h
Log Message:
Nuke all remaining occurrences of Py_PROTO and Py_FPROTO.
Index: acceler.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/acceler.c,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** acceler.c 2000/06/30 23:58:05 2.14
--- acceler.c 2000/07/09 03:09:56 2.15
***************
*** 27,32 ****
/* Forward references */
! static void fixdfa Py_PROTO((grammar *, dfa *));
! static void fixstate Py_PROTO((grammar *, state *));
void
--- 27,32 ----
/* Forward references */
! static void fixdfa(grammar *, dfa *);
! static void fixstate(grammar *, state *);
void
Index: firstsets.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/firstsets.c,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** firstsets.c 2000/06/30 23:58:05 2.9
--- firstsets.c 2000/07/09 03:09:56 2.10
***************
*** 18,22 ****
/* Forward */
! static void calcfirstset Py_PROTO((grammar *, dfa *));
void
--- 18,22 ----
/* Forward */
! static void calcfirstset(grammar *, dfa *);
void
Index: grammar.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/grammar.c,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** grammar.c 2000/06/30 23:58:05 2.15
--- grammar.c 2000/07/09 03:09:56 2.16
***************
*** 143,147 ****
/* Forward */
! static void translabel Py_PROTO((grammar *, label *));
void
--- 143,147 ----
/* Forward */
! static void translabel(grammar *, label *);
void
Index: intrcheck.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/intrcheck.c,v
retrieving revision 2.32
retrieving revision 2.33
diff -C2 -r2.32 -r2.33
*** intrcheck.c 2000/06/30 23:58:05 2.32
--- intrcheck.c 2000/07/09 03:09:56 2.33
***************
*** 23,27 ****
/* Copied here from ceval.h -- can't include that file. */
! int Py_AddPendingCall Py_PROTO((int (*func) Py_PROTO((ANY *)), ANY *arg));
--- 23,27 ----
/* Copied here from ceval.h -- can't include that file. */
! int Py_AddPendingCall(int (*func)(ANY *), ANY *arg);
***************
*** 153,157 ****
#endif /* _M_IX86 */
{
! extern void Py_Exit Py_PROTO((int));
static char message[] =
"python: to interrupt a truly hanging Python program, interrupt once more.\n";
--- 153,157 ----
#endif /* _M_IX86 */
{
! extern void Py_Exit(int);
static char message[] =
"python: to interrupt a truly hanging Python program, interrupt once more.\n";
Index: listnode.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/listnode.c,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -r2.11 -r2.12
*** listnode.c 2000/06/30 23:58:05 2.11
--- listnode.c 2000/07/09 03:09:56 2.12
***************
*** 16,21 ****
/* Forward */
! static void list1node Py_PROTO((FILE *, node *));
! static void listnode Py_PROTO((FILE *, node *));
void
--- 16,21 ----
/* Forward */
! static void list1node(FILE *, node *);
! static void listnode(FILE *, node *);
void
Index: myreadline.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/myreadline.c,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -r2.21 -r2.22
*** myreadline.c 2000/07/03 21:39:47 2.21
--- myreadline.c 2000/07/09 03:09:56 2.22
***************
*** 119,123 ****
Note: Python expects in return a buffer allocated with PyMem_Malloc. */
! char *(*PyOS_ReadlineFunctionPointer) Py_PROTO((char *));
--- 119,123 ----
Note: Python expects in return a buffer allocated with PyMem_Malloc. */
! char *(*PyOS_ReadlineFunctionPointer)(char *);
Index: node.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/node.c,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** node.c 2000/06/30 23:58:05 2.10
--- node.c 2000/07/09 03:09:56 2.11
***************
*** 65,69 ****
/* Forward */
! static void freechildren Py_PROTO((node *));
--- 65,69 ----
/* Forward */
! static void freechildren(node *);
Index: parser.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/parser.c,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** parser.c 2000/06/30 23:58:05 2.13
--- parser.c 2000/07/09 03:09:56 2.14
***************
*** 34,38 ****
/* STACK DATA TYPE */
! static void s_reset Py_PROTO((stack *));
static void
--- 34,38 ----
/* STACK DATA TYPE */
! static void s_reset(stack *);
static void
***************
*** 45,49 ****
#define s_empty(s) ((s)->s_top == &(s)->s_base[MAXSTACK])
! static int s_push Py_PROTO((stack *, dfa *, node *));
static int
--- 45,49 ----
#define s_empty(s) ((s)->s_top == &(s)->s_base[MAXSTACK])
! static int s_push(stack *, dfa *, node *);
static int
***************
*** 67,71 ****
#ifdef Py_DEBUG
! static void s_pop Py_PROTO((stack *));
static void
--- 67,71 ----
#ifdef Py_DEBUG
! static void s_pop(stack *);
static void
***************
*** 123,127 ****
/* PARSER STACK OPERATIONS */
! static int shift Py_PROTO((stack *, int, char *, int, int));
static int
--- 123,127 ----
/* PARSER STACK OPERATIONS */
! static int shift(stack *, int, char *, int, int);
static int
***************
*** 142,146 ****
}
! static int push Py_PROTO((stack *, int, dfa *, int, int));
static int
--- 142,146 ----
}
! static int push(stack *, int, dfa *, int, int);
static int
***************
*** 166,170 ****
/* PARSER PROPER */
! static int classify Py_PROTO((grammar *, int, char *));
static int
--- 166,170 ----
/* PARSER PROPER */
! static int classify(grammar *, int, char *);
static int
Index: parser.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/parser.h,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -r2.11 -r2.12
*** parser.h 2000/06/30 23:58:05 2.11
--- parser.h 2000/07/09 03:09:56 2.12
***************
*** 37,45 ****
} parser_state;
! parser_state *PyParser_New Py_PROTO((grammar *g, int start));
! void PyParser_Delete Py_PROTO((parser_state *ps));
! int PyParser_AddToken
! Py_PROTO((parser_state *ps, int type, char *str, int lineno));
! void PyGrammar_AddAccelerators Py_PROTO((grammar *g));
#ifdef __cplusplus
--- 37,44 ----
} parser_state;
! parser_state *PyParser_New(grammar *g, int start);
! void PyParser_Delete(parser_state *ps);
! int PyParser_AddToken(parser_state *ps, int type, char *str, int lineno);
! void PyGrammar_AddAccelerators(grammar *g);
#ifdef __cplusplus
Index: parsetok.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/parsetok.c,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** parsetok.c 2000/06/30 23:58:05 2.20
--- parsetok.c 2000/07/09 03:09:56 2.21
***************
*** 23,28 ****
/* Forward */
! static node *parsetok Py_PROTO((struct tok_state *, grammar *, int,
! perrdetail *));
/* Parse input coming from a string. Return error code, print some errors. */
--- 23,27 ----
/* Forward */
! static node *parsetok(struct tok_state *, grammar *, int, perrdetail *);
/* Parse input coming from a string. Return error code, print some errors. */
Index: pgen.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/pgen.c,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** pgen.c 2000/06/30 23:58:05 2.14
--- pgen.c 2000/07/09 03:09:56 2.15
***************
*** 46,57 ****
/* Forward */
! static void compile_rhs Py_PROTO((labellist *ll,
! nfa *nf, node *n, int *pa, int *pb));
! static void compile_alt Py_PROTO((labellist *ll,
! nfa *nf, node *n, int *pa, int *pb));
! static void compile_item Py_PROTO((labellist *ll,
! nfa *nf, node *n, int *pa, int *pb));
! static void compile_atom Py_PROTO((labellist *ll,
! nfa *nf, node *n, int *pa, int *pb));
static int
--- 46,57 ----
/* Forward */
! static void compile_rhs(labellist *ll,
! nfa *nf, node *n, int *pa, int *pb);
! static void compile_alt(labellist *ll,
! nfa *nf, node *n, int *pa, int *pb);
! static void compile_item(labellist *ll,
! nfa *nf, node *n, int *pa, int *pb);
! static void compile_atom(labellist *ll,
! nfa *nf, node *n, int *pa, int *pb);
static int
***************
*** 112,116 ****
/* Forward */
! static void compile_rule Py_PROTO((nfagrammar *gr, node *n));
static nfagrammar *
--- 112,116 ----
/* Forward */
! static void compile_rule(nfagrammar *gr, node *n);
static nfagrammar *
***************
*** 421,428 ****
/* Forward */
! static void printssdfa Py_PROTO((int xx_nstates, ss_state *xx_state, int nbits,
! labellist *ll, char *msg));
! static void simplify Py_PROTO((int xx_nstates, ss_state *xx_state));
! static void convert Py_PROTO((dfa *d, int xx_nstates, ss_state *xx_state));
static void
--- 421,428 ----
/* Forward */
! static void printssdfa(int xx_nstates, ss_state *xx_state, int nbits,
! labellist *ll, char *msg);
! static void simplify(int xx_nstates, ss_state *xx_state);
! static void convert(dfa *d, int xx_nstates, ss_state *xx_state);
static void
Index: pgen.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/pgen.h,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -r2.11 -r2.12
*** pgen.h 2000/06/30 23:58:05 2.11
--- pgen.h 2000/07/09 03:09:56 2.12
***************
*** 17,24 ****
/* Parser generator interface */
! extern grammar *meta_grammar Py_PROTO((void));
struct _node;
! extern grammar *pgen Py_PROTO((struct _node *));
#ifdef __cplusplus
--- 17,24 ----
/* Parser generator interface */
! extern grammar *meta_grammar(void);
struct _node;
! extern grammar *pgen(struct _node *);
#ifdef __cplusplus
Index: pgenmain.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/pgenmain.c,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** pgenmain.c 2000/06/30 23:58:05 2.19
--- pgenmain.c 2000/07/09 03:09:56 2.20
***************
*** 33,40 ****
/* Forward */
! grammar *getgrammar Py_PROTO((char *filename));
#ifdef THINK_C
! int main Py_PROTO((int, char **));
! char *askfile Py_PROTO((void));
#endif
--- 33,40 ----
/* Forward */
! grammar *getgrammar(char *filename);
#ifdef THINK_C
! int main(int, char **);
! char *askfile(void);
#endif
Index: printgrammar.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/printgrammar.c,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** printgrammar.c 2000/06/30 23:58:05 2.10
--- printgrammar.c 2000/07/09 03:09:56 2.11
***************
*** 15,22 ****
/* Forward */
! static void printarcs Py_PROTO((int, dfa *, FILE *));
! static void printstates Py_PROTO((grammar *, FILE *));
! static void printdfas Py_PROTO((grammar *, FILE *));
! static void printlabels Py_PROTO((grammar *, FILE *));
void
--- 15,22 ----
/* Forward */
! static void printarcs(int, dfa *, FILE *);
! static void printstates(grammar *, FILE *);
! static void printdfas(grammar *, FILE *);
! static void printlabels(grammar *, FILE *);
void
Index: tokenizer.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/tokenizer.c,v
retrieving revision 2.44
retrieving revision 2.45
diff -C2 -r2.44 -r2.45
*** tokenizer.c 2000/06/30 23:58:05 2.44
--- tokenizer.c 2000/07/09 03:09:56 2.45
***************
*** 18,22 ****
#include "errcode.h"
! extern char *PyOS_Readline Py_PROTO((char *));
/* Return malloc'ed string including trailing \n;
empty malloc'ed string for EOF;
--- 18,22 ----
#include "errcode.h"
! extern char *PyOS_Readline(char *);
/* Return malloc'ed string including trailing \n;
empty malloc'ed string for EOF;
***************
*** 35,41 ****
/* Forward */
! static struct tok_state *tok_new Py_PROTO((void));
! static int tok_nextc Py_PROTO((struct tok_state *tok));
! static void tok_backup Py_PROTO((struct tok_state *tok, int c));
/* Token names */
--- 35,41 ----
/* Forward */
! static struct tok_state *tok_new(void);
! static int tok_nextc(struct tok_state *tok);
! static void tok_backup(struct tok_state *tok, int c);
/* Token names */
Index: tokenizer.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/tokenizer.h,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** tokenizer.h 2000/06/30 23:58:05 2.14
--- tokenizer.h 2000/07/09 03:09:56 2.15
***************
*** 50,58 ****
};
! extern struct tok_state *PyTokenizer_FromString Py_PROTO((char *));
! extern struct tok_state *PyTokenizer_FromFile
! Py_PROTO((FILE *, char *, char *));
! extern void PyTokenizer_Free Py_PROTO((struct tok_state *));
! extern int PyTokenizer_Get Py_PROTO((struct tok_state *, char **, char **));
#ifdef __cplusplus
--- 50,57 ----
};
! extern struct tok_state *PyTokenizer_FromString(char *);
! extern struct tok_state *PyTokenizer_FromFile(FILE *, char *, char *);
! extern void PyTokenizer_Free(struct tok_state *);
! extern int PyTokenizer_Get(struct tok_state *, char **, char **);
#ifdef __cplusplus
- Previous message: [Python-checkins] CVS: python/dist/src/Tools/freeze makefreeze.py,1.10,1.11
- Next message: [Python-checkins] CVS: python/dist/src/Python bltinmodule.c,2.168,2.169 ceval.c,2.182,2.183 compile.c,2.113,2.114 errors.c,2.47,2.48 getargs.c,2.38,2.39 import.c,2.139,2.140 importdl.h,2.14,2.15 marshal.c,1.51,1.52 modsupport.c,2.47,2.48 pythonrun.c,2.100,2.101 sysmodule.c,2.68,2.69
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]