Mercurial > cpython-lru_cache-weakref

comparison Python/pythonrun.c @ 46126:b06a15efdc6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 61958-61959 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r61958 | amaury.forgeotdarc | 2008-03-27 00:07:43 +0100 (Thu, 27 Mar 2008) | 2 lines C89 compliance: Microsoft compilers want variable declarations at the top ........
author Christian Heimes <christian@cheimes.de>
date Wed, 26 Mar 2008 23:25:24 +0000
parents 36d828d27c36
children e8916c64df4c
comparison
equal deleted inserted replaced
46125:36d828d27c36 46126:b06a15efdc6d
1584 PyParser_ASTFromString(const char *s, const char *filename, int start, 1584 PyParser_ASTFromString(const char *s, const char *filename, int start,
1585 PyCompilerFlags *flags, PyArena *arena) 1585 PyCompilerFlags *flags, PyArena *arena)
1586 { 1586 {
1587 mod_ty mod; 1587 mod_ty mod;
1588 perrdetail err; 1588 perrdetail err;
1589 int iflags; 1589 int iflags = PARSER_FLAGS(flags);
1590 iflags = PARSER_FLAGS(flags);
1591 1590
1592 node *n = PyParser_ParseStringFlagsFilenameEx(s, filename, 1591 node *n = PyParser_ParseStringFlagsFilenameEx(s, filename,
1593 &_PyParser_Grammar, start, &err, 1592 &_PyParser_Grammar, start, &err,
1594 &iflags); 1593 &iflags);
1595 if (n) { 1594 if (n) {
1612 char *ps2, PyCompilerFlags *flags, int *errcode, 1611 char *ps2, PyCompilerFlags *flags, int *errcode,
1613 PyArena *arena) 1612 PyArena *arena)
1614 { 1613 {
1615 mod_ty mod; 1614 mod_ty mod;
1616 perrdetail err; 1615 perrdetail err;
1617 int iflags; 1616 int iflags = PARSER_FLAGS(flags);
1618 1617
1619 iflags = PARSER_FLAGS(flags);
1620 node *n = PyParser_ParseFileFlagsEx(fp, filename, enc, 1618 node *n = PyParser_ParseFileFlagsEx(fp, filename, enc,
1621 &_PyParser_Grammar, 1619 &_PyParser_Grammar,
1622 start, ps1, ps2, &err, &iflags); 1620 start, ps1, ps2, &err, &iflags);
1623 if (n) { 1621 if (n) {
1624 if (flags) { 1622 if (flags) {