From 67d56532e3ae8e6758664ddbb6682a0c45b94937 Mon Sep 17 00:00:00 2001 From: sulyi Date: Wed, 30 Nov 2016 08:04:08 +0100 Subject: [PATCH] [jsinterp] Minor quick fixes - missing enumerate in op_ids and aop_ids - order of relation and operator regex in input_element --- youtube_dl/jsinterp.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/youtube_dl/jsinterp.py b/youtube_dl/jsinterp.py index 22167fdc1..3c8d3fd37 100644 --- a/youtube_dl/jsinterp.py +++ b/youtube_dl/jsinterp.py @@ -98,8 +98,8 @@ _PUNCTUATIONS = { } token_ids = dict((token[0], i) for i, token in enumerate(_TOKENS)) -op_ids = dict((op[0], i) for i, op in _OPERATORS) -aop_ids = dict((aop[0], i)for i, aop in _ASSIGN_OPERATORS) +op_ids = dict((op[0], i) for i, op in enumerate(_OPERATORS)) +aop_ids = dict((aop[0], i)for i, aop in enumerate(_ASSIGN_OPERATORS)) _COMMENT_RE = r'(?P/\*(?:(?!\*/)(?:\n|.))*\*/)' _TOKENS_RE = r'|'.join('(?P<%(id)s>%(value)s)' % {'id': name, 'value': value} @@ -112,14 +112,14 @@ _RELATIONS_RE = r'|'.join(r'(?P<%(id)s>%(value)s)' % {'id': name, 'value': re.es _OPERATORS_RE = r'(?P%s)' % r'|'.join(re.escape(op) for op, opfunc in _OPERATORS) _ASSIGN_OPERATORS_RE = r'(?P%s)' % r'|'.join(re.escape(op) for op, opfunc in _ASSIGN_OPERATORS) -input_element = re.compile(r'''\s*(?:%(comment)s|%(rsv)s|%(token)s|%(punct)s|%(rel)s|%(assign)s|%(op)s)\s*''' % { +input_element = re.compile(r'''\s*(?:%(comment)s|%(rsv)s|%(token)s|%(punct)s|%(assign)s|%(op)s|%(rel)s)\s*''' % { 'comment': _COMMENT_RE, 'rsv': _RESERVED_WORDS_RE, 'token': _TOKENS_RE, 'punct': _PUNCTUATIONS_RE, - 'rel': _RELATIONS_RE, 'assign': _ASSIGN_OPERATORS_RE, - 'op': _OPERATORS_RE + 'op': _OPERATORS_RE, + 'rel': _RELATIONS_RE }) undefined = object()