Author: Brian Kearns <[email protected]>
Branch:
Changeset: r62650:5f4b6b693539
Date: 2013-03-22 04:03 -0400
http://bitbucket.org/pypy/pypy/changeset/5f4b6b693539/
Log: cleanups in rpython.translator
diff --git a/rpython/translator/backendopt/escape.py
b/rpython/translator/backendopt/escape.py
--- a/rpython/translator/backendopt/escape.py
+++ b/rpython/translator/backendopt/escape.py
@@ -226,9 +226,6 @@
return NotImplemented
return VarState(self.get_creationpoint(op.result, "malloc_varsize",
op))
- def op_keepalive(self, op, state):
- return None
-
def op_cast_pointer(self, op, state):
return state
diff --git a/rpython/translator/backendopt/mallocprediction.py
b/rpython/translator/backendopt/mallocprediction.py
--- a/rpython/translator/backendopt/mallocprediction.py
+++ b/rpython/translator/backendopt/mallocprediction.py
@@ -26,7 +26,7 @@
STRUCT)._obj.destructor_funcptr
if destr_ptr:
continue
- except (ValueError, AttributeError), e:
+ except (ValueError, AttributeError):
pass
varstate = adi.getstate(op.result)
assert len(varstate.creation_points) == 1
diff --git a/rpython/translator/backendopt/mallocv.py
b/rpython/translator/backendopt/mallocv.py
--- a/rpython/translator/backendopt/mallocv.py
+++ b/rpython/translator/backendopt/mallocv.py
@@ -1,5 +1,5 @@
from rpython.flowspace.model import Variable, Constant, Block, Link
-from rpython.flowspace.model import SpaceOperation, FunctionGraph, copygraph
+from rpython.flowspace.model import SpaceOperation, copygraph
from rpython.flowspace.model import checkgraph
from rpython.flowspace.model import c_last_exception
from rpython.translator.backendopt.support import log
diff --git a/rpython/translator/backendopt/tailrecursion.py
b/rpython/translator/backendopt/tailrecursion.py
--- a/rpython/translator/backendopt/tailrecursion.py
+++ b/rpython/translator/backendopt/tailrecursion.py
@@ -1,4 +1,3 @@
-from rpython.translator.simplify import get_graph
from rpython.flowspace.model import mkentrymap, checkgraph
# this transformation is very academical -- I had too much time
diff --git a/rpython/translator/c/extfunc.py b/rpython/translator/c/extfunc.py
--- a/rpython/translator/c/extfunc.py
+++ b/rpython/translator/c/extfunc.py
@@ -48,9 +48,6 @@
def _RPyListOfString_New(length=lltype.Signed):
return LIST_OF_STR.ll_newlist(length)
- def _RPyListOfString_New(length=lltype.Signed):
- return LIST_OF_STR.ll_newlist(length)
-
def _RPyListOfString_SetItem(l=p,
index=lltype.Signed,
newstring=lltype.Ptr(STR)):
diff --git a/rpython/translator/c/funcgen.py b/rpython/translator/c/funcgen.py
--- a/rpython/translator/c/funcgen.py
+++ b/rpython/translator/c/funcgen.py
@@ -264,7 +264,6 @@
for op in self.gen_link(link):
yield '\t' + op
# 'break;' not needed, as gen_link ends in a 'goto'
-
# Emit default case
yield 'default:'
if defaultlink is None:
@@ -371,7 +370,7 @@
# the C preprocessor cannot handle operations taking a variable number
# of arguments, so here are Python methods that do it
-
+
def OP_NEWLIST(self, op):
args = [self.expr(v) for v in op.args]
r = self.expr(op.result)
diff --git a/rpython/translator/c/node.py b/rpython/translator/c/node.py
--- a/rpython/translator/c/node.py
+++ b/rpython/translator/c/node.py
@@ -1,6 +1,6 @@
from rpython.rtyper.lltypesystem.lltype import (Struct, Array, FixedSizeArray,
FuncType, typeOf, GcStruct, GcArray, RttiStruct, ContainerType, parentlink,
- Ptr, Void, OpaqueType, Float, RuntimeTypeInfo, getRuntimeTypeInfo, Char,
+ Void, OpaqueType, Float, RuntimeTypeInfo, getRuntimeTypeInfo, Char,
_subarray)
from rpython.rtyper.lltypesystem import llmemory, llgroup
from rpython.translator.c.funcgen import FunctionCodeGenerator
@@ -11,10 +11,7 @@
from rpython.translator.c.primitive import PrimitiveType, name_signed
from rpython.rlib import exports
from rpython.rlib.rfloat import isfinite, isinf
-from rpython.rlib.rstackovf import _StackOverflow
from rpython.translator.c import extfunc
-from rpython.translator.tool.cbuild import ExternalCompilationInfo
-from py.builtin import BaseException
def needs_gcheader(T):
if not isinstance(T, ContainerType):
@@ -259,7 +256,6 @@
return 'RPyItem(%s, %s)' % (baseexpr, indexexpr)
def definition(self):
- gcpolicy = self.db.gcpolicy
yield 'struct %s {' % self.name
for fname, typename in self.gcfields:
yield '\t' + cdecl(typename, fname) + ';'
@@ -701,7 +697,6 @@
def initializationexpr(self, decoration=''):
T = self.getTYPE()
- defnode = self.db.gettypedefnode(T)
yield '{'
if needs_gcheader(T):
gc_init = self.db.gcpolicy.array_gcheader_initdata(self)
@@ -772,7 +767,6 @@
def initializationexpr(self, decoration=''):
T = self.getTYPE()
assert self.typename == self.implementationtypename # not var-sized
- is_empty = True
yield '{'
# _names == ['item0', 'item1', ...]
for j, name in enumerate(T._names):
diff --git a/rpython/translator/driver.py b/rpython/translator/driver.py
--- a/rpython/translator/driver.py
+++ b/rpython/translator/driver.py
@@ -315,7 +315,7 @@
for func, inputtypes in self.secondary_entrypoints:
if inputtypes == Ellipsis:
continue
- rettype = annotator.build_types(func, inputtypes, False)
+ annotator.build_types(func, inputtypes, False)
if self.entry_point:
s = annotator.build_types(self.entry_point, self.inputtypes)
diff --git a/rpython/translator/exceptiontransform.py
b/rpython/translator/exceptiontransform.py
--- a/rpython/translator/exceptiontransform.py
+++ b/rpython/translator/exceptiontransform.py
@@ -1,14 +1,13 @@
from rpython.translator.simplify import join_blocks, cleanup_graph
from rpython.translator.unsimplify import copyvar, varoftype
from rpython.translator.unsimplify import insert_empty_block, split_block
-from rpython.translator.backendopt import canraise, inline, support,
removenoops
+from rpython.translator.backendopt import canraise, inline
from rpython.flowspace.model import Block, Constant, Variable, Link, \
- c_last_exception, SpaceOperation, checkgraph, FunctionGraph, mkentrymap
+ c_last_exception, SpaceOperation, FunctionGraph, mkentrymap
from rpython.rtyper.lltypesystem import lltype, llmemory, rffi
from rpython.rtyper.ootypesystem import ootype
from rpython.rtyper.lltypesystem import lloperation
from rpython.rtyper import rtyper
-from rpython.rtyper import rclass
from rpython.rtyper.rmodel import inputconst
from rpython.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong
from rpython.rlib.rarithmetic import r_singlefloat
@@ -106,7 +105,7 @@
evalue = rpyexc_fetch_value()
rpyexc_clear()
return evalue
-
+
def rpyexc_restore_exception(evalue):
if evalue:
exc_data.exc_type = rclass.ll_inst_type(evalue)
@@ -408,14 +407,13 @@
# XXX: does alloc_shortcut make sense also for ootype?
if alloc_shortcut:
- T = spaceop.result.concretetype
var_no_exc = self.gen_nonnull(spaceop.result, llops)
else:
v_exc_type = self.gen_getfield('exc_type', llops)
var_no_exc = self.gen_isnull(v_exc_type, llops)
block.operations.extend(llops)
-
+
block.exitswitch = var_no_exc
#exception occurred case
b = Block([])
diff --git a/rpython/translator/gensupp.py b/rpython/translator/gensupp.py
--- a/rpython/translator/gensupp.py
+++ b/rpython/translator/gensupp.py
@@ -3,8 +3,6 @@
Another name could be genEric, but well...
"""
-import sys
-
def uniquemodulename(name, SEEN={}):
# never reuse the same module name within a Python session!
i = 0
diff --git a/rpython/translator/goal/_test_thread.py
b/rpython/translator/goal/_test_thread.py
--- a/rpython/translator/goal/_test_thread.py
+++ b/rpython/translator/goal/_test_thread.py
@@ -1,4 +1,4 @@
-import thread, time
+import thread
class MonitorList(list):
def append(self, obj):
diff --git a/rpython/translator/goal/bpnn.py b/rpython/translator/goal/bpnn.py
--- a/rpython/translator/goal/bpnn.py
+++ b/rpython/translator/goal/bpnn.py
@@ -187,8 +187,6 @@
# __________ Entry point for stand-alone builds __________
-import time
-
def entry_point(argv):
if len(argv) > 1:
N = int(argv[1])
diff --git a/rpython/translator/goal/gcbench.py
b/rpython/translator/goal/gcbench.py
--- a/rpython/translator/goal/gcbench.py
+++ b/rpython/translator/goal/gcbench.py
@@ -43,7 +43,7 @@
# - No attempt to measure variation with object size
# - Results are sensitive to locking cost, but we dont
# check for proper locking
-import os, time
+import time
USAGE = """gcbench [num_repetitions] [--depths=N,N,N..] [--threads=N]"""
ENABLE_THREADS = True
diff --git a/rpython/translator/goal/query.py b/rpython/translator/goal/query.py
--- a/rpython/translator/goal/query.py
+++ b/rpython/translator/goal/query.py
@@ -1,6 +1,5 @@
# functions to query information out of the translator and annotator from the
debug prompt of translate
import types
-import re
import rpython.annotator.model as annmodel
import rpython.flowspace.model as flowmodel
@@ -23,7 +22,7 @@
return "%s -> %s" % (
', '.join(map(hbinding, g.getargs())),
hbinding(g.getreturnvar()))
-
+
class Found(Exception):
pass
diff --git a/rpython/translator/goal/targetgcbench.py
b/rpython/translator/goal/targetgcbench.py
--- a/rpython/translator/goal/targetgcbench.py
+++ b/rpython/translator/goal/targetgcbench.py
@@ -1,4 +1,3 @@
-import os, sys
from rpython.translator.goal import gcbench
# _____ Define and setup target ___
diff --git a/rpython/translator/goal/targetpushpop.py
b/rpython/translator/goal/targetpushpop.py
--- a/rpython/translator/goal/targetpushpop.py
+++ b/rpython/translator/goal/targetpushpop.py
@@ -7,8 +7,6 @@
actually implementing argv of the executable.
"""
-import os, sys
-
# __________ Entry point __________
class A(object):
diff --git a/rpython/translator/goal/targetvarsized.py
b/rpython/translator/goal/targetvarsized.py
--- a/rpython/translator/goal/targetvarsized.py
+++ b/rpython/translator/goal/targetvarsized.py
@@ -1,4 +1,4 @@
-import os, sys
+import os
#from rpython.translator.goal import richards
modfilename = os.path.join(os.path.dirname(__file__), 'richards.py')
diff --git a/rpython/translator/platform/__init__.py
b/rpython/translator/platform/__init__.py
--- a/rpython/translator/platform/__init__.py
+++ b/rpython/translator/platform/__init__.py
@@ -2,7 +2,6 @@
import py, os, sys
-from rpython.tool.ansi_print import ansi_log
from rpython.tool.runsubprocess import run_subprocess as _run_subprocess
from rpython.tool.udir import udir
diff --git a/rpython/translator/platform/arm.py
b/rpython/translator/platform/arm.py
--- a/rpython/translator/platform/arm.py
+++ b/rpython/translator/platform/arm.py
@@ -1,8 +1,6 @@
-import py, os
from rpython.translator.platform.linux import Linux
from rpython.translator.platform.posix import _run_subprocess, GnuMakefile
from rpython.translator.platform import ExecutionResult, log
-from rpython.tool.udir import udir
from os import getenv
SB2 = getenv('SB2')
diff --git a/rpython/translator/platform/darwin.py
b/rpython/translator/platform/darwin.py
--- a/rpython/translator/platform/darwin.py
+++ b/rpython/translator/platform/darwin.py
@@ -1,7 +1,5 @@
"""Support for OS X."""
-import os
-
from rpython.translator.platform import posix
class Darwin(posix.BasePosix):
@@ -21,7 +19,7 @@
return (list(self.shared_only)
+ ['-dynamiclib', '-undefined', 'dynamic_lookup']
+ args)
-
+
def _include_dirs_for_libffi(self):
return ['/usr/include/ffi']
diff --git a/rpython/translator/simplify.py b/rpython/translator/simplify.py
--- a/rpython/translator/simplify.py
+++ b/rpython/translator/simplify.py
@@ -6,10 +6,10 @@
"""
import py
+
from rpython.flowspace import operation
-from rpython.flowspace.model import (SpaceOperation, Variable, Constant, Block,
- Link, c_last_exception, checkgraph,
- mkentrymap)
+from rpython.flowspace.model import (SpaceOperation, Variable, Constant,
+ c_last_exception, checkgraph, mkentrymap)
from rpython.rlib import rarithmetic
from rpython.translator import unsimplify
from rpython.translator.backendopt import ssa
@@ -21,7 +21,7 @@
Return an object which is supposed to have attributes such as graph and
_callable
"""
- if hasattr(func, '_obj'):
+ if hasattr(func, '_obj'):
return func._obj # lltypesystem
else:
return func # ootypesystem
@@ -489,7 +489,7 @@
pending.append(prevvar)
flow_read_var_backward(read_vars)
-
+
for block in blocks:
# look for removable operations whose result is never used
@@ -501,7 +501,7 @@
elif op.opname == 'simple_call':
# XXX we want to have a more effective and safe
# way to check if this operation has side effects
- # ...
+ # ...
if op.args and isinstance(op.args[0], Constant):
func = op.args[0].value
try:
@@ -956,7 +956,6 @@
break
else:
raise AssertionError("lost 'iter' operation")
- vlength = Variable('maxlength')
vlist2 = Variable(vlist)
chint = Constant({'maxlength': True})
iterblock.operations += [
@@ -1018,5 +1017,4 @@
eliminate_empty_blocks(graph)
join_blocks(graph)
remove_identical_vars(graph)
- checkgraph(graph)
-
+ checkgraph(graph)
diff --git a/rpython/translator/tool/graphpage.py
b/rpython/translator/tool/graphpage.py
--- a/rpython/translator/tool/graphpage.py
+++ b/rpython/translator/tool/graphpage.py
@@ -1,7 +1,6 @@
-import inspect, types
from rpython.flowspace.model import Block, Link, FunctionGraph
from rpython.flowspace.model import safe_iterblocks, safe_iterlinks
-from rpython.translator.tool.make_dot import DotGen, make_dot, make_dot_graphs
+from rpython.translator.tool.make_dot import DotGen, make_dot_graphs
from rpython.annotator.model import SomePBC
from rpython.annotator.description import MethodDesc
from rpython.annotator.classdef import ClassDef
@@ -27,7 +26,7 @@
label += "\\n" + self.createlink(info.origin, 'Originated at')
if caused_by is not None:
label += '\\n' + self.createlink(caused_by)
-
+
dotgen.emit_node('0', shape="box", color="red", label=label)
for n, (data, caused_by) in zip(range(len(history)), history):
label = nottoowide(data)
@@ -387,8 +386,6 @@
return 'class_hierarchy'
def do_compute(self, dotgen):
- translator = self.translator
-
# show the class hierarchy
self.compute_class_hieararchy(dotgen)
diff --git a/rpython/translator/tool/lltracker.py
b/rpython/translator/tool/lltracker.py
--- a/rpython/translator/tool/lltracker.py
+++ b/rpython/translator/tool/lltracker.py
@@ -3,7 +3,6 @@
"""
import sys, os
-import gc
from rpython.rtyper.lltypesystem import lltype, llmemory
from rpython.memory.gcheader import header2obj
from rpython.translator.tool.reftracker import BaseRefTrackerPage, MARKER
@@ -12,7 +11,6 @@
class LLRefTrackerPage(BaseRefTrackerPage):
-
def compute(self, objectlist, size_gc_header):
self.size_gc_header = size_gc_header
return BaseRefTrackerPage.compute(self, objectlist)
@@ -74,7 +72,6 @@
with_header=False):
yield fmt % (name,), value
if gcobjptr:
- GCT = lltype.typeOf(gcobjptr)
if self.size_gc_header is not None:
for sub in self.enum_content(gcobjptr._obj,
with_header=False):
diff --git a/rpython/translator/transform.py b/rpython/translator/transform.py
--- a/rpython/translator/transform.py
+++ b/rpython/translator/transform.py
@@ -5,12 +5,10 @@
completed.
"""
-import types
from rpython.flowspace.model import SpaceOperation
from rpython.flowspace.model import Variable, Constant, Link
from rpython.flowspace.model import c_last_exception, checkgraph
from rpython.annotator import model as annmodel
-from rpython.rlib.rstack import stack_check
from rpython.rtyper.lltypesystem import lltype
def checkgraphs(self, blocks):
diff --git a/rpython/translator/translator.py b/rpython/translator/translator.py
--- a/rpython/translator/translator.py
+++ b/rpython/translator/translator.py
@@ -4,15 +4,16 @@
translation-related code. It can be used for interactive testing of the
translator; see pypy/bin/translatorshell.py.
"""
-import os, sys, types, copy
+import sys
+import types
from rpython.translator import simplify
from rpython.flowspace.model import FunctionGraph, checkgraph, Block
from rpython.flowspace.objspace import build_flow
from rpython.tool.ansi_print import ansi_log
from rpython.tool.sourcetools import nice_repr_for_func
-from rpython.config.translationoption import get_combined_translation_config
from rpython.config.translationoption import get_platform
+
import py
log = py.log.Producer("flowgraph")
py.log.setconsumer("flowgraph", ansi_log)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
