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

[jsinterp] Re-prioritising TODOs

Browse Source
This commit is contained in:
sulyi 2016-12-11 09:42:43 +01:00
parent 4f55fe7da2
commit 57c8ccb7c5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
youtube_dl/jsinterp/jsinterp.py
View File

@ -16,7 +16,7 @@ class Context(object):
self.local_vars = {} self.local_vars = {}
if variables is not None: if variables is not None:
for k, v in dict(variables).items(): for k, v in dict(variables).items():
# TODO validate identifiers # XXX validate identifiers
self.local_vars[k] = Reference(v, (self.local_vars, k)) self.local_vars[k] = Reference(v, (self.local_vars, k))
@ -53,7 +53,7 @@ class JSInterpreter(object):
self.global_vars = {} self.global_vars = {}
if variables is not None: if variables is not None:
for k, v in dict(variables).items(): for k, v in dict(variables).items():
# TODO validate identifiers # XXX validate identifiers
self.global_vars[k] = Reference(v, (self.global_vars, k)) self.global_vars[k] = Reference(v, (self.global_vars, k))
self.context = Context(self.global_vars) self.context = Context(self.global_vars)
self._context_stack = [] self._context_stack = []
@ -179,7 +179,7 @@ class JSInterpreter(object):
token_stream.pop() token_stream.pop()
token = {'break': Token.BREAK, 'continue': Token.CONTINUE}[token_value] token = {'break': Token.BREAK, 'continue': Token.CONTINUE}[token_value]
peek_id, peek_value, peek_pos = token_stream.peek() peek_id, peek_value, peek_pos = token_stream.peek()
# FIXME no line break here # XXX no line break here
if peek_id is not Token.END: if peek_id is not Token.END:
token_stream.chk_id() token_stream.chk_id()
label = peek_value label = peek_value
@ -195,7 +195,7 @@ class JSInterpreter(object):
elif token_value == 'return': elif token_value == 'return':
token_stream.pop() token_stream.pop()
peek_id, peek_value, peek_pos = token_stream.peek() peek_id, peek_value, peek_pos = token_stream.peek()
# FIXME no line break here # XXX no line break here
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()
@ -228,7 +228,7 @@ class JSInterpreter(object):
expr_list = [] expr_list = []
has_another = True has_another = True
while has_another: while has_another:
# TODO check specs is it just the first AssignmentExpression can't be FunctionExpression? # XXX check specs is it just the first AssignmentExpression can't be FunctionExpression?
peek_id, peek_value, peek_pos = token_stream.peek() peek_id, peek_value, peek_pos = token_stream.peek()
if not (peek_id is Token.COPEN and peek_id is Token.ID and peek_value == 'function'): 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)) expr_list.append(self._assign_expression(token_stream, stack_top - 1))
@ -411,7 +411,7 @@ class JSInterpreter(object):
if stack_top < 0: if stack_top < 0:
raise ExtractorError('Recursion limit reached') raise ExtractorError('Recursion limit reached')
# TODO check no linebreak # XXX check no linebreak here
peek_id, peek_value, peek_pos = token_stream.peek() peek_id, peek_value, peek_pos = token_stream.peek()
if peek_id is not Token.SOPEN: if peek_id is not Token.SOPEN:
raise ExtractorError('Array expected at %d' % peek_pos) raise ExtractorError('Array expected at %d' % peek_pos)
@ -620,7 +620,7 @@ class JSInterpreter(object):
leftvalue = leftref.getvalue() leftvalue = leftref.getvalue()
rightvalue = self.interpret_expression(right).getvalue() rightvalue = self.interpret_expression(right).getvalue()
leftref.putvalue(op(leftvalue, rightvalue)) leftref.putvalue(op(leftvalue, rightvalue))
# TODO check specs # XXX check specs what to return
ref = leftref ref = leftref
elif name is Token.EXPR: elif name is Token.EXPR:
@ -667,7 +667,7 @@ class JSInterpreter(object):
ref = target ref = target
elif name is Token.ID: elif name is Token.ID:
# TODO error handling (unknown id) # XXX error handling (unknown id)
ref = self.context.local_vars[expr[1]] if expr[1] in self.context.local_vars else self.global_vars[expr[1]] ref = self.context.local_vars[expr[1]] if expr[1] in self.context.local_vars else self.global_vars[expr[1]]
# literal # literal
@ -725,7 +725,7 @@ class JSInterpreter(object):
self.context = cx self.context = cx
def pop_context(self): def pop_context(self):
# TODO check underflow # XXX check underflow
self.context = self._context_stack.pop() self.context = self._context_stack.pop()
def call_function(self, funcname, *args): def call_function(self, funcname, *args):