2001-02-10 06:22:18 +08:00
|
|
|
#include "Python.h"
|
2005-10-21 03:59:25 +08:00
|
|
|
#include "Python-ast.h"
|
|
|
|
#include "code.h"
|
2001-02-10 06:22:18 +08:00
|
|
|
#include "symtable.h"
|
|
|
|
#include "structmember.h"
|
|
|
|
|
2005-12-19 12:27:42 +08:00
|
|
|
/* error strings used for warnings */
|
2005-10-21 03:59:25 +08:00
|
|
|
#define GLOBAL_AFTER_ASSIGN \
|
|
|
|
"name '%.400s' is assigned to before global declaration"
|
2001-12-10 08:53:18 +08:00
|
|
|
|
2007-02-27 14:50:52 +08:00
|
|
|
#define NONLOCAL_AFTER_ASSIGN \
|
|
|
|
"name '%.400s' is assigned to before nonlocal declaration"
|
|
|
|
|
2005-10-21 03:59:25 +08:00
|
|
|
#define GLOBAL_AFTER_USE \
|
|
|
|
"name '%.400s' is used prior to global declaration"
|
2001-12-10 08:53:18 +08:00
|
|
|
|
2007-02-27 14:50:52 +08:00
|
|
|
#define NONLOCAL_AFTER_USE \
|
|
|
|
"name '%.400s' is used prior to nonlocal declaration"
|
|
|
|
|
2005-12-19 12:27:42 +08:00
|
|
|
#define IMPORT_STAR_WARNING "import * only allowed at module level"
|
|
|
|
|
Merge the rest of the trunk.
Merged revisions 46490-46494,46496,46498,46500,46506,46521,46538,46558,46563-46567,46570-46571,46583,46593,46595-46598,46604,46606,46609-46753 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r46610 | martin.v.loewis | 2006-06-03 09:42:26 +0200 (Sat, 03 Jun 2006) | 2 lines
Updated version (win32-icons2.zip) from #1490384.
........
r46612 | andrew.kuchling | 2006-06-03 20:09:41 +0200 (Sat, 03 Jun 2006) | 1 line
[Bug #1472084] Fix description of do_tag
........
r46614 | andrew.kuchling | 2006-06-03 20:33:35 +0200 (Sat, 03 Jun 2006) | 1 line
[Bug #1475554] Strengthen text to say 'must' instead of 'should'
........
r46616 | andrew.kuchling | 2006-06-03 20:41:28 +0200 (Sat, 03 Jun 2006) | 1 line
[Bug #1441864] Clarify description of 'data' argument
........
r46617 | andrew.kuchling | 2006-06-03 20:43:24 +0200 (Sat, 03 Jun 2006) | 1 line
Minor rewording
........
r46619 | andrew.kuchling | 2006-06-03 21:02:35 +0200 (Sat, 03 Jun 2006) | 9 lines
[Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler.
Fix by renaming the variable.
In a different module, Neal fixed it by renaming _self to self. There's
already a variable named 'self' here, so I used selfptr.
(I'm committing this on a Mac without Tk, but it's a simple search-and-replace.
<crosses fingers>, so I'll watch the buildbots and see what happens.)
........
r46621 | fredrik.lundh | 2006-06-03 23:56:05 +0200 (Sat, 03 Jun 2006) | 5 lines
"_self" is a said to be a reserved word in Watcom C 10.6. I'm
not sure that's really standard compliant behaviour, but I guess
we have to fix that anyway...
........
r46622 | andrew.kuchling | 2006-06-04 00:44:42 +0200 (Sun, 04 Jun 2006) | 1 line
Update readme
........
r46623 | andrew.kuchling | 2006-06-04 00:59:23 +0200 (Sun, 04 Jun 2006) | 1 line
Drop 0 parameter
........
r46624 | andrew.kuchling | 2006-06-04 00:59:59 +0200 (Sun, 04 Jun 2006) | 1 line
Some code tidying; use curses.wrapper
........
r46625 | andrew.kuchling | 2006-06-04 01:02:15 +0200 (Sun, 04 Jun 2006) | 1 line
Use True; value returned from main is unused
........
r46626 | andrew.kuchling | 2006-06-04 01:07:21 +0200 (Sun, 04 Jun 2006) | 1 line
Use true division, and the True value
........
r46627 | andrew.kuchling | 2006-06-04 01:09:58 +0200 (Sun, 04 Jun 2006) | 1 line
Docstring fix; use True
........
r46628 | andrew.kuchling | 2006-06-04 01:15:56 +0200 (Sun, 04 Jun 2006) | 1 line
Put code in a main() function; loosen up the spacing to match current code style
........
r46629 | andrew.kuchling | 2006-06-04 01:39:07 +0200 (Sun, 04 Jun 2006) | 1 line
Use functions; modernize code
........
r46630 | andrew.kuchling | 2006-06-04 01:43:22 +0200 (Sun, 04 Jun 2006) | 1 line
This demo requires Medusa (not just asyncore); remove it
........
r46631 | andrew.kuchling | 2006-06-04 01:46:36 +0200 (Sun, 04 Jun 2006) | 2 lines
Remove xmlrpc demo -- it duplicates the SimpleXMLRPCServer module.
........
r46632 | andrew.kuchling | 2006-06-04 01:47:22 +0200 (Sun, 04 Jun 2006) | 1 line
Remove xmlrpc/ directory
........
r46633 | andrew.kuchling | 2006-06-04 01:51:21 +0200 (Sun, 04 Jun 2006) | 1 line
Remove dangling reference
........
r46634 | andrew.kuchling | 2006-06-04 01:59:36 +0200 (Sun, 04 Jun 2006) | 1 line
Add more whitespace; use a better socket name
........
r46635 | tim.peters | 2006-06-04 03:22:53 +0200 (Sun, 04 Jun 2006) | 2 lines
Whitespace normalization.
........
r46637 | tim.peters | 2006-06-04 05:26:02 +0200 (Sun, 04 Jun 2006) | 16 lines
In a PYMALLOC_DEBUG build obmalloc adds extra debugging info
to each allocated block. This was using 4 bytes for each such
piece of info regardless of platform. This didn't really matter
before (proof: no bug reports, and the debug-build obmalloc would
have assert-failed if it was ever asked for a chunk of memory
>= 2**32 bytes), since container indices were plain ints. But after
the Py_ssize_t changes, it's at least theoretically possible to
allocate a list or string whose guts exceed 2**32 bytes, and the
PYMALLOC_DEBUG routines would fail then (having only 4 bytes
to record the originally requested size).
Now we use sizeof(size_t) bytes for each of a PYMALLOC_DEBUG
build's extra debugging fields. This won't make any difference
on 32-bit boxes, but will add 16 bytes to each allocation in
a debug build on a 64-bit box.
........
r46638 | tim.peters | 2006-06-04 05:38:04 +0200 (Sun, 04 Jun 2006) | 4 lines
_PyObject_DebugMalloc(): The return value should add
2*sizeof(size_t) now, not 8. This probably accounts for
current disasters on the 64-bit buildbot slaves.
........
r46639 | neal.norwitz | 2006-06-04 08:19:31 +0200 (Sun, 04 Jun 2006) | 1 line
SF #1499797, Fix for memory leak in WindowsError_str
........
r46640 | andrew.macintyre | 2006-06-04 14:31:09 +0200 (Sun, 04 Jun 2006) | 2 lines
Patch #1454481: Make thread stack size runtime tunable.
........
r46641 | andrew.macintyre | 2006-06-04 14:59:59 +0200 (Sun, 04 Jun 2006) | 2 lines
clean up function declarations to conform to PEP-7 style.
........
r46642 | martin.blais | 2006-06-04 15:49:49 +0200 (Sun, 04 Jun 2006) | 15 lines
Fixes in struct and socket from merge reviews.
- Following Guido's comments, renamed
* pack_to -> pack_into
* recv_buf -> recv_into
* recvfrom_buf -> recvfrom_into
- Made fixes to _struct.c according to Neal Norwitz comments on the checkins
list.
- Converted some ints into the appropriate -- I hope -- ssize_t and size_t.
........
r46643 | ronald.oussoren | 2006-06-04 16:05:28 +0200 (Sun, 04 Jun 2006) | 3 lines
"Import" LDFLAGS in Mac/OSX/Makefile.in to ensure pythonw gets build with
the right compiler flags.
........
r46644 | ronald.oussoren | 2006-06-04 16:24:59 +0200 (Sun, 04 Jun 2006) | 2 lines
Drop Mac wrappers for the WASTE library.
........
r46645 | tim.peters | 2006-06-04 17:49:07 +0200 (Sun, 04 Jun 2006) | 3 lines
s_methods[]: Stop compiler warnings by casting
s_unpack_from to PyCFunction.
........
r46646 | george.yoshida | 2006-06-04 19:04:12 +0200 (Sun, 04 Jun 2006) | 2 lines
Remove a redundant word
........
r46647 | george.yoshida | 2006-06-04 19:17:25 +0200 (Sun, 04 Jun 2006) | 2 lines
Markup fix
........
r46648 | martin.v.loewis | 2006-06-04 21:36:28 +0200 (Sun, 04 Jun 2006) | 2 lines
Patch #1359618: Speed-up charmap encoder.
........
r46649 | georg.brandl | 2006-06-04 23:46:16 +0200 (Sun, 04 Jun 2006) | 3 lines
Repair refleaks in unicodeobject.
........
r46650 | georg.brandl | 2006-06-04 23:56:52 +0200 (Sun, 04 Jun 2006) | 4 lines
Patch #1346214: correctly optimize away "if 0"-style stmts
(thanks to Neal for review)
........
r46651 | georg.brandl | 2006-06-05 00:15:37 +0200 (Mon, 05 Jun 2006) | 2 lines
Bug #1500293: fix memory leaks in _subprocess module.
........
r46654 | tim.peters | 2006-06-05 01:43:53 +0200 (Mon, 05 Jun 2006) | 2 lines
Whitespace normalization.
........
r46655 | tim.peters | 2006-06-05 01:52:47 +0200 (Mon, 05 Jun 2006) | 16 lines
Revert revisions:
46640 Patch #1454481: Make thread stack size runtime tunable.
46647 Markup fix
The first is causing many buildbots to fail test runs, and there
are multiple causes with seemingly no immediate prospects for
repairing them. See python-dev discussion.
Note that a branch can (and should) be created for resolving these
problems, like
svn copy svn+ssh://svn.python.org/python/trunk -r46640 svn+ssh://svn.python.org/python/branches/NEW_BRANCH
followed by merging rev 46647 to the new branch.
........
r46656 | andrew.kuchling | 2006-06-05 02:08:09 +0200 (Mon, 05 Jun 2006) | 1 line
Mention second encoding speedup
........
r46657 | gregory.p.smith | 2006-06-05 02:31:01 +0200 (Mon, 05 Jun 2006) | 7 lines
bugfix: when log_archive was called with the DB_ARCH_REMOVE flag present
in BerkeleyDB >= 4.2 it tried to construct a list out of an uninitialized
char **log_list.
feature: export the DB_ARCH_REMOVE flag by name in the module on BerkeleyDB >= 4.2.
........
r46658 | gregory.p.smith | 2006-06-05 02:33:35 +0200 (Mon, 05 Jun 2006) | 5 lines
fix a bug in the previous commit. don't leak empty list on error return and
fix the additional rare (out of memory only) bug that it was supposed to fix
of not freeing log_list when the python allocator failed.
........
r46660 | tim.peters | 2006-06-05 02:55:26 +0200 (Mon, 05 Jun 2006) | 9 lines
"Flat is better than nested."
Move the long-winded, multiply-nested -R support out
of runtest() and into some module-level helper functions.
This makes runtest() and the -R code easier to follow.
That in turn allowed seeing some opportunities for code
simplification, and made it obvious that reglog.txt
never got closed.
........
r46661 | hyeshik.chang | 2006-06-05 02:59:54 +0200 (Mon, 05 Jun 2006) | 3 lines
Fix a potentially invalid memory access of CJKCodecs' shift-jis
decoder. (found by Neal Norwitz)
........
r46663 | gregory.p.smith | 2006-06-05 03:39:52 +0200 (Mon, 05 Jun 2006) | 3 lines
* support DBEnv.log_stat() method on BerkeleyDB >= 4.0 [patch #1494885]
........
r46664 | tim.peters | 2006-06-05 03:43:03 +0200 (Mon, 05 Jun 2006) | 3 lines
Remove doctest.testmod's deprecated (in 2.4) `isprivate`
argument. A lot of hair went into supporting that!
........
r46665 | tim.peters | 2006-06-05 03:47:24 +0200 (Mon, 05 Jun 2006) | 2 lines
Whitespace normalization.
........
r46666 | tim.peters | 2006-06-05 03:48:21 +0200 (Mon, 05 Jun 2006) | 2 lines
Make doctest news more accurate.
........
r46667 | gregory.p.smith | 2006-06-05 03:56:15 +0200 (Mon, 05 Jun 2006) | 3 lines
* support DBEnv.lsn_reset() method on BerkeleyDB >= 4.4 [patch #1494902]
........
r46668 | gregory.p.smith | 2006-06-05 04:02:25 +0200 (Mon, 05 Jun 2006) | 3 lines
mention the just committed bsddb changes
........
r46671 | gregory.p.smith | 2006-06-05 19:38:04 +0200 (Mon, 05 Jun 2006) | 3 lines
* add support for DBSequence objects [patch #1466734]
........
r46672 | gregory.p.smith | 2006-06-05 20:20:07 +0200 (Mon, 05 Jun 2006) | 3 lines
forgot to add this file in previous commit
........
r46673 | tim.peters | 2006-06-05 20:36:12 +0200 (Mon, 05 Jun 2006) | 2 lines
Whitespace normalization.
........
r46674 | tim.peters | 2006-06-05 20:36:54 +0200 (Mon, 05 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46675 | gregory.p.smith | 2006-06-05 20:48:21 +0200 (Mon, 05 Jun 2006) | 4 lines
* fix DBCursor.pget() bug with keyword argument names when no data= is
supplied [SF pybsddb bug #1477863]
........
r46676 | andrew.kuchling | 2006-06-05 21:05:32 +0200 (Mon, 05 Jun 2006) | 1 line
Remove use of Trove name, which isn't very helpful to users
........
r46677 | andrew.kuchling | 2006-06-05 21:08:25 +0200 (Mon, 05 Jun 2006) | 1 line
[Bug #1470026] Include link to list of classifiers
........
r46679 | tim.peters | 2006-06-05 22:48:49 +0200 (Mon, 05 Jun 2006) | 10 lines
Access _struct attributes directly instead of mucking with getattr.
string_reverse(): Simplify.
assertRaises(): Raise TestFailed on failure.
test_unpack_from(), test_pack_into(), test_pack_into_fn(): never
use `assert` to test for an expected result (it doesn't test anything
when Python is run with -O).
........
r46680 | tim.peters | 2006-06-05 22:49:27 +0200 (Mon, 05 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46681 | gregory.p.smith | 2006-06-06 01:38:06 +0200 (Tue, 06 Jun 2006) | 3 lines
add depends = ['md5.h'] to the _md5 module extension for correctness sake.
........
r46682 | brett.cannon | 2006-06-06 01:51:55 +0200 (Tue, 06 Jun 2006) | 4 lines
Add 3 more bytes to a buffer to cover constants in string and null byte on top of 10 possible digits for an int.
Closes bug #1501223.
........
r46684 | gregory.p.smith | 2006-06-06 01:59:37 +0200 (Tue, 06 Jun 2006) | 5 lines
- bsddb: the __len__ method of a DB object has been fixed to return correct
results. It could previously incorrectly return 0 in some cases.
Fixes SF bug 1493322 (pybsddb bug 1184012).
........
r46686 | tim.peters | 2006-06-06 02:25:07 +0200 (Tue, 06 Jun 2006) | 7 lines
_PySys_Init(): It's rarely a good idea to size a buffer to the
exact maximum size someone guesses is needed. In this case, if
we're really worried about extreme integers, then "cp%d" can
actually need 14 bytes (2 for "cp" + 1 for \0 at the end +
11 for -(2**31-1)). So reserve 128 bytes instead -- nothing is
actually saved by making a stack-local buffer tiny.
........
r46687 | neal.norwitz | 2006-06-06 09:22:08 +0200 (Tue, 06 Jun 2006) | 1 line
Remove unused variable (and stop compiler warning)
........
r46688 | neal.norwitz | 2006-06-06 09:23:01 +0200 (Tue, 06 Jun 2006) | 1 line
Fix a bunch of parameter strings
........
r46689 | thomas.heller | 2006-06-06 13:34:33 +0200 (Tue, 06 Jun 2006) | 6 lines
Convert CFieldObject tp_members to tp_getset, since there is no
structmember typecode for Py_ssize_t fields. This should fix some of
the errors on the PPC64 debian machine (64-bit, big endian).
Assigning to readonly fields now raises AttributeError instead of
TypeError, so the testcase has to be changed as well.
........
r46690 | thomas.heller | 2006-06-06 13:54:32 +0200 (Tue, 06 Jun 2006) | 1 line
Damn - the sentinel was missing. And fix another silly mistake.
........
r46691 | martin.blais | 2006-06-06 14:46:55 +0200 (Tue, 06 Jun 2006) | 13 lines
Normalized a few cases of whitespace in function declarations.
Found them using::
find . -name '*.py' | while read i ; do grep 'def[^(]*( ' $i /dev/null ; done
find . -name '*.py' | while read i ; do grep ' ):' $i /dev/null ; done
(I was doing this all over my own code anyway, because I'd been using spaces in
all defs, so I thought I'd make a run on the Python code as well. If you need
to do such fixes in your own code, you can use xx-rename or parenregu.el within
emacs.)
........
r46693 | thomas.heller | 2006-06-06 17:34:18 +0200 (Tue, 06 Jun 2006) | 1 line
Specify argtypes for all test functions. Maybe that helps on strange ;-) architectures
........
r46694 | tim.peters | 2006-06-06 17:50:17 +0200 (Tue, 06 Jun 2006) | 5 lines
BSequence_set_range(): Rev 46688 ("Fix a bunch of
parameter strings") changed this function's signature
seemingly by mistake, which is causing buildbots to fail
test_bsddb3. Restored the pre-46688 signature.
........
r46695 | tim.peters | 2006-06-06 17:52:35 +0200 (Tue, 06 Jun 2006) | 4 lines
On python-dev Thomas Heller said these were committed
by mistake in rev 46693, so reverting this part of
rev 46693.
........
r46696 | andrew.kuchling | 2006-06-06 19:10:41 +0200 (Tue, 06 Jun 2006) | 1 line
Fix comment typo
........
r46697 | brett.cannon | 2006-06-06 20:08:16 +0200 (Tue, 06 Jun 2006) | 2 lines
Fix coding style guide bug.
........
r46698 | thomas.heller | 2006-06-06 20:50:46 +0200 (Tue, 06 Jun 2006) | 2 lines
Add a hack so that foreign functions returning float now do work on 64-bit
big endian platforms.
........
r46699 | thomas.heller | 2006-06-06 21:25:13 +0200 (Tue, 06 Jun 2006) | 3 lines
Use the same big-endian hack as in _ctypes/callproc.c for callback functions.
This fixes the callback function tests that return float.
........
r46700 | ronald.oussoren | 2006-06-06 21:50:24 +0200 (Tue, 06 Jun 2006) | 5 lines
* Ensure that "make altinstall" works when the tree was configured
with --enable-framework
* Also for --enable-framework: allow users to use --prefix to specify
the location of the compatibility symlinks (such as /usr/local/bin/python)
........
r46701 | ronald.oussoren | 2006-06-06 21:56:00 +0200 (Tue, 06 Jun 2006) | 3 lines
A quick hack to ensure the right key-bindings for IDLE on osx: install patched
configuration files during a framework install.
........
r46702 | tim.peters | 2006-06-07 03:04:59 +0200 (Wed, 07 Jun 2006) | 4 lines
dash_R_cleanup(): Clear filecmp._cache. This accounts for
different results across -R runs (at least on Windows) of
test_filecmp.
........
r46705 | tim.peters | 2006-06-07 08:57:51 +0200 (Wed, 07 Jun 2006) | 17 lines
SF patch 1501987: Remove randomness from test_exceptions,
from ?iga Seilnacht (sorry about the name, but Firefox
on my box can't display the first character of the name --
the SF "Unix name" is zseil).
This appears to cure the oddball intermittent leaks across
runs when running test_exceptions under -R. I'm not sure
why, but I'm too sleepy to care ;-)
The thrust of the SF patch was to remove randomness in the
pickle protocol used. I changed the patch to use
range(pickle.HIGHEST_PROTOCOL + 1), to try both pickle and
cPickle, and randomly mucked with other test lines to put
statements on their own lines.
Not a bugfix candidate (this is fiddling new-in-2.5 code).
........
r46706 | andrew.kuchling | 2006-06-07 15:55:33 +0200 (Wed, 07 Jun 2006) | 1 line
Add an SQLite introduction, taken from the 'What's New' text
........
r46708 | andrew.kuchling | 2006-06-07 19:02:52 +0200 (Wed, 07 Jun 2006) | 1 line
Mention other placeholders
........
r46709 | andrew.kuchling | 2006-06-07 19:03:46 +0200 (Wed, 07 Jun 2006) | 1 line
Add an item; also, escape %
........
r46710 | andrew.kuchling | 2006-06-07 19:04:01 +0200 (Wed, 07 Jun 2006) | 1 line
Mention other placeholders
........
r46716 | ronald.oussoren | 2006-06-07 20:57:44 +0200 (Wed, 07 Jun 2006) | 2 lines
Move Mac/OSX/Tools one level up
........
r46717 | ronald.oussoren | 2006-06-07 20:58:01 +0200 (Wed, 07 Jun 2006) | 2 lines
Move Mac/OSX/PythonLauncher one level up
........
r46718 | ronald.oussoren | 2006-06-07 20:58:42 +0200 (Wed, 07 Jun 2006) | 2 lines
mv Mac/OSX/BuildScript one level up
........
r46719 | ronald.oussoren | 2006-06-07 21:02:03 +0200 (Wed, 07 Jun 2006) | 2 lines
Move Mac/OSX/* one level up
........
r46720 | ronald.oussoren | 2006-06-07 21:06:01 +0200 (Wed, 07 Jun 2006) | 2 lines
And the last bit: move IDLE one level up and adjust makefiles
........
r46723 | ronald.oussoren | 2006-06-07 21:38:53 +0200 (Wed, 07 Jun 2006) | 4 lines
- Patch the correct version of python in the Info.plists at build time, instead
of relying on a maintainer to update them before releases.
- Remove the now empty Mac/OSX directory
........
r46727 | ronald.oussoren | 2006-06-07 22:18:44 +0200 (Wed, 07 Jun 2006) | 7 lines
* If BuildApplet.py is used as an applet it starts with a version of
sys.exutable that isn't usuable on an #!-line. That results in generated
applets that don't actually work. Work around this problem by resetting
sys.executable.
* argvemulator.py didn't work on intel macs. This patch fixes this
(bug #1491468)
........
r46728 | tim.peters | 2006-06-07 22:40:06 +0200 (Wed, 07 Jun 2006) | 2 lines
Whitespace normalization.
........
r46729 | tim.peters | 2006-06-07 22:40:54 +0200 (Wed, 07 Jun 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r46730 | thomas.heller | 2006-06-07 22:43:06 +0200 (Wed, 07 Jun 2006) | 7 lines
Fix for foreign functions returning small structures on 64-bit big
endian machines. Should fix the remaininf failure in the PPC64
Debian buildbot.
Thanks to Matthias Klose for providing access to a machine to debug
and test this.
........
r46731 | brett.cannon | 2006-06-07 23:48:17 +0200 (Wed, 07 Jun 2006) | 2 lines
Clarify documentation for bf_getcharbuffer.
........
r46735 | neal.norwitz | 2006-06-08 07:12:45 +0200 (Thu, 08 Jun 2006) | 1 line
Fix a refleak in recvfrom_into
........
r46736 | gregory.p.smith | 2006-06-08 07:17:08 +0200 (Thu, 08 Jun 2006) | 9 lines
- bsddb: the bsddb.dbtables Modify method now raises the proper error and
aborts the db transaction safely when a modifier callback fails.
Fixes SF python patch/bug #1408584.
Also cleans up the bsddb.dbtables docstrings since thats the only
documentation that exists for that unadvertised module. (people
really should really just use sqlite3)
........
r46737 | gregory.p.smith | 2006-06-08 07:38:11 +0200 (Thu, 08 Jun 2006) | 4 lines
* Turn the deadlock situation described in SF bug #775414 into a
DBDeadLockError exception.
* add the test case for my previous dbtables commit.
........
r46738 | gregory.p.smith | 2006-06-08 07:39:54 +0200 (Thu, 08 Jun 2006) | 2 lines
pasted set_lk_detect line in wrong spot in previous commit. fixed. passes tests this time.
........
r46739 | armin.rigo | 2006-06-08 12:56:24 +0200 (Thu, 08 Jun 2006) | 6 lines
(arre, arigo) SF bug #1350060
Give a consistent behavior for comparison and hashing of method objects
(both user- and built-in methods). Now compares the 'self' recursively.
The hash was already asking for the hash of 'self'.
........
r46740 | andrew.kuchling | 2006-06-08 13:56:44 +0200 (Thu, 08 Jun 2006) | 1 line
Typo fix
........
r46741 | georg.brandl | 2006-06-08 14:45:01 +0200 (Thu, 08 Jun 2006) | 2 lines
Bug #1502750: Fix getargs "i" format to use LONG_MIN and LONG_MAX for bounds checking.
........
r46743 | georg.brandl | 2006-06-08 14:54:13 +0200 (Thu, 08 Jun 2006) | 2 lines
Bug #1502728: Correctly link against librt library on HP-UX.
........
r46745 | georg.brandl | 2006-06-08 14:55:47 +0200 (Thu, 08 Jun 2006) | 3 lines
Add news for recent bugfix.
........
r46746 | georg.brandl | 2006-06-08 15:31:07 +0200 (Thu, 08 Jun 2006) | 4 lines
Argh. "integer" is a very confusing word ;)
Actually, checking for INT_MAX and INT_MIN is correct since
the format code explicitly handles a C "int".
........
r46748 | nick.coghlan | 2006-06-08 15:54:49 +0200 (Thu, 08 Jun 2006) | 1 line
Add functools.update_wrapper() and functools.wraps() as described in PEP 356
........
r46751 | georg.brandl | 2006-06-08 16:50:21 +0200 (Thu, 08 Jun 2006) | 4 lines
Bug #1502805: don't alias file.__exit__ to file.close since the
latter can return something that's true.
........
r46752 | georg.brandl | 2006-06-08 16:50:53 +0200 (Thu, 08 Jun 2006) | 3 lines
Convert test_file to unittest.
........
2006-06-08 23:35:45 +08:00
|
|
|
#define RETURN_VAL_IN_GENERATOR \
|
|
|
|
"'return' with argument inside generator"
|
2005-12-19 12:27:42 +08:00
|
|
|
|
Merged revisions 65715,65724,65726,65732,65736-65739,65775 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65715 | benjamin.peterson | 2008-08-16 16:04:16 -0500 (Sat, 16 Aug 2008) | 1 line
add some documentation for symtable
........
r65724 | benjamin.peterson | 2008-08-16 17:11:33 -0500 (Sat, 16 Aug 2008) | 2 lines
include filename and line number in SyntaxError
........
r65726 | georg.brandl | 2008-08-16 17:37:05 -0500 (Sat, 16 Aug 2008) | 2 lines
Review symtable docs.
........
r65732 | benjamin.peterson | 2008-08-16 18:29:40 -0500 (Sat, 16 Aug 2008) | 1 line
PySTEntry's constructor is static; there's no point in a fancy API name
........
r65736 | benjamin.peterson | 2008-08-16 20:09:17 -0500 (Sat, 16 Aug 2008) | 1 line
expose PySTEntry.nested so the symtable module will work
........
r65737 | benjamin.peterson | 2008-08-16 20:17:15 -0500 (Sat, 16 Aug 2008) | 1 line
a few improvements
........
r65738 | benjamin.peterson | 2008-08-16 20:27:30 -0500 (Sat, 16 Aug 2008) | 1 line
fix compile errors
........
r65739 | benjamin.peterson | 2008-08-16 21:23:43 -0500 (Sat, 16 Aug 2008) | 1 line
uhh PySTEntry->ste_unoptimized has to be exposed too
........
r65775 | benjamin.peterson | 2008-08-17 12:13:26 -0500 (Sun, 17 Aug 2008) | 5 lines
get the symtable module back in working order
- Fix broken functions
- Add (hopefully) extensive tests
- Modernize a little
........
2008-08-18 02:02:44 +08:00
|
|
|
|
2006-03-01 06:36:46 +08:00
|
|
|
static PySTEntryObject *
|
Merged revisions 65715,65724,65726,65732,65736-65739,65775 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65715 | benjamin.peterson | 2008-08-16 16:04:16 -0500 (Sat, 16 Aug 2008) | 1 line
add some documentation for symtable
........
r65724 | benjamin.peterson | 2008-08-16 17:11:33 -0500 (Sat, 16 Aug 2008) | 2 lines
include filename and line number in SyntaxError
........
r65726 | georg.brandl | 2008-08-16 17:37:05 -0500 (Sat, 16 Aug 2008) | 2 lines
Review symtable docs.
........
r65732 | benjamin.peterson | 2008-08-16 18:29:40 -0500 (Sat, 16 Aug 2008) | 1 line
PySTEntry's constructor is static; there's no point in a fancy API name
........
r65736 | benjamin.peterson | 2008-08-16 20:09:17 -0500 (Sat, 16 Aug 2008) | 1 line
expose PySTEntry.nested so the symtable module will work
........
r65737 | benjamin.peterson | 2008-08-16 20:17:15 -0500 (Sat, 16 Aug 2008) | 1 line
a few improvements
........
r65738 | benjamin.peterson | 2008-08-16 20:27:30 -0500 (Sat, 16 Aug 2008) | 1 line
fix compile errors
........
r65739 | benjamin.peterson | 2008-08-16 21:23:43 -0500 (Sat, 16 Aug 2008) | 1 line
uhh PySTEntry->ste_unoptimized has to be exposed too
........
r65775 | benjamin.peterson | 2008-08-17 12:13:26 -0500 (Sun, 17 Aug 2008) | 5 lines
get the symtable module back in working order
- Fix broken functions
- Add (hopefully) extensive tests
- Modernize a little
........
2008-08-18 02:02:44 +08:00
|
|
|
ste_new(struct symtable *st, identifier name, _Py_block_ty block,
|
2010-09-21 07:02:10 +08:00
|
|
|
void *key, int lineno, int col_offset)
|
2001-02-10 06:22:18 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PySTEntryObject *ste = NULL;
|
2012-09-10 09:08:46 +08:00
|
|
|
PyObject *k = NULL;
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
k = PyLong_FromVoidPtr(key);
|
|
|
|
if (k == NULL)
|
|
|
|
goto fail;
|
|
|
|
ste = PyObject_New(PySTEntryObject, &PySTEntry_Type);
|
2012-09-12 23:58:10 +08:00
|
|
|
if (ste == NULL) {
|
|
|
|
Py_DECREF(k);
|
2010-05-09 23:52:27 +08:00
|
|
|
goto fail;
|
2012-09-12 23:58:10 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
ste->ste_table = st;
|
2012-09-12 23:52:46 +08:00
|
|
|
ste->ste_id = k; /* ste owns reference to k */
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
ste->ste_name = name;
|
|
|
|
Py_INCREF(name);
|
|
|
|
|
|
|
|
ste->ste_symbols = NULL;
|
|
|
|
ste->ste_varnames = NULL;
|
|
|
|
ste->ste_children = NULL;
|
|
|
|
|
|
|
|
ste->ste_symbols = PyDict_New();
|
|
|
|
if (ste->ste_symbols == NULL)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
ste->ste_varnames = PyList_New(0);
|
|
|
|
if (ste->ste_varnames == NULL)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
ste->ste_children = PyList_New(0);
|
|
|
|
if (ste->ste_children == NULL)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
ste->ste_type = block;
|
|
|
|
ste->ste_unoptimized = 0;
|
|
|
|
ste->ste_nested = 0;
|
|
|
|
ste->ste_free = 0;
|
|
|
|
ste->ste_varargs = 0;
|
|
|
|
ste->ste_varkeywords = 0;
|
|
|
|
ste->ste_opt_lineno = 0;
|
2010-09-21 07:02:10 +08:00
|
|
|
ste->ste_opt_col_offset = 0;
|
2010-10-21 05:25:23 +08:00
|
|
|
ste->ste_tmpname = 0;
|
2010-05-09 23:52:27 +08:00
|
|
|
ste->ste_lineno = lineno;
|
2010-09-21 07:02:10 +08:00
|
|
|
ste->ste_col_offset = col_offset;
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
if (st->st_cur != NULL &&
|
|
|
|
(st->st_cur->ste_nested ||
|
|
|
|
st->st_cur->ste_type == FunctionBlock))
|
|
|
|
ste->ste_nested = 1;
|
|
|
|
ste->ste_child_free = 0;
|
|
|
|
ste->ste_generator = 0;
|
|
|
|
ste->ste_returns_value = 0;
|
|
|
|
|
|
|
|
if (PyDict_SetItem(st->st_blocks, ste->ste_id, (PyObject *)ste) < 0)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
return ste;
|
2001-02-10 06:22:18 +08:00
|
|
|
fail:
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_XDECREF(ste);
|
|
|
|
return NULL;
|
2001-02-10 06:22:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
2005-10-21 03:59:25 +08:00
|
|
|
ste_repr(PySTEntryObject *ste)
|
2001-02-10 06:22:18 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return PyUnicode_FromFormat("<symtable entry %U(%ld), line %d>",
|
|
|
|
ste->ste_name,
|
|
|
|
PyLong_AS_LONG(ste->ste_id), ste->ste_lineno);
|
2001-02-10 06:22:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2005-10-21 03:59:25 +08:00
|
|
|
ste_dealloc(PySTEntryObject *ste)
|
2001-02-10 06:22:18 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
ste->ste_table = NULL;
|
|
|
|
Py_XDECREF(ste->ste_id);
|
|
|
|
Py_XDECREF(ste->ste_name);
|
|
|
|
Py_XDECREF(ste->ste_symbols);
|
|
|
|
Py_XDECREF(ste->ste_varnames);
|
|
|
|
Py_XDECREF(ste->ste_children);
|
|
|
|
PyObject_Del(ste);
|
2001-02-10 06:22:18 +08:00
|
|
|
}
|
|
|
|
|
2005-10-21 03:59:25 +08:00
|
|
|
#define OFF(x) offsetof(PySTEntryObject, x)
|
2001-02-10 06:22:18 +08:00
|
|
|
|
2001-09-21 04:46:19 +08:00
|
|
|
static PyMemberDef ste_memberlist[] = {
|
2010-05-09 23:52:27 +08:00
|
|
|
{"id", T_OBJECT, OFF(ste_id), READONLY},
|
|
|
|
{"name", T_OBJECT, OFF(ste_name), READONLY},
|
|
|
|
{"symbols", T_OBJECT, OFF(ste_symbols), READONLY},
|
|
|
|
{"varnames", T_OBJECT, OFF(ste_varnames), READONLY},
|
|
|
|
{"children", T_OBJECT, OFF(ste_children), READONLY},
|
|
|
|
{"optimized",T_INT, OFF(ste_unoptimized), READONLY},
|
|
|
|
{"nested", T_INT, OFF(ste_nested), READONLY},
|
|
|
|
{"type", T_INT, OFF(ste_type), READONLY},
|
|
|
|
{"lineno", T_INT, OFF(ste_lineno), READONLY},
|
|
|
|
{NULL}
|
2001-02-10 06:22:18 +08:00
|
|
|
};
|
|
|
|
|
2005-10-21 03:59:25 +08:00
|
|
|
PyTypeObject PySTEntry_Type = {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
|
|
|
"symtable entry",
|
|
|
|
sizeof(PySTEntryObject),
|
|
|
|
0,
|
|
|
|
(destructor)ste_dealloc, /* tp_dealloc */
|
|
|
|
0, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
0, /* tp_reserved */
|
|
|
|
(reprfunc)ste_repr, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
|
|
0, /* tp_doc */
|
|
|
|
0, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
0, /* tp_iter */
|
|
|
|
0, /* tp_iternext */
|
|
|
|
0, /* tp_methods */
|
|
|
|
ste_memberlist, /* tp_members */
|
|
|
|
0, /* tp_getset */
|
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
0, /* tp_init */
|
|
|
|
0, /* tp_alloc */
|
|
|
|
0, /* tp_new */
|
2001-02-10 06:22:18 +08:00
|
|
|
};
|
2005-10-21 03:59:25 +08:00
|
|
|
|
|
|
|
static int symtable_analyze(struct symtable *st);
|
2005-12-19 12:27:42 +08:00
|
|
|
static int symtable_warn(struct symtable *st, char *msg, int lineno);
|
2010-05-09 23:52:27 +08:00
|
|
|
static int symtable_enter_block(struct symtable *st, identifier name,
|
2010-09-21 07:02:10 +08:00
|
|
|
_Py_block_ty block, void *ast, int lineno,
|
|
|
|
int col_offset);
|
2005-10-21 03:59:25 +08:00
|
|
|
static int symtable_exit_block(struct symtable *st, void *ast);
|
|
|
|
static int symtable_visit_stmt(struct symtable *st, stmt_ty s);
|
|
|
|
static int symtable_visit_expr(struct symtable *st, expr_ty s);
|
|
|
|
static int symtable_visit_genexp(struct symtable *st, expr_ty s);
|
2007-04-15 20:05:43 +08:00
|
|
|
static int symtable_visit_listcomp(struct symtable *st, expr_ty s);
|
|
|
|
static int symtable_visit_setcomp(struct symtable *st, expr_ty s);
|
Merged revisions 56154-56264 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r56155 | neal.norwitz | 2007-07-03 08:59:08 +0300 (Tue, 03 Jul 2007) | 1 line
Get this test working after converting map to return an iterator
................
r56202 | neal.norwitz | 2007-07-09 04:30:09 +0300 (Mon, 09 Jul 2007) | 37 lines
Merged revisions 56124-56201 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r56129 | georg.brandl | 2007-06-30 04:01:01 -0700 (Sat, 30 Jun 2007) | 2 lines
Document smtp.SMTPAuthenticationError.
........
r56137 | georg.brandl | 2007-07-01 01:11:35 -0700 (Sun, 01 Jul 2007) | 2 lines
Fix a few webbrowser.py problems.
........
r56143 | georg.brandl | 2007-07-02 04:54:28 -0700 (Mon, 02 Jul 2007) | 2 lines
Remove duplicate sentence from alarm() doc.
........
r56170 | mark.hammond | 2007-07-03 19:03:10 -0700 (Tue, 03 Jul 2007) | 3 lines
copy built files to the PCBuild directory, where tools like
distutils or external build processes can find them.
........
r56176 | kurt.kaiser | 2007-07-05 15:03:39 -0700 (Thu, 05 Jul 2007) | 10 lines
Many calls to tk.call involve an arglist containing a single tuple.
Calls using METH_OLDARGS unpack this tuple; calls using METH_VARARG
don't. Tcl's concatenation of args was affected; IDLE doesn't start.
Modify Tkapp_Call() to unpack single tuple arglists.
Bug 1733943
Ref http://mail.python.org/pipermail/python-checkins/2007-May/060454.html
........
r56177 | neal.norwitz | 2007-07-05 21:13:39 -0700 (Thu, 05 Jul 2007) | 1 line
Fix typo in comment
........
................
r56251 | neal.norwitz | 2007-07-11 10:01:01 +0300 (Wed, 11 Jul 2007) | 1 line
Get working with map returning an iterator (had to fix whitespace too)
................
r56255 | thomas.wouters | 2007-07-11 13:41:37 +0300 (Wed, 11 Jul 2007) | 6 lines
Clean up merge glitch or copy-paste error (the entire module was duplicated,
except the first half even had some more copy-paste errors, referring to
listcomps and genexps instead of setcomps)
................
r56256 | thomas.wouters | 2007-07-11 15:16:01 +0300 (Wed, 11 Jul 2007) | 14 lines
Dict comprehensions. Still needs doc changes (like many python-3000 features
;-). It generates bytecode similar to:
x = {}
for k, v in (generator here):
x[k] = v
except there is no tuple-packing and -unpacking involved. Trivial
measurement suggests it's significantly faster than dict(generator here) (in
the order of 2 to 3 times as fast) but I have not done extensive
measurements.
................
r56263 | guido.van.rossum | 2007-07-11 15:36:26 +0300 (Wed, 11 Jul 2007) | 3 lines
Patch 1724999 by Ali Gholami Rudi -- avoid complaints about dict size
change during iter in destroy call.
................
2007-07-11 21:09:30 +08:00
|
|
|
static int symtable_visit_dictcomp(struct symtable *st, expr_ty s);
|
2005-10-21 03:59:25 +08:00
|
|
|
static int symtable_visit_arguments(struct symtable *st, arguments_ty);
|
|
|
|
static int symtable_visit_excepthandler(struct symtable *st, excepthandler_ty);
|
|
|
|
static int symtable_visit_alias(struct symtable *st, alias_ty);
|
|
|
|
static int symtable_visit_comprehension(struct symtable *st, comprehension_ty);
|
|
|
|
static int symtable_visit_keyword(struct symtable *st, keyword_ty);
|
|
|
|
static int symtable_visit_slice(struct symtable *st, slice_ty);
|
2007-05-16 02:46:22 +08:00
|
|
|
static int symtable_visit_params(struct symtable *st, asdl_seq *args);
|
|
|
|
static int symtable_visit_argannotations(struct symtable *st, asdl_seq *args);
|
2005-10-21 03:59:25 +08:00
|
|
|
static int symtable_implicit_arg(struct symtable *st, int pos);
|
2006-12-28 14:47:50 +08:00
|
|
|
static int symtable_visit_annotations(struct symtable *st, stmt_ty s);
|
2005-10-21 03:59:25 +08:00
|
|
|
|
|
|
|
|
2007-04-15 20:05:43 +08:00
|
|
|
static identifier top = NULL, lambda = NULL, genexpr = NULL,
|
2010-05-09 23:52:27 +08:00
|
|
|
listcomp = NULL, setcomp = NULL, dictcomp = NULL,
|
|
|
|
__class__ = NULL, __locals__ = NULL;
|
2005-10-21 03:59:25 +08:00
|
|
|
|
|
|
|
#define GET_IDENTIFIER(VAR) \
|
2010-05-09 23:52:27 +08:00
|
|
|
((VAR) ? (VAR) : ((VAR) = PyUnicode_InternFromString(# VAR)))
|
2005-10-21 03:59:25 +08:00
|
|
|
|
|
|
|
#define DUPLICATE_ARGUMENT \
|
2007-08-25 06:53:58 +08:00
|
|
|
"duplicate argument '%U' in function definition"
|
2005-10-21 03:59:25 +08:00
|
|
|
|
|
|
|
static struct symtable *
|
|
|
|
symtable_new(void)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
struct symtable *st;
|
|
|
|
|
|
|
|
st = (struct symtable *)PyMem_Malloc(sizeof(struct symtable));
|
|
|
|
if (st == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
st->st_filename = NULL;
|
|
|
|
st->st_blocks = NULL;
|
|
|
|
|
|
|
|
if ((st->st_stack = PyList_New(0)) == NULL)
|
|
|
|
goto fail;
|
|
|
|
if ((st->st_blocks = PyDict_New()) == NULL)
|
|
|
|
goto fail;
|
|
|
|
st->st_cur = NULL;
|
|
|
|
st->st_private = NULL;
|
|
|
|
return st;
|
2005-10-21 03:59:25 +08:00
|
|
|
fail:
|
2010-05-09 23:52:27 +08:00
|
|
|
PySymtable_Free(st);
|
|
|
|
return NULL;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
struct symtable *
|
|
|
|
PySymtable_Build(mod_ty mod, const char *filename, PyFutureFeatures *future)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
struct symtable *st = symtable_new();
|
|
|
|
asdl_seq *seq;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (st == NULL)
|
|
|
|
return st;
|
|
|
|
st->st_filename = filename;
|
|
|
|
st->st_future = future;
|
|
|
|
/* Make the initial symbol information gathering pass */
|
|
|
|
if (!GET_IDENTIFIER(top) ||
|
2010-09-21 07:02:10 +08:00
|
|
|
!symtable_enter_block(st, top, ModuleBlock, (void *)mod, 0, 0)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
PySymtable_Free(st);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
st->st_top = st->st_cur;
|
|
|
|
st->st_cur->ste_unoptimized = OPT_TOPLEVEL;
|
|
|
|
switch (mod->kind) {
|
|
|
|
case Module_kind:
|
|
|
|
seq = mod->v.Module.body;
|
|
|
|
for (i = 0; i < asdl_seq_LEN(seq); i++)
|
|
|
|
if (!symtable_visit_stmt(st,
|
|
|
|
(stmt_ty)asdl_seq_GET(seq, i)))
|
|
|
|
goto error;
|
|
|
|
break;
|
|
|
|
case Expression_kind:
|
|
|
|
if (!symtable_visit_expr(st, mod->v.Expression.body))
|
|
|
|
goto error;
|
|
|
|
break;
|
|
|
|
case Interactive_kind:
|
|
|
|
seq = mod->v.Interactive.body;
|
|
|
|
for (i = 0; i < asdl_seq_LEN(seq); i++)
|
|
|
|
if (!symtable_visit_stmt(st,
|
|
|
|
(stmt_ty)asdl_seq_GET(seq, i)))
|
|
|
|
goto error;
|
|
|
|
break;
|
|
|
|
case Suite_kind:
|
|
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
|
|
"this compiler does not handle Suites");
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (!symtable_exit_block(st, (void *)mod)) {
|
|
|
|
PySymtable_Free(st);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Make the second symbol analysis pass */
|
|
|
|
if (symtable_analyze(st))
|
|
|
|
return st;
|
|
|
|
PySymtable_Free(st);
|
|
|
|
return NULL;
|
2005-10-21 03:59:25 +08:00
|
|
|
error:
|
2010-05-09 23:52:27 +08:00
|
|
|
(void) symtable_exit_block(st, (void *)mod);
|
|
|
|
PySymtable_Free(st);
|
|
|
|
return NULL;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
PySymtable_Free(struct symtable *st)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_XDECREF(st->st_blocks);
|
|
|
|
Py_XDECREF(st->st_stack);
|
|
|
|
PyMem_Free((void *)st);
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PySTEntryObject *
|
|
|
|
PySymtable_Lookup(struct symtable *st, void *key)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *k, *v;
|
|
|
|
|
|
|
|
k = PyLong_FromVoidPtr(key);
|
|
|
|
if (k == NULL)
|
|
|
|
return NULL;
|
|
|
|
v = PyDict_GetItem(st->st_blocks, k);
|
|
|
|
if (v) {
|
|
|
|
assert(PySTEntry_Check(v));
|
|
|
|
Py_INCREF(v);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyErr_SetString(PyExc_KeyError,
|
|
|
|
"unknown symbol table entry");
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_DECREF(k);
|
|
|
|
return (PySTEntryObject *)v;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
int
|
2005-10-21 03:59:25 +08:00
|
|
|
PyST_GetScope(PySTEntryObject *ste, PyObject *name)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *v = PyDict_GetItem(ste->ste_symbols, name);
|
|
|
|
if (!v)
|
|
|
|
return 0;
|
|
|
|
assert(PyLong_Check(v));
|
|
|
|
return (PyLong_AS_LONG(v) >> SCOPE_OFFSET) & SCOPE_MASK;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Analyze raw symbol information to determine scope of each name.
|
|
|
|
|
Merged revisions 55817-55961 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
2007-06-14 02:07:49 +08:00
|
|
|
The next several functions are helpers for symtable_analyze(),
|
2010-05-09 23:52:27 +08:00
|
|
|
which determines whether a name is local, global, or free. In addition,
|
2005-10-21 03:59:25 +08:00
|
|
|
it determines which local variables are cell variables; they provide
|
2010-05-09 23:52:27 +08:00
|
|
|
bindings that are used for free variables in enclosed blocks.
|
2005-10-21 03:59:25 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
There are also two kinds of global variables, implicit and explicit. An
|
2005-10-21 03:59:25 +08:00
|
|
|
explicit global is declared with the global statement. An implicit
|
|
|
|
global is a free variable for which the compiler has found no binding
|
|
|
|
in an enclosing function scope. The implicit global is either a global
|
|
|
|
or a builtin. Python's module and class blocks use the xxx_NAME opcodes
|
|
|
|
to handle these names to implement slightly odd semantics. In such a
|
|
|
|
block, the name is treated as global until it is assigned to; then it
|
|
|
|
is treated as a local.
|
|
|
|
|
|
|
|
The symbol table requires two passes to determine the scope of each name.
|
2007-04-15 20:05:43 +08:00
|
|
|
The first pass collects raw facts from the AST via the symtable_visit_*
|
|
|
|
functions: the name is a parameter here, the name is used but not defined
|
|
|
|
here, etc. The second pass analyzes these facts during a pass over the
|
|
|
|
PySTEntryObjects created during pass 1.
|
2005-10-21 03:59:25 +08:00
|
|
|
|
|
|
|
When a function is entered during the second pass, the parent passes
|
2010-05-09 23:52:27 +08:00
|
|
|
the set of all name bindings visible to its children. These bindings
|
2007-04-15 20:05:43 +08:00
|
|
|
are used to determine if non-local variables are free or implicit globals.
|
2007-04-23 18:14:27 +08:00
|
|
|
Names which are explicitly declared nonlocal must exist in this set of
|
|
|
|
visible names - if they do not, a syntax error is raised. After doing
|
|
|
|
the local analysis, it analyzes each of its child blocks using an
|
|
|
|
updated set of name bindings.
|
2005-10-21 03:59:25 +08:00
|
|
|
|
2007-04-15 20:05:43 +08:00
|
|
|
The children update the free variable set. If a local variable is added to
|
|
|
|
the free variable set by the child, the variable is marked as a cell. The
|
|
|
|
function object being defined must provide runtime storage for the variable
|
|
|
|
that may outlive the function's frame. Cell variables are removed from the
|
|
|
|
free set before the analyze function returns to its parent.
|
2007-04-23 18:14:27 +08:00
|
|
|
|
2007-04-15 20:05:43 +08:00
|
|
|
During analysis, the names are:
|
|
|
|
symbols: dict mapping from symbol names to flag values (including offset scope values)
|
|
|
|
scopes: dict mapping from symbol names to scope values (no offset)
|
|
|
|
local: set of all symbol names local to the current scope
|
|
|
|
bound: set of all symbol names local to a containing function scope
|
|
|
|
free: set of all symbol names referenced but not bound in child scopes
|
|
|
|
global: set of all symbol names explicitly declared as global
|
2005-10-21 03:59:25 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
#define SET_SCOPE(DICT, NAME, I) { \
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *o = PyLong_FromLong(I); \
|
|
|
|
if (!o) \
|
|
|
|
return 0; \
|
|
|
|
if (PyDict_SetItem((DICT), (NAME), o) < 0) { \
|
|
|
|
Py_DECREF(o); \
|
|
|
|
return 0; \
|
|
|
|
} \
|
|
|
|
Py_DECREF(o); \
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Decide on scope of name, given flags.
|
|
|
|
|
2009-03-31 23:26:37 +08:00
|
|
|
The namespace dictionaries may be modified to record information
|
|
|
|
about the new name. For example, a new global will add an entry to
|
|
|
|
global. A name that was global can be changed to local.
|
2005-10-21 03:59:25 +08:00
|
|
|
*/
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2007-04-15 20:05:43 +08:00
|
|
|
analyze_name(PySTEntryObject *ste, PyObject *scopes, PyObject *name, long flags,
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *bound, PyObject *local, PyObject *free,
|
|
|
|
PyObject *global)
|
2005-10-21 03:59:25 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (flags & DEF_GLOBAL) {
|
|
|
|
if (flags & DEF_PARAM) {
|
|
|
|
PyErr_Format(PyExc_SyntaxError,
|
|
|
|
"name '%U' is parameter and global",
|
|
|
|
name);
|
2010-09-21 07:02:10 +08:00
|
|
|
PyErr_SyntaxLocationEx(ste->ste_table->st_filename,
|
|
|
|
ste->ste_lineno, ste->ste_col_offset);
|
2010-05-09 23:52:27 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2007-02-27 14:50:52 +08:00
|
|
|
if (flags & DEF_NONLOCAL) {
|
2010-05-09 23:52:27 +08:00
|
|
|
PyErr_Format(PyExc_SyntaxError,
|
|
|
|
"name '%U' is nonlocal and global",
|
|
|
|
name);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
SET_SCOPE(scopes, name, GLOBAL_EXPLICIT);
|
|
|
|
if (PySet_Add(global, name) < 0)
|
|
|
|
return 0;
|
|
|
|
if (bound && (PySet_Discard(bound, name) < 0))
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (flags & DEF_NONLOCAL) {
|
|
|
|
if (flags & DEF_PARAM) {
|
|
|
|
PyErr_Format(PyExc_SyntaxError,
|
|
|
|
"name '%U' is parameter and nonlocal",
|
|
|
|
name);
|
|
|
|
return 0;
|
2007-02-27 14:50:52 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
if (!bound) {
|
|
|
|
PyErr_Format(PyExc_SyntaxError,
|
|
|
|
"nonlocal declaration not allowed at module level");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!PySet_Contains(bound, name)) {
|
|
|
|
PyErr_Format(PyExc_SyntaxError,
|
|
|
|
"no binding for nonlocal '%U' found",
|
|
|
|
name);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
SET_SCOPE(scopes, name, FREE);
|
|
|
|
ste->ste_free = 1;
|
|
|
|
return PySet_Add(free, name) >= 0;
|
|
|
|
}
|
|
|
|
if (flags & DEF_BOUND) {
|
2010-07-21 06:39:34 +08:00
|
|
|
SET_SCOPE(scopes, name, LOCAL);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (PySet_Add(local, name) < 0)
|
|
|
|
return 0;
|
|
|
|
if (PySet_Discard(global, name) < 0)
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
/* If an enclosing block has a binding for this name, it
|
|
|
|
is a free variable rather than a global variable.
|
|
|
|
Note that having a non-NULL bound implies that the block
|
|
|
|
is nested.
|
|
|
|
*/
|
|
|
|
if (bound && PySet_Contains(bound, name)) {
|
|
|
|
SET_SCOPE(scopes, name, FREE);
|
|
|
|
ste->ste_free = 1;
|
|
|
|
return PySet_Add(free, name) >= 0;
|
|
|
|
}
|
|
|
|
/* If a parent has a global statement, then call it global
|
|
|
|
explicit? It could also be global implicit.
|
|
|
|
*/
|
|
|
|
if (global && PySet_Contains(global, name)) {
|
|
|
|
SET_SCOPE(scopes, name, GLOBAL_IMPLICIT);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (ste->ste_nested)
|
|
|
|
ste->ste_free = 1;
|
|
|
|
SET_SCOPE(scopes, name, GLOBAL_IMPLICIT);
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#undef SET_SCOPE
|
|
|
|
|
|
|
|
/* If a name is defined in free and also in locals, then this block
|
|
|
|
provides the binding for the free variable. The name should be
|
|
|
|
marked CELL in this block and removed from the free list.
|
|
|
|
|
|
|
|
Note that the current block's free variables are included in free.
|
|
|
|
That's safe because no name can be free and local in the same scope.
|
Merged revisions 55817-55961 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
2007-06-14 02:07:49 +08:00
|
|
|
|
2007-10-30 03:54:24 +08:00
|
|
|
The 'restricted' argument may be set to a string to restrict the analysis
|
Merged revisions 55817-55961 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
2007-06-14 02:07:49 +08:00
|
|
|
to the one variable whose name equals that string (e.g. "__class__").
|
2005-10-21 03:59:25 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
2007-10-30 03:54:24 +08:00
|
|
|
analyze_cells(PyObject *scopes, PyObject *free, const char *restricted)
|
2005-10-21 03:59:25 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *name, *v, *v_cell;
|
|
|
|
int success = 0;
|
|
|
|
Py_ssize_t pos = 0;
|
|
|
|
|
|
|
|
v_cell = PyLong_FromLong(CELL);
|
|
|
|
if (!v_cell)
|
|
|
|
return 0;
|
|
|
|
while (PyDict_Next(scopes, &pos, &name, &v)) {
|
|
|
|
long scope;
|
|
|
|
assert(PyLong_Check(v));
|
|
|
|
scope = PyLong_AS_LONG(v);
|
2010-07-21 06:39:34 +08:00
|
|
|
if (scope != LOCAL)
|
2010-05-09 23:52:27 +08:00
|
|
|
continue;
|
|
|
|
if (!PySet_Contains(free, name))
|
|
|
|
continue;
|
|
|
|
if (restricted != NULL &&
|
|
|
|
PyUnicode_CompareWithASCIIString(name, restricted))
|
|
|
|
continue;
|
|
|
|
/* Replace LOCAL with CELL for this name, and remove
|
|
|
|
from free. It is safe to replace the value of name
|
|
|
|
in the dict, because it will not cause a resize.
|
|
|
|
*/
|
|
|
|
if (PyDict_SetItem(scopes, name, v_cell) < 0)
|
|
|
|
goto error;
|
|
|
|
if (PySet_Discard(free, name) < 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
success = 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
error:
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(v_cell);
|
|
|
|
return success;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for illegal statements in unoptimized namespaces */
|
|
|
|
static int
|
|
|
|
check_unoptimized(const PySTEntryObject* ste) {
|
2010-05-09 23:52:27 +08:00
|
|
|
const char* trailer;
|
|
|
|
|
|
|
|
if (ste->ste_type != FunctionBlock || !ste->ste_unoptimized
|
|
|
|
|| !(ste->ste_free || ste->ste_child_free))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
trailer = (ste->ste_child_free ?
|
|
|
|
"contains a nested function with free variables" :
|
|
|
|
"is a nested function");
|
|
|
|
|
|
|
|
switch (ste->ste_unoptimized) {
|
|
|
|
case OPT_TOPLEVEL: /* import * at top-level is fine */
|
|
|
|
return 1;
|
|
|
|
case OPT_IMPORT_STAR:
|
|
|
|
PyErr_Format(PyExc_SyntaxError,
|
|
|
|
"import * is not allowed in function '%U' because it %s",
|
|
|
|
ste->ste_name, trailer);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2010-09-21 07:02:10 +08:00
|
|
|
PyErr_SyntaxLocationEx(ste->ste_table->st_filename, ste->ste_opt_lineno,
|
|
|
|
ste->ste_opt_col_offset);
|
2010-05-09 23:52:27 +08:00
|
|
|
return 0;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
/* Enter the final scope information into the ste_symbols dict.
|
|
|
|
*
|
2005-10-21 03:59:25 +08:00
|
|
|
* All arguments are dicts. Modifies symbols, others are read-only.
|
|
|
|
*/
|
|
|
|
static int
|
2010-05-09 23:52:27 +08:00
|
|
|
update_symbols(PyObject *symbols, PyObject *scopes,
|
2006-04-21 18:40:58 +08:00
|
|
|
PyObject *bound, PyObject *free, int classflag)
|
2005-10-21 03:59:25 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *name = NULL, *itr = NULL;
|
|
|
|
PyObject *v = NULL, *v_scope = NULL, *v_new = NULL, *v_free = NULL;
|
|
|
|
Py_ssize_t pos = 0;
|
|
|
|
|
|
|
|
/* Update scope information for all symbols in this scope */
|
|
|
|
while (PyDict_Next(symbols, &pos, &name, &v)) {
|
|
|
|
long scope, flags;
|
|
|
|
assert(PyLong_Check(v));
|
|
|
|
flags = PyLong_AS_LONG(v);
|
|
|
|
v_scope = PyDict_GetItem(scopes, name);
|
|
|
|
assert(v_scope && PyLong_Check(v_scope));
|
|
|
|
scope = PyLong_AS_LONG(v_scope);
|
|
|
|
flags |= (scope << SCOPE_OFFSET);
|
|
|
|
v_new = PyLong_FromLong(flags);
|
|
|
|
if (!v_new)
|
|
|
|
return 0;
|
|
|
|
if (PyDict_SetItem(symbols, name, v_new) < 0) {
|
|
|
|
Py_DECREF(v_new);
|
|
|
|
return 0;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(v_new);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Record not yet resolved free variables from children (if any) */
|
|
|
|
v_free = PyLong_FromLong(FREE << SCOPE_OFFSET);
|
|
|
|
if (!v_free)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
itr = PyObject_GetIter(free);
|
|
|
|
if (!itr)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
while ((name = PyIter_Next(itr))) {
|
|
|
|
v = PyDict_GetItem(symbols, name);
|
|
|
|
|
|
|
|
/* Handle symbol that already exists in this scope */
|
|
|
|
if (v) {
|
|
|
|
/* Handle a free variable in a method of
|
|
|
|
the class that has the same name as a local
|
|
|
|
or global in the class scope.
|
|
|
|
*/
|
|
|
|
if (classflag &&
|
|
|
|
PyLong_AS_LONG(v) & (DEF_BOUND | DEF_GLOBAL)) {
|
|
|
|
long flags = PyLong_AS_LONG(v) | DEF_FREE_CLASS;
|
|
|
|
v_new = PyLong_FromLong(flags);
|
|
|
|
if (!v_new) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (PyDict_SetItem(symbols, name, v_new) < 0) {
|
|
|
|
Py_DECREF(v_new);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_DECREF(v_new);
|
|
|
|
}
|
|
|
|
/* It's a cell, or already free in this scope */
|
|
|
|
Py_DECREF(name);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/* Handle global symbol */
|
|
|
|
if (!PySet_Contains(bound, name)) {
|
|
|
|
Py_DECREF(name);
|
|
|
|
continue; /* it's a global */
|
|
|
|
}
|
|
|
|
/* Propagate new free symbol up the lexical stack */
|
|
|
|
if (PyDict_SetItem(symbols, name, v_free) < 0) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_DECREF(name);
|
|
|
|
}
|
|
|
|
Py_DECREF(itr);
|
|
|
|
Py_DECREF(v_free);
|
|
|
|
return 1;
|
2007-04-15 20:05:43 +08:00
|
|
|
error:
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_XDECREF(v_free);
|
|
|
|
Py_XDECREF(itr);
|
|
|
|
Py_XDECREF(name);
|
|
|
|
return 0;
|
|
|
|
}
|
2005-10-21 03:59:25 +08:00
|
|
|
|
|
|
|
/* Make final symbol table decisions for block of ste.
|
2009-03-31 23:26:37 +08:00
|
|
|
|
2005-10-21 03:59:25 +08:00
|
|
|
Arguments:
|
|
|
|
ste -- current symtable entry (input/output)
|
2009-03-31 23:26:37 +08:00
|
|
|
bound -- set of variables bound in enclosing scopes (input). bound
|
|
|
|
is NULL for module blocks.
|
2005-10-21 03:59:25 +08:00
|
|
|
free -- set of free variables in enclosed scopes (output)
|
|
|
|
globals -- set of declared global variables in enclosing scopes (input)
|
2009-03-31 23:26:37 +08:00
|
|
|
|
|
|
|
The implementation uses two mutually recursive functions,
|
|
|
|
analyze_block() and analyze_child_block(). analyze_block() is
|
|
|
|
responsible for analyzing the individual names defined in a block.
|
|
|
|
analyze_child_block() prepares temporary namespace dictionaries
|
|
|
|
used to evaluated nested blocks.
|
|
|
|
|
|
|
|
The two functions exist because a child block should see the name
|
|
|
|
bindings of its enclosing blocks, but those bindings should not
|
|
|
|
propagate back to a parent block.
|
2005-10-21 03:59:25 +08:00
|
|
|
*/
|
|
|
|
|
2009-03-31 23:26:37 +08:00
|
|
|
static int
|
2010-05-09 23:52:27 +08:00
|
|
|
analyze_child_block(PySTEntryObject *entry, PyObject *bound, PyObject *free,
|
|
|
|
PyObject *global, PyObject* child_free);
|
2009-03-31 23:26:37 +08:00
|
|
|
|
2005-10-21 03:59:25 +08:00
|
|
|
static int
|
2010-05-09 23:52:27 +08:00
|
|
|
analyze_block(PySTEntryObject *ste, PyObject *bound, PyObject *free,
|
|
|
|
PyObject *global)
|
2005-10-21 03:59:25 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *name, *v, *local = NULL, *scopes = NULL, *newbound = NULL;
|
|
|
|
PyObject *newglobal = NULL, *newfree = NULL, *allfree = NULL;
|
|
|
|
PyObject *temp;
|
|
|
|
int i, success = 0;
|
|
|
|
Py_ssize_t pos = 0;
|
|
|
|
|
|
|
|
local = PySet_New(NULL); /* collect new names bound in block */
|
|
|
|
if (!local)
|
|
|
|
goto error;
|
|
|
|
scopes = PyDict_New(); /* collect scopes defined for each name */
|
|
|
|
if (!scopes)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Allocate new global and bound variable dictionaries. These
|
|
|
|
dictionaries hold the names visible in nested blocks. For
|
|
|
|
ClassBlocks, the bound and global names are initialized
|
|
|
|
before analyzing names, because class bindings aren't
|
|
|
|
visible in methods. For other blocks, they are initialized
|
|
|
|
after names are analyzed.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* TODO(jhylton): Package these dicts in a struct so that we
|
|
|
|
can write reasonable helper functions?
|
|
|
|
*/
|
|
|
|
newglobal = PySet_New(NULL);
|
|
|
|
if (!newglobal)
|
|
|
|
goto error;
|
|
|
|
newfree = PySet_New(NULL);
|
|
|
|
if (!newfree)
|
|
|
|
goto error;
|
|
|
|
newbound = PySet_New(NULL);
|
|
|
|
if (!newbound)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Class namespace has no effect on names visible in
|
|
|
|
nested functions, so populate the global and bound
|
|
|
|
sets to be passed to child blocks before analyzing
|
|
|
|
this one.
|
|
|
|
*/
|
|
|
|
if (ste->ste_type == ClassBlock) {
|
|
|
|
/* Pass down known globals */
|
|
|
|
temp = PyNumber_InPlaceOr(newglobal, global);
|
|
|
|
if (!temp)
|
|
|
|
goto error;
|
|
|
|
Py_DECREF(temp);
|
|
|
|
/* Pass down previously bound symbols */
|
|
|
|
if (bound) {
|
|
|
|
temp = PyNumber_InPlaceOr(newbound, bound);
|
|
|
|
if (!temp)
|
|
|
|
goto error;
|
|
|
|
Py_DECREF(temp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
while (PyDict_Next(ste->ste_symbols, &pos, &name, &v)) {
|
|
|
|
long flags = PyLong_AS_LONG(v);
|
|
|
|
if (!analyze_name(ste, scopes, name, flags,
|
|
|
|
bound, local, free, global))
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Populate global and bound sets to be passed to children. */
|
|
|
|
if (ste->ste_type != ClassBlock) {
|
|
|
|
/* Add function locals to bound set */
|
|
|
|
if (ste->ste_type == FunctionBlock) {
|
|
|
|
temp = PyNumber_InPlaceOr(newbound, local);
|
|
|
|
if (!temp)
|
|
|
|
goto error;
|
|
|
|
Py_DECREF(temp);
|
|
|
|
}
|
|
|
|
/* Pass down previously bound symbols */
|
|
|
|
if (bound) {
|
|
|
|
temp = PyNumber_InPlaceOr(newbound, bound);
|
|
|
|
if (!temp)
|
|
|
|
goto error;
|
|
|
|
Py_DECREF(temp);
|
|
|
|
}
|
|
|
|
/* Pass down known globals */
|
|
|
|
temp = PyNumber_InPlaceOr(newglobal, global);
|
|
|
|
if (!temp)
|
|
|
|
goto error;
|
|
|
|
Py_DECREF(temp);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Special-case __class__ */
|
|
|
|
if (!GET_IDENTIFIER(__class__))
|
|
|
|
goto error;
|
|
|
|
assert(PySet_Contains(local, __class__) == 1);
|
|
|
|
if (PySet_Add(newbound, __class__) < 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Recursively call analyze_block() on each child block.
|
|
|
|
|
|
|
|
newbound, newglobal now contain the names visible in
|
|
|
|
nested blocks. The free variables in the children will
|
|
|
|
be collected in allfree.
|
|
|
|
*/
|
|
|
|
allfree = PySet_New(NULL);
|
|
|
|
if (!allfree)
|
|
|
|
goto error;
|
|
|
|
for (i = 0; i < PyList_GET_SIZE(ste->ste_children); ++i) {
|
|
|
|
PyObject *c = PyList_GET_ITEM(ste->ste_children, i);
|
|
|
|
PySTEntryObject* entry;
|
|
|
|
assert(c && PySTEntry_Check(c));
|
|
|
|
entry = (PySTEntryObject*)c;
|
|
|
|
if (!analyze_child_block(entry, newbound, newfree, newglobal,
|
|
|
|
allfree))
|
|
|
|
goto error;
|
|
|
|
/* Check if any children have free variables */
|
|
|
|
if (entry->ste_free || entry->ste_child_free)
|
|
|
|
ste->ste_child_free = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
temp = PyNumber_InPlaceOr(newfree, allfree);
|
|
|
|
if (!temp)
|
|
|
|
goto error;
|
|
|
|
Py_DECREF(temp);
|
|
|
|
|
|
|
|
/* Check if any local variables must be converted to cell variables */
|
|
|
|
if (ste->ste_type == FunctionBlock && !analyze_cells(scopes, newfree,
|
|
|
|
NULL))
|
|
|
|
goto error;
|
|
|
|
else if (ste->ste_type == ClassBlock && !analyze_cells(scopes, newfree,
|
|
|
|
"__class__"))
|
|
|
|
goto error;
|
|
|
|
/* Records the results of the analysis in the symbol table entry */
|
|
|
|
if (!update_symbols(ste->ste_symbols, scopes, bound, newfree,
|
|
|
|
ste->ste_type == ClassBlock))
|
|
|
|
goto error;
|
|
|
|
if (!check_unoptimized(ste))
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
temp = PyNumber_InPlaceOr(free, newfree);
|
|
|
|
if (!temp)
|
|
|
|
goto error;
|
|
|
|
Py_DECREF(temp);
|
|
|
|
success = 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
error:
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_XDECREF(scopes);
|
|
|
|
Py_XDECREF(local);
|
|
|
|
Py_XDECREF(newbound);
|
|
|
|
Py_XDECREF(newglobal);
|
|
|
|
Py_XDECREF(newfree);
|
|
|
|
Py_XDECREF(allfree);
|
|
|
|
if (!success)
|
|
|
|
assert(PyErr_Occurred());
|
|
|
|
return success;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
2009-03-31 23:26:37 +08:00
|
|
|
static int
|
2010-05-09 23:52:27 +08:00
|
|
|
analyze_child_block(PySTEntryObject *entry, PyObject *bound, PyObject *free,
|
|
|
|
PyObject *global, PyObject* child_free)
|
2009-03-31 23:26:37 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *temp_bound = NULL, *temp_global = NULL, *temp_free = NULL;
|
|
|
|
PyObject *temp;
|
|
|
|
|
|
|
|
/* Copy the bound and global dictionaries.
|
|
|
|
|
|
|
|
These dictionary are used by all blocks enclosed by the
|
|
|
|
current block. The analyze_block() call modifies these
|
|
|
|
dictionaries.
|
|
|
|
|
|
|
|
*/
|
|
|
|
temp_bound = PySet_New(bound);
|
|
|
|
if (!temp_bound)
|
|
|
|
goto error;
|
|
|
|
temp_free = PySet_New(free);
|
|
|
|
if (!temp_free)
|
|
|
|
goto error;
|
|
|
|
temp_global = PySet_New(global);
|
|
|
|
if (!temp_global)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
if (!analyze_block(entry, temp_bound, temp_free, temp_global))
|
|
|
|
goto error;
|
|
|
|
temp = PyNumber_InPlaceOr(child_free, temp_free);
|
|
|
|
if (!temp)
|
|
|
|
goto error;
|
|
|
|
Py_DECREF(temp);
|
|
|
|
Py_DECREF(temp_bound);
|
|
|
|
Py_DECREF(temp_free);
|
|
|
|
Py_DECREF(temp_global);
|
|
|
|
return 1;
|
2009-03-31 23:26:37 +08:00
|
|
|
error:
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_XDECREF(temp_bound);
|
|
|
|
Py_XDECREF(temp_free);
|
|
|
|
Py_XDECREF(temp_global);
|
|
|
|
return 0;
|
2009-03-31 23:26:37 +08:00
|
|
|
}
|
|
|
|
|
2005-10-21 03:59:25 +08:00
|
|
|
static int
|
|
|
|
symtable_analyze(struct symtable *st)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *free, *global;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
free = PySet_New(NULL);
|
|
|
|
if (!free)
|
|
|
|
return 0;
|
|
|
|
global = PySet_New(NULL);
|
|
|
|
if (!global) {
|
|
|
|
Py_DECREF(free);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
r = analyze_block(st->st_top, NULL, free, global);
|
|
|
|
Py_DECREF(free);
|
|
|
|
Py_DECREF(global);
|
|
|
|
return r;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2005-12-19 12:27:42 +08:00
|
|
|
symtable_warn(struct symtable *st, char *msg, int lineno)
|
2005-10-21 03:59:25 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (PyErr_WarnExplicit(PyExc_SyntaxWarning, msg, st->st_filename,
|
|
|
|
lineno, NULL, NULL) < 0) {
|
|
|
|
if (PyErr_ExceptionMatches(PyExc_SyntaxWarning)) {
|
|
|
|
PyErr_SetString(PyExc_SyntaxError, msg);
|
2010-09-21 07:02:10 +08:00
|
|
|
PyErr_SyntaxLocationEx(st->st_filename, st->st_cur->ste_lineno,
|
|
|
|
st->st_cur->ste_col_offset);
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
Merged revisions 65715,65724,65726,65732,65736-65739,65775 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65715 | benjamin.peterson | 2008-08-16 16:04:16 -0500 (Sat, 16 Aug 2008) | 1 line
add some documentation for symtable
........
r65724 | benjamin.peterson | 2008-08-16 17:11:33 -0500 (Sat, 16 Aug 2008) | 2 lines
include filename and line number in SyntaxError
........
r65726 | georg.brandl | 2008-08-16 17:37:05 -0500 (Sat, 16 Aug 2008) | 2 lines
Review symtable docs.
........
r65732 | benjamin.peterson | 2008-08-16 18:29:40 -0500 (Sat, 16 Aug 2008) | 1 line
PySTEntry's constructor is static; there's no point in a fancy API name
........
r65736 | benjamin.peterson | 2008-08-16 20:09:17 -0500 (Sat, 16 Aug 2008) | 1 line
expose PySTEntry.nested so the symtable module will work
........
r65737 | benjamin.peterson | 2008-08-16 20:17:15 -0500 (Sat, 16 Aug 2008) | 1 line
a few improvements
........
r65738 | benjamin.peterson | 2008-08-16 20:27:30 -0500 (Sat, 16 Aug 2008) | 1 line
fix compile errors
........
r65739 | benjamin.peterson | 2008-08-16 21:23:43 -0500 (Sat, 16 Aug 2008) | 1 line
uhh PySTEntry->ste_unoptimized has to be exposed too
........
r65775 | benjamin.peterson | 2008-08-17 12:13:26 -0500 (Sun, 17 Aug 2008) | 5 lines
get the symtable module back in working order
- Fix broken functions
- Add (hopefully) extensive tests
- Modernize a little
........
2008-08-18 02:02:44 +08:00
|
|
|
/* symtable_enter_block() gets a reference via ste_new.
|
2005-10-21 03:59:25 +08:00
|
|
|
This reference is released when the block is exited, via the DECREF
|
|
|
|
in symtable_exit_block().
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
|
|
|
symtable_exit_block(struct symtable *st, void *ast)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_ssize_t end;
|
|
|
|
|
|
|
|
Py_CLEAR(st->st_cur);
|
|
|
|
end = PyList_GET_SIZE(st->st_stack) - 1;
|
|
|
|
if (end >= 0) {
|
|
|
|
st->st_cur = (PySTEntryObject *)PyList_GET_ITEM(st->st_stack,
|
|
|
|
end);
|
|
|
|
if (st->st_cur == NULL)
|
|
|
|
return 0;
|
|
|
|
Py_INCREF(st->st_cur);
|
|
|
|
if (PySequence_DelItem(st->st_stack, end) < 0)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2010-05-09 23:52:27 +08:00
|
|
|
symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block,
|
2010-09-21 07:02:10 +08:00
|
|
|
void *ast, int lineno, int col_offset)
|
2005-10-21 03:59:25 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PySTEntryObject *prev = NULL;
|
|
|
|
|
|
|
|
if (st->st_cur) {
|
|
|
|
prev = st->st_cur;
|
|
|
|
if (PyList_Append(st->st_stack, (PyObject *)st->st_cur) < 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
Py_DECREF(st->st_cur);
|
|
|
|
}
|
2010-09-21 07:02:10 +08:00
|
|
|
st->st_cur = ste_new(st, name, block, ast, lineno, col_offset);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (st->st_cur == NULL)
|
|
|
|
return 0;
|
2010-10-16 11:45:45 +08:00
|
|
|
if (block == ModuleBlock)
|
2010-05-09 23:52:27 +08:00
|
|
|
st->st_global = st->st_cur->ste_symbols;
|
|
|
|
if (prev) {
|
|
|
|
if (PyList_Append(prev->ste_children,
|
|
|
|
(PyObject *)st->st_cur) < 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
2006-01-08 09:06:06 +08:00
|
|
|
static long
|
2005-10-21 03:59:25 +08:00
|
|
|
symtable_lookup(struct symtable *st, PyObject *name)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *o;
|
|
|
|
PyObject *mangled = _Py_Mangle(st->st_private, name);
|
|
|
|
if (!mangled)
|
|
|
|
return 0;
|
|
|
|
o = PyDict_GetItem(st->st_cur->ste_symbols, mangled);
|
|
|
|
Py_DECREF(mangled);
|
|
|
|
if (!o)
|
|
|
|
return 0;
|
|
|
|
return PyLong_AsLong(o);
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2010-05-09 23:52:27 +08:00
|
|
|
symtable_add_def(struct symtable *st, PyObject *name, int flag)
|
2005-10-21 03:59:25 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *o;
|
|
|
|
PyObject *dict;
|
|
|
|
long val;
|
|
|
|
PyObject *mangled = _Py_Mangle(st->st_private, name);
|
|
|
|
|
|
|
|
|
|
|
|
if (!mangled)
|
|
|
|
return 0;
|
|
|
|
dict = st->st_cur->ste_symbols;
|
|
|
|
if ((o = PyDict_GetItem(dict, mangled))) {
|
|
|
|
val = PyLong_AS_LONG(o);
|
|
|
|
if ((flag & DEF_PARAM) && (val & DEF_PARAM)) {
|
|
|
|
/* Is it better to use 'mangled' or 'name' here? */
|
|
|
|
PyErr_Format(PyExc_SyntaxError, DUPLICATE_ARGUMENT, name);
|
2010-09-21 07:02:10 +08:00
|
|
|
PyErr_SyntaxLocationEx(st->st_filename,
|
|
|
|
st->st_cur->ste_lineno,
|
|
|
|
st->st_cur->ste_col_offset);
|
2010-05-09 23:52:27 +08:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
val |= flag;
|
|
|
|
} else
|
|
|
|
val = flag;
|
|
|
|
o = PyLong_FromLong(val);
|
|
|
|
if (o == NULL)
|
|
|
|
goto error;
|
|
|
|
if (PyDict_SetItem(dict, mangled, o) < 0) {
|
|
|
|
Py_DECREF(o);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_DECREF(o);
|
|
|
|
|
|
|
|
if (flag & DEF_PARAM) {
|
|
|
|
if (PyList_Append(st->st_cur->ste_varnames, mangled) < 0)
|
|
|
|
goto error;
|
|
|
|
} else if (flag & DEF_GLOBAL) {
|
|
|
|
/* XXX need to update DEF_GLOBAL for other flags too;
|
|
|
|
perhaps only DEF_FREE_GLOBAL */
|
|
|
|
val = flag;
|
|
|
|
if ((o = PyDict_GetItem(st->st_global, mangled))) {
|
|
|
|
val |= PyLong_AS_LONG(o);
|
|
|
|
}
|
|
|
|
o = PyLong_FromLong(val);
|
2005-10-21 03:59:25 +08:00
|
|
|
if (o == NULL)
|
2010-05-09 23:52:27 +08:00
|
|
|
goto error;
|
|
|
|
if (PyDict_SetItem(st->st_global, mangled, o) < 0) {
|
|
|
|
Py_DECREF(o);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
Py_DECREF(o);
|
|
|
|
}
|
|
|
|
Py_DECREF(mangled);
|
|
|
|
return 1;
|
2005-10-24 02:37:42 +08:00
|
|
|
|
|
|
|
error:
|
2010-05-09 23:52:27 +08:00
|
|
|
Py_DECREF(mangled);
|
|
|
|
return 0;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* VISIT, VISIT_SEQ and VIST_SEQ_TAIL take an ASDL type as their second argument.
|
|
|
|
They use the ASDL name to synthesize the name of the C type and the visit
|
2010-05-09 23:52:27 +08:00
|
|
|
function.
|
|
|
|
|
2005-10-21 03:59:25 +08:00
|
|
|
VISIT_SEQ_TAIL permits the start of an ASDL sequence to be skipped, which is
|
|
|
|
useful if the first node in the sequence requires special treatment.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define VISIT(ST, TYPE, V) \
|
2010-05-09 23:52:27 +08:00
|
|
|
if (!symtable_visit_ ## TYPE((ST), (V))) \
|
|
|
|
return 0;
|
2005-11-14 02:50:34 +08:00
|
|
|
|
|
|
|
#define VISIT_IN_BLOCK(ST, TYPE, V, S) \
|
2010-05-09 23:52:27 +08:00
|
|
|
if (!symtable_visit_ ## TYPE((ST), (V))) { \
|
|
|
|
symtable_exit_block((ST), (S)); \
|
|
|
|
return 0; \
|
|
|
|
}
|
2005-11-14 02:50:34 +08:00
|
|
|
|
2005-10-21 03:59:25 +08:00
|
|
|
#define VISIT_SEQ(ST, TYPE, SEQ) { \
|
2010-05-09 23:52:27 +08:00
|
|
|
int i; \
|
|
|
|
asdl_seq *seq = (SEQ); /* avoid variable capture */ \
|
|
|
|
for (i = 0; i < asdl_seq_LEN(seq); i++) { \
|
|
|
|
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
|
|
|
|
if (!symtable_visit_ ## TYPE((ST), elt)) \
|
|
|
|
return 0; \
|
|
|
|
} \
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
2005-11-14 02:50:34 +08:00
|
|
|
|
|
|
|
#define VISIT_SEQ_IN_BLOCK(ST, TYPE, SEQ, S) { \
|
2010-05-09 23:52:27 +08:00
|
|
|
int i; \
|
|
|
|
asdl_seq *seq = (SEQ); /* avoid variable capture */ \
|
|
|
|
for (i = 0; i < asdl_seq_LEN(seq); i++) { \
|
|
|
|
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
|
|
|
|
if (!symtable_visit_ ## TYPE((ST), elt)) { \
|
|
|
|
symtable_exit_block((ST), (S)); \
|
|
|
|
return 0; \
|
|
|
|
} \
|
|
|
|
} \
|
2005-11-14 02:50:34 +08:00
|
|
|
}
|
|
|
|
|
2005-10-21 03:59:25 +08:00
|
|
|
#define VISIT_SEQ_TAIL(ST, TYPE, SEQ, START) { \
|
2010-05-09 23:52:27 +08:00
|
|
|
int i; \
|
|
|
|
asdl_seq *seq = (SEQ); /* avoid variable capture */ \
|
|
|
|
for (i = (START); i < asdl_seq_LEN(seq); i++) { \
|
|
|
|
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
|
|
|
|
if (!symtable_visit_ ## TYPE((ST), elt)) \
|
|
|
|
return 0; \
|
|
|
|
} \
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
2005-11-14 02:50:34 +08:00
|
|
|
|
|
|
|
#define VISIT_SEQ_TAIL_IN_BLOCK(ST, TYPE, SEQ, START, S) { \
|
2010-05-09 23:52:27 +08:00
|
|
|
int i; \
|
|
|
|
asdl_seq *seq = (SEQ); /* avoid variable capture */ \
|
|
|
|
for (i = (START); i < asdl_seq_LEN(seq); i++) { \
|
|
|
|
TYPE ## _ty elt = (TYPE ## _ty)asdl_seq_GET(seq, i); \
|
|
|
|
if (!symtable_visit_ ## TYPE((ST), elt)) { \
|
|
|
|
symtable_exit_block((ST), (S)); \
|
|
|
|
return 0; \
|
|
|
|
} \
|
|
|
|
} \
|
2005-11-14 02:50:34 +08:00
|
|
|
}
|
|
|
|
|
2006-10-28 07:31:49 +08:00
|
|
|
#define VISIT_KWONLYDEFAULTS(ST, KW_DEFAULTS) { \
|
2010-05-09 23:52:27 +08:00
|
|
|
int i = 0; \
|
|
|
|
asdl_seq *seq = (KW_DEFAULTS); /* avoid variable capture */ \
|
|
|
|
for (i = 0; i < asdl_seq_LEN(seq); i++) { \
|
|
|
|
expr_ty elt = (expr_ty)asdl_seq_GET(seq, i); \
|
|
|
|
if (!elt) continue; /* can be NULL */ \
|
|
|
|
if (!symtable_visit_expr((ST), elt)) \
|
|
|
|
return 0; \
|
|
|
|
} \
|
2006-10-28 07:31:49 +08:00
|
|
|
}
|
|
|
|
|
2006-02-28 06:32:47 +08:00
|
|
|
static int
|
|
|
|
symtable_new_tmpname(struct symtable *st)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
char tmpname[256];
|
|
|
|
identifier tmp;
|
|
|
|
|
|
|
|
PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]",
|
|
|
|
++st->st_cur->ste_tmpname);
|
|
|
|
tmp = PyUnicode_InternFromString(tmpname);
|
|
|
|
if (!tmp)
|
|
|
|
return 0;
|
|
|
|
if (!symtable_add_def(st, tmp, DEF_LOCAL))
|
|
|
|
return 0;
|
|
|
|
Py_DECREF(tmp);
|
|
|
|
return 1;
|
2006-02-28 06:32:47 +08:00
|
|
|
}
|
|
|
|
|
2006-10-28 07:31:49 +08:00
|
|
|
|
2005-10-21 03:59:25 +08:00
|
|
|
static int
|
|
|
|
symtable_visit_stmt(struct symtable *st, stmt_ty s)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
switch (s->kind) {
|
|
|
|
case FunctionDef_kind:
|
|
|
|
if (!symtable_add_def(st, s->v.FunctionDef.name, DEF_LOCAL))
|
|
|
|
return 0;
|
|
|
|
if (s->v.FunctionDef.args->defaults)
|
|
|
|
VISIT_SEQ(st, expr, s->v.FunctionDef.args->defaults);
|
|
|
|
if (s->v.FunctionDef.args->kw_defaults)
|
|
|
|
VISIT_KWONLYDEFAULTS(st,
|
|
|
|
s->v.FunctionDef.args->kw_defaults);
|
|
|
|
if (!symtable_visit_annotations(st, s))
|
|
|
|
return 0;
|
|
|
|
if (s->v.FunctionDef.decorator_list)
|
|
|
|
VISIT_SEQ(st, expr, s->v.FunctionDef.decorator_list);
|
|
|
|
if (!symtable_enter_block(st, s->v.FunctionDef.name,
|
2010-09-21 07:02:10 +08:00
|
|
|
FunctionBlock, (void *)s, s->lineno,
|
|
|
|
s->col_offset))
|
2010-05-09 23:52:27 +08:00
|
|
|
return 0;
|
|
|
|
VISIT_IN_BLOCK(st, arguments, s->v.FunctionDef.args, s);
|
|
|
|
VISIT_SEQ_IN_BLOCK(st, stmt, s->v.FunctionDef.body, s);
|
|
|
|
if (!symtable_exit_block(st, s))
|
|
|
|
return 0;
|
|
|
|
break;
|
|
|
|
case ClassDef_kind: {
|
|
|
|
PyObject *tmp;
|
|
|
|
if (!symtable_add_def(st, s->v.ClassDef.name, DEF_LOCAL))
|
|
|
|
return 0;
|
|
|
|
VISIT_SEQ(st, expr, s->v.ClassDef.bases);
|
|
|
|
VISIT_SEQ(st, keyword, s->v.ClassDef.keywords);
|
|
|
|
if (s->v.ClassDef.starargs)
|
|
|
|
VISIT(st, expr, s->v.ClassDef.starargs);
|
|
|
|
if (s->v.ClassDef.kwargs)
|
|
|
|
VISIT(st, expr, s->v.ClassDef.kwargs);
|
|
|
|
if (s->v.ClassDef.decorator_list)
|
|
|
|
VISIT_SEQ(st, expr, s->v.ClassDef.decorator_list);
|
|
|
|
if (!symtable_enter_block(st, s->v.ClassDef.name, ClassBlock,
|
2010-09-21 07:02:10 +08:00
|
|
|
(void *)s, s->lineno, s->col_offset))
|
2010-05-09 23:52:27 +08:00
|
|
|
return 0;
|
|
|
|
if (!GET_IDENTIFIER(__class__) ||
|
|
|
|
!symtable_add_def(st, __class__, DEF_LOCAL) ||
|
|
|
|
!GET_IDENTIFIER(__locals__) ||
|
|
|
|
!symtable_add_def(st, __locals__, DEF_PARAM)) {
|
|
|
|
symtable_exit_block(st, s);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
tmp = st->st_private;
|
|
|
|
st->st_private = s->v.ClassDef.name;
|
|
|
|
VISIT_SEQ_IN_BLOCK(st, stmt, s->v.ClassDef.body, s);
|
|
|
|
st->st_private = tmp;
|
|
|
|
if (!symtable_exit_block(st, s))
|
|
|
|
return 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case Return_kind:
|
|
|
|
if (s->v.Return.value) {
|
|
|
|
VISIT(st, expr, s->v.Return.value);
|
|
|
|
st->st_cur->ste_returns_value = 1;
|
|
|
|
if (st->st_cur->ste_generator) {
|
|
|
|
PyErr_SetString(PyExc_SyntaxError,
|
|
|
|
RETURN_VAL_IN_GENERATOR);
|
2010-09-21 07:02:10 +08:00
|
|
|
PyErr_SyntaxLocationEx(st->st_filename,
|
|
|
|
s->lineno,
|
|
|
|
s->col_offset);
|
2010-05-09 23:52:27 +08:00
|
|
|
return 0;
|
2007-08-31 08:04:24 +08:00
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case Delete_kind:
|
|
|
|
VISIT_SEQ(st, expr, s->v.Delete.targets);
|
|
|
|
break;
|
|
|
|
case Assign_kind:
|
|
|
|
VISIT_SEQ(st, expr, s->v.Assign.targets);
|
|
|
|
VISIT(st, expr, s->v.Assign.value);
|
|
|
|
break;
|
|
|
|
case AugAssign_kind:
|
|
|
|
VISIT(st, expr, s->v.AugAssign.target);
|
|
|
|
VISIT(st, expr, s->v.AugAssign.value);
|
|
|
|
break;
|
|
|
|
case For_kind:
|
|
|
|
VISIT(st, expr, s->v.For.target);
|
|
|
|
VISIT(st, expr, s->v.For.iter);
|
|
|
|
VISIT_SEQ(st, stmt, s->v.For.body);
|
|
|
|
if (s->v.For.orelse)
|
|
|
|
VISIT_SEQ(st, stmt, s->v.For.orelse);
|
|
|
|
break;
|
|
|
|
case While_kind:
|
|
|
|
VISIT(st, expr, s->v.While.test);
|
|
|
|
VISIT_SEQ(st, stmt, s->v.While.body);
|
|
|
|
if (s->v.While.orelse)
|
|
|
|
VISIT_SEQ(st, stmt, s->v.While.orelse);
|
|
|
|
break;
|
|
|
|
case If_kind:
|
|
|
|
/* XXX if 0: and lookup_yield() hacks */
|
|
|
|
VISIT(st, expr, s->v.If.test);
|
|
|
|
VISIT_SEQ(st, stmt, s->v.If.body);
|
|
|
|
if (s->v.If.orelse)
|
|
|
|
VISIT_SEQ(st, stmt, s->v.If.orelse);
|
|
|
|
break;
|
|
|
|
case Raise_kind:
|
|
|
|
if (s->v.Raise.exc) {
|
|
|
|
VISIT(st, expr, s->v.Raise.exc);
|
|
|
|
if (s->v.Raise.cause) {
|
|
|
|
VISIT(st, expr, s->v.Raise.cause);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case TryExcept_kind:
|
|
|
|
VISIT_SEQ(st, stmt, s->v.TryExcept.body);
|
|
|
|
VISIT_SEQ(st, stmt, s->v.TryExcept.orelse);
|
|
|
|
VISIT_SEQ(st, excepthandler, s->v.TryExcept.handlers);
|
|
|
|
break;
|
|
|
|
case TryFinally_kind:
|
|
|
|
VISIT_SEQ(st, stmt, s->v.TryFinally.body);
|
|
|
|
VISIT_SEQ(st, stmt, s->v.TryFinally.finalbody);
|
|
|
|
break;
|
|
|
|
case Assert_kind:
|
|
|
|
VISIT(st, expr, s->v.Assert.test);
|
|
|
|
if (s->v.Assert.msg)
|
|
|
|
VISIT(st, expr, s->v.Assert.msg);
|
|
|
|
break;
|
|
|
|
case Import_kind:
|
|
|
|
VISIT_SEQ(st, alias, s->v.Import.names);
|
|
|
|
/* XXX Don't have the lineno available inside
|
|
|
|
visit_alias */
|
2010-09-21 07:02:10 +08:00
|
|
|
if (st->st_cur->ste_unoptimized && !st->st_cur->ste_opt_lineno) {
|
2010-05-09 23:52:27 +08:00
|
|
|
st->st_cur->ste_opt_lineno = s->lineno;
|
2010-09-21 07:02:10 +08:00
|
|
|
st->st_cur->ste_opt_col_offset = s->col_offset;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
break;
|
|
|
|
case ImportFrom_kind:
|
|
|
|
VISIT_SEQ(st, alias, s->v.ImportFrom.names);
|
|
|
|
/* XXX Don't have the lineno available inside
|
|
|
|
visit_alias */
|
2010-09-21 07:02:10 +08:00
|
|
|
if (st->st_cur->ste_unoptimized && !st->st_cur->ste_opt_lineno) {
|
2010-05-09 23:52:27 +08:00
|
|
|
st->st_cur->ste_opt_lineno = s->lineno;
|
2010-09-21 07:02:10 +08:00
|
|
|
st->st_cur->ste_opt_col_offset = s->col_offset;
|
|
|
|
}
|
2010-05-09 23:52:27 +08:00
|
|
|
break;
|
|
|
|
case Global_kind: {
|
|
|
|
int i;
|
|
|
|
asdl_seq *seq = s->v.Global.names;
|
|
|
|
for (i = 0; i < asdl_seq_LEN(seq); i++) {
|
|
|
|
identifier name = (identifier)asdl_seq_GET(seq, i);
|
|
|
|
char *c_name = _PyUnicode_AsString(name);
|
|
|
|
long cur = symtable_lookup(st, name);
|
|
|
|
if (cur < 0)
|
|
|
|
return 0;
|
|
|
|
if (cur & (DEF_LOCAL | USE)) {
|
|
|
|
char buf[256];
|
|
|
|
if (cur & DEF_LOCAL)
|
|
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
|
|
GLOBAL_AFTER_ASSIGN,
|
|
|
|
c_name);
|
|
|
|
else
|
|
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
|
|
GLOBAL_AFTER_USE,
|
|
|
|
c_name);
|
|
|
|
if (!symtable_warn(st, buf, s->lineno))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!symtable_add_def(st, name, DEF_GLOBAL))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case Nonlocal_kind: {
|
|
|
|
int i;
|
|
|
|
asdl_seq *seq = s->v.Nonlocal.names;
|
|
|
|
for (i = 0; i < asdl_seq_LEN(seq); i++) {
|
|
|
|
identifier name = (identifier)asdl_seq_GET(seq, i);
|
|
|
|
char *c_name = _PyUnicode_AsString(name);
|
|
|
|
long cur = symtable_lookup(st, name);
|
|
|
|
if (cur < 0)
|
|
|
|
return 0;
|
|
|
|
if (cur & (DEF_LOCAL | USE)) {
|
|
|
|
char buf[256];
|
|
|
|
if (cur & DEF_LOCAL)
|
|
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
|
|
NONLOCAL_AFTER_ASSIGN,
|
|
|
|
c_name);
|
|
|
|
else
|
|
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
|
|
NONLOCAL_AFTER_USE,
|
|
|
|
c_name);
|
|
|
|
if (!symtable_warn(st, buf, s->lineno))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!symtable_add_def(st, name, DEF_NONLOCAL))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case Expr_kind:
|
|
|
|
VISIT(st, expr, s->v.Expr.value);
|
|
|
|
break;
|
|
|
|
case Pass_kind:
|
|
|
|
case Break_kind:
|
|
|
|
case Continue_kind:
|
|
|
|
/* nothing to do here */
|
|
|
|
break;
|
|
|
|
case With_kind:
|
|
|
|
VISIT(st, expr, s->v.With.context_expr);
|
|
|
|
if (s->v.With.optional_vars) {
|
|
|
|
VISIT(st, expr, s->v.With.optional_vars);
|
|
|
|
}
|
|
|
|
VISIT_SEQ(st, stmt, s->v.With.body);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2005-10-21 03:59:25 +08:00
|
|
|
symtable_visit_expr(struct symtable *st, expr_ty e)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
switch (e->kind) {
|
|
|
|
case BoolOp_kind:
|
|
|
|
VISIT_SEQ(st, expr, e->v.BoolOp.values);
|
|
|
|
break;
|
|
|
|
case BinOp_kind:
|
|
|
|
VISIT(st, expr, e->v.BinOp.left);
|
|
|
|
VISIT(st, expr, e->v.BinOp.right);
|
|
|
|
break;
|
|
|
|
case UnaryOp_kind:
|
|
|
|
VISIT(st, expr, e->v.UnaryOp.operand);
|
|
|
|
break;
|
|
|
|
case Lambda_kind: {
|
|
|
|
if (!GET_IDENTIFIER(lambda))
|
|
|
|
return 0;
|
|
|
|
if (e->v.Lambda.args->defaults)
|
|
|
|
VISIT_SEQ(st, expr, e->v.Lambda.args->defaults);
|
2011-11-05 05:17:45 +08:00
|
|
|
if (e->v.Lambda.args->kw_defaults)
|
|
|
|
VISIT_KWONLYDEFAULTS(st,
|
|
|
|
e->v.Lambda.args->kw_defaults);
|
2010-05-09 23:52:27 +08:00
|
|
|
if (!symtable_enter_block(st, lambda,
|
2010-09-21 07:02:10 +08:00
|
|
|
FunctionBlock, (void *)e, e->lineno,
|
|
|
|
e->col_offset))
|
2010-05-09 23:52:27 +08:00
|
|
|
return 0;
|
|
|
|
VISIT_IN_BLOCK(st, arguments, e->v.Lambda.args, (void*)e);
|
|
|
|
VISIT_IN_BLOCK(st, expr, e->v.Lambda.body, (void*)e);
|
|
|
|
if (!symtable_exit_block(st, (void *)e))
|
|
|
|
return 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case IfExp_kind:
|
|
|
|
VISIT(st, expr, e->v.IfExp.test);
|
|
|
|
VISIT(st, expr, e->v.IfExp.body);
|
|
|
|
VISIT(st, expr, e->v.IfExp.orelse);
|
|
|
|
break;
|
|
|
|
case Dict_kind:
|
|
|
|
VISIT_SEQ(st, expr, e->v.Dict.keys);
|
|
|
|
VISIT_SEQ(st, expr, e->v.Dict.values);
|
|
|
|
break;
|
|
|
|
case Set_kind:
|
|
|
|
VISIT_SEQ(st, expr, e->v.Set.elts);
|
|
|
|
break;
|
|
|
|
case GeneratorExp_kind:
|
|
|
|
if (!symtable_visit_genexp(st, e))
|
|
|
|
return 0;
|
|
|
|
break;
|
|
|
|
case ListComp_kind:
|
|
|
|
if (!symtable_visit_listcomp(st, e))
|
|
|
|
return 0;
|
|
|
|
break;
|
|
|
|
case SetComp_kind:
|
|
|
|
if (!symtable_visit_setcomp(st, e))
|
|
|
|
return 0;
|
|
|
|
break;
|
|
|
|
case DictComp_kind:
|
|
|
|
if (!symtable_visit_dictcomp(st, e))
|
|
|
|
return 0;
|
|
|
|
break;
|
|
|
|
case Yield_kind:
|
|
|
|
if (e->v.Yield.value)
|
|
|
|
VISIT(st, expr, e->v.Yield.value);
|
|
|
|
st->st_cur->ste_generator = 1;
|
|
|
|
if (st->st_cur->ste_returns_value) {
|
|
|
|
PyErr_SetString(PyExc_SyntaxError,
|
|
|
|
RETURN_VAL_IN_GENERATOR);
|
2010-09-21 07:02:10 +08:00
|
|
|
PyErr_SyntaxLocationEx(st->st_filename,
|
|
|
|
e->lineno, e->col_offset);
|
2010-05-09 23:52:27 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case Compare_kind:
|
|
|
|
VISIT(st, expr, e->v.Compare.left);
|
|
|
|
VISIT_SEQ(st, expr, e->v.Compare.comparators);
|
|
|
|
break;
|
|
|
|
case Call_kind:
|
|
|
|
VISIT(st, expr, e->v.Call.func);
|
|
|
|
VISIT_SEQ(st, expr, e->v.Call.args);
|
|
|
|
VISIT_SEQ(st, keyword, e->v.Call.keywords);
|
|
|
|
if (e->v.Call.starargs)
|
|
|
|
VISIT(st, expr, e->v.Call.starargs);
|
|
|
|
if (e->v.Call.kwargs)
|
|
|
|
VISIT(st, expr, e->v.Call.kwargs);
|
|
|
|
break;
|
|
|
|
case Num_kind:
|
|
|
|
case Str_kind:
|
|
|
|
case Bytes_kind:
|
|
|
|
case Ellipsis_kind:
|
|
|
|
/* Nothing to do here. */
|
|
|
|
break;
|
|
|
|
/* The following exprs can be assignment targets. */
|
|
|
|
case Attribute_kind:
|
|
|
|
VISIT(st, expr, e->v.Attribute.value);
|
|
|
|
break;
|
|
|
|
case Subscript_kind:
|
|
|
|
VISIT(st, expr, e->v.Subscript.value);
|
|
|
|
VISIT(st, slice, e->v.Subscript.slice);
|
|
|
|
break;
|
|
|
|
case Starred_kind:
|
|
|
|
VISIT(st, expr, e->v.Starred.value);
|
|
|
|
break;
|
|
|
|
case Name_kind:
|
|
|
|
if (!symtable_add_def(st, e->v.Name.id,
|
|
|
|
e->v.Name.ctx == Load ? USE : DEF_LOCAL))
|
|
|
|
return 0;
|
|
|
|
/* Special-case super: it counts as a use of __class__ */
|
|
|
|
if (e->v.Name.ctx == Load &&
|
|
|
|
st->st_cur->ste_type == FunctionBlock &&
|
|
|
|
!PyUnicode_CompareWithASCIIString(e->v.Name.id, "super")) {
|
|
|
|
if (!GET_IDENTIFIER(__class__) ||
|
|
|
|
!symtable_add_def(st, __class__, USE))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
/* child nodes of List and Tuple will have expr_context set */
|
|
|
|
case List_kind:
|
|
|
|
VISIT_SEQ(st, expr, e->v.List.elts);
|
|
|
|
break;
|
|
|
|
case Tuple_kind:
|
|
|
|
VISIT_SEQ(st, expr, e->v.Tuple.elts);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
symtable_implicit_arg(struct symtable *st, int pos)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
PyObject *id = PyUnicode_FromFormat(".%d", pos);
|
|
|
|
if (id == NULL)
|
|
|
|
return 0;
|
|
|
|
if (!symtable_add_def(st, id, DEF_PARAM)) {
|
|
|
|
Py_DECREF(id);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
Py_DECREF(id);
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2007-05-16 02:46:22 +08:00
|
|
|
symtable_visit_params(struct symtable *st, asdl_seq *args)
|
2005-10-21 03:59:25 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!args)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
for (i = 0; i < asdl_seq_LEN(args); i++) {
|
|
|
|
arg_ty arg = (arg_ty)asdl_seq_GET(args, i);
|
|
|
|
if (!symtable_add_def(st, arg->arg, DEF_PARAM))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2007-05-16 02:46:22 +08:00
|
|
|
symtable_visit_argannotations(struct symtable *st, asdl_seq *args)
|
2005-10-21 03:59:25 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!args)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
for (i = 0; i < asdl_seq_LEN(args); i++) {
|
|
|
|
arg_ty arg = (arg_ty)asdl_seq_GET(args, i);
|
|
|
|
if (arg->annotation)
|
|
|
|
VISIT(st, expr, arg->annotation);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
2006-12-28 14:47:50 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
symtable_visit_annotations(struct symtable *st, stmt_ty s)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
arguments_ty a = s->v.FunctionDef.args;
|
|
|
|
|
|
|
|
if (a->args && !symtable_visit_argannotations(st, a->args))
|
|
|
|
return 0;
|
|
|
|
if (a->varargannotation)
|
|
|
|
VISIT(st, expr, a->varargannotation);
|
|
|
|
if (a->kwargannotation)
|
|
|
|
VISIT(st, expr, a->kwargannotation);
|
|
|
|
if (a->kwonlyargs && !symtable_visit_argannotations(st, a->kwonlyargs))
|
|
|
|
return 0;
|
|
|
|
if (s->v.FunctionDef.returns)
|
|
|
|
VISIT(st, expr, s->v.FunctionDef.returns);
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2005-10-21 03:59:25 +08:00
|
|
|
symtable_visit_arguments(struct symtable *st, arguments_ty a)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
/* skip default arguments inside function block
|
|
|
|
XXX should ast be different?
|
|
|
|
*/
|
|
|
|
if (a->args && !symtable_visit_params(st, a->args))
|
|
|
|
return 0;
|
|
|
|
if (a->kwonlyargs && !symtable_visit_params(st, a->kwonlyargs))
|
|
|
|
return 0;
|
|
|
|
if (a->vararg) {
|
|
|
|
if (!symtable_add_def(st, a->vararg, DEF_PARAM))
|
|
|
|
return 0;
|
|
|
|
st->st_cur->ste_varargs = 1;
|
|
|
|
}
|
|
|
|
if (a->kwarg) {
|
|
|
|
if (!symtable_add_def(st, a->kwarg, DEF_PARAM))
|
|
|
|
return 0;
|
|
|
|
st->st_cur->ste_varkeywords = 1;
|
|
|
|
}
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2005-10-21 03:59:25 +08:00
|
|
|
symtable_visit_excepthandler(struct symtable *st, excepthandler_ty eh)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
if (eh->v.ExceptHandler.type)
|
|
|
|
VISIT(st, expr, eh->v.ExceptHandler.type);
|
|
|
|
if (eh->v.ExceptHandler.name)
|
|
|
|
if (!symtable_add_def(st, eh->v.ExceptHandler.name, DEF_LOCAL))
|
|
|
|
return 0;
|
|
|
|
VISIT_SEQ(st, stmt, eh->v.ExceptHandler.body);
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2005-10-21 03:59:25 +08:00
|
|
|
symtable_visit_alias(struct symtable *st, alias_ty a)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
/* Compute store_name, the name actually bound by the import
|
2010-06-12 05:53:07 +08:00
|
|
|
operation. It is different than a->name when a->name is a
|
2010-05-09 23:52:27 +08:00
|
|
|
dotted package name (e.g. spam.eggs)
|
|
|
|
*/
|
|
|
|
PyObject *store_name;
|
|
|
|
PyObject *name = (a->asname == NULL) ? a->name : a->asname;
|
|
|
|
const Py_UNICODE *base = PyUnicode_AS_UNICODE(name);
|
|
|
|
Py_UNICODE *dot = Py_UNICODE_strchr(base, '.');
|
|
|
|
if (dot) {
|
|
|
|
store_name = PyUnicode_FromUnicode(base, dot - base);
|
|
|
|
if (!store_name)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
store_name = name;
|
|
|
|
Py_INCREF(store_name);
|
|
|
|
}
|
|
|
|
if (PyUnicode_CompareWithASCIIString(name, "*")) {
|
|
|
|
int r = symtable_add_def(st, store_name, DEF_IMPORT);
|
|
|
|
Py_DECREF(store_name);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (st->st_cur->ste_type != ModuleBlock) {
|
2011-06-21 11:09:13 +08:00
|
|
|
int lineno = st->st_cur->ste_lineno;
|
|
|
|
int col_offset = st->st_cur->ste_col_offset;
|
|
|
|
PyErr_SetString(PyExc_SyntaxError, IMPORT_STAR_WARNING);
|
|
|
|
PyErr_SyntaxLocationEx(st->st_filename, lineno, col_offset);
|
|
|
|
Py_DECREF(store_name);
|
|
|
|
return 0;
|
2010-05-09 23:52:27 +08:00
|
|
|
}
|
|
|
|
st->st_cur->ste_unoptimized |= OPT_IMPORT_STAR;
|
|
|
|
Py_DECREF(store_name);
|
|
|
|
return 1;
|
|
|
|
}
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2005-10-21 03:59:25 +08:00
|
|
|
symtable_visit_comprehension(struct symtable *st, comprehension_ty lc)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
VISIT(st, expr, lc->target);
|
|
|
|
VISIT(st, expr, lc->iter);
|
|
|
|
VISIT_SEQ(st, expr, lc->ifs);
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2005-10-21 03:59:25 +08:00
|
|
|
symtable_visit_keyword(struct symtable *st, keyword_ty k)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
VISIT(st, expr, k->value);
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2005-10-21 03:59:25 +08:00
|
|
|
symtable_visit_slice(struct symtable *st, slice_ty s)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
switch (s->kind) {
|
|
|
|
case Slice_kind:
|
|
|
|
if (s->v.Slice.lower)
|
|
|
|
VISIT(st, expr, s->v.Slice.lower)
|
|
|
|
if (s->v.Slice.upper)
|
|
|
|
VISIT(st, expr, s->v.Slice.upper)
|
|
|
|
if (s->v.Slice.step)
|
|
|
|
VISIT(st, expr, s->v.Slice.step)
|
|
|
|
break;
|
|
|
|
case ExtSlice_kind:
|
|
|
|
VISIT_SEQ(st, slice, s->v.ExtSlice.dims)
|
|
|
|
break;
|
|
|
|
case Index_kind:
|
|
|
|
VISIT(st, expr, s->v.Index.value)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return 1;
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2007-04-15 20:05:43 +08:00
|
|
|
symtable_handle_comprehension(struct symtable *st, expr_ty e,
|
Merged revisions 56154-56264 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r56155 | neal.norwitz | 2007-07-03 08:59:08 +0300 (Tue, 03 Jul 2007) | 1 line
Get this test working after converting map to return an iterator
................
r56202 | neal.norwitz | 2007-07-09 04:30:09 +0300 (Mon, 09 Jul 2007) | 37 lines
Merged revisions 56124-56201 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r56129 | georg.brandl | 2007-06-30 04:01:01 -0700 (Sat, 30 Jun 2007) | 2 lines
Document smtp.SMTPAuthenticationError.
........
r56137 | georg.brandl | 2007-07-01 01:11:35 -0700 (Sun, 01 Jul 2007) | 2 lines
Fix a few webbrowser.py problems.
........
r56143 | georg.brandl | 2007-07-02 04:54:28 -0700 (Mon, 02 Jul 2007) | 2 lines
Remove duplicate sentence from alarm() doc.
........
r56170 | mark.hammond | 2007-07-03 19:03:10 -0700 (Tue, 03 Jul 2007) | 3 lines
copy built files to the PCBuild directory, where tools like
distutils or external build processes can find them.
........
r56176 | kurt.kaiser | 2007-07-05 15:03:39 -0700 (Thu, 05 Jul 2007) | 10 lines
Many calls to tk.call involve an arglist containing a single tuple.
Calls using METH_OLDARGS unpack this tuple; calls using METH_VARARG
don't. Tcl's concatenation of args was affected; IDLE doesn't start.
Modify Tkapp_Call() to unpack single tuple arglists.
Bug 1733943
Ref http://mail.python.org/pipermail/python-checkins/2007-May/060454.html
........
r56177 | neal.norwitz | 2007-07-05 21:13:39 -0700 (Thu, 05 Jul 2007) | 1 line
Fix typo in comment
........
................
r56251 | neal.norwitz | 2007-07-11 10:01:01 +0300 (Wed, 11 Jul 2007) | 1 line
Get working with map returning an iterator (had to fix whitespace too)
................
r56255 | thomas.wouters | 2007-07-11 13:41:37 +0300 (Wed, 11 Jul 2007) | 6 lines
Clean up merge glitch or copy-paste error (the entire module was duplicated,
except the first half even had some more copy-paste errors, referring to
listcomps and genexps instead of setcomps)
................
r56256 | thomas.wouters | 2007-07-11 15:16:01 +0300 (Wed, 11 Jul 2007) | 14 lines
Dict comprehensions. Still needs doc changes (like many python-3000 features
;-). It generates bytecode similar to:
x = {}
for k, v in (generator here):
x[k] = v
except there is no tuple-packing and -unpacking involved. Trivial
measurement suggests it's significantly faster than dict(generator here) (in
the order of 2 to 3 times as fast) but I have not done extensive
measurements.
................
r56263 | guido.van.rossum | 2007-07-11 15:36:26 +0300 (Wed, 11 Jul 2007) | 3 lines
Patch 1724999 by Ali Gholami Rudi -- avoid complaints about dict size
change during iter in destroy call.
................
2007-07-11 21:09:30 +08:00
|
|
|
identifier scope_name, asdl_seq *generators,
|
|
|
|
expr_ty elt, expr_ty value)
|
2005-10-21 03:59:25 +08:00
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
int is_generator = (e->kind == GeneratorExp_kind);
|
|
|
|
int needs_tmp = !is_generator;
|
|
|
|
comprehension_ty outermost = ((comprehension_ty)
|
|
|
|
asdl_seq_GET(generators, 0));
|
|
|
|
/* Outermost iterator is evaluated in current scope */
|
|
|
|
VISIT(st, expr, outermost->iter);
|
|
|
|
/* Create comprehension scope for the rest */
|
|
|
|
if (!scope_name ||
|
2010-09-21 07:02:10 +08:00
|
|
|
!symtable_enter_block(st, scope_name, FunctionBlock, (void *)e,
|
|
|
|
e->lineno, e->col_offset)) {
|
2010-05-09 23:52:27 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
st->st_cur->ste_generator = is_generator;
|
|
|
|
/* Outermost iter is received as an argument */
|
|
|
|
if (!symtable_implicit_arg(st, 0)) {
|
|
|
|
symtable_exit_block(st, (void *)e);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* Allocate temporary name if needed */
|
|
|
|
if (needs_tmp && !symtable_new_tmpname(st)) {
|
|
|
|
symtable_exit_block(st, (void *)e);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
VISIT_IN_BLOCK(st, expr, outermost->target, (void*)e);
|
|
|
|
VISIT_SEQ_IN_BLOCK(st, expr, outermost->ifs, (void*)e);
|
|
|
|
VISIT_SEQ_TAIL_IN_BLOCK(st, comprehension,
|
|
|
|
generators, 1, (void*)e);
|
|
|
|
if (value)
|
|
|
|
VISIT_IN_BLOCK(st, expr, value, (void*)e);
|
|
|
|
VISIT_IN_BLOCK(st, expr, elt, (void*)e);
|
|
|
|
return symtable_exit_block(st, (void *)e);
|
2005-10-21 03:59:25 +08:00
|
|
|
}
|
2007-04-15 20:05:43 +08:00
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2007-04-15 20:05:43 +08:00
|
|
|
symtable_visit_genexp(struct symtable *st, expr_ty e)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return symtable_handle_comprehension(st, e, GET_IDENTIFIER(genexpr),
|
|
|
|
e->v.GeneratorExp.generators,
|
|
|
|
e->v.GeneratorExp.elt, NULL);
|
2007-04-15 20:05:43 +08:00
|
|
|
}
|
|
|
|
|
2010-05-09 23:52:27 +08:00
|
|
|
static int
|
2007-04-15 20:05:43 +08:00
|
|
|
symtable_visit_listcomp(struct symtable *st, expr_ty e)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return symtable_handle_comprehension(st, e, GET_IDENTIFIER(listcomp),
|
|
|
|
e->v.ListComp.generators,
|
|
|
|
e->v.ListComp.elt, NULL);
|
2007-04-15 20:05:43 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
symtable_visit_setcomp(struct symtable *st, expr_ty e)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return symtable_handle_comprehension(st, e, GET_IDENTIFIER(setcomp),
|
|
|
|
e->v.SetComp.generators,
|
|
|
|
e->v.SetComp.elt, NULL);
|
Merged revisions 56154-56264 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r56155 | neal.norwitz | 2007-07-03 08:59:08 +0300 (Tue, 03 Jul 2007) | 1 line
Get this test working after converting map to return an iterator
................
r56202 | neal.norwitz | 2007-07-09 04:30:09 +0300 (Mon, 09 Jul 2007) | 37 lines
Merged revisions 56124-56201 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r56129 | georg.brandl | 2007-06-30 04:01:01 -0700 (Sat, 30 Jun 2007) | 2 lines
Document smtp.SMTPAuthenticationError.
........
r56137 | georg.brandl | 2007-07-01 01:11:35 -0700 (Sun, 01 Jul 2007) | 2 lines
Fix a few webbrowser.py problems.
........
r56143 | georg.brandl | 2007-07-02 04:54:28 -0700 (Mon, 02 Jul 2007) | 2 lines
Remove duplicate sentence from alarm() doc.
........
r56170 | mark.hammond | 2007-07-03 19:03:10 -0700 (Tue, 03 Jul 2007) | 3 lines
copy built files to the PCBuild directory, where tools like
distutils or external build processes can find them.
........
r56176 | kurt.kaiser | 2007-07-05 15:03:39 -0700 (Thu, 05 Jul 2007) | 10 lines
Many calls to tk.call involve an arglist containing a single tuple.
Calls using METH_OLDARGS unpack this tuple; calls using METH_VARARG
don't. Tcl's concatenation of args was affected; IDLE doesn't start.
Modify Tkapp_Call() to unpack single tuple arglists.
Bug 1733943
Ref http://mail.python.org/pipermail/python-checkins/2007-May/060454.html
........
r56177 | neal.norwitz | 2007-07-05 21:13:39 -0700 (Thu, 05 Jul 2007) | 1 line
Fix typo in comment
........
................
r56251 | neal.norwitz | 2007-07-11 10:01:01 +0300 (Wed, 11 Jul 2007) | 1 line
Get working with map returning an iterator (had to fix whitespace too)
................
r56255 | thomas.wouters | 2007-07-11 13:41:37 +0300 (Wed, 11 Jul 2007) | 6 lines
Clean up merge glitch or copy-paste error (the entire module was duplicated,
except the first half even had some more copy-paste errors, referring to
listcomps and genexps instead of setcomps)
................
r56256 | thomas.wouters | 2007-07-11 15:16:01 +0300 (Wed, 11 Jul 2007) | 14 lines
Dict comprehensions. Still needs doc changes (like many python-3000 features
;-). It generates bytecode similar to:
x = {}
for k, v in (generator here):
x[k] = v
except there is no tuple-packing and -unpacking involved. Trivial
measurement suggests it's significantly faster than dict(generator here) (in
the order of 2 to 3 times as fast) but I have not done extensive
measurements.
................
r56263 | guido.van.rossum | 2007-07-11 15:36:26 +0300 (Wed, 11 Jul 2007) | 3 lines
Patch 1724999 by Ali Gholami Rudi -- avoid complaints about dict size
change during iter in destroy call.
................
2007-07-11 21:09:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
symtable_visit_dictcomp(struct symtable *st, expr_ty e)
|
|
|
|
{
|
2010-05-09 23:52:27 +08:00
|
|
|
return symtable_handle_comprehension(st, e, GET_IDENTIFIER(dictcomp),
|
|
|
|
e->v.DictComp.generators,
|
|
|
|
e->v.DictComp.key,
|
|
|
|
e->v.DictComp.value);
|
2007-04-15 20:05:43 +08:00
|
|
|
}
|