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

[jsinterp] Adding for parser

Browse Source 
- refractors JSInterpreter._expression
This commit is contained in:
sulyi 2016-12-12 13:16:08 +01:00
parent 253e32671d
commit 3ba28c6eef
2 changed files with 70 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/test_jsinterp_parser.py
View File

@ -755,6 +755,14 @@ 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 code and ast')
def test_for(self):
# TODO for statement test
# might be split up
jsi = JSInterpreter('')
ast = []
self.assertEqual(list(jsi.statements()), ast)
@unittest.skip('Test not yet implemented: missing code and ast') @unittest.skip('Test not yet implemented: missing code and ast')
def test_do(self): def test_do(self):
# TODO do statement test # TODO do statement test
@ -780,7 +788,6 @@ class TestJSInterpreterParser(unittest.TestCase):
@unittest.skip('Test not yet implemented: missing code and ast') @unittest.skip('Test not yet implemented: missing code and ast')
def test_funct_expr(self): def test_funct_expr(self):
# TODO function expression test # TODO function expression test
# might be combined with another
jsi = JSInterpreter('') jsi = JSInterpreter('')
ast = [] ast = []
self.assertEqual(list(jsi.statements()), ast) self.assertEqual(list(jsi.statements()), ast)

85
youtube_dl/jsinterp/jsinterp.py
View File

