Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5
Changeset: r88342:b1fc47fa5ded
Date: 2016-11-13 14:05 +0000
http://bitbucket.org/pypy/pypy/changeset/b1fc47fa5ded/
Log: hg merge default
diff --git a/rpython/tool/disassembler.py b/rpython/tool/disassembler.py
--- a/rpython/tool/disassembler.py
+++ b/rpython/tool/disassembler.py
@@ -53,6 +53,19 @@
def get_opcode_from_info(self, info):
return self.map[info.bytecode_no]
+ @property
+ def filename(self):
+ return self.co.co_filename
+
+ @property
+ def startlineno(self):
+ return self.co.co_firstlineno
+
+ @property
+ def name(self):
+ return self.co.co_name
+
+
def _setup():
for opcode in opname:
if not opcode.startswith('<'):
diff --git a/rpython/tool/jitlogparser/storage.py
b/rpython/tool/jitlogparser/storage.py
--- a/rpython/tool/jitlogparser/storage.py
+++ b/rpython/tool/jitlogparser/storage.py
@@ -92,15 +92,15 @@
class GenericCode(object):
def __init__(self, fname, startlineno, name):
- self._fname = fname
- self._startlineno = startlineno
- self._name = name
+ self.filename = fname
+ self.startlineno = startlineno
+ self.name = name
self._first_bytecodes = {} # {lineno: info}
self._source = None
def __repr__(self):
return 'GenericCode(%r, %r, %r)' % (
- self._fname, self._startlineno, self._name)
+ self.filename, self.startlineno, self.name)
def get_opcode_from_info(self, info):
lineno = ~info.bytecode_no
@@ -115,9 +115,9 @@
@property
def source(self):
if self._source is None:
- src = linecache.getlines(self._fname)
- if self._startlineno > 0:
- src = src[self._startlineno - 1:]
+ src = linecache.getlines(self.filename)
+ if self.startlineno > 0:
+ src = src[self.startlineno - 1:]
self._source = [s.rstrip('\n\r') for s in src]
return self._source
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
