Author: Stephan <[email protected]>
Branch:
Changeset: r187:255df334ee16
Date: 2012-05-12 20:40 +0200
http://bitbucket.org/pypy/lang-js/changeset/255df334ee16/
Log: wip
diff --git a/js/astbuilder.py b/js/astbuilder.py
--- a/js/astbuilder.py
+++ b/js/astbuilder.py
@@ -8,98 +8,12 @@
def _get_root_map():
return ROOT_MAP
-#class Scope(object):
-# _immutable_fields_ = ['local_variables']
-# def __init__(self):
-# self.local_variables = ROOT_MAP
-# self.declared_variables = []
-#
-# def __repr__(self):
-# return '%s: %s; %s' % (object.__repr__(self),
repr(self.local_variables), repr(self.declared_variables))
-#
-# def add_local(self, identifier):
-# if not self.is_local(identifier):
-# self.local_variables = self.local_variables.add(identifier)
-#
-# def declare_local(self, identifier):
-# if not self.is_local(identifier):
-# self.add_local(identifier)
-# if not identifier in self.declared_variables:
-# self.declared_variables.append(identifier)
-#
-# def is_local(self, identifier):
-# return self.local_variables.lookup(identifier) !=
self.local_variables.NOT_FOUND
-#
-# def get_local(self, identifier):
-# idx = self.local_variables.lookup(identifier)
-# if idx == self.local_variables.NOT_FOUND:
-# raise ValueError
-# return idx
-
-#class GlobalScope(Scope):
-# def add_local(self, identifier):
-# pass
-#
-# def declare_local(self, identifier):
-# if not identifier in self.declared_variables:
-# self.declared_variables.append(identifier)
-#
-# def is_local(self, identifier):
-# return False
-#
-# def get_local(self, identifier):
-# raise ValueError
-#
-#class EvalScope(GlobalScope):
-# def declare_local(self, identifier):
-# pass
-
-#class Scopes(object):
-# def __init__(self):
-# self._scopes = []
-# self._scopes.append(GlobalScope())
-#
-# def current_scope(self):
-# if not self._scopes:
-# return None
-# else:
-# return self._scopes[-1]
-#
-# def new_scope(self):
-# self._scopes.append(Scope())
-#
-# def end_scope(self):
-# self._scopes.pop()
-#
-# def declarations(self):
-# if self.scope_present():
-# return self.current_scope().declared_variables
-# else:
-# return []
-#
-# def is_local(self, identifier):
-# return self.scope_present() == True and
self.current_scope().is_local(identifier) == True
-#
-# def scope_present(self):
-# return self.current_scope() is not None
-#
-# def add_local(self, identifier):
-# if self.scope_present():
-# self.current_scope().add_local(identifier)
-#
-# def declare_local(self, identifier):
-# if self.scope_present():
-# self.current_scope().declare_local(identifier)
-#
-# def get_local(self, identifier):
-# return self.current_scope().get_local(identifier)
-
class SymbolMap(object):
def __init__(self):
- self.functions = {}
- self.variables = {}
self.symbols = {}
- self.parameters = {}
+ self.functions = []
+ self.variables = []
+ self.parameters = []
self.next_index = 0
def add_symbol(self, identifyer):
@@ -113,21 +27,21 @@
idx = self.add_symbol(identifyer)
if identifyer not in self.variables:
- self.variables[identifyer] = idx
+ self.variables.append(identifyer)
return idx
def add_function(self, identifyer):
idx = self.add_symbol(identifyer)
if identifyer not in self.functions:
- self.functions[identifyer] = idx
+ self.functions.append(identifyer)
return idx
def add_parameter(self, identifyer):
idx = self.add_symbol(identifyer)
if identifyer not in self.parameters:
- self.parameters[identifyer] = idx
+ self.parameters.append(identifyer)
return idx
def get_index(self, identifyer):
@@ -232,10 +146,10 @@
#print 'closing scope, returning to %d' % (self.depth, )
def current_scope_variables(self):
- return self.current_scope().variables.keys()
+ return self.current_scope().variables
def current_scope_parameters(self):
- return self.current_scope().parameters.keys()
+ return self.current_scope().parameters
def current_scope(self):
try:
diff --git a/js/bench/v8/v1/run.js b/js/bench/v8/v1/run.js
--- a/js/bench/v8/v1/run.js
+++ b/js/bench/v8/v1/run.js
@@ -28,9 +28,9 @@
load('base.js');
load('looping.js');
-load('richards.js');
-load('deltablue.js');
-load('crypto.js');
+//load('richards.js');
+//load('deltablue.js');
+//load('crypto.js');
//load('raytrace.js');
//load('earley-boyer.js');
diff --git a/js/builtins.py b/js/builtins.py
--- a/js/builtins.py
+++ b/js/builtins.py
@@ -1,7 +1,5 @@
from js.jsobj import w_Undefined, W_IntNumber, w_Null, W_Boolean,\
- W_FloatNumber, W_String, newbool,\
- isnull_or_undefined, W_Number,\
- DONT_DELETE, DONT_ENUM, READ_ONLY, INTERNAL, _w
+ W_FloatNumber, W_String, newbool, isnull_or_undefined, W_Number, _w
from js.execution import ThrowException, JsTypeError
from js.jsparser import parse, ParseError
@@ -13,167 +11,9 @@
from pypy.rlib.rarithmetic import r_uint
from pypy.rlib.rfloat import NAN, INFINITY
from pypy.rlib.objectmodel import we_are_translated
-from pypy.rlib.streamio import open_file_as_stream
from pypy.rlib import jit
[email protected]_look_inside
-def eval_source(script_source, sourcename):
- temp_tree = parse(script_source)
- builder = make_eval_ast_builder()
- return builder.dispatch(temp_tree)
-
[email protected]_look_inside
-def load_source(script_source, sourcename):
- temp_tree = parse(script_source)
- builder = make_ast_builder()
- return builder.dispatch(temp_tree)
-
-def load_file(filename):
- f = open_file_as_stream(filename)
- t = load_source(f.readall(), filename)
- f.close()
- return t
-
-def make_loadjs(interp):
- def f(this, args):
- filename = str(args[0].ToString())
- t = load_file(filename)
- interp.run(t)
- return w_Undefined
- return f
-
-# 15.1.2.1
-from js.jsobj import W_BasicFunction
-class W__Eval(W_BasicFunction):
- def ToString(self):
- return "function eval() { [native code] }"
-
- def Call(self, args=[], this=None):
- if len(args) == 0:
- return w_Undefined
-
- arg0 = args[0]
- if not isinstance(arg0, W_String):
- return arg0
-
- src = arg0.ToString()
- try:
- node = eval_source(src, 'evalcode')
- except ParseError, e:
- raise ThrowException(W_String('SyntaxError: '+str(e)))
-
- bytecode = JsCode()
- node.emit(bytecode)
- func = bytecode.make_js_function()
- return func.run(self._context_)
-
-#class W_HasOwnProperty(W_NewBuiltin):
- #def Call(self, args=[], this=None):
- #if len(args) >= 1:
- #propname = args[0].ToString()
- #if propname in self._get_property_keys():
- #return newbool(True)
- #return newbool(False)
-
-#class W_IsPrototypeOf(W_NewBuiltin):
- #def Call(self, args=[], this=None):
- #w_obj = args[0]
- #if len(args) >= 1 and isinstance(w_obj, W_PrimitiveObject):
- #O = this
- #assert isinstance(w_obj, W_PrimitiveObject)
- #V = w_obj.Prototype
- #while V is not None:
- #if O == V:
- #return newbool(True)
- #assert isinstance(V, W_PrimitiveObject)
- #V = V.Prototype
- #return newbool(False)
-
-#class W_PropertyIsEnumerable(W_NewBuiltin):
- #def Call(self, args=[], this=None):
- #if len(args) >= 1:
- #propname = args[0].ToString()
- #if self._has_property(propname) and not
self._get_property_flags(propname) & DONT_ENUM:
- #return newbool(True)
- #return newbool(False)
-
-#class W_Function(W_NewBuiltin):
- #def __init__(self, ctx, Prototype=None, Class='function',
Value=w_Undefined):
- #W_NewBuiltin.__init__(self, Prototype, Class, Value)
- #self.ctx = ctx
-
- #def Call(self, args=[], this=None):
- #tam = len(args)
- #if tam >= 1:
- #fbody = args[tam-1].ToString()
- #argslist = []
- #for i in range(tam-1):
- #argslist.append(args[i].ToString())
- #fargs = ','.join(argslist)
- #functioncode = "function (%s) {%s}"%(fargs, fbody)
- #else:
- #functioncode = "function () {}"
- ##remove program and sourcelements node
- #funcnode = parse(functioncode).children[0].children[0]
- #builder = make_ast_builder()
- #ast = builder.dispatch(funcnode)
- #bytecode = JsCode()
- #ast.emit(bytecode)
- #func = bytecode.make_js_function()
- #return func.run(self.ctx)
-
- #def Construct(self, args=[]):
- #return self.Call(args, this=None)
-
-#functionstring= 'function (arguments go here!) {\n'+ \
- #' [lots of stuff :)]\n'+ \
- #'}'
-#class W_FToString(W_NewBuiltin):
- #def Call(self, args=[], this=None):
- #from js.jsobj import W__Function
- #if isinstance(this, W_PrimitiveObject):
- #if this.Class == 'Function':
- #return W_String(functionstring)
- #if isinstance(this, W__Function):
- #return W_String(functionstring)
-
- #raise JsTypeError('this is not a function object')
-
-#class W_ValueToString(W_NewBuiltin):
- #"this is the toString function for objects with Value"
- #mytype = ''
- #def Call(self, args=[], this=None):
- #assert isinstance(this, W_PrimitiveObject)
- #if this.Value.type() != self.mytype:
- #raise JsTypeError('Wrong type')
- #return W_String(this.Value.ToString())
-
-#class W_NumberValueToString(W_ValueToString):
- #mytype = 'number'
-
-#class W_BooleanValueToString(W_ValueToString):
- #mytype = 'boolean'
-
-#class W_StringValueToString(W_ValueToString):
- #mytype = 'string'
-
-#class W_NativeObject(W_Object):
- #def __init__(self, Class, Prototype, Value=w_Undefined):
- #W_Object.__init__(self, Prototype, Class, Value)
-
-#@specialize.memo()
-#def get_value_of(type):
- #class W_ValueValueOf(W_NewBuiltin):
- #"this is the valueOf function for objects with Value"
- #def Call(self, args=[], this=None):
- #assert isinstance(this, W_PrimitiveObject)
- #if type != this.Class:
- #raise JsTypeError('%s.prototype.valueOf called with
incompatible type' % self.type())
- #return this.Value
- #return W_ValueValueOf
-
-
class Sorter(TimSort):
def __init__(self, list, listlength=None, compare_fn=None):
TimSort.__init__(self, list, listlength)
@@ -185,83 +25,6 @@
return result == -1
return a.ToString() < b.ToString()
-#class W_ObjectObject(W_NativeObject):
- #def __init__(self, Class, Prototype, Value=w_Undefined):
- #W_NativeObject.__init__(self, Class, Prototype, Value)
-
- #def Call(self, args=[], this=None):
- #if len(args) >= 1 and not isnull_or_undefined(args[0]):
- #return args[0].ToObject()
- #else:
- #return self.Construct()
-
- #def Construct(self, args=[]):
- #if (len(args) >= 1 and not args[0] is w_Undefined and not args[0] is
w_Null):
- ## XXX later we could separate builtins and normal objects
- #return args[0].ToObject()
- #return create_object('Object')
-
-#class W_BooleanObject(W_NativeObject):
- #def Call(self, args=[], this=None):
- #if len(args) >= 1 and not isnull_or_undefined(args[0]):
- #return newbool(args[0].ToBoolean())
- #else:
- #return newbool(False)
-
- #def Construct(self, args=[]):
- #if len(args) >= 1 and not isnull_or_undefined(args[0]):
- #Value = newbool(args[0].ToBoolean())
- #return create_object('Boolean', Value = Value)
- #return create_object('Boolean', Value = newbool(False))
-
-#class W_NumberObject(W_NativeObject):
- #def Call(self, args=[], this=None):
- #if len(args) >= 1 and not isnull_or_undefined(args[0]):
- #return W_FloatNumber(args[0].ToNumber())
- #elif len(args) >= 1 and args[0] is w_Undefined:
- #return W_FloatNumber(NAN)
- #else:
- #return W_FloatNumber(0.0)
-
- #def ToNumber(self):
- #return 0.0
-
- #def Construct(self, args=[]):
- #if len(args) >= 1 and not isnull_or_undefined(args[0]):
- #Value = W_FloatNumber(args[0].ToNumber())
- #return create_object('Number', Value = Value)
- #return create_object('Number', Value = W_FloatNumber(0.0))
-
-#class W_StringObject(W_NativeObject):
- #length = 1
- #def Call(self, args=[], this=None):
- #if len(args) >= 1:
- #return W_String(args[0].ToString())
- #else:
- #return W_String('')
-
- #def Construct(self, args=[]):
- #if len(args) >= 1:
- #Value = W_String(args[0].ToString())
- #else:
- #Value = W_String('')
- #return Value.ToObject()
-
-#class W_ArrayObject(W_NativeObject):
- #def __init__(self, Class, Prototype):
- #W_NativeObject.__init__(self, Class, Prototype, None )
-
- #def Call(self, args=[], this=None):
- #if len(args) == 1 and isinstance(args[0], W_Number):
- #array = create_array()
- #array.Put('length', args[0])
- #else:
- #array = create_array(args)
- #return array
-
- #def Construct(self, args=[]):
- #return self.Call(args)
-
def new_native_function(function, name = None):
from js.functions import JsNativeFunction
from js.jsobj import W__Function
@@ -276,24 +39,25 @@
return _w(func(*args))
return f
+def put_native_function(obj, name, func, writable = False, configurable =
False, enumerable = False):
+ jsfunc = new_native_function(func, name)
+ put_property(obj, name, jsfunc, writable = writable, configurable =
configurable, enumerable = enumerable)
+
+def put_intimate_function(obj, name, func, writable = False, configurable =
False, enumerable = False):
+ from js.functions import JsIntimateFunction
+ from js.jsobj import W__Function
+
+ scope = None
+ jsfunc = JsIntimateFunction(native_function(func), name)
+ w_func = W__Function(jsfunc)
+ put_property(obj, name, w_func, writable = writable, configurable =
configurable, enumerable = enumerable)
+
+# 15
+def put_property(obj, name, value, writable = True, configurable = False,
enumerable = True):
+ from js.jsobj import put_property as _put_property
+ _put_property(obj, name, value, writable, configurable, enumerable)
+
def setup_builtins(global_object):
- def put_native_function(obj, name, func, writable = False, configurable =
False, enumerable = False):
- jsfunc = new_native_function(func, name)
- put_property(obj, name, jsfunc, writable = writable, configurable =
configurable, enumerable = enumerable)
-
- def put_intimate_function(obj, name, func, writable = False, configurable
= False, enumerable = False):
- from js.functions import JsIntimateFunction
- from js.jsobj import W__Function
-
- scope = None
- jsfunc = JsIntimateFunction(native_function(func), name)
- w_func = W__Function(jsfunc)
- put_property(obj, name, w_func, writable = writable, configurable =
configurable, enumerable = enumerable)
-
- # 15
- def put_property(obj, name, value, writable = True, configurable = False,
enumerable = True):
- from js.jsobj import put_property as _put_property
- _put_property(obj, name, value, writable, configurable, enumerable)
# Forward declaration
# 15.2.3
@@ -321,9 +85,10 @@
w_FunctionPrototype._prototype_ = w_ObjectPrototype
# initial prototype
- from js.jsobj import W__Object, W__Function
+ from js.jsobj import W__Object, W__Function, W_BasicFunction
W__Object._prototype_ = w_ObjectPrototype
W__Function._prototype_ = w_FunctionPrototype
+ W_BasicFunction._prototype_ = w_FunctionPrototype
# 15.2 Object Objects
# 15.2.3 Properties of the Object Constructor
@@ -379,6 +144,7 @@
from js.jsobj import W_BooleanObject
w_BooleanPrototype = W_BooleanObject(False)
w_BooleanPrototype._prototype_ = W__Object._prototype_
+ put_property(w_BooleanPrototype, '__proto__',
w_BooleanPrototype._prototype_, writable = False, enumerable = False,
configurable = False)
# 15.6.3.1
put_property(w_Boolean, 'prototype', w_BooleanPrototype, writable = False,
enumerable = False, configurable = False)
@@ -616,4 +382,4 @@
put_native_function(global_object, 'pypy_repr',
global_builtins.pypy_repr)
put_native_function(global_object, 'inspect', global_builtins.inspect)
- #put_native_function(global_object, 'load', make_loadjs(interp))
+ put_intimate_function(global_object, 'load', global_builtins.js_load)
diff --git a/js/builtins_array.py b/js/builtins_array.py
--- a/js/builtins_array.py
+++ b/js/builtins_array.py
@@ -3,17 +3,17 @@
# 15.4.4.7
def push(this, args):
o = this.ToObject()
- lenVal = o.Get('length')
- n = lenVal.ToUInt32()
+ len_val = o.get('length')
+ n = len_val.ToUInt32()
for item in args:
e = item
- o.Put(str(n), e)
+ o.put(str(n), e, True)
n = n + 1
- o.set_length(n)
+ o.put('length', _w(n), True)
- return o
+ return n
# 15.4.4.2
def to_string(this, args):
@@ -60,24 +60,24 @@
# 15.4.4.6
def pop(this, args):
o = this.ToObject()
- lenVal = o.Get('length')
+ lenVal = o.get('length')
l = lenVal.ToUInt32()
if l == 0:
- o.Put('length', _w(0))
+ o.put('length', _w(0))
return w_Undefined
else:
indx = l - 1
indxs = str(indx)
- element = o.Get(indxs)
- o.Delete(indxs)
- o.Put('length', _w(indx))
+ element = o.get(indxs)
+ o.delete(indxs, True)
+ o.put('length', _w(indx))
return element
# 15.4.4.8
def reverse(this, args):
o = this.ToObject()
- length = o.Get('length').ToUInt32()
+ length = o.ret('length').ToUInt32()
import math
middle = math.floor(length/2)
@@ -87,20 +87,20 @@
upper = length - lower - 1
lowerP = str(lower)
upperP = str(upper)
- lowerValue = o.Get(lowerP)
- upperValue = o.Get(upperP)
+ lowerValue = o.ret(lowerP)
+ upperValue = o.ret(upperP)
lowerExists = o.HasProperty(lowerP)
upperExists = o.HasProperty(upperP)
if lowerExists is True and upperExists is True:
- o.Put(lowerP, upperValue)
- o.Put(upperP, lowerValue)
+ o.put(lowerP, upperValue)
+ o.put(upperP, lowerValue)
elif lowerExists is False and upperExists is True:
- o.Put(lowerP, upperValue)
- o.Delete(upperP)
+ o.put(lowerP, upperValue)
+ o.delete(upperP)
elif lowerExists is True and upperExists is False:
- o.Delete(lowerP)
- o.Put(upperP, lowerValue)
+ o.delete(lowerP)
+ o.put(upperP, lowerValue)
lower = lower + 1
diff --git a/js/builtins_boolean.py b/js/builtins_boolean.py
--- a/js/builtins_boolean.py
+++ b/js/builtins_boolean.py
@@ -1,6 +1,26 @@
+from js.jsobj import W_Boolean, W_BooleanObject
+from js.execution import JsTypeError
+
# 15.6.4.2
def to_string(this, args):
- return this.to_string()
+ if isinstance(this, W_Boolean):
+ b = this
+ elif isinstance(this, W_BooleanObject):
+ b = this.PrimitiveValue()
+ else:
+ raise JsTypeError()
+
+ if b.ToBoolean() == True:
+ return 'true'
+ else:
+ return 'false'
def value_of(this, args):
+ if isinstance(this, W_Boolean):
+ b = this
+ elif isinstance(this, W_BooleanObject):
+ b = this.PrimitiveValue()
+ else:
+ raise JsTypeError()
+
return this.ToBoolean()
diff --git a/js/builtins_function.py b/js/builtins_function.py
--- a/js/builtins_function.py
+++ b/js/builtins_function.py
@@ -1,7 +1,12 @@
from js.jsobj import isnull_or_undefined
def to_string(this, args):
- return this.to_string()
+ from js.jsobj import W_BasicFunction
+ if not isinstance(this, W_BasicFunction):
+ from js.execution import JsTypeError
+ raise JsTypeError()
+
+ return this._to_string_()
def empty(this, args):
from js.jsobj import w_Undefined
@@ -9,7 +14,7 @@
# 15.3.4.4 Function.prototype.call
def call(this, args):
- pass
+ raise NotImplementedError()
#if len(args) >= 1:
#if isnull_or_undefined(args[0]):
#thisArg = this.ctx.get_global()
@@ -23,7 +28,7 @@
# 15.3.4.3 Function.prototype.apply (thisArg, argArray)
def apply(this, args):
- pass
+ raise NotImplementedError()
#try:
#if isnull_or_undefined(args[0]):
#thisArg = this.ctx.get_global()
diff --git a/js/builtins_global.py b/js/builtins_global.py
--- a/js/builtins_global.py
+++ b/js/builtins_global.py
@@ -120,3 +120,21 @@
ctx = EvalExecutionContext(f, calling_context = calling_context)
res = f.run(ctx)
return _w(res)
+
+def js_load(ctx):
+ from js.interpreter import load_file
+ from js.jscode import ast_to_bytecode
+ from js.functions import JsEvalCode
+ from js.execution_context import EvalExecutionContext
+
+ args = ctx.argv()
+ filename = args[0].to_string()
+
+ ast = load_file(filename)
+ symbol_map = ast.symbol_map
+ code = ast_to_bytecode(ast, symbol_map)
+
+ f = JsEvalCode(code)
+ calling_context = ctx._calling_context_
+ ctx = EvalExecutionContext(f, calling_context = calling_context)
+ f.run(ctx)
diff --git a/js/execution_context.py b/js/execution_context.py
--- a/js/execution_context.py
+++ b/js/execution_context.py
@@ -177,7 +177,7 @@
if strict:
self._this_binding_ = this
- elif isnull_or_undefined(this):
+ elif this is None or isnull_or_undefined(this):
self._this_binding_ = get_global_object()
elif this.klass() is not 'Object':
self._this_binding_ = this.ToObject()
diff --git a/js/interpreter.py b/js/interpreter.py
--- a/js/interpreter.py
+++ b/js/interpreter.py
@@ -1,17 +1,25 @@
-from js.astbuilder import make_ast_builder, make_eval_ast_builder
from js.jscode import JsCode
from pypy.rlib.objectmodel import we_are_translated
+from pypy.rlib.streamio import open_file_as_stream
import js.builtins
-TEST = False
+def load_file(filename):
+ from js.astbuilder import parse_to_ast
-def load_source(script_source, sourcename):
- return js.builtins.load_source(script_source, sourcename)
+ f = open_file_as_stream(filename)
+ src = f.readall()
+ ast = parse_to_ast(src)
+ f.close()
+ return ast
-def load_file(filename):
- return js.builtins.load_file(filename)
+def add_interpreter_builtins(global_object):
+ from js.builtins import new_native_function, native_function,
put_native_function
+ def trace(this, args):
+ import pdb; pdb.set_trace()
+
+ put_native_function(global_object, 'trace', trace)
class Interpreter(object):
"""Creates a js interpreter"""
@@ -20,6 +28,7 @@
self.global_object = W_BasicObject()
from js.builtins import setup_builtins
setup_builtins(self.global_object)
+ add_interpreter_builtins(self.global_object)
def run_ast(self, ast):
symbol_map = ast.symbol_map
diff --git a/js/js_interactive.py b/js/js_interactive.py
--- a/js/js_interactive.py
+++ b/js/js_interactive.py
@@ -6,7 +6,7 @@
import sys
import getopt
-from js.interpreter import load_source, Interpreter, load_file
+from js.interpreter import Interpreter, load_file
from js.jsparser import parse, ParseError
from js.jsobj import W_String, w_Undefined, W_Boolean
from pypy.rlib.streamio import open_file_as_stream
@@ -79,7 +79,7 @@
#print repr(res)
print res.to_string()
except JsException, exc:
- print exc.exception.to_string()
+ self.showtraceback(exc)
except SystemExit:
raise
except JsException, exc:
@@ -89,6 +89,7 @@
print
def runsource(self, source, filename="<input>"):
+ from js.astbuilder import parse_to_ast
"""Parse and run source in the interpreter.
One of these cases can happen:
@@ -97,7 +98,7 @@
3) The input is complete. Executes the source code.
"""
try:
- ast = load_source(source, filename)
+ ast = parse_to_ast(str(source))
except ParseError, exc:
if exc.source_pos.i == len(source):
# Case 2
@@ -113,7 +114,7 @@
def showtraceback(self, exc):
# XXX format exceptions nicier
- print exc.exception.to_string()
+ print exc.value.to_string()
def showsyntaxerror(self, filename, exc):
# XXX format syntax errors nicier
diff --git a/js/jscode.py b/js/jscode.py
--- a/js/jscode.py
+++ b/js/jscode.py
@@ -41,10 +41,10 @@
self._symbols = symbol_map
def variables(self):
- return self._symbols.variables.keys()
+ return self._symbols.variables
def functions(self):
- return self._symbols.functions.keys()
+ return self._symbols.functions
def index_for_symbol(self, symbol):
return self._symbols.get_index(symbol)
@@ -56,7 +56,7 @@
return self._symbols.get_symbol(index)
def params(self):
- return self._symbols.parameters.keys()
+ return self._symbols.parameters
@jit.elidable
def estimated_stack_size(self):
@@ -161,14 +161,13 @@
def to_function_opcodes(self):
self.unlabel()
- self.unpop_or_undefined()
+ #self.unpop_or_undefined()
+ self.emit('LOAD_UNDEFINED')
return self.opcodes
def to_global_opcodes(self):
- #import pdb; pdb.set_trace()
self.unlabel()
self.unpop_or_undefined()
- #self.unpop()
return self.opcodes
def to_executable_opcodes(self):
diff --git a/js/jsobj.py b/js/jsobj.py
--- a/js/jsobj.py
+++ b/js/jsobj.py
@@ -45,6 +45,12 @@
def ToInteger(self):
return int(self.ToNumber())
+ def ToInt32(self):
+ return r_int32(self.ToInteger())
+
+ def ToUInt32(self):
+ return r_uint32(self.ToInteger())
+
def is_callable(self):
return False
@@ -305,7 +311,7 @@
def put(self, p, v, throw = False):
if self.can_put(p) is False:
if throw is True:
- raise JsTypeError(self.__class__)
+ raise JsTypeError()
own_desc = self.get_own_property(p)
if is_data_descriptor(own_desc):
@@ -371,7 +377,9 @@
return True
if throw is True:
- raise JsTypeError(self.__class__)
+ raise JsTypeError()
+
+ return False
# 8.12.8
def default_value(self, hint = 'Number'):
@@ -387,7 +395,8 @@
if res is not None:
return res
- raise JsTypeError(self.__class__)
+ import pdb; pdb.set_trace()
+ raise JsTypeError()
def _default_value_string_(self):
to_string = self.get('toString')
@@ -407,7 +416,7 @@
def define_own_property(self, p, desc, throw = False):
def reject():
if throw:
- raise JsTypeError(self.__class__)
+ raise JsTypeError()
else:
return False
@@ -470,7 +479,7 @@
else:
raise NotImplementedError(self.__class__)
# 10
- elif is_data_descriptor(current) and is_data_descriptor(current):
+ elif is_data_descriptor(current) and is_data_descriptor(desc):
# 10.a
if current.configurable is False:
# 10.a.i
@@ -548,12 +557,7 @@
_class_ = 'Date'
class W__Object(W_BasicObject):
- def to_string(self):
- try:
- res = self.ToPrimitive('String')
- except JsTypeError:
- return "[object %s]" % (self.klass() ,)
- return res.to_string()
+ pass
class W_ObjectConstructor(W_BasicObject):
def __init__(self):
@@ -584,7 +588,7 @@
W_BasicObject.__init__(self)
def Call(self, args = [], this = None, calling_context = None):
- raise NotImplementedError(self.__class__)
+ raise NotImplementedError("abstract")
# 13.2.2
def Construct(self, args=[]):
@@ -597,7 +601,6 @@
# but I fail to find a case that falls into this
obj._prototype_ = W__Object._prototype_
-
result = self.Call(args, this=obj)
if isinstance(result, W__Object):
return result
@@ -607,8 +610,11 @@
def is_callable(self):
return True
+ def _to_string_(self):
+ return 'function() {}'
+
class W_FunctionConstructor(W_BasicFunction):
- def to_string(self):
+ def _to_string_(self):
return "function Function() { [native code] }"
# 15.3.2.1
@@ -667,6 +673,9 @@
def Construct(self, args=[]):
return self.Call(args).ToObject()
+ def _to_string_(self):
+ return "function Number() { [native code] }"
+
# 15.5.2
class W_StringConstructor(W_BasicFunction):
def Call(self, args = [], this = None, calling_context = None):
@@ -678,6 +687,9 @@
def Construct(self, args=[]):
return self.Call(args).ToObject()
+ def _to_string_(self):
+ return "function String() { [native code] }"
+
# 15.6.2
class W_BooleanConstructor(W_BasicFunction):
def Call(self, args = [], this = None, calling_context = None):
@@ -689,6 +701,9 @@
def Construct(self, args=[]):
return self.Call(args).ToObject()
+ def _to_string_(self):
+ return "function Boolean() { [native code] }"
+
# 15.9.2
class W_DateConstructor(W_BasicFunction):
def Call(self, args=[], this=None):
@@ -699,6 +714,9 @@
def Construct(self, args=[]):
return self.Call(args).ToObject()
+ def _to_string_(self):
+ return "function Date() { [native code] }"
+
class W__Function(W_BasicFunction):
#_immutable_fields_ = ['_function_']
@@ -725,6 +743,9 @@
if strict is True:
raise NotImplementedError()
+ def _to_string(self):
+ return self._function_.to_string()
+
def code(self):
return self._function_
@@ -766,10 +787,6 @@
def is_strict(self):
return self._strict_
-class W_Eval(W_BasicFunction):
- def Call(self, args = [], this = None, calling_context = None):
- raise NotImplementedError()
-
# 10.6
class W_Arguments(W_BasicObject):
_class_ = 'Arguments'
@@ -874,7 +891,7 @@
old_len_desc = self.get_own_property('length')
assert old_len_desc is not w_Undefined
- old_len = old_len_desc.value
+ old_len = old_len_desc.value.ToUInt32()
# 3
if p == 'length':
@@ -932,7 +949,7 @@
# 4
elif is_array_index(p):
# a
- index = p.ToUInt32()
+ index = r_uint32(int(p))
# b
if index >= old_len and old_len_desc.writable is False:
return reject()
@@ -954,7 +971,12 @@
return W_BasicObject.define_own_property(self, p, desc, throw)
def is_array_index(p):
- return (isinstance(p, W_Number) or isinstance(p, W_NumericObject)) and
str(p.ToUInt32()) == p
+ try:
+ return str(r_uint32(int(p))) == p
+ except ValueError:
+ return False
+
+ #return (isinstance(p, W_Number) or isinstance(p, W_NumericObject)) and
str(p.ToUInt32()) == p
#def set_length(self, newlength):
#if newlength < self.length:
@@ -1084,12 +1106,6 @@
return False
return bool(num)
- def ToInt32(self):
- return r_int32(self.ToInteger())
-
- def ToUInt32(self):
- return r_uint32(self.ToInteger())
-
def __eq__(self, other):
if isinstance(other, W_Number):
return self.ToNumber() == other.ToNumber()
diff --git a/js/opcodes.py b/js/opcodes.py
--- a/js/opcodes.py
+++ b/js/opcodes.py
@@ -134,7 +134,11 @@
from js.jsobj import W__Array
array = W__Array()
for i in range(self.counter):
- array.Put(str(self.counter - i - 1), ctx.stack_pop())
+ el = ctx.stack_pop()
+ index = str(self.counter - i - 1)
+ array.put(index, el)
+ length = self.counter
+ array.put('length', _w(length))
ctx.stack_append(array)
def stack_change(self):
@@ -225,7 +229,7 @@
class TYPEOF(BaseUnaryOperation):
def eval(self, ctx):
var = ctx.stack_pop()
- ctx.stack_append(W_String(one.type()))
+ ctx.stack_append(W_String(var.type()))
class TYPEOF_VARIABLE(Opcode):
def __init__(self, index, name):
@@ -359,9 +363,13 @@
def eval(self, ctx):
left = ctx.stack_pop()
member = ctx.stack_pop()
+ name = member.to_string()
+
value = ctx.stack_pop()
- name = member.to_string()
- left.ToObject().put(name, value)
+
+ l_obj = left.ToObject()
+ l_obj.put(name, value)
+
ctx.stack_append(value)
class STORE(Opcode):
@@ -589,12 +597,8 @@
def commonnew(ctx, obj, args):
from js.jsobj import W_BasicObject
if not isinstance(obj, W_BasicObject):
- raise ThrowException(W_String('it is not a constructor'))
- try:
- res = obj.Construct(args=args)
- return res
- except JsTypeError:
- raise ThrowException(W_String('it is not a constructor'))
+ raise JsTypeError('it is not a constructor')
+ res = obj.Construct(args=args)
return res
class NEW(Opcode):
@@ -605,13 +609,15 @@
from js.jsobj import W_List
assert isinstance(y, W_List)
args = y.to_list()
- ctx.stack_append(commonnew(ctx, x, args))
+ res = commonnew(ctx, x, args)
+ ctx.stack_append(res)
class NEW_NO_ARGS(Opcode):
_stack_change = 0
def eval(self, ctx):
x = ctx.stack_pop()
- ctx.stack_append(commonnew(ctx, x, []))
+ res = commonnew(ctx, x, [])
+ ctx.stack_append(res)
# ------------ iterator support ----------------
diff --git a/js/test/ecma/conftest.py b/js/test/ecma/conftest.py
--- a/js/test/ecma/conftest.py
+++ b/js/test/ecma/conftest.py
@@ -1,4 +1,13 @@
import pytest
+import py
+
+from _pytest.runner import Failed
+from js.interpreter import Interpreter, load_file
+from js.jsobj import _w
+from js import interpreter
+from js.execution import JsException
+from pypy.rlib.parsing.parsing import ParseError
+
exclusionlist = ['shell.js', 'browser.js']
#passing_tests = ['Number', 'Boolean', 'Array']
@@ -17,95 +26,73 @@
help="run js interpreter ecma tests"
)
-import py
-
-from _pytest.runner import Failed
-from js.interpreter import Interpreter, load_file
-from js.jsobj import _w
-from js import interpreter
-from js.execution import JsBaseExcept
-from pypy.rlib.parsing.parsing import ParseError
-
-interpreter.TEST = True
-
rootdir = py.path.local(__file__).dirpath()
-
class JSTestFile(pytest.File):
def __init__(self, fspath, parent=None, config=None, session=None):
super(JSTestFile, self).__init__(fspath, parent, config, session)
self.name = self.fspath.purebasename
+
def collect(self):
if self.session.config.getvalue("ecma") is not True:
pytest.skip("ECMA tests disabled, run with --ecma")
+ interp = Interpreter()
- self.init_interp()
+ # the tests expect eval to return "error" on an exception
+ from js.builtins import put_intimate_function
+ def overriden_eval(ctx):
+ from js.builtins_global import js_eval
+ from js.execution import JsException
+ try:
+ return js_eval(ctx)
+ except JsException:
+ return "error"
+
+ global_object = interp.global_object
+ del(global_object._properties_['eval'])
+ put_intimate_function(global_object, 'eval', overriden_eval,
configurable = False)
+
+ shellpath = rootdir/'shell.js'
+ shellfile = load_file(str(shellpath))
+ interp.run_ast(shellfile)
+
#actually run the file :)
t = load_file(str(self.fspath))
try:
- self.interp.run(t)
+ interp.run_ast(t)
except ParseError, e:
raise Failed(msg=e.nice_error_message(filename=str(self.fspath)))
#, excinfo=None)
- except JsBaseExcept, e:
- raise Failed(msg="Javascript Error: "+str(e)) #,
excinfo=py.code.ExceptionInfo())
- except:
- raise
- ctx = self.interp.global_context
- testcases = ctx.resolve_identifier('testcases')
- self.tc = ctx.resolve_identifier('tc')
- testcount = testcases.Get('length').ToInt32()
+ #except JsException, e:
+ #import pdb; pdb.set_trace()
+ #raise Failed(msg="Javascript Error: "+str(e)) #,
excinfo=py.code.ExceptionInfo())
+
+ testcases = global_object.get('testcases')
+ #tc = global_object.get('tc')
+ #self.tc = tc
+ testcount = testcases.get('length').ToInt32()
self.testcases = testcases
+ run_test_func = global_object.get('run_test')
+ def get_result(test_num):
+ w_test_number = _w(test_num)
+ result = run_test_func.Call(args = [w_test_number])
+ return result.to_string()
+
for number in xrange(testcount):
- yield JSTestItem(str(number), parent=self)
-
- def init_interp(cls):
- if hasattr(cls, 'interp'):
- from js.jsobj import W__Array
- cls.testcases.PutValue(W__Array(), cls.interp.global_context)
- cls.tc.PutValue(_w(0), cls.interp.global_context)
-
- cls.interp = Interpreter()
- shellpath = rootdir/'shell.js'
- if not hasattr(cls, 'shellfile'):
- cls.shellfile = load_file(str(shellpath))
- cls.interp.run(cls.shellfile)
- cls.testcases =
cls.interp.global_context.resolve_identifier('testcases')
- cls.tc = cls.interp.global_context.resolve_identifier('tc')
-
- # override eval
- from js.builtins import new_native_function
-
- ctx = cls.interp.global_context
- def overriden_evaljs(this, args):
- from js.builtins import W__Eval
- try:
- w_eval = W__Eval(ctx)
- return w_eval.Call(args, this)
- except JsBaseExcept:
- return "error"
-
- cls.interp.w_Global.Put('eval', new_native_function(ctx,
overriden_evaljs, 'eval'))
-
-#
-# init_interp = classmethod(init_interp)
-#
-#
-#
+ result = get_result(number)
+ yield JSTestItem(str(number), result, parent=self)
class JSTestItem(pytest.Item):
- def __init__(self, name, parent=None, config=None, session=None):
+ def __init__(self, name, result, parent=None, config=None, session=None):
super(JSTestItem, self).__init__(name, parent, config, session)
self.test_number = int(name)
self.name = parent.name + '.' + name
+ self.result = result
def runtest(self):
- ctx = self.parent.interp.global_context
- r3 = ctx.resolve_identifier('run_test')
- w_test_number = _w(self.test_number)
- result = r3.Call([w_test_number]).ToString()
+ result = self.result
__tracebackhide__ = True
if result != "passed":
raise JsTestException(self, result)
@@ -119,9 +106,6 @@
])
_handling_traceback = False
-# def _getpathlineno(self):
-# return self.parent.parent.fspath, 0
-#
class JsTestException(Exception):
def __init__(self, item, result):
diff --git a/js/test/test_array.py b/js/test/test_array.py
--- a/js/test/test_array.py
+++ b/js/test/test_array.py
@@ -11,3 +11,9 @@
assertv("var x = [4,3,2,1]; x.pop();", 1)
assertv("var x = [4,3,2,1]; x.pop(); x.pop(); x.pop(); x.pop();", 4)
assertv("var x = [4,3,2,1]; x.pop(); x.pop(); x.pop(); x.pop(); x.length",
0)
+
+def test_array_length():
+ assertv("var x = []; x.length;", 0)
+ assertv("var x = [1,2,3]; x.length;", 3);
+ assertv("var x = []; x[0] = 1; x[1] = 2; x[2] = 3; x.length;", 3);
+ assertv("var x = []; x[2] = 3; x.length;", 3);
diff --git a/js/test/test_execution_context.py
b/js/test/test_execution_context.py
--- a/js/test/test_execution_context.py
+++ b/js/test/test_execution_context.py
@@ -1,3 +1,2 @@
import py
-from js.jscode import FunctionExecutionContext
diff --git a/js/test/test_interp.py b/js/test/test_interp.py
--- a/js/test/test_interp.py
+++ b/js/test/test_interp.py
@@ -949,3 +949,22 @@
def test_empty_function_with_params():
assertv("x = function(x) { }; x(); false", False)
+
+def test_params_order(capsys):
+ assertp("function f(a, b, c, d) { return print([a, b, c, d]) };
f(1,2,3,4)", "1,2,3,4", capsys);
+ assertp("function f(z, y, x, w) { return print([z, y, x, w]) };
f(1,2,3,4)", "1,2,3,4", capsys);
+ assertp("function f(n, d, e, a) { return print([n, d, e, a]) };
f(1,2,3,4)", "1,2,3,4", capsys);
+
+def test_function_without_implicit_return_value():
+ assertv("""
+ function f(a) {
+ if(a != null)
+ if(true) this.foo(a);
+ }
+ f(null);
+ 1;
+ """, 1)
+
+def test_boolean_constructor():
+ assertv("typeof Boolean(true)", 'boolean')
+ assertv("typeof new Boolean(true)", 'object')
diff --git a/js/test/test_jscode.py b/js/test/test_jscode.py
--- a/js/test/test_jscode.py
+++ b/js/test/test_jscode.py
@@ -45,24 +45,3 @@
#
# ctx = make_global_context()
# assert nf.run(ctx, [_w(1), _w(2)]).ToInteger() == 3
-
-class TestJs_Function(object):
- #def test_run(self):
- #from js.builtins import load_source
- #from js.jscode import JsCode
- #from js.jsexecution_context import make_global_context
- #from js.jsobj import _w
-
- #code = """
- #function f(a, b) {
- #return a + b;
- #}
- #"""
-
- #bytecode = JsCode()
- #load_source(code, '').emit(bytecode)
-
- #f = bytecode.ToJsFunction()
- #ctx = make_global_context()
-
- #assert f.run(ctx, [_w(1), _w(2)]).ToInteger() == 3
diff --git a/js/test/test_locals.py b/js/test/test_locals.py
--- a/js/test/test_locals.py
+++ b/js/test/test_locals.py
@@ -1,52 +1,52 @@
import py
-from js.astbuilder import Scopes
+#from js.astbuilder import Scopes
-def test_scopes_is_local():
- scopes = Scopes()
+#def test_scopes_is_local():
+ #scopes = Scopes()
- scopes.new_scope()
- assert scopes.is_local('a') is False
- scopes.add_local('a')
- assert scopes.is_local('a') is True
- assert scopes.is_local('b') is False
- scopes.add_local('b')
- assert scopes.is_local('b') is True
+ #scopes.new_scope()
+ #assert scopes.is_local('a') is False
+ #scopes.add_local('a')
+ #assert scopes.is_local('a') is True
+ #assert scopes.is_local('b') is False
+ #scopes.add_local('b')
+ #assert scopes.is_local('b') is True
- scopes.new_scope()
- assert scopes.is_local('a') is False
- scopes.add_local('a')
- assert scopes.is_local('a') is True
- assert scopes.is_local('b') is False
+ #scopes.new_scope()
+ #assert scopes.is_local('a') is False
+ #scopes.add_local('a')
+ #assert scopes.is_local('a') is True
+ #assert scopes.is_local('b') is False
-def test_scopes_get_local():
- scopes = Scopes()
- scopes.new_scope()
- scopes.add_local('a')
- scopes.add_local('b')
- assert scopes.get_local('a') == 0
- assert scopes.get_local('b') == 1
- py.test.raises(ValueError, scopes.get_local, 'c')
+#def test_scopes_get_local():
+ #scopes = Scopes()
+ #scopes.new_scope()
+ #scopes.add_local('a')
+ #scopes.add_local('b')
+ #assert scopes.get_local('a') == 0
+ #assert scopes.get_local('b') == 1
+ #py.test.raises(ValueError, scopes.get_local, 'c')
- scopes.new_scope()
- scopes.add_local('b')
- assert scopes.get_local('b') == 0
- py.test.raises(ValueError, scopes.get_local, 'a')
+ #scopes.new_scope()
+ #scopes.add_local('b')
+ #assert scopes.get_local('b') == 0
+ #py.test.raises(ValueError, scopes.get_local, 'a')
-def test_scopes_declare_local():
- scopes = Scopes()
- scopes.new_scope()
- assert scopes.declarations() == []
- assert scopes.is_local('a') is False
- assert scopes.is_local('b') is False
- assert scopes.is_local('c') is False
- scopes.declare_local('a')
- assert scopes.is_local('a') is True
- assert scopes.is_local('b') is False
- scopes.add_local('b')
- assert scopes.is_local('b') is True
- assert scopes.get_local('a') == 0
- assert scopes.get_local('b') == 1
- py.test.raises(ValueError, scopes.get_local, 'c')
- assert scopes.declarations() == ['a']
+#def test_scopes_declare_local():
+ #scopes = Scopes()
+ #scopes.new_scope()
+ #assert scopes.declarations() == []
+ #assert scopes.is_local('a') is False
+ #assert scopes.is_local('b') is False
+ #assert scopes.is_local('c') is False
+ #scopes.declare_local('a')
+ #assert scopes.is_local('a') is True
+ #assert scopes.is_local('b') is False
+ #scopes.add_local('b')
+ #assert scopes.is_local('b') is True
+ #assert scopes.get_local('a') == 0
+ #assert scopes.get_local('b') == 1
+ #py.test.raises(ValueError, scopes.get_local, 'c')
+ #assert scopes.declarations() == ['a']
diff --git a/js/test/test_numbers.py b/js/test/test_numbers.py
--- a/js/test/test_numbers.py
+++ b/js/test/test_numbers.py
@@ -1,10 +1,10 @@
-from js.test.test_interp import assertv
+from js.test.test_interp import assertp
-def test_infinity_nan():
- assertv('1/0', 'Infinity')
- assertv('0/0', 'NaN')
- assertv('-1/0', '-Infinity')
+def test_infinity_nan(capsys):
+ assertp('print(1/0)', 'Infinity', capsys)
+ assertp('print(0/0)', 'NaN', capsys)
+ assertp('print(-1/0)', '-Infinity', capsys)
-def test_overflow_int_to_float():
- assertv('1e200', '1e+200')
+def test_overflow_int_to_float(capsys):
+ assertp('print(1e200)', '1e+200', capsys)
diff --git a/js/test/test_parser.py b/js/test/test_parser.py
--- a/js/test/test_parser.py
+++ b/js/test/test_parser.py
@@ -11,6 +11,8 @@
from js.jscode import JsCode
import sys
+xfail = py.test.mark.xfail
+
GFILE = py.path.local(__file__).dirpath().join('../jsgrammar.txt')
try:
t = GFILE.read(mode='U')
@@ -314,6 +316,7 @@
pos = astb.get_pos(t)
assert pos.start == 0
+ @xfail
def test_primaryexpression(self):
self.check('(6)', ['LOAD_INTCONSTANT 6'])
self.check('((((6))))', ['LOAD_INTCONSTANT 6'])
@@ -345,6 +348,7 @@
def test_raising(self):
py.test.raises(FakeParseError, self.check, '1=2', [])
+ @xfail
def test_expression(self):
self.check('1 - 1 - 1', [
'LOAD_INTCONSTANT 1',
@@ -370,12 +374,14 @@
'LOAD_STRINGCONSTANT "world"',
'ADD'])
+ @xfail
def test_member(self):
self.check('a["b"]',
['LOAD_STRINGCONSTANT "b"',
'LOAD_VARIABLE "a"',
'LOAD_MEMBER'])
+ @xfail
def test_store_local(self):
self.check("function f() {var x; x = 1;}",
['DECLARE_FUNCTION f [] [\n DECLARE_VAR "x"\n LOAD_INTCONSTANT
1\n STORE_LOCAL 0\n]'])
@@ -393,6 +399,7 @@
bytecode.remove_labels()
assert_bytecode_list_eql(bytecode.opcodes, expected_after_rl)
+ @xfail
def test_control_flow(self):
self.check_remove_label('while (i>1) {x}',
['LABEL 0',
@@ -458,10 +465,12 @@
def setup_class(cls):
cls.parse = parse_func('sourceelements')
+ @xfail
def test_function_decl(self):
self.check('function f(x, y, z) {x;}',
['DECLARE_FUNCTION f [\'x\', \'y\', \'z\'] [\n LOAD_LOCAL
0\n]'])
+ @xfail
def test_function_expression(self):
self.check('var x = function() {return x}',[
'DECLARE_VAR "x"',
@@ -470,12 +479,14 @@
'STORE "x"',
'POP'])
+ @xfail
def test_var_declr(self):
self.check('x; var x;', [
'DECLARE_VAR "x"',
'LOAD_VARIABLE "x"',
'POP'])
+ @xfail
def test_call(self):
self.check('print("stuff")',[
'LOAD_STRINGCONSTANT "stuff"',
@@ -484,6 +495,7 @@
'CALL',
'POP'])
+ @xfail
def test_member(self):
self.check('a.b', ['LOAD_STRINGCONSTANT "b"',
'LOAD_VARIABLE "a"',
@@ -495,6 +507,7 @@
'STORE_MEMBER',
'POP'])
+ @xfail
def test_different_assignments(self):
self.check('x += y', [
'LOAD_VARIABLE "x"',
@@ -540,17 +553,20 @@
'STORE_MEMBER',
'POP'])
+ @xfail
def test_variable_assign(self):
self.check('x=1;', ['LOAD_INTCONSTANT 1', 'STORE "x"', 'POP'])
self.check('var x; x = 1;', ['DECLARE_VAR "x"', 'LOAD_INTCONSTANT 1',
'STORE "x"', 'POP'])
self.check('var x=1;', ['DECLARE_VAR "x"', 'LOAD_INTCONSTANT 1',
'STORE "x"', 'POP'])
self.check('x+=1;', ['LOAD_VARIABLE "x"','LOAD_INTCONSTANT 1', 'ADD',
'STORE "x"', 'POP'])
+ @xfail
def test_local_function_param(self):
self.check('function f(x) { return x; };', ['DECLARE_FUNCTION f
[\'x\'] [\n LOAD_LOCAL 0\n RETURN\n LOAD_UNDEFINED\n]'])
self.check('function f(x) { var y; return y; };', ['DECLARE_FUNCTION f
[\'x\'] [\n DECLARE_VAR "y"\n LOAD_LOCAL 1\n RETURN\n LOAD_UNDEFINED\n]'])
self.check('function f(x) { return y; };', ['DECLARE_FUNCTION f
[\'x\'] [\n LOAD_VARIABLE "y"\n RETURN\n LOAD_UNDEFINED\n]'])
+@xfail
def test_retlast_pop_removal():
jscode = JsCode()
jscode.emit('POP')
@@ -564,7 +580,7 @@
assert_bytecode_list_eql(jsfunc.opcodes, ['POP', 'LOAD_UNDEFINED'])
-
+@xfail
def test_retlast_undefined_addition():
jscode = JsCode()
jsfunc = jscode.make_js_function()
@@ -577,6 +593,7 @@
from js.jsparser import parse
+@xfail
def test_simplesemicolon():
yield parse, 'x'
yield parse, 'if(1){x}'
diff --git a/js/test/test_scope.py b/js/test/test_scope.py
--- a/js/test/test_scope.py
+++ b/js/test/test_scope.py
@@ -1,6 +1,7 @@
-
+import py
from js.test.test_interp import assertv
[email protected]
def test_variable_deletion():
assertv("var x = 3; delete this.x;", False)
assertv("x = 3; delete this.x;", True)
diff --git a/js/utils.py b/js/utils.py
--- a/js/utils.py
+++ b/js/utils.py
@@ -26,8 +26,8 @@
return self.stack[i]
def append(self, element):
- from js.jsobj import W___Root
- assert isinstance(element, W___Root)
+ from js.jsobj import W_Root
+ assert isinstance(element, W_Root)
i = self.stack_pointer
assert i >= 0
self.stack[i] = element
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
