From: dirkf <fieldhouse@gmx.net>
Date: Wed, 10 Jul 2024 17:02:11 +0000 (+0100)
Subject: [jsinterp] Further improve expression parsing (fix fd8242e)
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=76ac69917ec76ba663da843795f46916831e6da9;p=youtube-dl

[jsinterp] Further improve expression parsing (fix fd8242e)
Passes tests from yt-dlp
---

diff --git a/youtube_dl/jsinterp.py b/youtube_dl/jsinterp.py
index 799497acb..a2074a91e 100644
--- a/youtube_dl/jsinterp.py
+++ b/youtube_dl/jsinterp.py
@@ -804,16 +804,19 @@ class JSInterpreter(object):
             if op in ('+', '-'):
                 # simplify/adjust consecutive instances of these operators
                 undone = 0
-                while len(separated) > 1 and not separated[-1].strip():
+                separated = [s.strip() for s in separated]
+                while len(separated) > 1 and not separated[-1]:
                     undone += 1
                     separated.pop()
                 if op == '-' and undone % 2 != 0:
                     right_expr = op + right_expr
                 elif op == '+':
-                    while len(separated) > 1 and separated[-1].strip() in self.OP_CHARS:
+                    while len(separated) > 1 and set(separated[-1]) <= self.OP_CHARS:
+                        right_expr = separated.pop() + right_expr
+                    if separated[-1][-1:] in self.OP_CHARS:
                         right_expr = separated.pop() + right_expr
                 # hanging op at end of left => unary + (strip) or - (push right)
-                left_val = separated[-1]
+                left_val = separated[-1] if separated else ''
                 for dm_op in ('*', '%', '/', '**'):
                     bodmas = tuple(self._separate(left_val, dm_op, skip_delims=skip_delim))
                     if len(bodmas) > 1 and not bodmas[-1].strip():