[pypy-commit] pypy precise-instantiate: some import and dead clean up removal

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: precise-instantiate
Changeset: r65364:c71041db17e0
Date: 2013-07-12 13:14 +1000
http://bitbucket.org/pypy/pypy/changeset/c71041db17e0/

Log:	some import and dead clean up removal

diff --git a/rpython/rtyper/lltypesystem/rpbc.py b/rpython/rtyper/lltypesystem/rpbc.py
--- a/rpython/rtyper/lltypesystem/rpbc.py
+++ b/rpython/rtyper/lltypesystem/rpbc.py
@@ -1,25 +1,20 @@
 import types
-import sys
-from rpython.tool.pairtype import pairtype, pair
-from rpython.annotator import model as annmodel
-from rpython.annotator import description
-from rpython.flowspace.model import Constant, Variable
-from rpython.rtyper.lltypesystem.lltype import \
-     typeOf, Void, ForwardReference, Struct, Bool, Char, \
-     Ptr, malloc, nullptr, Array, Signed, FuncType
-from rpython.rtyper.rmodel import Repr, TyperError, inputconst, inputdesc
-from rpython.rtyper.rpbc import samesig,\
-     commonbase, allattributenames, adjust_shape, \
-     AbstractClassesPBCRepr, AbstractMethodsPBCRepr, OverriddenFunctionPBCRepr, \
-     AbstractMultipleFrozenPBCRepr, MethodOfFrozenPBCRepr, \
-     AbstractFunctionsPBCRepr, AbstractMultipleUnrelatedFrozenPBCRepr, \
-     SingleFrozenPBCRepr, none_frozen_pbc_repr, get_concrete_calltable
+
+from rpython.annotator import description, model as annmodel
+from rpython.rlib.debug import ll_assert
+from rpython.rlib.unroll import unrolling_iterable
+from rpython.rtyper import callparse
 from rpython.rtyper.lltypesystem import rclass, llmemory
-from rpython.tool.sourcetools import has_varargs
-from rpython.rlib.unroll import unrolling_iterable
-from rpython.rlib.debug import ll_assert
+from rpython.rtyper.lltypesystem.lltype import (typeOf, Void, ForwardReference,
+    Struct, Bool, Char, Ptr, malloc, nullptr, Array, Signed)
+from rpython.rtyper.rmodel import Repr, TyperError, inputconst
+from rpython.rtyper.rpbc import (AbstractClassesPBCRepr, AbstractMethodsPBCRepr,
+    OverriddenFunctionPBCRepr, AbstractMultipleFrozenPBCRepr,
+    AbstractFunctionsPBCRepr, AbstractMultipleUnrelatedFrozenPBCRepr,
+    SingleFrozenPBCRepr, MethodOfFrozenPBCRepr, none_frozen_pbc_repr,
+    get_concrete_calltable)
+from rpython.tool.pairtype import pairtype
 
-from rpython.rtyper import callparse
 
 def rtype_is_None(robj1, rnone2, hop, pos=0):
     if isinstance(robj1.lowleveltype, Ptr):
@@ -41,6 +36,7 @@
     else:
         raise TyperError('rtype_is_None of %r' % (robj1))
 
+
 # ____________________________________________________________
 
 class MultipleFrozenPBCRepr(AbstractMultipleFrozenPBCRepr):
@@ -67,7 +63,7 @@
         mangled_name, r_value = self.fieldmap[attr]
         cmangledname = inputconst(Void, mangled_name)
         return llops.genop('getfield', [vpbc, cmangledname],
-                           resulttype = r_value)
+                           resulttype=r_value)
 
 
 class MultipleUnrelatedFrozenPBCRepr(AbstractMultipleUnrelatedFrozenPBCRepr):
@@ -86,6 +82,7 @@
     def null_instance(self):
         return llmemory.Address._defl()
 
