feat: rework identifiers map and handle duplicate source ids

tact-lang · Oct 14, 2024 · f1b2c45 · f1b2c45
1 parent 23168ec
commit f1b2c45
Show file tree

Hide file tree

Showing 9 changed files with 254 additions and 175 deletions.
diff --git a/src/generator/writers/writeFunction.ts b/src/generator/writers/writeFunction.ts
@@ -475,10 +475,10 @@ export function writeStatement(
             }
             const ty = getType(ctx.ctx, t.name);
             const ids = ty.fields.map((field) => {
-                const id = Array.from(f.identifiers.entries()).find(
-                    ([key, val]) => val.text !== "_" && key.text === field.name,
-                );
-                return id ? funcIdOf(id[1]) : "_";
+                const id = f.identifiers.get(field.name);
+                return id === undefined || isWildcard(id[1])
+                    ? "_"
+                    : funcIdOf(id[1]);
             });
             ctx.append(
                 `var (${ids.join(", ")}) = ${writeCastedExpression(f.expression, t, ctx)};`,