@ -140,11 +140,49 @@ class JSInterpreter(object):
statement = (Token.IF, cond_expr, true_expr, false_expr) statement = (Token.IF, cond_expr, true_expr, false_expr)
elif token_value is 'for': elif token_value is 'for':
# ASAP parse for loop statement token_stream.pop()
token_id, token_value, token_pos = token_stream.pop()
if token_id is not Token.POPEN:
raise ExtractorError('''Expected '(' at %d''' % token_pos)
# FIXME set infor True (checked by variable declaration and relation expression)
raise ExtractorError('For loop is not yet supported at %d' % token_pos) token_id, token_value, token_pos = token_stream.peek()
if token_id is Token.END:
init = None
elif token_id.ID and token_value == 'var':
# XXX refactor (create dedicated method for handling variable declaration list)
init = self._next_statement(token_stream, stack_top - 1)
else:
init = self._expression(token_stream, stack_top - 1)
token_id, token_value, token_pos = token_stream.pop()
if token_id is Token.IN:
cond = self._expression(token_stream, stack_top - 1)
# FIXME further processing might be needed for interpretation
incr = None
# NOTE ES6 has of operator
elif token_id is Token.END:
token_id, token_value, token_pos = token_stream.peek()
cond = None if token_id is Token.END else self._expression(token_stream, stack_top - 1)
token_id, token_value, token_pos = token_stream.pop()
if token_id is not Token.PCLOSE:
raise ExtractorError('''Expected ')' at %d''' % token_pos)
token_id, token_value, token_pos = token_stream.peek()
incr = None if token_id is Token.END else self._expression(token_stream, stack_top - 1)
else:
raise ExtractorError('Invalid condition in for loop initialization at %d' % token_pos)
token_id, token_value, token_pos = token_stream.pop()
if token_id is not Token.PCLOSE:
raise ExtractorError('''Expected ')' at %d''' % token_pos)
body = self._next_statement(token_stream, stack_top - 1)
statement = (Token.FOR, init, cond, incr, body)
elif token_value is 'do': elif token_value is 'do':
token_stream.pop() token_stream.pop()
@ -167,11 +205,11 @@ class JSInterpreter(object):
statement = (Token.DO, expr, body) statement = (Token.DO, expr, body)
peek_id, peek_value, peek_pos = token_stream.peek() peek_id, peek_value, peek_pos = token_stream.peek()
if peek_id is not Token.END: if peek_id is Token.END:
token_stream.pop()
else:
# FIXME automatic end insertion # FIXME automatic end insertion
raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos)) raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos))
else:
token_stream.pop()
elif token_value is 'while': elif token_value is 'while':
token_stream.pop() token_stream.pop()
@ -201,11 +239,11 @@ class JSInterpreter(object):
token_stream.pop() token_stream.pop()
statement = (token, label_name) statement = (token, label_name)
peek_id, peek_value, peek_pos = token_stream.peek() peek_id, peek_value, peek_pos = token_stream.peek()
if peek_id is not Token.END: if peek_id is Token.END:
token_stream.pop()
else:
# FIXME automatic end insertion # FIXME automatic end insertion
raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos)) raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos))
else:
token_stream.pop()
elif token_value == 'return': elif token_value == 'return':
token_stream.pop() token_stream.pop()
@ -214,11 +252,11 @@ class JSInterpreter(object):
expr = self._expression(token_stream, stack_top - 1) if peek_id is not Token.END else None expr = self._expression(token_stream, stack_top - 1) if peek_id is not Token.END else None
statement = (Token.RETURN, expr) statement = (Token.RETURN, expr)
peek_id, peek_value, peek_pos = token_stream.peek() peek_id, peek_value, peek_pos = token_stream.peek()
if peek_id is not Token.END: if peek_id is Token.END:
token_stream.pop()
else:
# FIXME automatic end insertion # FIXME automatic end insertion
raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos)) raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos))
else:
token_stream.pop()
elif token_value == 'with': elif token_value == 'with':
token_stream.pop() token_stream.pop()
@ -288,11 +326,11 @@ class JSInterpreter(object):
expr = self._expression(token_stream, stack_top - 1) expr = self._expression(token_stream, stack_top - 1)
statement = (Token.RETURN, expr) statement = (Token.RETURN, expr)
peek_id, peek_value, peek_pos = token_stream.peek() peek_id, peek_value, peek_pos = token_stream.peek()
if peek_id is not Token.END: if peek_id is Token.END:
token_stream.pop()
else:
# FIXME automatic end insertion # FIXME automatic end insertion
raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos)) raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos))
else:
token_stream.pop()
elif token_value == 'try': elif token_value == 'try':
token_stream.pop() token_stream.pop()
@ -333,11 +371,11 @@ class JSInterpreter(object):
token_stream.pop() token_stream.pop()
statement = (Token.DEBUG) statement = (Token.DEBUG)
peek_id, peek_value, peek_pos = token_stream.peek() peek_id, peek_value, peek_pos = token_stream.peek()
if peek_id is not Token.END: if peek_id is Token.END:
token_stream.pop()
else:
# FIXME automatic end insertion # FIXME automatic end insertion
raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos)) raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos))
else:
token_stream.pop()
else: else:
# XXX possible refactoring (this is the only branch not poping) # XXX possible refactoring (this is the only branch not poping)
token_id, token_value, token_pos = token_stream.peek(2) token_id, token_value, token_pos = token_stream.peek(2)
@ -348,25 +386,14 @@ class JSInterpreter(object):
# expr # expr
if statement is None: if statement is None:
expr_list = [] statement = self._expression(token_stream, stack_top - 1)
has_another = True
while has_another:
peek_id, peek_value, peek_pos = token_stream.peek() peek_id, peek_value, peek_pos = token_stream.peek()
# XXX this check can be abandoned, it's only here to mirror the grammar
if not (peek_id is Token.COPEN and peek_id is Token.ID and peek_value == 'function'):
expr_list.append(self._assign_expression(token_stream, stack_top - 1))
peek_id, peek_value, peek_pos = token_stream.peek()
if peek_id is Token.END: if peek_id is Token.END:
token_stream.pop() token_stream.pop()
has_another = False
elif peek_id is Token.COMMA:
pass
else: else:
# FIXME automatic end insertion # FIXME automatic end insertion
raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos)) raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos))
statement = (Token.EXPR, expr_list)
return statement return statement
def statements(self, code=None, pos=0, stack_size=100): def statements(self, code=None, pos=0, stack_size=100):