Author: Stephan <step...@stzal.com>
Branch:
Changeset: r338:b62ede861110
Date: 2013-01-09 10:34 +0100
http://bitbucket.org/pypy/lang-js/changeset/b62ede861110/
Log: make W_Root settled
diff --git a/js/builtins/array.py b/js/builtins/array.py
--- a/js/builtins/array.py
+++ b/js/builtins/array.py
@@ -64,6 +64,8 @@
array = this.ToObject()
func = array.get(u'join')
if func.is_callable():
+ from js.jsobj import W_BasicFunction
+ assert isinstance(func, W_BasicFunction)
return func.Call(this=this).to_string()
else:
return this.to_string()
@@ -219,6 +221,8 @@
from js.execution import JsTypeError
raise JsTypeError(u'')
+ from js.jsobj import W_BasicFunction
+ assert isinstance(comparefn, W_BasicFunction)
res = comparefn.Call(args=[x, y], this=newundefined())
return res.ToInteger()
diff --git a/js/jsobj.py b/js/jsobj.py
--- a/js/jsobj.py
+++ b/js/jsobj.py
@@ -33,6 +33,7 @@
class W_Root(object):
+ _settled_ = True
_immutable_fields_ = ['_type_']
_type_ = ''
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
