Menu
▾
▴
[Jython-checkins] SF.net SVN: jython: [4166] branches/utf16
|
From: <zy...@us...> - 2008-02-23 22:31:31
|
Revision: 4166
http://jython.svn.sourceforge.net/jython/?rev=4166&view=rev
Author: zyasoft
Date: 2008-02-23 14:31:27 -0800 (Sat, 23 Feb 2008)
Log Message:
-----------
Merged revisions 4092,4096,4098-4114,4117-4120,4122-4132,4134-4135,4138,4140-4141,4143-4144,4146-4153,4156-4157,4159-4160,4162-4164 via svnmerge from
https://jython.svn.sourceforge.net/svnroot/jython/trunk/jython
........
r4092 | cgroves | 2008-02-03 14:37:51 -0700 (Sun, 03 Feb 2008) | 1 line
convert array, bool, classmethod, complex, enumerate and float from templates to annotations
........
r4096 | cgroves | 2008-02-03 23:27:28 -0700 (Sun, 03 Feb 2008) | 1 line
Migrate bugtests 51-75 into Lib/test from Jens Abraham's work on GHOP task 281: http://code.google.com/p/google-highly-open-participation-psf/issues/detail?id=281
........
r4098 | pjenvey | 2008-02-04 20:04:10 -0700 (Mon, 04 Feb 2008) | 1 line
from http://svn.python.org/projects/python/branches/release23-maint/Lib/test/test_logging.py@33658
........
r4099 | pjenvey | 2008-02-04 20:10:06 -0700 (Mon, 04 Feb 2008) | 1 line
use cpython_compatibile_select on jython
........
r4100 | pjenvey | 2008-02-04 22:05:41 -0700 (Mon, 04 Feb 2008) | 1 line
test_logging and test_pickletools now pass
........
r4101 | pjenvey | 2008-02-04 23:18:10 -0700 (Mon, 04 Feb 2008) | 1 line
test_iterlen currently fails, test_email fails due to bug #1886758
........
r4102 | pjenvey | 2008-02-04 23:29:37 -0700 (Mon, 04 Feb 2008) | 1 line
these will run now
........
r4103 | pjenvey | 2008-02-05 20:26:51 -0700 (Tue, 05 Feb 2008) | 3 lines
make addBuilder do more to fully accomplish what add/fillFromClass do, for
types initialized before their builders are
........
r4104 | pjenvey | 2008-02-06 18:01:51 -0700 (Wed, 06 Feb 2008) | 2 lines
organize imports, rearrange javadocs as per coding standards
........
r4105 | pjenvey | 2008-02-06 19:29:38 -0700 (Wed, 06 Feb 2008) | 1 line
convert deque to expose annotations
........
r4106 | pjenvey | 2008-02-07 13:28:53 -0700 (Thu, 07 Feb 2008) | 3 lines
kill safeRepr, which is really just an older, bogus way of getting the type
name. use getType().fastGetName() instead
........
r4107 | pjenvey | 2008-02-07 14:40:20 -0700 (Thu, 07 Feb 2008) | 6 lines
o change PyType's name attribute for builtin types; include the fully
qualified name of the type including its module, like CPython does. allows
builtin types in org.python.modules to have a valid __module__ value
o kill PyType's getFullName; it's only really needed in a couple places and
misused for fastGetName everywhere else
........
r4108 | pjenvey | 2008-02-07 15:05:29 -0700 (Thu, 07 Feb 2008) | 1 line
match error messages to CPython
........
r4109 | pjenvey | 2008-02-07 15:27:10 -0700 (Thu, 07 Feb 2008) | 3 lines
fallthrough method's __name__ and __doc__ to the underlying callable instead of
copying them. fixes the fact that we weren't always copying them
........
r4110 | pjenvey | 2008-02-07 16:29:55 -0700 (Thu, 07 Feb 2008) | 1 line
followup r4109: builtin functions need to expose getDoc too. fixes test_generators
........
r4111 | pjenvey | 2008-02-07 16:35:46 -0700 (Thu, 07 Feb 2008) | 4 lines
make Py.makeClass fallback to the builtins when looking for __name__ (for the
class's __module__), like CPython does -- a corner case that probably only
doctests care about. with tests
........
r4112 | pjenvey | 2008-02-07 16:36:46 -0700 (Thu, 07 Feb 2008) | 1 line
woops, don't need this exception
........
r4113 | pjenvey | 2008-02-08 13:39:38 -0700 (Fri, 08 Feb 2008) | 1 line
for changes to the compiler package, from http://svn.python.org/projects/python/branches/release23-maint/Lib@60660
........
r4114 | pjenvey | 2008-02-08 13:45:13 -0700 (Fri, 08 Feb 2008) | 4 lines
include a stripped version of the compiler package that avoids the parser
module and imp.get_magic, which we lack. mainly for nose which just uses
compiler.consts.CO_GENERATOR
........
r4117 | pjenvey | 2008-02-09 14:28:29 -0700 (Sat, 09 Feb 2008) | 5 lines
disable PyGenerator's finalize for now. for some reason the garbage collector
attempts to finalize generators before they're done with in some situations (in
particular seen when running the full nose test suite). finalize is for 2.5
style generators which we don't fully support now anyway
........
r4118 | pjenvey | 2008-02-09 14:40:55 -0700 (Sat, 09 Feb 2008) | 2 lines
handle $py.class as well as .pyc/o
........
r4119 | pjenvey | 2008-02-09 15:23:34 -0700 (Sat, 09 Feb 2008) | 1 line
make this more like the changeset for nose
........
r4120 | cgroves | 2008-02-09 19:24:14 -0700 (Sat, 09 Feb 2008) | 6 lines
Allow classmethods to be exposed on builtin types using @ExposedClassMethod and
expose dict with its fromkeys classmethod using that.
Expose defaultdict.
........
r4122 | cgroves | 2008-02-10 01:16:48 -0700 (Sun, 10 Feb 2008) | 1 line
respect verbose passed into test_main
........
r4123 | cgroves | 2008-02-10 01:17:36 -0700 (Sun, 10 Feb 2008) | 1 line
Convert remaining types in mappings to annotations
........
r4124 | cgroves | 2008-02-10 01:34:03 -0700 (Sun, 10 Feb 2008) | 1 line
Convert random which had an expose but was excluded from mappings for some reason and staticmethod which had generated code but no .expose. Should be the last of the gexpose code
........
r4125 | cgroves | 2008-02-10 01:46:19 -0700 (Sun, 10 Feb 2008) | 1 line
Clear out the gexpose newstyle setup
........
r4126 | pjenvey | 2008-02-10 16:30:29 -0700 (Sun, 10 Feb 2008) | 1 line
use a consistent docstring type
........
r4127 | cgroves | 2008-02-10 17:52:05 -0700 (Sun, 10 Feb 2008) | 6 lines
Make PyDataDescr a newstyle type and add setType on it so it can be given its
type by DescriptorExposer without requiring a PyType.fromClass.
Remove the reflection based descriptors.
........
r4128 | cgroves | 2008-02-10 18:25:46 -0700 (Sun, 10 Feb 2008) | 1 line
add TYPE to zipimporter so its builder will be setup before it's referenced in zipimport or ySystemState
........
r4129 | cgroves | 2008-02-10 18:28:20 -0700 (Sun, 10 Feb 2008) | 1 line
Track the types that will be initialized before their builders are assigned in Py.BOOTSTRAP_TYPES and complain if we bootstrap something that isn't in that set, or if something from that set isn't bootstrapped
........
r4130 | cgroves | 2008-02-13 02:52:10 -0700 (Wed, 13 Feb 2008) | 1 line
Get test_extcall to line up with jython. Leave single line test_extcall in output so it'll override the one from CPythonLib
........
r4131 | cgroves | 2008-02-13 02:52:28 -0700 (Wed, 13 Feb 2008) | 1 line
Remove unused field
........
r4132 | cgroves | 2008-02-16 00:34:24 -0700 (Sat, 16 Feb 2008) | 1 line
Make the module the interpreter is running __main__ not main
........
r4134 | cgroves | 2008-02-16 11:27:11 -0700 (Sat, 16 Feb 2008) | 1 line
Use SO_REUSEADDR so this can run repeatedly
........
r4135 | pjenvey | 2008-02-16 14:48:59 -0700 (Sat, 16 Feb 2008) | 3 lines
fallback to the class name of the IOException if its message is null (which is
typical of the nio IOExceptions)
........
r4138 | cgroves | 2008-02-16 18:11:37 -0700 (Sat, 16 Feb 2008) | 1 line
pull the jarjar stuff from asm_compiler over for use with pyasm
........
r4140 | cgroves | 2008-02-16 19:07:46 -0700 (Sat, 16 Feb 2008) | 1 line
Only jarjar if the underlying jars have changed so we don't update jython.jar if nothing has changed
........
r4141 | cgroves | 2008-02-16 19:09:56 -0700 (Sat, 16 Feb 2008) | 1 line
Actually include all the asm jars in checking if jarjar needs to run
........
r4143 | cgroves | 2008-02-16 19:59:09 -0700 (Sat, 16 Feb 2008) | 1 line
Actually use our jarjar'd asm
........
r4144 | cgroves | 2008-02-16 19:59:54 -0700 (Sat, 16 Feb 2008) | 1 line
Should've gone with the last commit
........
r4146 | pjenvey | 2008-02-17 22:31:45 -0700 (Sun, 17 Feb 2008) | 4 lines
flush stdout and stderr upon exit/cleanup of the interpreter, after calling the
exit funcs. fixes:
jython -c "import sys; sys.stdout.write('foo')"
........
r4147 | pjenvey | 2008-02-18 00:23:06 -0700 (Mon, 18 Feb 2008) | 4 lines
we need the absolute path of the shell exe when running a subprocess with a
custom environ that lacks PATH. cheat and default to /bin/sh for POSIX, as it's
worked well for CPython
........
r4148 | pjenvey | 2008-02-18 00:46:16 -0700 (Mon, 18 Feb 2008) | 4 lines
file doesn't need __nonzero__, it defaults to True since it lacks __len__. it
doesn't need __cmp__ either; having it actually caused a TypeError with:
tempfile.TemporaryFile() == 1
........
r4149 | pjenvey | 2008-02-18 12:01:57 -0700 (Mon, 18 Feb 2008) | 2 lines
subprocess from http://svn.python.org/projects/python/trunk@60896
........
r4150 | pjenvey | 2008-02-18 12:22:48 -0700 (Mon, 18 Feb 2008) | 6 lines
jython support for subprocess. PIPEs expose the Java Process' streams,
otherwise we sync to the Process' streams with a thread, like popen2.
stdin=None (share stdin with the parent) could block that coupling thread
forever (and stopping it with Thread.interrupt() would close the parent's
stdin), so we don't support syncing it
........
r4151 | pjenvey | 2008-02-18 19:06:39 -0700 (Mon, 18 Feb 2008) | 5 lines
o only escape command lists, leave the command strings for shell=True alone
(on windows)
o if starting the process fails for whatever reason just propagate its
IOException up, as an OSError
........
r4152 | pjenvey | 2008-02-18 19:13:55 -0700 (Mon, 18 Feb 2008) | 3 lines
check for EACCESS when opening files for writing and a FileNotFoundException is
thrown
........
r4153 | pjenvey | 2008-02-18 23:16:21 -0700 (Mon, 18 Feb 2008) | 3 lines
from
http://svn.python.org/projects/python/branches/release23-maint/Lib/distutils/command@38383
........
r4156 | pjenvey | 2008-02-19 12:39:23 -0700 (Tue, 19 Feb 2008) | 5 lines
o remove build_ext: I changed my mind on stopping the c compiler here, let's do
it in a JythonCompiler class instead
o bring in distutils.ccompiler from:
http://svn.python.org/projects/python/branches/release23-maint/Lib/distutils/ccompiler.py@37185
........
r4157 | pjenvey | 2008-02-19 13:06:53 -0700 (Tue, 19 Feb 2008) | 5 lines
o add JythonCompiler, which simply raises a CCompiler exception about
extensions not being supported. distributions can catch this and skip optional
extensions on Jython (simplejson and Genshi trunk already do this)
o stub out sysconfig vars that build_ext expects with os2's
........
r4159 | pjenvey | 2008-02-20 20:48:06 -0700 (Wed, 20 Feb 2008) | 4 lines
close the file handle: we might try deleting it before the garbage collector
does and cause this fatal error on Windows: 'The process cannot access the file
because it is being used by another process.'
........
r4160 | pjenvey | 2008-02-20 21:04:06 -0700 (Wed, 20 Feb 2008) | 6 lines
zipimporter fixes for windows:
o convert '/' to File.separator in ZipEntry names, and back to '/' in
getDataStream
o use File.separator in zip_searchorder
o always close zip files when finished
........
r4162 | pjenvey | 2008-02-21 20:19:09 -0700 (Thu, 21 Feb 2008) | 4 lines
o was using an invalid filename on windows instead of the actual testtar
filename
o ensure all file handles are closed to avoid os.remove problems on windows
........
r4163 | pjenvey | 2008-02-21 20:27:10 -0700 (Thu, 21 Feb 2008) | 1 line
close stray file handles
........
r4164 | pjenvey | 2008-02-21 22:55:07 -0700 (Thu, 21 Feb 2008) | 4 lines
o add a chdir test for subprocess
o fix the subprocess command line strings to work on windows
o close file handles
........
Modified Paths:
--------------
branches/utf16/CPythonLib.includes
branches/utf16/CoreExposed.includes
branches/utf16/Lib/distutils/command/sdist.py
branches/utf16/Lib/distutils/sysconfig.py
branches/utf16/Lib/doctest.py
branches/utf16/Lib/javapath.py
branches/utf16/Lib/javashell.py
branches/utf16/Lib/test/output/test_extcall
branches/utf16/Lib/test/regrtest.py
branches/utf16/Lib/test/test_builtin_jy.py
branches/utf16/Lib/test/test_chdir.py
branches/utf16/Lib/test/test_extcall.py
branches/utf16/Lib/test/test_fileno.py
branches/utf16/Lib/test/test_generators.py
branches/utf16/Lib/test/test_java_integration.py
branches/utf16/Lib/test/test_select_new.py
branches/utf16/Lib/test/test_sets.py
branches/utf16/Lib/test/test_str_jy.py
branches/utf16/Lib/test/test_sys_jy.py
branches/utf16/Lib/test/test_tarfile.py
branches/utf16/build.xml
branches/utf16/src/org/python/core/ArgParser.java
branches/utf16/src/org/python/core/BytecodeLoader.java
branches/utf16/src/org/python/core/NewCompilerResources.java
branches/utf16/src/org/python/core/Py.java
branches/utf16/src/org/python/core/PyArray.java
branches/utf16/src/org/python/core/PyBaseString.java
branches/utf16/src/org/python/core/PyBoolean.java
branches/utf16/src/org/python/core/PyBuiltinFunctionSet.java
branches/utf16/src/org/python/core/PyBuiltinMethod.java
branches/utf16/src/org/python/core/PyClass.java
branches/utf16/src/org/python/core/PyClassMethod.java
branches/utf16/src/org/python/core/PyClassMethodDescr.java
branches/utf16/src/org/python/core/PyComplex.java
branches/utf16/src/org/python/core/PyDataDescr.java
branches/utf16/src/org/python/core/PyDictionary.java
branches/utf16/src/org/python/core/PyEnumerate.java
branches/utf16/src/org/python/core/PyFile.java
branches/utf16/src/org/python/core/PyFloat.java
branches/utf16/src/org/python/core/PyFunction.java
branches/utf16/src/org/python/core/PyGenerator.java
branches/utf16/src/org/python/core/PyInteger.java
branches/utf16/src/org/python/core/PyJavaPackage.java
branches/utf16/src/org/python/core/PyList.java
branches/utf16/src/org/python/core/PyLong.java
branches/utf16/src/org/python/core/PyMethod.java
branches/utf16/src/org/python/core/PyMethodDescr.java
branches/utf16/src/org/python/core/PyNewWrapper.java
branches/utf16/src/org/python/core/PyNotImplemented.java
branches/utf16/src/org/python/core/PyObject.java
branches/utf16/src/org/python/core/PyProperty.java
branches/utf16/src/org/python/core/PyReflectedFunction.java
branches/utf16/src/org/python/core/PySlice.java
branches/utf16/src/org/python/core/PyStaticMethod.java
branches/utf16/src/org/python/core/PyString.java
branches/utf16/src/org/python/core/PySuper.java
branches/utf16/src/org/python/core/PySystemState.java
branches/utf16/src/org/python/core/PyTuple.java
branches/utf16/src/org/python/core/PyType.java
branches/utf16/src/org/python/core/PyUnicode.java
branches/utf16/src/org/python/core/__builtin__.java
branches/utf16/src/org/python/core/io/FileIO.java
branches/utf16/src/org/python/core/io/TextIOBase.java
branches/utf16/src/org/python/expose/generate/DescriptorExposer.java
branches/utf16/src/org/python/expose/generate/ExposeTask.java
branches/utf16/src/org/python/expose/generate/ExposedFieldFinder.java
branches/utf16/src/org/python/expose/generate/ExposedMethodFinder.java
branches/utf16/src/org/python/expose/generate/ExposedTypeProcessor.java
branches/utf16/src/org/python/expose/generate/ExposedTypeVisitor.java
branches/utf16/src/org/python/expose/generate/Exposer.java
branches/utf16/src/org/python/expose/generate/MethodExposer.java
branches/utf16/src/org/python/expose/generate/NewExposer.java
branches/utf16/src/org/python/expose/generate/OverridableNewExposer.java
branches/utf16/src/org/python/expose/generate/PyTypes.java
branches/utf16/src/org/python/expose/generate/RestrictiveAnnotationVisitor.java
branches/utf16/src/org/python/expose/generate/TypeExposer.java
branches/utf16/src/org/python/modules/MD5Object.java
branches/utf16/src/org/python/modules/PyLocal.java
branches/utf16/src/org/python/modules/PyTeeIterator.java
branches/utf16/src/org/python/modules/_weakref.java
branches/utf16/src/org/python/modules/cPickle.java
branches/utf16/src/org/python/modules/collections/Collections.java
branches/utf16/src/org/python/modules/collections/PyDefaultDict.java
branches/utf16/src/org/python/modules/collections/PyDeque.java
branches/utf16/src/org/python/modules/itertools.java
branches/utf16/src/org/python/modules/random/PyRandom.java
branches/utf16/src/org/python/modules/random/RandomModule.java
branches/utf16/src/org/python/modules/sets/BaseSet.java
branches/utf16/src/org/python/modules/sets/PyImmutableSet.java
branches/utf16/src/org/python/modules/sets/PySet.java
branches/utf16/src/org/python/modules/sets/Sets.java
branches/utf16/src/org/python/modules/thread.java
branches/utf16/src/org/python/modules/time/PyTimeTuple.java
branches/utf16/src/org/python/modules/zipimport/zipimport.java
branches/utf16/src/org/python/modules/zipimport/zipimporter.java
branches/utf16/src/org/python/newcompiler/asm/AnnotationDis.java
branches/utf16/src/org/python/newcompiler/asm/ClassDis.java
branches/utf16/src/org/python/newcompiler/asm/FieldDis.java
branches/utf16/src/org/python/newcompiler/asm/MethodDis.java
branches/utf16/src/org/python/newcompiler/asm/OffsetTracer.java
branches/utf16/src/org/python/util/PythonInterpreter.java
branches/utf16/src/templates/mappings
branches/utf16/tests/java/org/python/expose/generate/DescriptorExposerTest.java
branches/utf16/tests/java/org/python/expose/generate/ExposeMethodFinderTest.java
branches/utf16/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java
branches/utf16/tests/java/org/python/expose/generate/ExposedTypeVisitorTest.java
branches/utf16/tests/java/org/python/expose/generate/MethodExposerTest.java
branches/utf16/tests/java/org/python/expose/generate/NewExposerTest.java
branches/utf16/tests/java/org/python/expose/generate/OverridableNewExposerTest.java
branches/utf16/tests/java/org/python/expose/generate/SimpleExposed.java
branches/utf16/tests/java/org/python/expose/generate/TypeExposerTest.java
Added Paths:
-----------
branches/utf16/Lib/compiler/
branches/utf16/Lib/compiler/pycodegen.py
branches/utf16/Lib/compiler/transformer.py
branches/utf16/Lib/distutils/ccompiler.py
branches/utf16/Lib/distutils/jythoncompiler.py
branches/utf16/Lib/subprocess.py
branches/utf16/Lib/test/test_logging.py
branches/utf16/Lib/test/test_subprocess.py
branches/utf16/Lib/test/test_types_jy.py
branches/utf16/extlibs/jarjar-0.7.jar
branches/utf16/src/org/python/core/PyBuiltinClassMethodNarrow.java
branches/utf16/src/org/python/expose/ExposedClassMethod.java
branches/utf16/src/org/python/expose/generate/ClassMethodExposer.java
branches/utf16/src/org/python/expose/generate/InstanceMethodExposer.java
branches/utf16/tests/java/javatests/BigDecimalTest.java
branches/utf16/tests/java/javatests/MethodInvokationTest.java
Removed Paths:
-------------
branches/utf16/Lib/compiler/pycodegen.py
branches/utf16/Lib/compiler/transformer.py
branches/utf16/bugtests/test051.py
branches/utf16/bugtests/test052.py
branches/utf16/bugtests/test053.py
branches/utf16/bugtests/test054.py
branches/utf16/bugtests/test055.py
branches/utf16/bugtests/test056.py
branches/utf16/bugtests/test057.py
branches/utf16/bugtests/test058.py
branches/utf16/bugtests/test059.py
branches/utf16/bugtests/test060.py
branches/utf16/bugtests/test061.py
branches/utf16/bugtests/test062.py
branches/utf16/bugtests/test063.py
branches/utf16/bugtests/test064.py
branches/utf16/bugtests/test065.py
branches/utf16/bugtests/test066.py
branches/utf16/bugtests/test066j.java
branches/utf16/bugtests/test067.py
branches/utf16/bugtests/test067j.java
branches/utf16/bugtests/test068.py
branches/utf16/bugtests/test069.py
branches/utf16/bugtests/test070.py
branches/utf16/bugtests/test071.py
branches/utf16/bugtests/test072.py
branches/utf16/bugtests/test073.py
branches/utf16/bugtests/test074.py
branches/utf16/bugtests/test075.py
branches/utf16/src/org/python/core/PyFieldDescr.java
branches/utf16/src/org/python/core/PyGetSetDescr.java
branches/utf16/src/templates/array.expose
branches/utf16/src/templates/baseset.expose
branches/utf16/src/templates/bool.expose
branches/utf16/src/templates/classmethod.expose
branches/utf16/src/templates/complex.expose
branches/utf16/src/templates/defaultdict.expose
branches/utf16/src/templates/deque.expose
branches/utf16/src/templates/dict.expose
branches/utf16/src/templates/enumerate.expose
branches/utf16/src/templates/float.expose
branches/utf16/src/templates/immutableset.expose
branches/utf16/src/templates/list.expose
branches/utf16/src/templates/local.expose
branches/utf16/src/templates/long.expose
branches/utf16/src/templates/property.expose
branches/utf16/src/templates/random.expose
branches/utf16/src/templates/sequence.expose
branches/utf16/src/templates/set.expose
branches/utf16/src/templates/slice.expose
branches/utf16/src/templates/super.expose
branches/utf16/src/templates/test.expose
branches/utf16/src/templates/tuple.expose
Property Changed:
----------------
branches/utf16/
Property changes on: branches/utf16
___________________________________________________________________
Name: svnmerge-integrated
- /branches/modern:1-4083 /trunk/jython:1-4088
+ /branches/modern:1-4083 /trunk/jython:1-4165
Modified: branches/utf16/CPythonLib.includes
===================================================================
--- branches/utf16/CPythonLib.includes 2008-02-23 18:40:56 UTC (rev 4165)
+++ branches/utf16/CPythonLib.includes 2008-02-23 22:31:27 UTC (rev 4166)
@@ -2,6 +2,7 @@
# used as fileset in build.xml (target copy-full)
# Lib directories, in alphabetical order:
+compiler/**
distutils/**
email/**
encodings/**
Modified: branches/utf16/CoreExposed.includes
===================================================================
--- branches/utf16/CoreExposed.includes 2008-02-23 18:40:56 UTC (rev 4165)
+++ branches/utf16/CoreExposed.includes 2008-02-23 22:31:27 UTC (rev 4166)
@@ -1,14 +1,34 @@
+org/python/core/PyArray.class
org/python/core/PyBaseString.class
+org/python/core/PyBoolean.class
org/python/core/PyBuiltinFunction.class
+org/python/core/PyClassMethod.class
+org/python/core/PyComplex.class
+org/python/core/PyDataDescr.class
+org/python/core/PyDictionary.class
+org/python/core/PyEnumerate.class
org/python/core/PyFile.class
+org/python/core/PyFloat.class
org/python/core/PyInteger.class
org/python/core/PyList.class
+org/python/core/PyLong.class
org/python/core/PyModule.class
org/python/core/PyNone.class
org/python/core/PyObject.class
+org/python/core/PyProperty.class
+org/python/core/PySlice.class
+org/python/core/PyStaticMethod.class
org/python/core/PyString.class
+org/python/core/PySuper.class
+org/python/core/PyTuple.class
org/python/core/PyType.class
org/python/core/PyUnicode.class
+org/python/modules/PyLocal.class
+org/python/modules/collections/PyDefaultDict.class
+org/python/modules/collections/PyDeque.class
+org/python/modules/random/PyRandom.class
+org/python/modules/sets/PyImmutableSet.class
+org/python/modules/sets/PySet.class
org/python/modules/time/PyTimeTuple.class
org/python/modules/zipimport/zipimporter.class
org/python/modules/PyTeeIterator.class
Copied: branches/utf16/Lib/compiler (from rev 4164, trunk/jython/Lib/compiler)
Deleted: branches/utf16/Lib/compiler/pycodegen.py
===================================================================
--- trunk/jython/Lib/compiler/pycodegen.py 2008-02-22 05:55:07 UTC (rev 4164)
+++ branches/utf16/Lib/compiler/pycodegen.py 2008-02-23 22:31:27 UTC (rev 4166)
@@ -1,1387 +0,0 @@
-import imp
-import os
-import marshal
-import struct
-import sys
-import types
-from cStringIO import StringIO
-
-from compiler import ast, parse, walk, syntax
-#from compiler import pyassem, misc, future, symbols
-from compiler import misc, future, symbols
-from compiler.consts import SC_LOCAL, SC_GLOBAL, SC_FREE, SC_CELL
-from compiler.consts import CO_VARARGS, CO_VARKEYWORDS, CO_NEWLOCALS,\
- CO_NESTED, CO_GENERATOR, CO_GENERATOR_ALLOWED, CO_FUTURE_DIVISION
-#from compiler.pyassem import TupleArg
-TupleArg = None
-
-# XXX The version-specific code can go, since this code only works with 2.x.
-# Do we have Python 1.x or Python 2.x?
-try:
- VERSION = sys.version_info[0]
-except AttributeError:
- VERSION = 1
-
-callfunc_opcode_info = {
- # (Have *args, Have **args) : opcode
- (0,0) : "CALL_FUNCTION",
- (1,0) : "CALL_FUNCTION_VAR",
- (0,1) : "CALL_FUNCTION_KW",
- (1,1) : "CALL_FUNCTION_VAR_KW",
-}
-
-LOOP = 1
-EXCEPT = 2
-TRY_FINALLY = 3
-END_FINALLY = 4
-
-def compileFile(filename, display=0):
- f = open(filename, 'U')
- buf = f.read()
- f.close()
- mod = Module(buf, filename)
- try:
- mod.compile(display)
- except SyntaxError:
- raise
- else:
- f = open(filename + "c", "wb")
- mod.dump(f)
- f.close()
-
-def compile(source, filename, mode, flags=None, dont_inherit=None):
- """Replacement for builtin compile() function"""
- if flags is not None or dont_inherit is not None:
- raise RuntimeError, "not implemented yet"
-
- if mode == "single":
- gen = Interactive(source, filename)
- elif mode == "exec":
- gen = Module(source, filename)
- elif mode == "eval":
- gen = Expression(source, filename)
- else:
- raise ValueError("compile() 3rd arg must be 'exec' or "
- "'eval' or 'single'")
- gen.compile()
- return gen.code
-
-class AbstractCompileMode:
-
- mode = None # defined by subclass
-
- def __init__(self, source, filename):
- self.source = source
- self.filename = filename
- self.code = None
-
- def _get_tree(self):
- tree = parse(self.source, self.mode)
- misc.set_filename(self.filename, tree)
- syntax.check(tree)
- return tree
-
- def compile(self):
- pass # implemented by subclass
-
- def getCode(self):
- return self.code
-
-class Expression(AbstractCompileMode):
-
- mode = "eval"
-
- def compile(self):
- tree = self._get_tree()
- gen = ExpressionCodeGenerator(tree)
- self.code = gen.getCode()
-
-class Interactive(AbstractCompileMode):
-
- mode = "single"
-
- def compile(self):
- tree = self._get_tree()
- gen = InteractiveCodeGenerator(tree)
- self.code = gen.getCode()
-
-class Module(AbstractCompileMode):
-
- mode = "exec"
-
- def compile(self, display=0):
- tree = self._get_tree()
- gen = ModuleCodeGenerator(tree)
- if display:
- import pprint
- print pprint.pprint(tree)
- self.code = gen.getCode()
-
- def dump(self, f):
- f.write(self.getPycHeader())
- marshal.dump(self.code, f)
-
- #MAGIC = imp.get_magic()
- MAGIC = None
-
- def getPycHeader(self):
- # compile.c uses marshal to write a long directly, with
- # calling the interface that would also generate a 1-byte code
- # to indicate the type of the value. simplest way to get the
- # same effect is to call marshal and then skip the code.
- mtime = os.path.getmtime(self.filename)
- mtime = struct.pack('<i', mtime)
- return self.MAGIC + mtime
-
-class LocalNameFinder:
- """Find local names in scope"""
- def __init__(self, names=()):
- self.names = misc.Set()
- self.globals = misc.Set()
- for name in names:
- self.names.add(name)
-
- # XXX list comprehensions and for loops
-
- def getLocals(self):
- for elt in self.globals.elements():
- if self.names.has_elt(elt):
- self.names.remove(elt)
- return self.names
-
- def visitDict(self, node):
- pass
-
- def visitGlobal(self, node):
- for name in node.names:
- self.globals.add(name)
-
- def visitFunction(self, node):
- self.names.add(node.name)
-
- def visitLambda(self, node):
- pass
-
- def visitImport(self, node):
- for name, alias in node.names:
- self.names.add(alias or name)
-
- def visitFrom(self, node):
- for name, alias in node.names:
- self.names.add(alias or name)
-
- def visitClass(self, node):
- self.names.add(node.name)
-
- def visitAssName(self, node):
- self.names.add(node.name)
-
-def is_constant_false(node):
- if isinstance(node, ast.Const):
- if not node.value:
- return 1
- return 0
-
-class CodeGenerator:
- """Defines basic code generator for Python bytecode
-
- This class is an abstract base class. Concrete subclasses must
- define an __init__() that defines self.graph and then calls the
- __init__() defined in this class.
-
- The concrete class must also define the class attributes
- NameFinder, FunctionGen, and ClassGen. These attributes can be
- defined in the initClass() method, which is a hook for
- initializing these methods after all the classes have been
- defined.
- """
-
- optimized = 0 # is namespace access optimized?
- __initialized = None
- class_name = None # provide default for instance variable
-
- def __init__(self):
- if self.__initialized is None:
- self.initClass()
- self.__class__.__initialized = 1
- self.checkClass()
- self.locals = misc.Stack()
- self.setups = misc.Stack()
- self.curStack = 0
- self.maxStack = 0
- self.last_lineno = None
- self._setupGraphDelegation()
- self._div_op = "BINARY_DIVIDE"
-
- # XXX set flags based on future features
- futures = self.get_module().futures
- for feature in futures:
- if feature == "division":
- self.graph.setFlag(CO_FUTURE_DIVISION)
- self._div_op = "BINARY_TRUE_DIVIDE"
- elif feature == "generators":
- self.graph.setFlag(CO_GENERATOR_ALLOWED)
-
- def initClass(self):
- """This method is called once for each class"""
-
- def checkClass(self):
- """Verify that class is constructed correctly"""
- try:
- assert hasattr(self, 'graph')
- assert getattr(self, 'NameFinder')
- assert getattr(self, 'FunctionGen')
- assert getattr(self, 'ClassGen')
- except AssertionError, msg:
- intro = "Bad class construction for %s" % self.__class__.__name__
- raise AssertionError, intro
-
- def _setupGraphDelegation(self):
- self.emit = self.graph.emit
- self.newBlock = self.graph.newBlock
- self.startBlock = self.graph.startBlock
- self.nextBlock = self.graph.nextBlock
- self.setDocstring = self.graph.setDocstring
-
- def getCode(self):
- """Return a code object"""
- return self.graph.getCode()
-
- def mangle(self, name):
- if self.class_name is not None:
- return misc.mangle(name, self.class_name)
- else:
- return name
-
- def parseSymbols(self, tree):
- s = symbols.SymbolVisitor()
- walk(tree, s)
- return s.scopes
-
- def get_module(self):
- raise RuntimeError, "should be implemented by subclasses"
-
- # Next five methods handle name access
-
- def isLocalName(self, name):
- return self.locals.top().has_elt(name)
-
- def storeName(self, name):
- self._nameOp('STORE', name)
-
- def loadName(self, name):
- self._nameOp('LOAD', name)
-
- def delName(self, name):
- self._nameOp('DELETE', name)
-
- def _nameOp(self, prefix, name):
- name = self.mangle(name)
- scope = self.scope.check_name(name)
- if scope == SC_LOCAL:
- if not self.optimized:
- self.emit(prefix + '_NAME', name)
- else:
- self.emit(prefix + '_FAST', name)
- elif scope == SC_GLOBAL:
- if not self.optimized:
- self.emit(prefix + '_NAME', name)
- else:
- self.emit(prefix + '_GLOBAL', name)
- elif scope == SC_FREE or scope == SC_CELL:
- self.emit(prefix + '_DEREF', name)
- else:
- raise RuntimeError, "unsupported scope for var %s: %d" % \
- (name, scope)
-
- def _implicitNameOp(self, prefix, name):
- """Emit name ops for names generated implicitly by for loops
-
- The interpreter generates names that start with a period or
- dollar sign. The symbol table ignores these names because
- they aren't present in the program text.
- """
- if self.optimized:
- self.emit(prefix + '_FAST', name)
- else:
- self.emit(prefix + '_NAME', name)
-
- # The set_lineno() function and the explicit emit() calls for
- # SET_LINENO below are only used to generate the line number table.
- # As of Python 2.3, the interpreter does not have a SET_LINENO
- # instruction. pyassem treats SET_LINENO opcodes as a special case.
-
- def set_lineno(self, node, force=False):
- """Emit SET_LINENO if necessary.
-
- The instruction is considered necessary if the node has a
- lineno attribute and it is different than the last lineno
- emitted.
-
- Returns true if SET_LINENO was emitted.
-
- There are no rules for when an AST node should have a lineno
- attribute. The transformer and AST code need to be reviewed
- and a consistent policy implemented and documented. Until
- then, this method works around missing line numbers.
- """
- lineno = getattr(node, 'lineno', None)
- if lineno is not None and (lineno != self.last_lineno
- or force):
- self.emit('SET_LINENO', lineno)
- self.last_lineno = lineno
- return True
- return False
-
- # The first few visitor methods handle nodes that generator new
- # code objects. They use class attributes to determine what
- # specialized code generators to use.
-
- NameFinder = LocalNameFinder
- FunctionGen = None
- ClassGen = None
-
- def visitModule(self, node):
- self.scopes = self.parseSymbols(node)
- self.scope = self.scopes[node]
- self.emit('SET_LINENO', 0)
- if node.doc:
- self.emit('LOAD_CONST', node.doc)
- self.storeName('__doc__')
- lnf = walk(node.node, self.NameFinder(), verbose=0)
- self.locals.push(lnf.getLocals())
- self.visit(node.node)
- self.emit('LOAD_CONST', None)
- self.emit('RETURN_VALUE')
-
- def visitExpression(self, node):
- self.set_lineno(node)
- self.scopes = self.parseSymbols(node)
- self.scope = self.scopes[node]
- self.visit(node.node)
- self.emit('RETURN_VALUE')
-
- def visitFunction(self, node):
- self._visitFuncOrLambda(node, isLambda=0)
- if node.doc:
- self.setDocstring(node.doc)
- self.storeName(node.name)
-
- def visitLambda(self, node):
- self._visitFuncOrLambda(node, isLambda=1)
-
- def _visitFuncOrLambda(self, node, isLambda=0):
- gen = self.FunctionGen(node, self.scopes, isLambda,
- self.class_name, self.get_module())
- walk(node.code, gen)
- gen.finish()
- self.set_lineno(node)
- for default in node.defaults:
- self.visit(default)
- frees = gen.scope.get_free_vars()
- if frees:
- for name in frees:
- self.emit('LOAD_CLOSURE', name)
- self.emit('LOAD_CONST', gen)
- self.emit('MAKE_CLOSURE', len(node.defaults))
- else:
- self.emit('LOAD_CONST', gen)
- self.emit('MAKE_FUNCTION', len(node.defaults))
-
- def visitClass(self, node):
- gen = self.ClassGen(node, self.scopes,
- self.get_module())
- walk(node.code, gen)
- gen.finish()
- self.set_lineno(node)
- self.emit('LOAD_CONST', node.name)
- for base in node.bases:
- self.visit(base)
- self.emit('BUILD_TUPLE', len(node.bases))
- frees = gen.scope.get_free_vars()
- for name in frees:
- self.emit('LOAD_CLOSURE', name)
- self.emit('LOAD_CONST', gen)
- if frees:
- self.emit('MAKE_CLOSURE', 0)
- else:
- self.emit('MAKE_FUNCTION', 0)
- self.emit('CALL_FUNCTION', 0)
- self.emit('BUILD_CLASS')
- self.storeName(node.name)
-
- # The rest are standard visitor methods
-
- # The next few implement control-flow statements
-
- def visitIf(self, node):
- end = self.newBlock()
- numtests = len(node.tests)
- for i in range(numtests):
- test, suite = node.tests[i]
- if is_constant_false(test):
- # XXX will need to check generator stuff here
- continue
- self.set_lineno(test)
- self.visit(test)
- nextTest = self.newBlock()
- self.emit('JUMP_IF_FALSE', nextTest)
- self.nextBlock()
- self.emit('POP_TOP')
- self.visit(suite)
- self.emit('JUMP_FORWARD', end)
- self.startBlock(nextTest)
- self.emit('POP_TOP')
- if node.else_:
- self.visit(node.else_)
- self.nextBlock(end)
-
- def visitWhile(self, node):
- self.set_lineno(node)
-
- loop = self.newBlock()
- else_ = self.newBlock()
-
- after = self.newBlock()
- self.emit('SETUP_LOOP', after)
-
- self.nextBlock(loop)
- self.setups.push((LOOP, loop))
-
- self.set_lineno(node, force=True)
- self.visit(node.test)
- self.emit('JUMP_IF_FALSE', else_ or after)
-
- self.nextBlock()
- self.emit('POP_TOP')
- self.visit(node.body)
- self.emit('JUMP_ABSOLUTE', loop)
-
- self.startBlock(else_) # or just the POPs if not else clause
- self.emit('POP_TOP')
- self.emit('POP_BLOCK')
- self.setups.pop()
- if node.else_:
- self.visit(node.else_)
- self.nextBlock(after)
-
- def visitFor(self, node):
- start = self.newBlock()
- anchor = self.newBlock()
- after = self.newBlock()
- self.setups.push((LOOP, start))
-
- self.set_lineno(node)
- self.emit('SETUP_LOOP', after)
- self.visit(node.list)
- self.emit('GET_ITER')
-
- self.nextBlock(start)
- self.set_lineno(node, force=1)
- self.emit('FOR_ITER', anchor)
- self.visit(node.assign)
- self.visit(node.body)
- self.emit('JUMP_ABSOLUTE', start)
- self.nextBlock(anchor)
- self.emit('POP_BLOCK')
- self.setups.pop()
- if node.else_:
- self.visit(node.else_)
- self.nextBlock(after)
-
- def visitBreak(self, node):
- if not self.setups:
- raise SyntaxError, "'break' outside loop (%s, %d)" % \
- (node.filename, node.lineno)
- self.set_lineno(node)
- self.emit('BREAK_LOOP')
-
- def visitContinue(self, node):
- if not self.setups:
- raise SyntaxError, "'continue' outside loop (%s, %d)" % \
- (node.filename, node.lineno)
- kind, block = self.setups.top()
- if kind == LOOP:
- self.set_lineno(node)
- self.emit('JUMP_ABSOLUTE', block)
- self.nextBlock()
- elif kind == EXCEPT or kind == TRY_FINALLY:
- self.set_lineno(node)
- # find the block that starts the loop
- top = len(self.setups)
- while top > 0:
- top = top - 1
- kind, loop_block = self.setups[top]
- if kind == LOOP:
- break
- if kind != LOOP:
- raise SyntaxError, "'continue' outside loop (%s, %d)" % \
- (node.filename, node.lineno)
- self.emit('CONTINUE_LOOP', loop_block)
- self.nextBlock()
- elif kind == END_FINALLY:
- msg = "'continue' not allowed inside 'finally' clause (%s, %d)"
- raise SyntaxError, msg % (node.filename, node.lineno)
-
- def visitTest(self, node, jump):
- end = self.newBlock()
- for child in node.nodes[:-1]:
- self.visit(child)
- self.emit(jump, end)
- self.nextBlock()
- self.emit('POP_TOP')
- self.visit(node.nodes[-1])
- self.nextBlock(end)
-
- def visitAnd(self, node):
- self.visitTest(node, 'JUMP_IF_FALSE')
-
- def visitOr(self, node):
- self.visitTest(node, 'JUMP_IF_TRUE')
-
- def visitCompare(self, node):
- self.visit(node.expr)
- cleanup = self.newBlock()
- for op, code in node.ops[:-1]:
- self.visit(code)
- self.emit('DUP_TOP')
- self.emit('ROT_THREE')
- self.emit('COMPARE_OP', op)
- self.emit('JUMP_IF_FALSE', cleanup)
- self.nextBlock()
- self.emit('POP_TOP')
- # now do the last comparison
- if node.ops:
- op, code = node.ops[-1]
- self.visit(code)
- self.emit('COMPARE_OP', op)
- if len(node.ops) > 1:
- end = self.newBlock()
- self.emit('JUMP_FORWARD', end)
- self.startBlock(cleanup)
- self.emit('ROT_TWO')
- self.emit('POP_TOP')
- self.nextBlock(end)
-
- # list comprehensions
- __list_count = 0
-
- def visitListComp(self, node):
- self.set_lineno(node)
- # setup list
- append = "$append%d" % self.__list_count
- self.__list_count = self.__list_count + 1
- self.emit('BUILD_LIST', 0)
- self.emit('DUP_TOP')
- self.emit('LOAD_ATTR', 'append')
- self._implicitNameOp('STORE', append)
-
- stack = []
- for i, for_ in zip(range(len(node.quals)), node.quals):
- start, anchor = self.visit(for_)
- cont = None
- for if_ in for_.ifs:
- if cont is None:
- cont = self.newBlock()
- self.visit(if_, cont)
- stack.insert(0, (start, cont, anchor))
-
- self._implicitNameOp('LOAD', append)
- self.visit(node.expr)
- self.emit('CALL_FUNCTION', 1)
- self.emit('POP_TOP')
-
- for start, cont, anchor in stack:
- if cont:
- skip_one = self.newBlock()
- self.emit('JUMP_FORWARD', skip_one)
- self.startBlock(cont)
- self.emit('POP_TOP')
- self.nextBlock(skip_one)
- self.emit('JUMP_ABSOLUTE', start)
- self.startBlock(anchor)
- self._implicitNameOp('DELETE', append)
-
- self.__list_count = self.__list_count - 1
-
- def visitListCompFor(self, node):
- start = self.newBlock()
- anchor = self.newBlock()
-
- self.visit(node.list)
- self.emit('GET_ITER')
- self.nextBlock(start)
- self.set_lineno(node, force=True)
- self.emit('FOR_ITER', anchor)
- self.nextBlock()
- self.visit(node.assign)
- return start, anchor
-
- def visitListCompIf(self, node, branch):
- self.set_lineno(node, force=True)
- self.visit(node.test)
- self.emit('JUMP_IF_FALSE', branch)
- self.newBlock()
- self.emit('POP_TOP')
-
- # exception related
-
- def visitAssert(self, node):
- # XXX would be interesting to implement this via a
- # transformation of the AST before this stage
- end = self.newBlock()
- self.set_lineno(node)
- # XXX __debug__ and AssertionError appear to be special cases
- # -- they are always loaded as globals even if there are local
- # names. I guess this is a sort of renaming op.
- self.emit('LOAD_GLOBAL', '__debug__')
- self.emit('JUMP_IF_FALSE', end)
- self.nextBlock()
- self.emit('POP_TOP')
- self.visit(node.test)
- self.emit('JUMP_IF_TRUE', end)
- self.nextBlock()
- self.emit('POP_TOP')
- self.emit('LOAD_GLOBAL', 'AssertionError')
- if node.fail:
- self.visit(node.fail)
- self.emit('RAISE_VARARGS', 2)
- else:
- self.emit('RAISE_VARARGS', 1)
- self.nextBlock(end)
- self.emit('POP_TOP')
-
- def visitRaise(self, node):
- self.set_lineno(node)
- n = 0
- if node.expr1:
- self.visit(node.expr1)
- n = n + 1
- if node.expr2:
- self.visit(node.expr2)
- n = n + 1
- if node.expr3:
- self.visit(node.expr3)
- n = n + 1
- self.emit('RAISE_VARARGS', n)
-
- def visitTryExcept(self, node):
- body = self.newBlock()
- handlers = self.newBlock()
- end = self.newBlock()
- if node.else_:
- lElse = self.newBlock()
- else:
- lElse = end
- self.set_lineno(node)
- self.emit('SETUP_EXCEPT', handlers)
- self.nextBlock(body)
- self.setups.push((EXCEPT, body))
- self.visit(node.body)
- self.emit('POP_BLOCK')
- self.setups.pop()
- self.emit('JUMP_FORWARD', lElse)
- self.startBlock(handlers)
-
- last = len(node.handlers) - 1
- for i in range(len(node.handlers)):
- expr, target, body = node.handlers[i]
- self.set_lineno(expr)
- if expr:
- self.emit('DUP_TOP')
- self.visit(expr)
- self.emit('COMPARE_OP', 'exception match')
- next = self.newBlock()
- self.emit('JUMP_IF_FALSE', next)
- self.nextBlock()
- self.emit('POP_TOP')
- self.emit('POP_TOP')
- if target:
- self.visit(target)
- else:
- self.emit('POP_TOP')
- self.emit('POP_TOP')
- self.visit(body)
- self.emit('JUMP_FORWARD', end)
- if expr:
- self.nextBlock(next)
- else:
- self.nextBlock()
- if expr: # XXX
- self.emit('POP_TOP')
- self.emit('END_FINALLY')
- if node.else_:
- self.nextBlock(lElse)
- self.visit(node.else_)
- self.nextBlock(end)
-
- def visitTryFinally(self, node):
- body = self.newBlock()
- final = self.newBlock()
- self.set_lineno(node)
- self.emit('SETUP_FINALLY', final)
- self.nextBlock(body)
- self.setups.push((TRY_FINALLY, body))
- self.visit(node.body)
- self.emit('POP_BLOCK')
- self.setups.pop()
- self.emit('LOAD_CONST', None)
- self.nextBlock(final)
- self.setups.push((END_FINALLY, final))
- self.visit(node.final)
- self.emit('END_FINALLY')
- self.setups.pop()
-
- # misc
-
- def visitDiscard(self, node):
- self.set_lineno(node)
- self.visit(node.expr)
- self.emit('POP_TOP')
-
- def visitConst(self, node):
- self.emit('LOAD_CONST', node.value)
-
- def visitKeyword(self, node):
- self.emit('LOAD_CONST', node.name)
- self.visit(node.expr)
-
- def visitGlobal(self, node):
- # no code to generate
- pass
-
- def visitName(self, node):
- self.set_lineno(node)
- self.loadName(node.name)
-
- def visitPass(self, node):
- self.set_lineno(node)
-
- def visitImport(self, node):
- self.set_lineno(node)
- for name, alias in node.names:
- if VERSION > 1:
- self.emit('LOAD_CONST', None)
- self.emit('IMPORT_NAME', name)
- mod = name.split(".")[0]
- if alias:
- self._resolveDots(name)
- self.storeName(alias)
- else:
- self.storeName(mod)
-
- def visitFrom(self, node):
- self.set_lineno(node)
- fromlist = map(lambda (name, alias): name, node.names)
- if VERSION > 1:
- self.emit('LOAD_CONST', tuple(fromlist))
- self.emit('IMPORT_NAME', node.modname)
- for name, alias in node.names:
- if VERSION > 1:
- if name == '*':
- self.namespace = 0
- self.emit('IMPORT_STAR')
- # There can only be one name w/ from ... import *
- assert len(node.names) == 1
- return
- else:
- self.emit('IMPORT_FROM', name)
- self._resolveDots(name)
- self.storeName(alias or name)
- else:
- self.emit('IMPORT_FROM', name)
- self.emit('POP_TOP')
-
- def _resolveDots(self, name):
- elts = name.split(".")
- if len(elts) == 1:
- return
- for elt in elts[1:]:
- self.emit('LOAD_ATTR', elt)
-
- def visitGetattr(self, node):
- self.visit(node.expr)
- self.emit('LOAD_ATTR', self.mangle(node.attrname))
-
- # next five implement assignments
-
- def visitAssign(self, node):
- self.set_lineno(node)
- self.visit(node.expr)
- dups = len(node.nodes) - 1
- for i in range(len(node.nodes)):
- elt = node.nodes[i]
- if i < dups:
- self.emit('DUP_TOP')
- if isinstance(elt, ast.Node):
- self.visit(elt)
-
- def visitAssName(self, node):
- if node.flags == 'OP_ASSIGN':
- self.storeName(node.name)
- elif node.flags == 'OP_DELETE':
- self.set_lineno(node)
- self.delName(node.name)
- else:
- print "oops", node.flags
-
- def visitAssAttr(self, node):
- self.visit(node.expr)
- if node.flags == 'OP_ASSIGN':
- self.emit('STORE_ATTR', self.mangle(node.attrname))
- elif node.flags == 'OP_DELETE':
- self.emit('DELETE_ATTR', self.mangle(node.attrname))
- else:
- print "warning: unexpected flags:", node.flags
- print node
-
- def _visitAssSequence(self, node, op='UNPACK_SEQUENCE'):
- if findOp(node) != 'OP_DELETE':
- self.emit(op, len(node.nodes))
- for child in node.nodes:
- self.visit(child)
-
- if VERSION > 1:
- visitAssTuple = _visitAssSequence
- visitAssList = _visitAssSequence
- else:
- def visitAssTuple(self, node):
- self._visitAssSequence(node, 'UNPACK_TUPLE')
-
- def visitAssList(self, node):
- self._visitAssSequence(node, 'UNPACK_LIST')
-
- # augmented assignment
-
- def visitAugAssign(self, node):
- self.set_lineno(node)
- aug_node = wrap_aug(node.node)
- self.visit(aug_node, "load")
- self.visit(node.expr)
- self.emit(self._augmented_opcode[node.op])
- self.visit(aug_node, "store")
-
- _augmented_opcode = {
- '+=' : 'INPLACE_ADD',
- '-=' : 'INPLACE_SUBTRACT',
- '*=' : 'INPLACE_MULTIPLY',
- '/=' : 'INPLACE_DIVIDE',
- '//=': 'INPLACE_FLOOR_DIVIDE',
- '%=' : 'INPLACE_MODULO',
- '**=': 'INPLACE_POWER',
- '>>=': 'INPLACE_RSHIFT',
- '<<=': 'INPLACE_LSHIFT',
- '&=' : 'INPLACE_AND',
- '^=' : 'INPLACE_XOR',
- '|=' : 'INPLACE_OR',
- }
-
- def visitAugName(self, node, mode):
- if mode == "load":
- self.loadName(node.name)
- elif mode == "store":
- self.storeName(node.name)
-
- def visitAugGetattr(self, node, mode):
- if mode == "load":
- self.visit(node.expr)
- self.emit('DUP_TOP')
- self.emit('LOAD_ATTR', self.mangle(node.attrname))
- elif mode == "store":
- self.emit('ROT_TWO')
- self.emit('STORE_ATTR', self.mangle(node.attrname))
-
- def visitAugSlice(self, node, mode):
- if mode == "load":
- self.visitSlice(node, 1)
- elif mode == "store":
- slice = 0
- if node.lower:
- slice = slice | 1
- if node.upper:
- slice = slice | 2
- if slice == 0:
- self.emit('ROT_TWO')
- elif slice == 3:
- self.emit('ROT_FOUR')
- else:
- self.emit('ROT_THREE')
- self.emit('STORE_SLICE+%d' % slice)
-
- def visitAugSubscript(self, node, mode):
- if len(node.subs) > 1:
- raise SyntaxError, "augmented assignment to tuple is not possible"
- if mode == "load":
- self.visitSubscript(node, 1)
- elif mode == "store":
- self.emit('ROT_THREE')
- self.emit('STORE_SUBSCR')
-
- def visitExec(self, node):
- self.visit(node.expr)
- if node.locals is None:
- self.emit('LOAD_CONST', None)
- else:
- self.visit(node.locals)
- if node.globals is None:
- self.emit('DUP_TOP')
- else:
- self.visit(node.globals)
- self.emit('EXEC_STMT')
-
- def visitCallFunc(self, node):
- pos = 0
- kw = 0
- self.set_lineno(node)
- self.visit(node.node)
- for arg in node.args:
- self.visit(arg)
- if isinstance(arg, ast.Keyword):
- kw = kw + 1
- else:
- pos = pos + 1
- if node.star_args is not None:
- self.visit(node.star_args)
- if node.dstar_args is not None:
- self.visit(node.dstar_args)
- have_star = node.star_args is not None
- have_dstar = node.dstar_args is not None
- opcode = callfunc_opcode_info[have_star, have_dstar]
- self.emit(opcode, kw << 8 | pos)
-
- def visitPrint(self, node, newline=0):
- self.set_lineno(node)
- if node.dest:
- self.visit(node.dest)
- for child in node.nodes:
- if node.dest:
- self.emit('DUP_TOP')
- self.visit(child)
- if node.dest:
- self.emit('ROT_TWO')
- self.emit('PRINT_ITEM_TO')
- else:
- self.emit('PRINT_ITEM')
- if node.dest and not newline:
- self.emit('POP_TOP')
-
- def visitPrintnl(self, node):
- self.visitPrint(node, newline=1)
- if node.dest:
- self.emit('PRINT_NEWLINE_TO')
- else:
- self.emit('PRINT_NEWLINE')
-
- def visitReturn(self, node):
- self.set_lineno(node)
- self.visit(node.value)
- self.emit('RETURN_VALUE')
-
- def visitYield(self, node):
- self.set_lineno(node)
- self.visit(node.value)
- self.emit('YIELD_VALUE')
-
- # slice and subscript stuff
-
- def visitSlice(self, node, aug_flag=None):
- # aug_flag is used by visitAugSlice
- self.visit(node.expr)
- slice = 0
- if node.lower:
- self.visit(node.lower)
- slice = slice | 1
- if node.upper:
- self.visit(node.upper)
- slice = slice | 2
- if aug_flag:
- if slice == 0:
- self.emit('DUP_TOP')
- elif slice == 3:
- self.emit('DUP_TOPX', 3)
- else:
- self.emit('DUP_TOPX', 2)
- if node.flags == 'OP_APPLY':
- self.emit('SLICE+%d' % slice)
- elif node.flags == 'OP_ASSIGN':
- self.emit('STORE_SLICE+%d' % slice)
- elif node.flags == 'OP_DELETE':
- self.emit('DELETE_SLICE+%d' % slice)
- else:
- print "weird slice", node.flags
- raise
-
- def visitSubscript(self, node, aug_flag=None):
- self.visit(node.expr)
- for sub in node.subs:
- self.visit(sub)
- if aug_flag:
- self.emit('DUP_TOPX', 2)
- if len(node.subs) > 1:
- self.emit('BUILD_TUPLE', len(node.subs))
- if node.flags == 'OP_APPLY':
- self.emit('BINARY_SUBSCR')
- elif node.flags == 'OP_ASSIGN':
- self.emit('STORE_SUBSCR')
- elif node.flags == 'OP_DELETE':
- self.emit('DELETE_SUBSCR')
-
- # binary ops
-
- def binaryOp(self, node, op):
- self.visit(node.left)
- self.visit(node.right)
- self.emit(op)
-
- def visitAdd(self, node):
- return self.binaryOp(node, 'BINARY_ADD')
-
- def visitSub(self, node):
- return self.binaryOp(node, 'BINARY_SUBTRACT')
-
- def visitMul(self, node):
- return self.binaryOp(node, 'BINARY_MULTIPLY')
-
- def visitDiv(self, node):
- return self.binaryOp(node, self._div_op)
-
- def visitFloorDiv(self, node):
- return self.binaryOp(node, 'BINARY_FLOOR_DIVIDE')
-
- def visitMod(self, node):
- return self.binaryOp(node, 'BINARY_MODULO')
-
- def visitPower(self, node):
- return self.binaryOp(node, 'BINARY_POWER')
-
- def visitLeftShift(self, node):
- return self.binaryOp(node, 'BINARY_LSHIFT')
-
- def visitRightShift(self, node):
- return self.binaryOp(node, 'BINARY_RSHIFT')
-
- # unary ops
-
- def unaryOp(self, node, op):
- self.visit(node.expr)
- self.emit(op)
-
- def visitInvert(self, node):
- return self.unaryOp(node, 'UNARY_INVERT')
-
- def visitUnarySub(self, node):
- return self.unaryOp(node, 'UNARY_NEGATIVE')
-
- def visitUnaryAdd(self, node):
- return self.unaryOp(node, 'UNARY_POSITIVE')
-
- def visitUnaryInvert(self, node):
- return self.unaryOp(node, 'UNARY_INVERT')
-
- def visitNot(self, node):
- return self.unaryOp(node, 'UNARY_NOT')
-
- def visitBackquote(self, node):
- return self.unaryOp(node, 'UNARY_CONVERT')
-
- # bit ops
-
- def bitOp(self, nodes, op):
- self.visit(nodes[0])
- for node in nodes[1:]:
- self.visit(node)
- self.emit(op)
-
- def visitBitand(self, node):
- return self.bitOp(node.nodes, 'BINARY_AND')
-
- def visitBitor(self, node):
- return self.bitOp(node.nodes, 'BINARY_OR')
-
- def visitBitxor(self, node):
- return self.bitOp(node.nodes, 'BINARY_XOR')
-
- # object constructors
-
- def visitEllipsis(self, node):
- self.emit('LOAD_CONST', Ellipsis)
-
- def visitTuple(self, node):
- self.set_lineno(node)
- for elt in node.nodes:
- self.visit(elt)
- self.emit('BUILD_TUPLE', len(node.nodes))
-
- def visitList(self, node):
- self.set_lineno(node)
- for elt in node.nodes:
- self.visit(elt)
- self.emit('BUILD_LIST', len(node.nodes))
-
- def visitSliceobj(self, node):
- for child in node.nodes:
- self.visit(child)
- self.emit('BUILD_SLICE', len(node.nodes))
-
- def visitDict(self, node):
- self.set_lineno(node)
- self.emit('BUILD_MAP', 0)
- for k, v in node.items:
- self.emit('DUP_TOP')
- self.visit(k)
- self.visit(v)
- self.emit('ROT_THREE')
- self.emit('STORE_SUBSCR')
-
-class NestedScopeMixin:
- """Defines initClass() for nested scoping (Python 2.2-compatible)"""
- def initClass(self):
- self.__class__.NameFinder = LocalNameFinder
- self.__class__.FunctionGen = FunctionCodeGenerator
- self.__class__.ClassGen = ClassCodeGenerator
-
-class ModuleCodeGenerator(NestedScopeMixin, CodeGenerator):
- __super_init = CodeGenerator.__init__
-
- scopes = None
-
- def __init__(self, tree):
- self.graph = pyassem.PyFlowGraph("<module>", tree.filename)
- self.futures = future.find_futures(tree)
- self.__super_ini...
[truncated message content] |