Upstream/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-10-31 23:59:40 +01:00
Code Issues Projects Releases Wiki Activity

Handle default in switch better

Browse Source 
Add a1fc7ca074
Thanks coletdjnz
This commit is contained in:
df 2021-11-04 12:48:06 +00:00 committed by dirkf
parent 96f87aaa3b
commit e1eae16b56
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/test_jsinterp.py
View File

@ -133,6 +133,21 @@ class TestJSInterpreter(unittest.TestCase):
self.assertEqual(jsi.call_function('x', 3), 6) self.assertEqual(jsi.call_function('x', 3), 6)
self.assertEqual(jsi.call_function('x', 5), 0) self.assertEqual(jsi.call_function('x', 5), 0)
def test_switch_default(self):
jsi = JSInterpreter('''
function x(f) { switch(f){
case 2: f+=2;
default: f-=1;
case 5:
case 6: f+=6;
case 0: break;
case 1: f+=1;
} return f }
''')
self.assertEqual(jsi.call_function('x', 1), 2)
self.assertEqual(jsi.call_function('x', 5), 11)
self.assertEqual(jsi.call_function('x', 9), 14)
def test_try(self): def test_try(self):
jsi = JSInterpreter(''' jsi = JSInterpreter('''
function x() { try{return 10} catch(e){return 5} } function x() { try{return 10} catch(e){return 5} }

17
youtube_dl/jsinterp.py
View File

@ -240,21 +240,26 @@ class JSInterpreter(object):
switch_val, remaining = self._separate_at_paren(expr[m.end() - 1:], ')') switch_val, remaining = self._separate_at_paren(expr[m.end() - 1:], ')')
switch_val = self.interpret_expression(switch_val, local_vars, allow_recursion) switch_val = self.interpret_expression(switch_val, local_vars, allow_recursion)
body, expr = self._separate_at_paren(remaining, '}') body, expr = self._separate_at_paren(remaining, '}')
body, default = body.split('default:') if 'default:' in body else (body, None) items = body.replace('default:', 'case default:').split('case ')[1:]
items = body.split('case ')[1:] for default in (False, True):
if default:
items.append('default:%s' % (default, ))
matched = False matched = False
for item in items: for item in items:
case, stmt = [i.strip() for i in self._separate(item, ':', 1)] case, stmt = [i.strip() for i in self._separate(item, ':', 1)]
matched = matched or case == 'default' or switch_val == self.interpret_expression(case, local_vars, allow_recursion) if default:
if matched: matched = matched or case == 'default'
elif not matched:
matched = (case != 'default'
and switch_val == self.interpret_expression(case, local_vars, allow_recursion))
if not matched:
continue
try: try:
ret, should_abort = self.interpret_statement(stmt, local_vars, allow_recursion - 1) ret, should_abort = self.interpret_statement(stmt, local_vars, allow_recursion - 1)
if should_abort: if should_abort:
return ret return ret
except JS_Break: except JS_Break:
break break
if matched:
break
return self.interpret_statement(expr, local_vars, allow_recursion - 1)[0] return self.interpret_statement(expr, local_vars, allow_recursion - 1)[0]
# Comma separated statements # Comma separated statements