Author: Ronan Lamy <[email protected]>
Branch: callfamily
Changeset: r76794:c118f115de13
Date: 2015-04-15 01:38 +0100
http://bitbucket.org/pypy/pypy/changeset/c118f115de13/
Log: turn nested function call_sites() into annotator method
diff --git a/rpython/annotator/annrpython.py b/rpython/annotator/annrpython.py
--- a/rpython/annotator/annrpython.py
+++ b/rpython/annotator/annrpython.py
@@ -290,6 +290,18 @@
graph, block, index = position_key
self.reflowpendingblock(graph, block)
+ def call_sites(self):
+ newblocks = self.added_blocks
+ if newblocks is None:
+ newblocks = self.annotated # all of them
+ for block in newblocks:
+ for op in block.operations:
+ if op.opname in ('simple_call', 'call_args'):
+ yield op
+
+ # some blocks are partially annotated
+ if op.result.annotation is None:
+ break # ignore the unannotated part
#___ simplification (should be moved elsewhere?) _______
diff --git a/rpython/annotator/bookkeeper.py b/rpython/annotator/bookkeeper.py
--- a/rpython/annotator/bookkeeper.py
+++ b/rpython/annotator/bookkeeper.py
@@ -92,21 +92,7 @@
# one with a dummy position
self.enter(None)
try:
- def call_sites():
- newblocks = self.annotator.added_blocks
- if newblocks is None:
- newblocks = self.annotator.annotated # all of them
- annotation = self.annotator.annotation
- for block in newblocks:
- for op in block.operations:
- if op.opname in ('simple_call', 'call_args'):
- yield op
-
- # some blocks are partially annotated
- if annotation(op.result) is None:
- break # ignore the unannotated part
-
- for call_op in call_sites():
+ for call_op in self.annotator.call_sites():
self.consider_call_site(call_op)
for pbc, args_s in self.emulated_pbc_calls.itervalues():
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
