Author: Manuel Jacob
Branch:
Changeset: r68790:4f968d7a8486
Date: 2014-01-20 18:39 +0100
http://bitbucket.org/pypy/pypy/changeset/4f968d7a8486/
Log: Move rpython/rtyper/raisingops/raisingops.py to
rpython/rtyper/raisingops.py.
diff --git a/rpython/rtyper/lltypesystem/lloperation.py
b/rpython/rtyper/lltypesystem/lloperation.py
--- a/rpython/rtyper/lltypesystem/lloperation.py
+++ b/rpython/rtyper/lltypesystem/lloperation.py
@@ -167,7 +167,7 @@
#
# This list corresponds to the operations implemented by the LLInterpreter.
# Note that many exception-raising operations can be replaced by calls
-# to helper functions in rpython.rtyper.raisingops.raisingops.
+# to helper functions in rpython.rtyper.raisingops.
# ***** Run test_lloperation after changes. *****
LL_OPERATIONS = {
diff --git a/rpython/rtyper/raisingops/raisingops.py
b/rpython/rtyper/raisingops.py
rename from rpython/rtyper/raisingops/raisingops.py
rename to rpython/rtyper/raisingops.py
diff --git a/rpython/rtyper/raisingops/__init__.py
b/rpython/rtyper/raisingops/__init__.py
deleted file mode 100644
diff --git a/rpython/translator/backendopt/raisingop2direct_call.py
b/rpython/translator/backendopt/raisingop2direct_call.py
--- a/rpython/translator/backendopt/raisingop2direct_call.py
+++ b/rpython/translator/backendopt/raisingop2direct_call.py
@@ -1,5 +1,5 @@
from rpython.translator.backendopt.support import log, all_operations, annotate
-import rpython.rtyper.raisingops.raisingops
+import rpython.rtyper.raisingops
log = log.raisingop2directcall
@@ -15,7 +15,7 @@
def raisingop2direct_call(translator, graphs=None):
"""search for operations that could raise an exception and change that
- operation into a direct_call to a function from the raisingops directory.
+ operation into a direct_call to a function from the raisingops module.
This function also needs to be annotated and specialized.
note: this could be extended to allow for any operation to be changed into
@@ -30,7 +30,7 @@
for op in all_operations(graphs):
if not is_raisingop(op):
continue
- func = getattr(rpython.rtyper.raisingops.raisingops, op.opname, None)
+ func = getattr(rpython.rtyper.raisingops, op.opname, None)
if not func:
log.warning("%s not found" % op.opname)
continue
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
