[Python-checkins] CVS: python/dist/src/Parser acceler.c,2.15,2.16 bitset.c,2.9,2.10 firstsets.c,2.10,2.11 grammar.c,2.16,2.17 grammar1.c,2.10,2.11 intrcheck.c,2.33,2.34 listnode.c,2.12,2.13 metagrammar.c,2.9,2.10 myreadline.c,2.22,2.23 node.c,2.11,2.12 parser.c,2.15,2.16 parsetok.c,2.22,2.23 pgen.c,2.16,2.17 pgenmain.c,2.20,2.21 printgrammar.c,2.11,2.12 tokenizer.c,2.46,2.47
Thomas Wouters
python-dev@python.org
2000年7月22日 12:20:57 -0700
- Previous message: [Python-checkins] CVS: python/nondist/sandbox/doctools textdoc.py,NONE,1.1 README,1.1,1.2 htmldoc.py,1.1,1.2 onlinehelp.py,1.1,1.2
- Next message: [Python-checkins] CVS: python/dist/src/Demo/embed demo.c,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src/Parser
In directory slayer.i.sourceforge.net:/tmp/cvs-serv24210
Modified Files:
acceler.c bitset.c firstsets.c grammar.c grammar1.c
intrcheck.c listnode.c metagrammar.c myreadline.c node.c
parser.c parsetok.c pgen.c pgenmain.c printgrammar.c
tokenizer.c
Log Message:
Mass ANSIfication.
Work around intrcheck.c's desire to pass 'PyErr_CheckSignals' to
'Py_AddPendingCall' by providing a (static) wrapper function that has the
right number of arguments.
Index: acceler.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/acceler.c,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** acceler.c 2000年07月09日 03:09:56 2.15
--- acceler.c 2000年07月22日 19:20:54 2.16
***************
*** 31,36 ****
void
! PyGrammar_AddAccelerators(g)
! grammar *g;
{
dfa *d;
--- 31,35 ----
void
! PyGrammar_AddAccelerators(grammar *g)
{
dfa *d;
***************
*** 49,54 ****
void
! PyGrammar_RemoveAccelerators(g)
! grammar *g;
{
dfa *d;
--- 48,52 ----
void
! PyGrammar_RemoveAccelerators(grammar *g)
{
dfa *d;
***************
*** 69,75 ****
static void
! fixdfa(g, d)
! grammar *g;
! dfa *d;
{
state *s;
--- 67,71 ----
static void
! fixdfa(grammar *g, dfa *d)
{
state *s;
***************
*** 81,87 ****
static void
! fixstate(g, s)
! grammar *g;
! state *s;
{
arc *a;
--- 77,81 ----
static void
! fixstate(grammar *g, state *s)
{
arc *a;
Index: bitset.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/bitset.c,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** bitset.c 2000年06月30日 23:58:05 2.9
--- bitset.c 2000年07月22日 19:20:54 2.10
***************
*** 15,20 ****
bitset
! newbitset(nbits)
! int nbits;
{
int nbytes = NBYTES(nbits);
--- 15,19 ----
bitset
! newbitset(int nbits)
{
int nbytes = NBYTES(nbits);
***************
*** 31,36 ****
void
! delbitset(ss)
! bitset ss;
{
PyMem_DEL(ss);
--- 30,34 ----
void
! delbitset(bitset ss)
{
PyMem_DEL(ss);
***************
*** 38,44 ****
int
! addbit(ss, ibit)
! bitset ss;
! int ibit;
{
int ibyte = BIT2BYTE(ibit);
--- 36,40 ----
int
! addbit(bitset ss, int ibit)
{
int ibyte = BIT2BYTE(ibit);
***************
*** 53,59 ****
#if 0 /* Now a macro */
int
! testbit(ss, ibit)
! bitset ss;
! int ibit;
{
return (ss[BIT2BYTE(ibit)] & BIT2MASK(ibit)) != 0;
--- 49,53 ----
#if 0 /* Now a macro */
int
! testbit(bitset ss, int ibit)
{
return (ss[BIT2BYTE(ibit)] & BIT2MASK(ibit)) != 0;
***************
*** 62,68 ****
int
! samebitset(ss1, ss2, nbits)
! bitset ss1, ss2;
! int nbits;
{
int i;
--- 56,60 ----
int
! samebitset(bitset ss1, bitset ss2, int nbits)
{
int i;
***************
*** 75,81 ****
void
! mergebitset(ss1, ss2, nbits)
! bitset ss1, ss2;
! int nbits;
{
int i;
--- 67,71 ----
void
! mergebitset(bitset ss1, bitset ss2, int nbits)
{
int i;
Index: firstsets.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/firstsets.c,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** firstsets.c 2000年07月09日 03:09:56 2.10
--- firstsets.c 2000年07月22日 19:20:54 2.11
***************
*** 21,26 ****
void
! addfirstsets(g)
! grammar *g;
{
int i;
--- 21,25 ----
void
! addfirstsets(grammar *g)
{
int i;
***************
*** 36,42 ****
static void
! calcfirstset(g, d)
! grammar *g;
! dfa *d;
{
int i, j;
--- 35,39 ----
static void
! calcfirstset(grammar *g, dfa *d)
{
int i, j;
Index: grammar.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/grammar.c,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -r2.16 -r2.17
*** grammar.c 2000年07月09日 03:09:56 2.16
--- grammar.c 2000年07月22日 19:20:54 2.17
***************
*** 22,27 ****
grammar *
! newgrammar(start)
! int start;
{
grammar *g;
--- 22,26 ----
grammar *
! newgrammar(int start)
{
grammar *g;
***************
*** 40,47 ****
dfa *
! adddfa(g, type, name)
! grammar *g;
! int type;
! char *name;
{
dfa *d;
--- 39,43 ----
dfa *
! adddfa(grammar *g, int type, char *name)
{
dfa *d;
***************
*** 61,66 ****
int
! addstate(d)
! dfa *d;
{
state *s;
--- 57,61 ----
int
! addstate(dfa *d)
{
state *s;
***************
*** 80,86 ****
void
! addarc(d, from, to, lbl)
! dfa *d;
! int lbl;
{
state *s;
--- 75,79 ----
void
! addarc(dfa *d, int from, int to, int lbl)
{
state *s;
***************
*** 100,107 ****
int
! addlabel(ll, type, str)
! labellist *ll;
! int type;
! char *str;
{
int i;
--- 93,97 ----
int
! addlabel(labellist *ll, int type, char *str)
{
int i;
***************
*** 125,132 ****
int
! findlabel(ll, type, str)
! labellist *ll;
! int type;
! char *str;
{
int i;
--- 115,119 ----
int
! findlabel(labellist *ll, int type, char *str)
{
int i;
***************
*** 146,151 ****
void
! translatelabels(g)
! grammar *g;
{
int i;
--- 133,137 ----
void
! translatelabels(grammar *g)
{
int i;
***************
*** 160,166 ****
static void
! translabel(g, lb)
! grammar *g;
! label *lb;
{
int i;
--- 146,150 ----
static void
! translabel(grammar *g, label *lb)
{
int i;
Index: grammar1.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/grammar1.c,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** grammar1.c 2000年06月30日 23:58:05 2.10
--- grammar1.c 2000年07月22日 19:20:54 2.11
***************
*** 19,25 ****
dfa *
! PyGrammar_FindDFA(g, type)
! grammar *g;
! register int type;
{
register dfa *d;
--- 19,23 ----
dfa *
! PyGrammar_FindDFA(grammar *g, register int type)
{
register dfa *d;
***************
*** 43,48 ****
char *
! PyGrammar_LabelRepr(lb)
! label *lb;
{
static char buf[100];
--- 41,45 ----
char *
! PyGrammar_LabelRepr(label *lb)
{
static char buf[100];
Index: intrcheck.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/intrcheck.c,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -r2.33 -r2.34
*** intrcheck.c 2000年07月09日 03:09:56 2.33
--- intrcheck.c 2000年07月22日 19:20:54 2.34
***************
*** 31,45 ****
void
! PyOS_InitInterrupts()
{
}
void
! PyOS_FiniInterrupts()
{
}
int
! PyOS_InterruptOccurred()
{
_wyield();
--- 31,45 ----
void
! PyOS_InitInterrupts(void)
{
}
void
! PyOS_FiniInterrupts(void)
{
}
int
! PyOS_InterruptOccurred(void)
{
_wyield();
***************
*** 67,71 ****
void
! PyOS_InitInterrupts()
{
_go32_want_ctrl_break(1 /* TRUE */);
--- 67,71 ----
void
! PyOS_InitInterrupts(void)
{
_go32_want_ctrl_break(1 /* TRUE */);
***************
*** 73,82 ****
void
! PyOS_FiniInterrupts()
{
}
int
! PyOS_InterruptOccurred()
{
return _go32_was_ctrl_break_hit();
--- 73,82 ----
void
! PyOS_FiniInterrupts(void)
{
}
int
! PyOS_InterruptOccurred(void)
{
return _go32_was_ctrl_break_hit();
***************
*** 88,102 ****
void
! PyOS_InitInterrupts()
{
}
void
! PyOS_FiniInterrupts()
{
}
int
! PyOS_InterruptOccurred()
{
int interrupted = 0;
--- 88,102 ----
void
! PyOS_InitInterrupts(void)
{
}
void
! PyOS_FiniInterrupts(void)
{
}
int
! PyOS_InterruptOccurred(void)
{
int interrupted = 0;
***************
*** 137,155 ****
void
! PyErr_SetInterrupt()
{
interrupted = 1;
}
! extern int PyErr_CheckSignals();
! /* ARGSUSED */
static RETSIGTYPE
! #if defined(_M_IX86) && !defined(__QNX__)
! intcatcher(int sig) /* So the C compiler shuts up */
! #else /* _M_IX86 */
! intcatcher(sig)
! int sig; /* Not used by required by interface */
! #endif /* _M_IX86 */
{
extern void Py_Exit(int);
--- 137,155 ----
void
! PyErr_SetInterrupt(void)
{
interrupted = 1;
}
! extern int PyErr_CheckSignals(void);
! static int
! checksignals_witharg(void * arg)
! {
! return PyErr_CheckSignals();
! }
!
static RETSIGTYPE
! intcatcher(int sig)
{
extern void Py_Exit(int);
***************
*** 168,178 ****
}
signal(SIGINT, intcatcher);
! Py_AddPendingCall(PyErr_CheckSignals, NULL);
}
! static RETSIGTYPE (*old_siginthandler)() = SIG_DFL;
void
! PyOS_InitInterrupts()
{
if ((old_siginthandler = signal(SIGINT, SIG_IGN)) != SIG_IGN)
--- 168,178 ----
}
signal(SIGINT, intcatcher);
! Py_AddPendingCall(checksignals_witharg, NULL);
}
! static RETSIGTYPE (*old_siginthandler)(int) = SIG_DFL;
void
! PyOS_InitInterrupts(void)
{
if ((old_siginthandler = signal(SIGINT, SIG_IGN)) != SIG_IGN)
***************
*** 190,194 ****
void
! PyOS_FiniInterrupts()
{
signal(SIGINT, old_siginthandler);
--- 190,194 ----
void
! PyOS_FiniInterrupts(void)
{
signal(SIGINT, old_siginthandler);
***************
*** 196,200 ****
int
! PyOS_InterruptOccurred()
{
if (!interrupted)
--- 196,200 ----
int
! PyOS_InterruptOccurred(void)
{
if (!interrupted)
***************
*** 207,211 ****
void
! PyOS_AfterFork()
{
}
--- 207,211 ----
void
! PyOS_AfterFork(void)
{
}
Index: listnode.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/listnode.c,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** listnode.c 2000年07月09日 03:09:56 2.12
--- listnode.c 2000年07月22日 19:20:54 2.13
***************
*** 20,25 ****
void
! PyNode_ListTree(n)
! node *n;
{
listnode(stdout, n);
--- 20,24 ----
void
! PyNode_ListTree(node *n)
{
listnode(stdout, n);
***************
*** 29,35 ****
static void
! listnode(fp, n)
! FILE *fp;
! node *n;
{
level = 0;
--- 28,32 ----
static void
! listnode(FILE *fp, node *n)
{
level = 0;
***************
*** 39,45 ****
static void
! list1node(fp, n)
! FILE *fp;
! node *n;
{
if (n == 0)
--- 36,40 ----
static void
! list1node(FILE *fp, node *n)
{
if (n == 0)
Index: metagrammar.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/metagrammar.c,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** metagrammar.c 2000年06月30日 23:58:05 2.9
--- metagrammar.c 2000年07月22日 19:20:54 2.10
***************
*** 157,161 ****
grammar *
! meta_grammar()
{
return &_PyParser_Grammar;
--- 157,161 ----
grammar *
! meta_grammar(void)
{
return &_PyParser_Grammar;
Index: myreadline.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/myreadline.c,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -r2.22 -r2.23
*** myreadline.c 2000年07月09日 03:09:56 2.22
--- myreadline.c 2000年07月22日 19:20:54 2.23
***************
*** 24,28 ****
#endif
! int (*PyOS_InputHook)() = NULL;
/* This function restarts a fgets() after an EINTR error occurred
--- 24,28 ----
#endif
! int (*PyOS_InputHook)(void) = NULL;
/* This function restarts a fgets() after an EINTR error occurred
***************
*** 30,37 ****
static int
! my_fgets(buf, len, fp)
! char *buf;
! int len;
! FILE *fp;
{
char *p;
--- 30,34 ----
static int
! my_fgets(char *buf, int len, FILE *fp)
{
char *p;
***************
*** 66,71 ****
char *
! PyOS_StdioReadline(prompt)
! char *prompt;
{
size_t n;
--- 63,67 ----
char *
! PyOS_StdioReadline(char *prompt)
{
size_t n;
***************
*** 125,130 ****
char *
! PyOS_Readline(prompt)
! char *prompt;
{
char *rv;
--- 121,125 ----
char *
! PyOS_Readline(char *prompt)
{
char *rv;
Index: node.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/node.c,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -r2.11 -r2.12
*** node.c 2000年07月09日 03:09:56 2.11
--- node.c 2000年07月22日 19:20:54 2.12
***************
*** 18,23 ****
node *
! PyNode_New(type)
! int type;
{
node *n = PyMem_NEW(node, 1);
--- 18,22 ----
node *
! PyNode_New(int type)
{
node *n = PyMem_NEW(node, 1);
***************
*** 36,44 ****
int
! PyNode_AddChild(n1, type, str, lineno)
! register node *n1;
! int type;
! char *str;
! int lineno;
{
register int nch = n1->n_nchildren;
--- 35,39 ----
int
! PyNode_AddChild(register node *n1, int type, char *str, int lineno)
{
register int nch = n1->n_nchildren;
***************
*** 69,74 ****
void
! PyNode_Free(n)
! node *n;
{
if (n != NULL) {
--- 64,68 ----
void
! PyNode_Free(node *n)
{
if (n != NULL) {
***************
*** 79,84 ****
static void
! freechildren(n)
! node *n;
{
int i;
--- 73,77 ----
static void
! freechildren(node *n)
{
int i;
Index: parser.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/parser.c,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** parser.c 2000年07月11日 17:52:59 2.15
--- parser.c 2000年07月22日 19:20:54 2.16
***************
*** 37,42 ****
static void
! s_reset(s)
! stack *s;
{
s->s_top = &s->s_base[MAXSTACK];
--- 37,41 ----
static void
! s_reset(stack *s)
{
s->s_top = &s->s_base[MAXSTACK];
***************
*** 45,55 ****
#define s_empty(s) ((s)->s_top == &(s)->s_base[MAXSTACK])
- static int s_push(stack *, dfa *, node *);
-
static int
! s_push(s, d, parent)
! register stack *s;
! dfa *d;
! node *parent;
{
register stackentry *top;
--- 44,49 ----
#define s_empty(s) ((s)->s_top == &(s)->s_base[MAXSTACK])
static int
! s_push(register stack *s, dfa *d, node *parent)
{
register stackentry *top;
***************
*** 67,75 ****
#ifdef Py_DEBUG
- static void s_pop(stack *);
-
static void
! s_pop(s)
! register stack *s;
{
if (s_empty(s))
--- 61,66 ----
#ifdef Py_DEBUG
static void
! s_pop(register stack *s)
{
if (s_empty(s))
***************
*** 88,94 ****
parser_state *
! PyParser_New(g, start)
! grammar *g;
! int start;
{
parser_state *ps;
--- 79,83 ----
parser_state *
! PyParser_New(grammar *g, int start)
{
parser_state *ps;
***************
*** 111,116 ****
void
! PyParser_Delete(ps)
! parser_state *ps;
{
/* NB If you want to save the parse tree,
--- 100,104 ----
void
! PyParser_Delete(parser_state *ps)
{
/* NB If you want to save the parse tree,
***************
*** 123,135 ****
/* PARSER STACK OPERATIONS */
- static int shift(stack *, int, char *, int, int);
-
static int
! shift(s, type, str, newstate, lineno)
! register stack *s;
! int type;
! char *str;
! int newstate;
! int lineno;
{
int err;
--- 111,116 ----
/* PARSER STACK OPERATIONS */
static int
! shift(register stack *s, int type, char *str, int newstate, int lineno)
{
int err;
***************
*** 142,154 ****
}
- static int push(stack *, int, dfa *, int, int);
-
static int
! push(s, type, d, newstate, lineno)
! register stack *s;
! int type;
! dfa *d;
! int newstate;
! int lineno;
{
int err;
--- 123,128 ----
}
static int
! push(register stack *s, int type, dfa *d, int newstate, int lineno)
{
int err;
***************
*** 166,176 ****
/* PARSER PROPER */
- static int classify(grammar *, int, char *);
-
static int
! classify(g, type, str)
! grammar *g;
! register int type;
! char *str;
{
register int n = g->g_ll.ll_nlabels;
--- 140,145 ----
/* PARSER PROPER */
static int
! classify(grammar *g, int type, char *str)
{
register int n = g->g_ll.ll_nlabels;
***************
*** 206,215 ****
int
! PyParser_AddToken(ps, type, str, lineno, expected_ret)
! register parser_state *ps;
! register int type;
! char *str;
! int lineno;
! int *expected_ret;
{
register int ilabel;
--- 175,180 ----
int
! PyParser_AddToken(register parser_state *ps, register int type, char *str,
! int lineno, int *expected_ret)
{
register int ilabel;
***************
*** 306,312 ****
void
! dumptree(g, n)
! grammar *g;
! node *n;
{
int i;
--- 271,275 ----
void
! dumptree(grammar *g, node *n)
{
int i;
***************
*** 332,338 ****
void
! showtree(g, n)
! grammar *g;
! node *n;
{
int i;
--- 295,299 ----
void
! showtree(grammar *g, node *n)
{
int i;
***************
*** 355,360 ****
void
! printtree(ps)
! parser_state *ps;
{
if (Py_DebugFlag) {
--- 316,320 ----
void
! printtree(parser_state *ps)
{
if (Py_DebugFlag) {
Index: parsetok.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/parsetok.c,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -r2.22 -r2.23
*** parsetok.c 2000年07月11日 17:52:59 2.22
--- parsetok.c 2000年07月22日 19:20:54 2.23
***************
*** 28,36 ****
node *
! PyParser_ParseString(s, g, start, err_ret)
! char *s;
! grammar *g;
! int start;
! perrdetail *err_ret;
{
struct tok_state *tok;
--- 28,32 ----
node *
! PyParser_ParseString(char *s, grammar *g, int start, perrdetail *err_ret)
{
struct tok_state *tok;
***************
*** 61,71 ****
node *
! PyParser_ParseFile(fp, filename, g, start, ps1, ps2, err_ret)
! FILE *fp;
! char *filename;
! grammar *g;
! int start;
! char *ps1, *ps2;
! perrdetail *err_ret;
{
struct tok_state *tok;
--- 57,62 ----
node *
! PyParser_ParseFile(FILE *fp, char *filename, grammar *g, int start,
! char *ps1, char *ps2, perrdetail *err_ret)
{
struct tok_state *tok;
***************
*** 96,104 ****
static node *
! parsetok(tok, g, start, err_ret)
! struct tok_state *tok;
! grammar *g;
! int start;
! perrdetail *err_ret;
{
parser_state *ps;
--- 87,91 ----
static node *
! parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret)
{
parser_state *ps;
Index: pgen.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/pgen.c,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -r2.16 -r2.17
*** pgen.c 2000年07月16日 12:04:32 2.16
--- pgen.c 2000年07月22日 19:20:54 2.17
***************
*** 56,61 ****
static int
! addnfastate(nf)
! nfa *nf;
{
nfastate *st;
--- 56,60 ----
static int
! addnfastate(nfa *nf)
{
nfastate *st;
***************
*** 71,77 ****
static void
! addnfaarc(nf, from, to, lbl)
! nfa *nf;
! int from, to, lbl;
{
nfastate *st;
--- 70,74 ----
static void
! addnfaarc(nfa *nf, int from, int to, int lbl)
{
nfastate *st;
***************
*** 88,93 ****
static nfa *
! newnfa(name)
! char *name;
{
nfa *nf;
--- 85,89 ----
static nfa *
! newnfa(char *name)
{
nfa *nf;
***************
*** 115,119 ****
static nfagrammar *
! newnfagrammar()
{
nfagrammar *gr;
--- 111,115 ----
static nfagrammar *
! newnfagrammar(void)
{
nfagrammar *gr;
***************
*** 131,137 ****
static nfa *
! addnfa(gr, name)
! nfagrammar *gr;
! char *name;
{
nfa *nf;
--- 127,131 ----
static nfa *
! addnfa(nfagrammar *gr, char *name)
{
nfa *nf;
***************
*** 161,166 ****
static nfagrammar *
! metacompile(n)
! node *n;
{
nfagrammar *gr;
--- 155,159 ----
static nfagrammar *
! metacompile(node *n)
{
nfagrammar *gr;
***************
*** 180,186 ****
static void
! compile_rule(gr, n)
! nfagrammar *gr;
! node *n;
{
nfa *nf;
--- 173,177 ----
static void
! compile_rule(nfagrammar *gr, node *n)
{
nfa *nf;
***************
*** 201,209 ****
static void
! compile_rhs(ll, nf, n, pa, pb)
! labellist *ll;
! nfa *nf;
! node *n;
! int *pa, *pb;
{
int i;
--- 192,196 ----
static void
! compile_rhs(labellist *ll, nfa *nf, node *n, int *pa, int *pb)
{
int i;
***************
*** 238,246 ****
static void
! compile_alt(ll, nf, n, pa, pb)
! labellist *ll;
! nfa *nf;
! node *n;
! int *pa, *pb;
{
int i;
--- 225,229 ----
static void
! compile_alt(labellist *ll, nfa *nf, node *n, int *pa, int *pb)
{
int i;
***************
*** 269,277 ****
static void
! compile_item(ll, nf, n, pa, pb)
! labellist *ll;
! nfa *nf;
! node *n;
! int *pa, *pb;
{
int i;
--- 252,256 ----
static void
! compile_item(labellist *ll, nfa *nf, node *n, int *pa, int *pb)
{
int i;
***************
*** 310,318 ****
static void
! compile_atom(ll, nf, n, pa, pb)
! labellist *ll;
! nfa *nf;
! node *n;
! int *pa, *pb;
{
int i;
--- 289,293 ----
static void
! compile_atom(labellist *ll, nfa *nf, node *n, int *pa, int *pb)
{
int i;
***************
*** 340,347 ****
static void
! dumpstate(ll, nf, istate)
! labellist *ll;
! nfa *nf;
! int istate;
{
nfastate *st;
--- 315,319 ----
static void
! dumpstate(labellist *ll, nfa *nf, int istate)
{
nfastate *st;
***************
*** 366,372 ****
static void
! dumpnfa(ll, nf)
! labellist *ll;
! nfa *nf;
{
int i;
--- 338,342 ----
static void
! dumpnfa(labellist *ll, nfa *nf)
{
int i;
***************
*** 382,389 ****
static void
! addclosure(ss, nf, istate)
! bitset ss;
! nfa *nf;
! int istate;
{
if (addbit(ss, istate)) {
--- 352,356 ----
static void
! addclosure(bitset ss, nfa *nf, int istate)
{
if (addbit(ss, istate)) {
***************
*** 427,434 ****
static void
! makedfa(gr, nf, d)
! nfagrammar *gr;
! nfa *nf;
! dfa *d;
{
int nbits = nf->nf_nstates;
--- 394,398 ----
static void
! makedfa(nfagrammar *gr, nfa *nf, dfa *d)
{
int nbits = nf->nf_nstates;
***************
*** 534,543 ****
static void
! printssdfa(xx_nstates, xx_state, nbits, ll, msg)
! int xx_nstates;
! ss_state *xx_state;
! int nbits;
! labellist *ll;
! char *msg;
{
int i, ibit, iarc;
--- 498,503 ----
static void
! printssdfa(int xx_nstates, ss_state *xx_state, int nbits,
! labellist *ll, char *msg)
{
int i, ibit, iarc;
***************
*** 580,585 ****
static int
! samestate(s1, s2)
! ss_state *s1, *s2;
{
int i;
--- 540,544 ----
static int
! samestate(ss_state *s1, ss_state *s2)
{
int i;
***************
*** 596,603 ****
static void
! renamestates(xx_nstates, xx_state, from, to)
! int xx_nstates;
! ss_state *xx_state;
! int from, to;
{
int i, j;
--- 555,559 ----
static void
! renamestates(int xx_nstates, ss_state *xx_state, int from, int to)
{
int i, j;
***************
*** 616,622 ****
static void
! simplify(xx_nstates, xx_state)
! int xx_nstates;
! ss_state *xx_state;
{
int changes;
--- 572,576 ----
static void
! simplify(int xx_nstates, ss_state *xx_state)
{
int changes;
***************
*** 649,656 ****
static void
! convert(d, xx_nstates, xx_state)
! dfa *d;
! int xx_nstates;
! ss_state *xx_state;
{
int i, j;
--- 603,607 ----
static void
! convert(dfa *d, int xx_nstates, ss_state *xx_state)
{
int i, j;
***************
*** 686,691 ****
static grammar *
! maketables(gr)
! nfagrammar *gr;
{
int i;
--- 637,641 ----
static grammar *
! maketables(nfagrammar *gr)
{
int i;
***************
*** 715,720 ****
grammar *
! pgen(n)
! node *n;
{
nfagrammar *gr;
--- 665,669 ----
grammar *
! pgen(node *n)
{
nfagrammar *gr;
Index: pgenmain.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/pgenmain.c,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** pgenmain.c 2000年07月09日 03:09:56 2.20
--- pgenmain.c 2000年07月22日 19:20:54 2.21
***************
*** 40,45 ****
void
! Py_Exit(sts)
! int sts;
{
exit(sts);
--- 40,44 ----
void
! Py_Exit(int sts)
{
exit(sts);
***************
*** 47,53 ****
int
! main(argc, argv)
! int argc;
! char **argv;
{
grammar *g;
--- 46,50 ----
int
! main(int argc, char **argv)
{
grammar *g;
***************
*** 86,91 ****
grammar *
! getgrammar(filename)
! char *filename;
{
FILE *fp;
--- 83,87 ----
grammar *
! getgrammar(char *filename)
{
FILE *fp;
***************
*** 133,137 ****
#ifdef THINK_C
char *
! askfile()
{
char buf[256];
--- 129,133 ----
#ifdef THINK_C
char *
! askfile(void)
{
char buf[256];
***************
*** 152,157 ****
void
! Py_FatalError(msg)
! char *msg;
{
fprintf(stderr, "pgen: FATAL ERROR: %s\n", msg);
--- 148,152 ----
void
! Py_FatalError(char *msg)
{
fprintf(stderr, "pgen: FATAL ERROR: %s\n", msg);
***************
*** 162,167 ****
/* ARGSUSED */
int
! guesstabsize(path)
! char *path;
{
return 4;
--- 157,161 ----
/* ARGSUSED */
int
! guesstabsize(char *path)
{
return 4;
***************
*** 172,177 ****
char *
! PyOS_Readline(prompt)
! char *prompt;
{
size_t n = 1000;
--- 166,170 ----
char *
! PyOS_Readline(char *prompt)
{
size_t n = 1000;
***************
*** 192,218 ****
}
- #ifdef HAVE_STDARG_PROTOTYPES
#include <stdarg.h>
- #else
- #include <varargs.h>
- #endif
void
- #ifdef HAVE_STDARG_PROTOTYPES
PySys_WriteStderr(const char *format, ...)
- #else
- PySys_WriteStderr(va_alist)
- va_dcl
- #endif
{
va_list va;
- #ifdef HAVE_STDARG_PROTOTYPES
va_start(va, format);
- #else
- char *format;
- va_start(va);
- format = va_arg(va, char *);
- #endif
vfprintf(stderr, format, va);
va_end(va);
--- 185,196 ----
Index: printgrammar.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/printgrammar.c,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -r2.11 -r2.12
*** printgrammar.c 2000年07月09日 03:09:56 2.11
--- printgrammar.c 2000年07月22日 19:20:54 2.12
***************
*** 21,27 ****
void
! printgrammar(g, fp)
! grammar *g;
! FILE *fp;
{
fprintf(fp, "#include \"pgenheaders.h\"\n");
--- 21,25 ----
void
! printgrammar(grammar *g, FILE *fp)
{
fprintf(fp, "#include \"pgenheaders.h\"\n");
***************
*** 38,44 ****
void
! printnonterminals(g, fp)
! grammar *g;
! FILE *fp;
{
dfa *d;
--- 36,40 ----
void
! printnonterminals(grammar *g, FILE *fp)
{
dfa *d;
***************
*** 51,58 ****
static void
! printarcs(i, d, fp)
! int i;
! dfa *d;
! FILE *fp;
{
arc *a;
--- 47,51 ----
static void
! printarcs(int i, dfa *d, FILE *fp)
{
arc *a;
***************
*** 72,78 ****
static void
! printstates(g, fp)
! grammar *g;
! FILE *fp;
{
state *s;
--- 65,69 ----
static void
! printstates(grammar *g, FILE *fp)
{
state *s;
***************
*** 94,100 ****
static void
! printdfas(g, fp)
! grammar *g;
! FILE *fp;
{
dfa *d;
--- 85,89 ----
static void
! printdfas(grammar *g, FILE *fp)
{
dfa *d;
***************
*** 116,122 ****
static void
! printlabels(g, fp)
! grammar *g;
! FILE *fp;
{
label *l;
--- 105,109 ----
static void
! printlabels(grammar *g, FILE *fp)
{
label *l;
Index: tokenizer.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/tokenizer.c,v
retrieving revision 2.46
retrieving revision 2.47
diff -C2 -r2.46 -r2.47
*** tokenizer.c 2000年07月11日 17:52:59 2.46
--- tokenizer.c 2000年07月22日 19:20:54 2.47
***************
*** 89,93 ****
static struct tok_state *
! tok_new()
{
struct tok_state *tok = PyMem_NEW(struct tok_state, 1);
--- 89,93 ----
static struct tok_state *
! tok_new(void)
{
struct tok_state *tok = PyMem_NEW(struct tok_state, 1);
***************
*** 117,122 ****
struct tok_state *
! PyTokenizer_FromString(str)
! char *str;
{
struct tok_state *tok = tok_new();
--- 117,121 ----
struct tok_state *
! PyTokenizer_FromString(char *str)
{
struct tok_state *tok = tok_new();
***************
*** 131,137 ****
struct tok_state *
! PyTokenizer_FromFile(fp, ps1, ps2)
! FILE *fp;
! char *ps1, *ps2;
{
struct tok_state *tok = tok_new();
--- 130,134 ----
struct tok_state *
! PyTokenizer_FromFile(FILE *fp, char *ps1, char *ps2)
{
struct tok_state *tok = tok_new();
***************
*** 154,159 ****
void
! PyTokenizer_Free(tok)
! struct tok_state *tok;
{
if (tok->fp != NULL && tok->buf != NULL)
--- 151,155 ----
void
! PyTokenizer_Free(struct tok_state *tok)
{
if (tok->fp != NULL && tok->buf != NULL)
***************
*** 166,171 ****
static int
! tok_nextc(tok)
! register struct tok_state *tok;
{
for (;;) {
--- 162,166 ----
static int
! tok_nextc(register struct tok_state *tok)
{
for (;;) {
***************
*** 322,328 ****
static void
! tok_backup(tok, c)
! register struct tok_state *tok;
! register int c;
{
if (c != EOF) {
--- 317,321 ----
static void
! tok_backup(register struct tok_state *tok, register int c)
{
if (c != EOF) {
***************
*** 338,343 ****
int
! PyToken_OneChar(c)
! int c;
{
switch (c) {
--- 331,335 ----
int
! PyToken_OneChar(int c)
{
switch (c) {
***************
*** 371,376 ****
int
! PyToken_TwoChars(c1, c2)
! int c1, c2;
{
switch (c1) {
--- 363,367 ----
int
! PyToken_TwoChars(int c1, int c2)
{
switch (c1) {
***************
*** 409,414 ****
static int
! indenterror(tok)
! struct tok_state *tok;
{
if (tok->alterror) {
--- 400,404 ----
static int
! indenterror(struct tok_state *tok)
{
if (tok->alterror) {
***************
*** 429,435 ****
int
! PyTokenizer_Get(tok, p_start, p_end)
! register struct tok_state *tok; /* In/out: tokenizer state */
! char **p_start, **p_end; /* Out: point to start/end of token */
{
register int c;
--- 419,424 ----
int
! PyTokenizer_Get(register struct tok_state *tok, char **p_start,
! char **p_end)
{
register int c;
***************
*** 813,819 ****
void
! tok_dump(type, start, end)
! int type;
! char *start, *end;
{
printf("%s", _PyParser_TokenNames[type]);
--- 802,806 ----
void
! tok_dump(int type, char *start, char *end)
{
printf("%s", _PyParser_TokenNames[type]);
- Previous message: [Python-checkins] CVS: python/nondist/sandbox/doctools textdoc.py,NONE,1.1 README,1.1,1.2 htmldoc.py,1.1,1.2 onlinehelp.py,1.1,1.2
- Next message: [Python-checkins] CVS: python/dist/src/Demo/embed demo.c,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]