[pypy-commit] lang-js default: hide js_trace from translator

stepahn noreply at buildbot.pypy.org
Fri Dec 28 11:35:07 CET 2012


Author: Stephan <stephan at stzal.com>
Branch: 
Changeset: r285:90a5caed0f91
Date: 2012-08-24 13:32 +0200
http://bitbucket.org/pypy/lang-js/changeset/90a5caed0f91/

Log:	hide js_trace from translator

diff --git a/js/builtins_interpreter.py b/js/builtins_interpreter.py
--- a/js/builtins_interpreter.py
+++ b/js/builtins_interpreter.py
@@ -1,9 +1,10 @@
 from js.object_space import w_return
+from pypy.rlib.objectmodel import we_are_translated
 
-def setup_builtins(global_object, overwrite_eval = False):
+
+def setup_builtins(global_object, overwrite_eval=False):
     from js.builtins import put_native_function
 
-    #put_native_function(global_object, u'trace', js_trace)
     put_native_function(global_object, u'load', js_load)
     put_native_function(global_object, u'debug', js_debug)
 
@@ -11,7 +12,9 @@
     if overwrite_eval is True:
         from js.builtins import put_intimate_function
         del(global_object._properties_[u'eval'])
-        put_intimate_function(global_object, u'eval', overriden_eval, configurable = False, params = [u'x'])
+        put_intimate_function(global_object, u'eval', overriden_eval, configurable=False, params=[u'x'])
+        put_native_function(global_object, u'trace', js_trace)
+
 
 @w_return
 def js_load(this, args):
@@ -22,7 +25,9 @@
 
 @w_return
 def js_trace(this, args):
-    import pdb; pdb.set_trace()
+    if not we_are_translated():
+        import pdb
+        pdb.set_trace()
 
 
 @w_return
@@ -41,4 +46,4 @@
     try:
         return js_eval(ctx)
     except JsException:
-        return NormalCompletion(value = _w("error"))
+        return NormalCompletion(value=_w("error"))


More information about the pypy-commit mailing list