R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[jsinterp] Adding ast to test_function_expression

Browse Source
This commit is contained in:
sulyi 2016-12-12 20:05:31 +01:00
parent f7993a196a
commit 2533dc421b
2 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
test/test_jsinterp_parser.py
View File

@ -880,22 +880,56 @@ class TestJSInterpreterParser(unittest.TestCase):
ast = [] ast = []
self.assertEqual(list(jsi.statements()), ast) self.assertEqual(list(jsi.statements()), ast)
@unittest.skip('Test not yet implemented: missing ast')
def test_function_expression(self): def test_function_expression(self):
# ASAP function expression test
jsi = JSInterpreter(''' jsi = JSInterpreter('''
function f() { function f() {
var add = (function () { var add = (function () {
var counter = 0; var counter = 0;
return function () {return counter += 1;} return function () {return counter += 1;};
})(); })();
add(); add();
add(); add();
return add(); return add();
} }
''') ''')
ast = [] ast = [
self.assertEqual(list(jsi.statements()), ast) (Token.FUNC, 'f', [],
(Token.BLOCK, [
(Token.VAR, zip(['add'], [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.FUNC, None, [], (Token.BLOCK, [
(Token.VAR, zip(
['counter'],
[(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.INT, 0), None, None)
]), None)]
)),
(Token.RETURN, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.FUNC, None, [], (Token.BLOCK, [
(Token.RETURN, (Token.EXPR, [
(Token.ASSIGN, _ASSIGN_OPERATORS['+='][1], (Token.OPEXPR, [
(Token.MEMBER, (Token.ID, 'counter'), None, None)
]), (Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.INT, 1), None, None)
]), None))
]))
])), None, None)
]), None)]))
])), None, None),
]), None)]), None, (Token.CALL, [], None))
]), None)])),
(Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.ID, 'add'), None, (Token.CALL, [], None))
]), None)]),
(Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.ID, 'add'), None, (Token.CALL, [], None))
]), None)]),
(Token.RETURN, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.ID, 'add'), None, (Token.CALL, [], None))
]), None)]))
]))
]
self.assertEqual(list(traverse(list(jsi.statements()))), list(traverse(ast)))
def test_object(self): def test_object(self):
jsi = JSInterpreter(''' jsi = JSInterpreter('''

6
youtube_dl/jsinterp/jsinterp.py
View File

@ -494,20 +494,22 @@ class JSInterpreter(object):
# TODO support let # TODO support let
peek_id, peek_value, peek_pos = token_stream.peek() peek_id, peek_value, peek_pos = token_stream.peek()
if peek_id in _token_keys: if peek_id in _token_keys:
token_stream.pop()
if peek_id is Token.ID: if peek_id is Token.ID:
# this # this
if peek_value == 'this': if peek_value == 'this':
token_stream.pop()
return (Token.RSV, 'this') return (Token.RSV, 'this')
# function expr # function expr
elif peek_value == 'function': elif peek_value == 'function':
return self._function(token_stream, stack_top - 1, True) return self._function(token_stream, stack_top - 1, True)
# id # id
else: else:
token_stream.chk_id(last=True) token_stream.chk_id()
token_stream.pop()
return (Token.ID, peek_value) return (Token.ID, peek_value)
# literals # literals
else: else:
token_stream.pop()
return (peek_id, peek_value) return (peek_id, peek_value)
# array # array
elif peek_id is Token.SOPEN: elif peek_id is Token.SOPEN: