[pypy-svn] r19037 - in pypy/dist/pypy/translator: . asm asm/ppcgen backendopt c llvm llvm/backendopt tool tool/pygame
mwh at codespeak.net
mwh at codespeak.net
Wed Oct 26 21:13:18 CEST 2005
Author: mwh
Date: Wed Oct 26 21:13:08 2005
New Revision: 19037
Modified:
pypy/dist/pypy/translator/annrpython.py
pypy/dist/pypy/translator/asm/genasm.py
pypy/dist/pypy/translator/asm/ppcgen/assembler.py
pypy/dist/pypy/translator/asm/ppcgen/ppc_assembler.py
pypy/dist/pypy/translator/asm/simulator.py
pypy/dist/pypy/translator/backendopt/all.py
pypy/dist/pypy/translator/backendopt/malloc.py
pypy/dist/pypy/translator/backendopt/propagate.py
pypy/dist/pypy/translator/backendopt/tailrecursion.py
pypy/dist/pypy/translator/c/database.py
pypy/dist/pypy/translator/c/external.py
pypy/dist/pypy/translator/c/gc.py
pypy/dist/pypy/translator/c/genc.py
pypy/dist/pypy/translator/c/pyobj.py
pypy/dist/pypy/translator/c/wrapper.py
pypy/dist/pypy/translator/geninterplevel.py
pypy/dist/pypy/translator/llvm/arraynode.py
pypy/dist/pypy/translator/llvm/backendopt/exception.py
pypy/dist/pypy/translator/llvm/backendopt/mergemallocs.py
pypy/dist/pypy/translator/llvm/build_llvm_module.py
pypy/dist/pypy/translator/llvm/codewriter.py
pypy/dist/pypy/translator/llvm/database.py
pypy/dist/pypy/translator/llvm/externs2ll.py
pypy/dist/pypy/translator/llvm/extfuncnode.py
pypy/dist/pypy/translator/llvm/funcnode.py
pypy/dist/pypy/translator/llvm/genllvm.py
pypy/dist/pypy/translator/llvm/opwriter.py
pypy/dist/pypy/translator/llvm/structnode.py
pypy/dist/pypy/translator/tool/graphpage.py
pypy/dist/pypy/translator/tool/graphserver.py
pypy/dist/pypy/translator/tool/pygame/graphclient.py
pypy/dist/pypy/translator/transform.py
pypy/dist/pypy/translator/translator.py
Log:
importfun vs translator/ (apart from js)
haven't run all the tests yet, will do so on snake pronto.
Modified: pypy/dist/pypy/translator/annrpython.py
==============================================================================
--- pypy/dist/pypy/translator/annrpython.py (original)
+++ pypy/dist/pypy/translator/annrpython.py Wed Oct 26 21:13:08 2005
@@ -1,12 +1,12 @@
from __future__ import generators
-from types import FunctionType, ClassType
+from types import ClassType
from pypy.tool.ansi_print import ansi_log
from pypy.annotation import model as annmodel
-from pypy.annotation.model import pair
+from pypy.annotation.pairtype import pair
from pypy.annotation.bookkeeper import Bookkeeper
from pypy.objspace.flow.model import Variable, Constant
-from pypy.objspace.flow.model import SpaceOperation, FunctionGraph
+from pypy.objspace.flow.model import FunctionGraph
from pypy.objspace.flow.model import last_exception, checkgraph
import py
log = py.log.Producer("annrpython")
Modified: pypy/dist/pypy/translator/asm/genasm.py
==============================================================================
--- pypy/dist/pypy/translator/asm/genasm.py (original)
+++ pypy/dist/pypy/translator/asm/genasm.py Wed Oct 26 21:13:08 2005
@@ -1,4 +1,3 @@
-import sys, os
from pypy.objspace.flow.model import Variable, Constant
#from pypy.translator.asm import infregmachine
from pypy.rpython.lltypesystem.lltype import Signed
@@ -11,6 +10,7 @@
TARGET_WIN386=2
# def determine_target():
+# import sys, os
# if sys.platform == 'darwin':
# if os.uname()[-1] == 'Power Macintosh':
# return TARGET_PPC
Modified: pypy/dist/pypy/translator/asm/ppcgen/assembler.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/assembler.py (original)
+++ pypy/dist/pypy/translator/asm/ppcgen/assembler.py Wed Oct 26 21:13:08 2005
@@ -1,4 +1,3 @@
-import array
import os
from pypy.translator.asm.ppcgen import form
Modified: pypy/dist/pypy/translator/asm/ppcgen/ppc_assembler.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/ppc_assembler.py (original)
+++ pypy/dist/pypy/translator/asm/ppcgen/ppc_assembler.py Wed Oct 26 21:13:08 2005
@@ -1,4 +1,3 @@
-import array
from pypy.translator.asm.ppcgen.ppc_form import PPCForm as Form
from pypy.translator.asm.ppcgen.ppc_field import ppc_fields
from pypy.translator.asm.ppcgen.assembler import Assembler
Modified: pypy/dist/pypy/translator/asm/simulator.py
==============================================================================
--- pypy/dist/pypy/translator/asm/simulator.py (original)
+++ pypy/dist/pypy/translator/asm/simulator.py Wed Oct 26 21:13:08 2005
@@ -2,7 +2,6 @@
import autopath
from pypy.rpython.llinterp import LLFrame
#from pypy.translator.asm.infregmachine import Instruction
-from pypy.objspace.flow.model import Constant
"""
Notes on the register allocation algorithm:
@@ -30,7 +29,6 @@
def regmap(regperm):
- import operator
"""answer a map IRM notation -> current FRM notation"""
map={}
for reg in range(1,len(regperm)):
Modified: pypy/dist/pypy/translator/backendopt/all.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/all.py (original)
+++ pypy/dist/pypy/translator/backendopt/all.py Wed Oct 26 21:13:08 2005
@@ -1,4 +1,3 @@
-from pypy.objspace.flow.model import checkgraph
from pypy.translator.backendopt.removenoops import remove_same_as
from pypy.translator.backendopt.inline import auto_inlining
from pypy.translator.backendopt.malloc import remove_simple_mallocs
Modified: pypy/dist/pypy/translator/backendopt/malloc.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/malloc.py (original)
+++ pypy/dist/pypy/translator/backendopt/malloc.py Wed Oct 26 21:13:08 2005
@@ -1,5 +1,5 @@
from pypy.objspace.flow.model import Variable, Constant, Block, Link
-from pypy.objspace.flow.model import SpaceOperation, traverse, checkgraph
+from pypy.objspace.flow.model import SpaceOperation, traverse
from pypy.tool.algo.unionfind import UnionFind
from pypy.rpython.lltypesystem import lltype
from pypy.translator.simplify import remove_identical_vars
Modified: pypy/dist/pypy/translator/backendopt/propagate.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/propagate.py (original)
+++ pypy/dist/pypy/translator/backendopt/propagate.py Wed Oct 26 21:13:08 2005
@@ -1,10 +1,10 @@
from pypy.objspace.flow.model import Block, Variable, Constant, last_exception
from pypy.objspace.flow.model import traverse, mkentrymap, checkgraph
from pypy.objspace.flow.model import SpaceOperation
-from pypy.rpython.lltypesystem.lltype import Void, Bool
+from pypy.rpython.lltypesystem.lltype import Bool
from pypy.rpython.llinterp import LLInterpreter, LLFrame
from pypy.translator import simplify
-from pypy.translator.backendopt.tailrecursion import get_graph
+from pypy.translator.simplify import get_graph
from pypy.translator.backendopt.removenoops import remove_same_as
from pypy.translator.backendopt.inline import OP_WEIGHTS
Modified: pypy/dist/pypy/translator/backendopt/tailrecursion.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/tailrecursion.py (original)
+++ pypy/dist/pypy/translator/backendopt/tailrecursion.py Wed Oct 26 21:13:08 2005
@@ -1,11 +1,5 @@
-import sys
from pypy.translator.simplify import get_graph
-from pypy.translator.unsimplify import copyvar, split_block
-from pypy.objspace.flow.model import Variable, Constant, Block, Link
-from pypy.objspace.flow.model import SpaceOperation, last_exception
-from pypy.objspace.flow.model import traverse, mkentrymap, checkgraph, flatten
-from pypy.annotation import model as annmodel
-from pypy.rpython.lltypesystem.lltype import Bool, typeOf, FuncType, _ptr
+from pypy.objspace.flow.model import mkentrymap, checkgraph
# this transformation is very academical -- I had too much time
Modified: pypy/dist/pypy/translator/c/database.py
==============================================================================
--- pypy/dist/pypy/translator/c/database.py (original)
+++ pypy/dist/pypy/translator/c/database.py Wed Oct 26 21:13:08 2005
@@ -1,9 +1,7 @@
-import sys
from pypy.rpython.lltypesystem.lltype import \
Primitive, Ptr, typeOf, RuntimeTypeInfo, \
Struct, Array, FuncType, PyObject, Void, \
- ContainerType, pyobjectptr, OpaqueType, GcStruct
-from pypy.objspace.flow.model import Constant
+ ContainerType, OpaqueType
from pypy.translator.c.primitive import PrimitiveName, PrimitiveType
from pypy.translator.c.primitive import PrimitiveErrorValue
from pypy.translator.c.node import StructDefNode, ArrayDefNode
Modified: pypy/dist/pypy/translator/c/external.py
==============================================================================
--- pypy/dist/pypy/translator/c/external.py (original)
+++ pypy/dist/pypy/translator/c/external.py Wed Oct 26 21:13:08 2005
@@ -1,7 +1,7 @@
from __future__ import generators
from pypy.rpython.lltypesystem.lltype import typeOf, Void
from pypy.translator.c.support import USESLOTS # set to False if necessary while refactoring
-from pypy.translator.c.support import cdecl, ErrorValue, somelettersfrom
+from pypy.translator.c.support import cdecl, somelettersfrom
class CExternalFunctionCodeGenerator(object):
Modified: pypy/dist/pypy/translator/c/gc.py
==============================================================================
--- pypy/dist/pypy/translator/c/gc.py (original)
+++ pypy/dist/pypy/translator/c/gc.py Wed Oct 26 21:13:08 2005
@@ -2,7 +2,7 @@
from pypy.translator.c.support import cdecl
from pypy.translator.c.node import ContainerNode
from pypy.rpython.lltypesystem.lltype import \
- typeOf, Ptr, PyObject, ContainerType, Array, GcArray, Struct, GcStruct, \
+ typeOf, Ptr, PyObject, ContainerType, GcArray, GcStruct, \
RuntimeTypeInfo, getRuntimeTypeInfo
PyObjPtr = Ptr(PyObject)
Modified: pypy/dist/pypy/translator/c/genc.py
==============================================================================
--- pypy/dist/pypy/translator/c/genc.py (original)
+++ pypy/dist/pypy/translator/c/genc.py Wed Oct 26 21:13:08 2005
@@ -1,5 +1,5 @@
import autopath
-import os, py
+import py
from pypy.translator.c.node import PyObjectNode
from pypy.translator.c.database import LowLevelDatabase
from pypy.translator.c.extfunc import pre_include_code_lines
Modified: pypy/dist/pypy/translator/c/pyobj.py
==============================================================================
--- pypy/dist/pypy/translator/c/pyobj.py (original)
+++ pypy/dist/pypy/translator/c/pyobj.py Wed Oct 26 21:13:08 2005
@@ -1,5 +1,5 @@
from __future__ import generators
-import autopath, os, sys, __builtin__, marshal, zlib
+import autopath, sys, __builtin__, marshal, zlib
from types import FunctionType, CodeType, InstanceType, ClassType
from pypy.objspace.flow.model import Variable, Constant
Modified: pypy/dist/pypy/translator/c/wrapper.py
==============================================================================
--- pypy/dist/pypy/translator/c/wrapper.py (original)
+++ pypy/dist/pypy/translator/c/wrapper.py Wed Oct 26 21:13:08 2005
@@ -1,8 +1,7 @@
-from pypy.objspace.flow.model import Variable, Constant, SpaceOperation
+from pypy.objspace.flow.model import Variable, Constant
from pypy.objspace.flow.model import Block, Link, FunctionGraph, checkgraph
-from pypy.annotation import model as annmodel
from pypy.rpython.lltypesystem.lltype import \
- Ptr, PyObject, typeOf, Signed, Void, FuncType, functionptr
+ Ptr, PyObject, typeOf, Signed, FuncType, functionptr
from pypy.rpython.rtyper import LowLevelOpList
from pypy.rpython.rmodel import inputconst, getfunctionptr, PyObjPtr
from pypy.rpython.robject import pyobj_repr
Modified: pypy/dist/pypy/translator/geninterplevel.py
==============================================================================
--- pypy/dist/pypy/translator/geninterplevel.py (original)
+++ pypy/dist/pypy/translator/geninterplevel.py Wed Oct 26 21:13:08 2005
@@ -44,18 +44,15 @@
"""
from __future__ import generators
-import autopath, os, sys, exceptions, inspect, types
+import autopath, os, sys, types
import cPickle as pickle, __builtin__
from copy_reg import _HEAPTYPE
from pypy.objspace.flow.model import Variable, Constant, SpaceOperation
-from pypy.objspace.flow.model import FunctionGraph, Block, Link
-from pypy.objspace.flow.model import last_exception
-from pypy.objspace.flow.model import traverse, uniqueitems, checkgraph
+from pypy.objspace.flow.model import last_exception, checkgraph
from pypy.interpreter.pycode import CO_VARARGS, CO_VARKEYWORDS
from types import FunctionType, CodeType, ModuleType
from pypy.interpreter.error import OperationError
from pypy.interpreter.argument import Arguments
-from pypy.rpython.rarithmetic import r_int, r_uint
from pypy.translator.backendopt.ssa import SSI_to_SSA
from pypy.translator.translator import Translator
@@ -64,7 +61,7 @@
from pypy.tool.sourcetools import render_docstr, NiceCompile
from pypy.translator.gensupp import ordered_blocks, UniqueList, builtin_base, \
- c_string, uniquemodulename, C_IDENTIFIER, NameManager
+ uniquemodulename, C_IDENTIFIER, NameManager
# list of simplifcation passes needed by geninterp
Modified: pypy/dist/pypy/translator/llvm/arraynode.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/arraynode.py (original)
+++ pypy/dist/pypy/translator/llvm/arraynode.py Wed Oct 26 21:13:08 2005
@@ -1,4 +1,3 @@
-import py
from pypy.rpython.lltypesystem import lltype
from pypy.translator.llvm.log import log
from pypy.translator.llvm.node import LLVMNode, ConstantLLVMNode
Modified: pypy/dist/pypy/translator/llvm/backendopt/exception.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/backendopt/exception.py (original)
+++ pypy/dist/pypy/translator/llvm/backendopt/exception.py Wed Oct 26 21:13:08 2005
@@ -2,7 +2,7 @@
from pypy.objspace.flow.model import Block, Constant, Variable, Link, \
last_exception, flatten, SpaceOperation
from pypy.annotation import model as annmodel
-from pypy.rpython.lltypesystem.lltype import Bool, Ptr
+from pypy.rpython.lltypesystem.lltype import Bool
n_calls = n_calls_patched = 0
Modified: pypy/dist/pypy/translator/llvm/backendopt/mergemallocs.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/backendopt/mergemallocs.py (original)
+++ pypy/dist/pypy/translator/llvm/backendopt/mergemallocs.py Wed Oct 26 21:13:08 2005
@@ -1,5 +1,5 @@
from pypy.objspace.flow.model import Block, flatten, SpaceOperation, Constant, Variable
-from pypy.rpython.lltypesystem.lltype import Struct, GcStruct, Void, Ptr
+from pypy.rpython.lltypesystem.lltype import GcStruct, Void, Ptr
from pypy.translator.llvm.backendopt.support import log
Modified: pypy/dist/pypy/translator/llvm/build_llvm_module.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/build_llvm_module.py (original)
+++ pypy/dist/pypy/translator/llvm/build_llvm_module.py Wed Oct 26 21:13:08 2005
@@ -2,7 +2,7 @@
Build a Python module out of llvmfile and a Pyrex wrapper file.
"""
-import os, sys, inspect, re, exceptions
+import os, sys
from py.process import cmdexec
from py import path
Modified: pypy/dist/pypy/translator/llvm/codewriter.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/codewriter.py (original)
+++ pypy/dist/pypy/translator/llvm/codewriter.py Wed Oct 26 21:13:08 2005
@@ -1,5 +1,3 @@
-import py
-from itertools import count
from pypy.translator.llvm.log import log
log = log.codewriter
Modified: pypy/dist/pypy/translator/llvm/database.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/database.py (original)
+++ pypy/dist/pypy/translator/llvm/database.py Wed Oct 26 21:13:08 2005
@@ -9,7 +9,6 @@
from pypy.translator.llvm.arraynode import ArrayNode, StrArrayNode, \
VoidArrayNode, ArrayTypeNode, VoidArrayTypeNode
from pypy.translator.llvm.opaquenode import OpaqueNode, OpaqueTypeNode
-from pypy.translator.llvm.node import ConstantLLVMNode
from pypy.rpython.lltypesystem import lltype
from pypy.objspace.flow.model import Constant, Variable
Modified: pypy/dist/pypy/translator/llvm/externs2ll.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/externs2ll.py (original)
+++ pypy/dist/pypy/translator/llvm/externs2ll.py Wed Oct 26 21:13:08 2005
@@ -5,8 +5,7 @@
from pypy.rpython.rmodel import inputconst, getfunctionptr
from pypy.rpython.lltypesystem import lltype
-from pypy.translator.llvm.codewriter import CodeWriter, \
- DEFAULT_TAIL, DEFAULT_CCONV
+from pypy.translator.llvm.codewriter import DEFAULT_CCONV
from pypy.tool.udir import udir
Modified: pypy/dist/pypy/translator/llvm/extfuncnode.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/extfuncnode.py (original)
+++ pypy/dist/pypy/translator/llvm/extfuncnode.py Wed Oct 26 21:13:08 2005
@@ -1,4 +1,3 @@
-import py
from pypy.translator.llvm.node import ConstantLLVMNode
from pypy.translator.llvm.log import log
log = log.extfuncnode
Modified: pypy/dist/pypy/translator/llvm/funcnode.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/funcnode.py (original)
+++ pypy/dist/pypy/translator/llvm/funcnode.py Wed Oct 26 21:13:08 2005
@@ -1,13 +1,11 @@
-import py
-import sys
-from pypy.objspace.flow.model import Block, Constant, Variable, Link
+from pypy.objspace.flow.model import Block, Constant, Link
from pypy.objspace.flow.model import flatten, mkentrymap, traverse, last_exception
from pypy.rpython.lltypesystem import lltype
from pypy.translator.llvm.node import LLVMNode, ConstantLLVMNode
from pypy.translator.llvm.opwriter import OpWriter
from pypy.translator.llvm.log import log
from pypy.translator.llvm.backendopt.removeexcmallocs import remove_exception_mallocs
-from pypy.translator.llvm.backendopt.mergemallocs import merge_mallocs
+#from pypy.translator.llvm.backendopt.mergemallocs import merge_mallocs
from pypy.translator.unsimplify import remove_double_links
log = log.funcnode
Modified: pypy/dist/pypy/translator/llvm/genllvm.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/genllvm.py (original)
+++ pypy/dist/pypy/translator/llvm/genllvm.py Wed Oct 26 21:13:08 2005
@@ -1,9 +1,4 @@
-import os
import time
-import types
-import urllib
-
-import py
from pypy.translator.llvm import build_llvm_module
from pypy.translator.llvm.database import Database
@@ -11,13 +6,11 @@
from pypy.rpython.rmodel import inputconst, getfunctionptr
from pypy.rpython.lltypesystem import lltype
from pypy.tool.udir import udir
-from pypy.translator.llvm.codewriter import CodeWriter, \
- DEFAULT_TAIL, DEFAULT_CCONV
+from pypy.translator.llvm.codewriter import CodeWriter
from pypy.translator.llvm import extfuncnode
from pypy.translator.llvm.module.extfunction import extdeclarations, \
extfunctions, dependencies
from pypy.translator.llvm.node import LLVMNode
-from pypy.translator.llvm.structnode import StructNode
from pypy.translator.llvm.externs2ll import post_setup_externs, generate_llfile
from pypy.translator.llvm.gc import GcPolicy
from pypy.translator.llvm.exception import ExceptionPolicy
Modified: pypy/dist/pypy/translator/llvm/opwriter.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/opwriter.py (original)
+++ pypy/dist/pypy/translator/llvm/opwriter.py Wed Oct 26 21:13:08 2005
@@ -1,4 +1,3 @@
-import py
from pypy.objspace.flow.model import Constant
from pypy.rpython.lltypesystem import lltype
from pypy.translator.llvm.module.extfunction import extfunctions
Modified: pypy/dist/pypy/translator/llvm/structnode.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/structnode.py (original)
+++ pypy/dist/pypy/translator/llvm/structnode.py Wed Oct 26 21:13:08 2005
@@ -1,4 +1,3 @@
-import py
from pypy.translator.llvm.log import log
from pypy.translator.llvm.node import LLVMNode, ConstantLLVMNode
from pypy.translator.llvm import varsize
Modified: pypy/dist/pypy/translator/tool/graphpage.py
==============================================================================
--- pypy/dist/pypy/translator/tool/graphpage.py (original)
+++ pypy/dist/pypy/translator/tool/graphpage.py Wed Oct 26 21:13:08 2005
@@ -1,8 +1,6 @@
import inspect, types
from pypy.objspace.flow.model import traverse, Block, Link
from pypy.translator.tool.make_dot import DotGen, make_dot, make_dot_graphs
-from pypy.interpreter.pycode import CO_VARARGS, CO_VARKEYWORDS
-from pypy.annotation import model
from pypy.annotation.classdef import ClassDef
from pypy.tool.uid import uid
Modified: pypy/dist/pypy/translator/tool/graphserver.py
==============================================================================
--- pypy/dist/pypy/translator/tool/graphserver.py (original)
+++ pypy/dist/pypy/translator/tool/graphserver.py Wed Oct 26 21:13:08 2005
@@ -92,7 +92,6 @@
def run_server_for_inprocess_client(t, options):
from pypy.translator.tool import graphpage
from pypy.translator.tool.pygame.graphclient import get_layout
- from pypy.translator.tool.pygame.graphdisplay import GraphDisplay
page = graphpage.TranslatorPage(t, options.huge)
Modified: pypy/dist/pypy/translator/tool/pygame/graphclient.py
==============================================================================
--- pypy/dist/pypy/translator/tool/pygame/graphclient.py (original)
+++ pypy/dist/pypy/translator/tool/pygame/graphclient.py Wed Oct 26 21:13:08 2005
@@ -8,7 +8,8 @@
from pypy.translator.tool.pygame.drawgraph import display_async_cmd
from pypy.translator.tool.pygame.drawgraph import display_async_quit
from pypy.translator.tool.pygame.drawgraph import wait_for_async_cmd
-from pypy.translator.tool.graphserver import MissingPage, portutil
+from pypy.translator.tool.graphserver import MissingPage
+from pypy.translator.tool import port as portutil
from pypy.tool.udir import udir
import py
Modified: pypy/dist/pypy/translator/transform.py
==============================================================================
--- pypy/dist/pypy/translator/transform.py (original)
+++ pypy/dist/pypy/translator/transform.py Wed Oct 26 21:13:08 2005
@@ -9,9 +9,8 @@
import types
from pypy.objspace.flow.model import SpaceOperation
-from pypy.objspace.flow.model import Variable, Constant, Block, Link
+from pypy.objspace.flow.model import Variable, Constant, Link
from pypy.objspace.flow.model import last_exception, checkgraph
-from pypy.translator.annrpython import CannotSimplify
from pypy.annotation import model as annmodel
from pypy.annotation.specialize import MemoTable
from pypy.rpython.rstack import stack_check
Modified: pypy/dist/pypy/translator/translator.py
==============================================================================
--- pypy/dist/pypy/translator/translator.py (original)
+++ pypy/dist/pypy/translator/translator.py Wed Oct 26 21:13:08 2005
@@ -8,9 +8,7 @@
from pypy.objspace.flow.model import *
from pypy.translator.simplify import simplify_graph
-from pypy.translator.gensupp import uniquemodulename
from pypy.translator.tool.cbuild import make_module_from_pyxstring
-from pypy.translator.tool.cbuild import make_module_from_c
from pypy.objspace.flow import FlowObjSpace
from pypy.tool.ansi_print import ansi_log
import py
@@ -136,7 +134,6 @@
"""Interactive debugging helper """
if f is None:
f = sys.stdout
- from pypy.objspace.flow.model import Block, flatten
if isinstance(x, Block):
for func, graph in self.flowgraphs.items():
if x in graph.iterblocks():
More information about the Pypy-commit
mailing list