Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r64300:0b33c638a659
Date: 2013-05-18 16:42 -0700
http://bitbucket.org/pypy/pypy/changeset/0b33c638a659/
Log: merge default
diff --git a/pypy/doc/coding-guide.rst b/pypy/doc/coding-guide.rst
--- a/pypy/doc/coding-guide.rst
+++ b/pypy/doc/coding-guide.rst
@@ -339,8 +339,9 @@
+ methods and other class attributes do not change after startup
+ single inheritance is fully supported
-+ simple mixins work too, but the mixed in class needs a ``_mixin_ = True``
- class attribute
++ simple mixins somewhat work too, but the mixed in class needs a
+ ``_mixin_ = True`` class attribute. isinstance checks against the
+ mixin type will fail when translated.
+ classes are first-class objects too
diff --git a/pypy/interpreter/astcompiler/codegen.py
b/pypy/interpreter/astcompiler/codegen.py
--- a/pypy/interpreter/astcompiler/codegen.py
+++ b/pypy/interpreter/astcompiler/codegen.py
@@ -916,9 +916,10 @@
self.emit_jump(ops.JUMP_IF_FALSE_OR_POP, cleanup, True)
if i < (ops_count - 1):
comp.comparators[i].walkabout(self)
- comp.comparators[-1].walkabout(self)
- last_kind = compare_operations(comp.ops[-1])
- self.emit_op_arg(ops.COMPARE_OP, last_kind)
+ last_op, last_comparator = comp.ops[-1], comp.comparators[-1]
+ if not self._optimize_comparator(last_op, last_comparator):
+ last_comparator.walkabout(self)
+ self.emit_op_arg(ops.COMPARE_OP, compare_operations(last_op))
if ops_count > 1:
end = self.new_block()
self.emit_jump(ops.JUMP_FORWARD, end)
@@ -927,6 +928,30 @@
self.emit_op(ops.POP_TOP)
self.use_next_block(end)
+ def _optimize_comparator(self, op, node):
+ """Fold lists of constants in the context of "in"/"not in".
+
+ lists are folded into tuples, otherwise returns False
+ """
+ if op in (ast.In, ast.NotIn) and isinstance(node, ast.List):
+ w_const = self._tuple_of_consts(node.elts)
+ if w_const is not None:
+ self.load_const(w_const)
+ return True
+ return False
+
+ def _tuple_of_consts(self, elts):
+ """Return a tuple of consts from elts if possible, or None"""
+ count = len(elts) if elts is not None else 0
+ consts_w = [None] * count
+ for i in range(count):
+ w_value = elts[i].as_constant()
+ if w_value is None:
+ # Not all constants
+ return None
+ consts_w[i] = w_value
+ return self.space.newtuple(consts_w)
+
def visit_IfExp(self, ifexp):
self.update_position(ifexp.lineno)
end = self.new_block()
diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py
b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -1046,3 +1046,15 @@
""")
assert 'generator' in space.str_w(space.repr(w_generator))
+ def test_folding_of_list_constants(self):
+ for source in (
+ # in/not in constants with BUILD_LIST should be folded to a tuple:
+ 'a in [1,2,3]',
+ 'a not in ["a","b","c"]',
+ 'a in [None, 1, None]',
+ 'a not in [(1, 2), 3, 4]',
+ ):
+ source = 'def f(): %s' % source
+ counts = self.count_instructions(source)
+ assert ops.BUILD_LIST not in counts
+ assert ops.LOAD_CONST in counts
diff --git a/pypy/interpreter/test/test_compiler.py
b/pypy/interpreter/test/test_compiler.py
--- a/pypy/interpreter/test/test_compiler.py
+++ b/pypy/interpreter/test/test_compiler.py
@@ -1047,6 +1047,13 @@
output = s.getvalue()
assert "LOAD_GLOBAL" not in output
+ def test_folding_of_list_constants(self):
+ source = 'a in [1, 2, 3]'
+ co = compile(source, '', 'exec')
+ i = co.co_consts.index((1, 2, 3))
+ assert i > -1
+ assert isinstance(co.co_consts[i], tuple)
+
class AppTestCallMethod(object):
spaceconfig = {'objspace.opcodes.CALL_METHOD': True}
diff --git a/pypy/objspace/std/dictmultiobject.py
b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -1167,13 +1167,7 @@
def _all_contained_in(space, w_dictview, w_other):
w_iter = space.iter(w_dictview)
- while True:
- try:
- w_item = space.next(w_iter)
- except OperationError, e:
- if not e.match(space, space.w_StopIteration):
- raise
- break
+ for w_item in space.iteriterable(w_iter):
if not space.is_true(space.contains(w_other, w_item)):
return space.w_False
return space.w_True
@@ -1181,7 +1175,8 @@
def _is_set_like(w_other):
from pypy.objspace.std.setobject import W_BaseSetObject
return (isinstance(w_other, W_BaseSetObject) or
- isinstance(w_other, SetLikeDictView))
+ isinstance(w_other, W_DictViewKeysObject) or
+ isinstance(w_other, W_DictViewItemsObject))
class SetLikeDictView(object):
_mixin_ = True
diff --git a/rpython/memory/gc/test/test_env.py
b/rpython/memory/gc/test/test_env.py
--- a/rpython/memory/gc/test/test_env.py
+++ b/rpython/memory/gc/test/test_env.py
@@ -161,7 +161,3 @@
""")
result = env.get_L2cache_linux2_cpuinfo(str(filepath))
assert result == 3072 * 1024
-
-def test_estimate_best_nursery_size_linux2_arm():
- result = env.get_L2cache_linux2()
- assert result == -1
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
