Browse Source

[jsinterp] Fix function calls without arguments.

totalwebcasting
Kacper Michajłow 8 years ago
parent
commit
189935f159
2 changed files with 9 additions and 2 deletions
  1. +7
    -0
      test/test_jsinterp.py
  2. +2
    -2
      youtube_dl/jsinterp.py

+ 7
- 0
test/test_jsinterp.py View File

@ -104,6 +104,13 @@ class TestJSInterpreter(unittest.TestCase):
}''') }''')
self.assertEqual(jsi.call_function('x'), [20, 20, 30, 40, 50]) self.assertEqual(jsi.call_function('x'), [20, 20, 30, 40, 50])
def test_call(self):
jsi = JSInterpreter('''
function x() { return 2; }
function y(a) { return x() + a; }
function z() { return y(3); }
''')
self.assertEqual(jsi.call_function('z'), 5)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

+ 2
- 2
youtube_dl/jsinterp.py View File

@ -198,12 +198,12 @@ class JSInterpreter(object):
return opfunc(x, y) return opfunc(x, y)
m = re.match( m = re.match(
r'^(?P<func>%s)\((?P<args>[a-zA-Z0-9_$,]+)\)$' % _NAME_RE, expr)
r'^(?P<func>%s)\((?P<args>[a-zA-Z0-9_$,]*)\)$' % _NAME_RE, expr)
if m: if m:
fname = m.group('func') fname = m.group('func')
argvals = tuple([ argvals = tuple([
int(v) if v.isdigit() else local_vars[v] int(v) if v.isdigit() else local_vars[v]
for v in m.group('args').split(',')])
for v in m.group('args').split(',')]) if len(m.group('args')) > 0 else tuple()
if fname not in self._functions: if fname not in self._functions:
self._functions[fname] = self.extract_function(fname) self._functions[fname] = self.extract_function(fname)
return self._functions[fname](argvals) return self._functions[fname](argvals)


Loading…
Cancel
Save