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

[jsinterp] Parentheses fix (test and parser)

Browse Source
This commit is contained in:
sulyi 2016-12-08 08:29:12 +01:00
parent 599b9db878
commit 70a5e31014
2 changed files with 62 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
test/test_jsinterp_parser.py
View File

@ -209,33 +209,71 @@ class TestJSInterpreterParser(unittest.TestCase):
] ]
self.assertEqual(list(jsi.statements()), ast) self.assertEqual(list(jsi.statements()), ast)
@unittest.skip('Expression parsed as call argument!')
def test_parens(self): def test_parens(self):
jsi = JSInterpreter('return (1) + (2) * ((( (( (((((3)))))) )) ));') jsi = JSInterpreter('return (1 + 2) * 3;')
ast = [(Token.RETURN, (Token.EXPR, [ ast = [
(Token.RETURN, (Token.EXPR, [
(Token.ASSIGN, None, (Token.ASSIGN, None,
(Token.OPEXPR, [ (Token.OPEXPR, [
(Token.EXPR, [ (Token.MEMBER, (Token.EXPR, [
(Token.ASSIGN, None, (Token.OPEXPR, [(Token.MEMBER, (Token.INT, 1), None, None)]), None) (Token.ASSIGN, None,
]), (Token.OPEXPR, [
(Token.EXPR, [ (Token.MEMBER, (Token.INT, 1), None, None),
(Token.ASSIGN, None, (Token.OPEXPR, [(Token.MEMBER, (Token.INT, 2), None, None)]), None) (Token.MEMBER, (Token.INT, 2), None, None),
]), (Token.OP, _OPERATORS['+'][1])
(Token.EXPR, [(Token.EXPR, [(Token.EXPR, [ ]), None)
(Token.EXPR, [(Token.EXPR, [ ]), None, None),
(Token.EXPR, [(Token.EXPR, [(Token.EXPR, [(Token.EXPR, [(Token.EXPR, [ (Token.MEMBER, (Token.INT, 3), None, None),
(Token.ASSIGN, None, (Token.OPEXPR, [(Token.MEMBER, (Token.INT, 3), None, None)]), None) (Token.OP, _OPERATORS['*'][1])
])])])])])
])])
])])])
]), None) ]), None)
])) ]))
] ]
self.assertEqual(list(jsi.statements()), ast) self.assertEqual(list(jsi.statements()), ast)
jsi = JSInterpreter('return (1 + 2) * 3;') jsi = JSInterpreter('return (1) + (2) * ((( (( (((((3)))))) )) ));')
ast = [] ast = [
(Token.RETURN, (Token.EXPR, [
(Token.ASSIGN, None,
(Token.OPEXPR, [
(Token.MEMBER, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.INT, 1), None, None)
]), None),]), None, None),
(Token.MEMBER, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.INT, 2), None, None)
]), None)]), None, None),
(Token.MEMBER, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.EXPR, [(Token.ASSIGN, None, (Token.OPEXPR, [
(Token.MEMBER, (Token.INT, 3), None, None)
]), None)]), None, None)
]), None)]), None, None)
]), None)]), None, None)
]), None)]), None, None)
]), None)]), None, None)
]), None)]), None, None)
]), None)]), None, None)
]), None)]), None, None)
]), None)]), None, None)
]), None)]), None, None),
(Token.OP, _OPERATORS['*'][1]),
(Token.OP, _OPERATORS['+'][1])
]), None)
]))
]
self.assertEqual(list(jsi.statements()), ast) self.assertEqual(list(jsi.statements()), ast)
@unittest.skip('Incomplete test case') @unittest.skip('Incomplete test case')

2
youtube_dl/jsinterp/jsinterp.py
View File

@ -257,7 +257,7 @@ class JSInterpreter(object):
if peek_id is not Token.PCLOSE: if peek_id is not Token.PCLOSE:
raise ExtractorError('Unbalanced parentheses at %d' % open_pos) raise ExtractorError('Unbalanced parentheses at %d' % open_pos)
token_stream.pop() token_stream.pop()
return (Token.EXPR, expr) return expr
# empty (probably) # empty (probably)
else: else:
return None return None