+
 class __extend__(pairtype(MultipleUnrelatedFrozenPBCRepr,
                           MultipleUnrelatedFrozenPBCRepr),
                  pairtype(MultipleUnrelatedFrozenPBCRepr,
@@ -100,11 +97,13 @@
         vlist = hop.inputargs(r, r)
         return hop.genop('adr_eq', vlist, resulttype=Bool)
 
+
 class __extend__(pairtype(MultipleFrozenPBCRepr,
                           MultipleUnrelatedFrozenPBCRepr)):
     def convert_from_to((robj1, robj2), v, llops):
         return llops.genop('cast_ptr_to_adr', [v], resulttype=llmemory.Address)
 
+
 # ____________________________________________________________
 
 class FunctionsPBCRepr(AbstractFunctionsPBCRepr):
@@ -123,6 +122,7 @@
     def get_specfunc_row(self, llop, v, c_rowname, resulttype):
         return llop.genop('getfield', [v, c_rowname], resulttype=resulttype)
 
+
 class SmallFunctionSetPBCRepr(Repr):
     def __init__(self, rtyper, s_pbc):
         self.rtyper = rtyper
@@ -252,15 +252,6 @@
             return hop.genop('char_ne', [v1, inputconst(Char, '\000')],
                          resulttype=Bool)
 
-##     def rtype_simple_call(self, hop):
-##         v_index = hop.inputarg(self, arg=0)
-##         v_ptr = hop.llops.convertvar(v_index, self, self.pointer_repr)
-##         hop2 = hop.copy()
-##         hop2.args_r[0] = self.pointer_repr
-##         hop2.args_v[0] = v_ptr
-##         return hop2.dispatch()
-
-##     rtype_call_args = rtype_simple_call
 
 class __extend__(pairtype(SmallFunctionSetPBCRepr, FunctionsPBCRepr)):
     def convert_from_to((r_set, r_ptr), v, llops):
@@ -273,6 +264,7 @@
             return llops.genop('getarrayitem', [r_set.c_pointer_table, v_int],
                                resulttype=r_ptr.lowleveltype)
 
+
 def compression_function(r_set):
     if r_set._compression_function is None:
         table = []
@@ -280,6 +272,7 @@
             table.append((chr(i), p))
         last_c, last_p = table[-1]
         unroll_table = unrolling_iterable(table[:-1])
+
         def ll_compress(fnptr):
             for c, p in unroll_table:
                 if fnptr == p:
@@ -290,6 +283,7 @@
         r_set._compression_function = ll_compress
     return r_set._compression_function
 
+
 class __extend__(pairtype(FunctionsPBCRepr, SmallFunctionSetPBCRepr)):
     def convert_from_to((r_ptr, r_set), v, llops):
         if r_ptr.lowleveltype is Void:
@@ -299,6 +293,7 @@
             ll_compress = compression_function(r_set)
             return llops.gendirectcall(ll_compress, v)
 
+
 def conversion_table(r_from, r_to):
     if r_to in r_from._conversion_tables:
         return r_from._conversion_tables[r_to]
@@ -320,7 +315,6 @@
         r_from._conversion_tables[r_to] = r
         return r
 
-## myf = open('convlog.txt', 'w')
 
 class __extend__(pairtype(SmallFunctionSetPBCRepr, SmallFunctionSetPBCRepr)):
     def convert_from_to((r_from, r_to), v, llops):
@@ -343,6 +337,7 @@
         else:
             return v
 
+
 class MethodsPBCRepr(AbstractMethodsPBCRepr):
     """Representation selected for a PBC of the form {func: classdef...}.
     It assumes that all the methods come from the same name in a base
@@ -418,17 +413,3 @@
         return 0
     else:
         return cls.hash
-
-# ____________________________________________________________
-
-##def rtype_call_memo(hop):
-##    memo_table = hop.args_v[0].value
-##    if memo_table.s_result.is_constant():
-##        return hop.inputconst(hop.r_result, memo_table.s_result.const)
-##    fieldname = memo_table.fieldname
-##    assert hop.nb_args == 2, "XXX"
-
-##    r_pbc = hop.args_r[1]
-##    assert isinstance(r_pbc, (MultipleFrozenPBCRepr, ClassesPBCRepr))
-##    v_table, v_pbc = hop.inputargs(Void, r_pbc)
-##    return r_pbc.getfield(v_pbc, fieldname, hop.llops)