|
@ -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) |
|
|