Author: Alex Gaynor <alex.gay...@gmail.com>
Branch: better-jit-hooks-2
Changeset: r51423:b906e1141138
Date: 2012-01-17 15:17 -0600
http://bitbucket.org/pypy/pypy/changeset/b906e1141138/
Log: Some naming changes.
diff --git a/pypy/module/pypyjit/interp_resop.py
b/pypy/module/pypyjit/interp_resop.py
--- a/pypy/module/pypyjit/interp_resop.py
+++ b/pypy/module/pypyjit/interp_resop.py
@@ -216,14 +216,14 @@
def get_pycode(self, space):
if self.jd_name == pypyjitdriver.name:
return space.getitem(self.w_descr, space.wrap(0))
- raise OperationError(space.w_AttributeError,
space.wrap('DebugMergePoint is not the main jitdriver DMP'))
+ raise OperationError(space.w_AttributeError, space.wrap("This
DebugMergePoint doesn't belong to the main Python JitDriver"))
def get_bytecode_no(self, space):
if self.jd_name == pypyjitdriver.name:
return space.getitem(self.w_descr, space.wrap(1))
- raise OperationError(space.w_AttributeError,
space.wrap('DebugMergePoint is not the main jitdriver DMP'))
+ raise OperationError(space.w_AttributeError, space.wrap("This
DebugMergePoint doesn't belong to the main Python JitDriver"))
- def get_jitdriver(self, space):
+ def get_jitdriver_name(self, space):
return space.wrap(self.jd_name)
WrappedOp.typedef = TypeDef(
@@ -246,7 +246,7 @@
descr = GetSetProperty(DebugMergePoint.get_descr),
pycode = GetSetProperty(DebugMergePoint.get_pycode),
bytecode_no = GetSetProperty(DebugMergePoint.get_bytecode_no),
- jitdriver_name = GetSetProperty(DebugMergePoint.get_jitdriver),
+ jitdriver_name = GetSetProperty(DebugMergePoint.get_jitdriver_name),
)
DebugMergePoint.acceptable_as_base_class = False
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
