[pypy-svn] r45293 - in pypy/dist/pypy/translator: c c/test sandbox sandbox/test

[arigo at codespeak.net]

Author: arigo
Date: Tue Jul 24 11:06:11 2007
New Revision: 45293

Added:
   pypy/dist/pypy/translator/sandbox/   (props changed)
   pypy/dist/pypy/translator/sandbox/__init__.py
      - copied unchanged from r45278, pypy/dist/pypy/translator/__init__.py
   pypy/dist/pypy/translator/sandbox/rsandbox.py
      - copied, changed from r45292, pypy/dist/pypy/translator/c/sandbox.py
   pypy/dist/pypy/translator/sandbox/sandboxmsg.py
      - copied unchanged from r45292, pypy/dist/pypy/translator/c/sandboxmsg.py
   pypy/dist/pypy/translator/sandbox/test/   (props changed)
   pypy/dist/pypy/translator/sandbox/test/__init__.py
      - copied unchanged from r45278, pypy/dist/pypy/translator/c/test/__init__.py
   pypy/dist/pypy/translator/sandbox/test/autopath.py
      - copied unchanged from r45278, pypy/dist/pypy/translator/c/test/autopath.py
   pypy/dist/pypy/translator/sandbox/test/test_sandbox.py
      - copied, changed from r45278, pypy/dist/pypy/translator/c/test/test_sandbox.py
Removed:
   pypy/dist/pypy/translator/c/sandbox.py
   pypy/dist/pypy/translator/c/sandboxmsg.py
   pypy/dist/pypy/translator/c/test/test_sandbox.py
Modified:
   pypy/dist/pypy/translator/c/node.py
Log:
Move the sandboxing code to its own directory.


Modified: pypy/dist/pypy/translator/c/node.py
==============================================================================
--- pypy/dist/pypy/translator/c/node.py	(original)
+++ pypy/dist/pypy/translator/c/node.py	Tue Jul 24 11:06:11 2007
@@ -723,8 +723,9 @@
         if hasattr(fnobj, 'includes'):
             # apply the sandbox transformation
             if sandbox:
-                from pypy.translator.c.sandbox import getSandboxFuncCodeGen
-                return [getSandboxFuncCodeGen(fnobj, db)]
+                from pypy.translator.sandbox import rsandbox
+                graph = rsandbox.get_external_function_sandbox_graph(fnobj, db)
+                return [FunctionCodeGenerator(graph, db)]
             else:
                 return []   # assume no wrapper needed
         else: