depyo 1.0.2 → 1.1.0

package/lib/handlers/unpack.js

@@ -102,28 +102,30 @@ function handleBuildSetUnpackA() {
 }
 
 function handleBuildMapUnpackA() {
-    processBuildMapUnpack.call(this);
+    // Py 3.5-3.8: count of mappings to merge for {**a, **b} dict literal.
+    processBuildMapUnpack.call(this, /*withCall=*/false);
 }
 
 function handleBuildMapUnpackWithCallA() {
-    processBuildMapUnpack.call(this);
+    // Py 3.5 only: oparg = count + (fn_loc << 8). Lower byte is the map count,
+    // upper byte locates the callable for error reporting.
+    // Py 3.6-3.8: oparg = plain count (this opcode is kept for unpack-with-call
+    // semantics but the fn_loc byte is dropped).
+    processBuildMapUnpack.call(this, /*withCall=*/true);
 }
 
-function processBuildMapUnpack() {
-    let mapNode = new AST.ASTMap();
-    for (let idx = 0; idx < this.code.Current.Argument; idx++) {
-        let pair = this.dataStack.pop(); // Should be a dictionary
-        if (pair instanceof AST.ASTMap) {
-            for (const entry of pair.values) {
-                mapNode.add(entry.key, entry.value);
-            }
-        } else {
-            if (global.g_cliArgs?.debug) {
-                console.error("Expected a map for BUILD_MAP_UNPACK");
-            }
-        }
+function processBuildMapUnpack(withCall) {
+    let count = this.code.Current.Argument;
+    if (withCall && this.object.Reader.versionCompare(3, 6) < 0) {
+        count = count & 0xFF;
+    }
+    let items = [];
+    for (let idx = 0; idx < count; idx++) {
+        items.unshift(this.dataStack.pop());
     }
-    this.dataStack.push(mapNode);
+    let node = new AST.ASTMapUnpack(items);
+    node.line = this.code.Current.LineNo;
+    this.dataStack.push(node);
 }
 
 module.exports = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "depyo",
-  "version": "1.0.2",
-  "description": "Python bytecode decompiler (Python 1.0–3.14) implemented in Node.js",
+  "version": "1.1.0",
+  "description": "Python bytecode decompiler (Python 1.0–3.15) implemented in Node.js",
   "bin": {
     "depyo": "./depyo.js"
   },