@scriptc/compiler 0.2.6 → 0.2.7

package/dist/frontend/lowering/expressions/union-field-write.js

@@ -1,9 +1,9 @@
 import { nodeThrowExpr, varRef } from "../../../ir/build.js";
 import * as ts from "../../ts7/adapter.js";
-import { BOOL, VOID, typeEquals } from "../../../ir/ir.js";
+import { BOOL, typeEquals } from "../../../ir/ir.js";
 import { locOf } from "../../program.js";
-/** Assign a common data field without projecting the union's records into
- * a new structural shape. Each tag writes the original record payload, so
+/** Assign a common data field without projecting the union's objects into
+ * a new structural shape. Each tag writes the original payload, so
  * aliases and identity-keyed collections observe the mutation. Accessors,
  * missing fields, and differently typed storage retain their own fences. */
 export function lowerUnionFieldWrite(lowerer, access, rhs) {
@@ -24,13 +24,15 @@ export function lowerUnionFieldWrite(lowerer, access, rhs) {
             fields.push(null);
             continue;
         }
-        if (arm.kind !== "record")
+        if (arm.kind !== "record" && arm.kind !== "object")
             return null;
-        const field = lowerer.shapes.get(arm.shapeId)?.fields.find((f) => f.name === access.name.text);
-        if (!field || (fieldType !== null && !typeEquals(fieldType, field.type)))
+        const type = arm.kind === "record"
+            ? lowerer.shapes.get(arm.shapeId)?.fields.find((f) => f.name === access.name.text)?.type
+            : lowerer.classes.get(arm.className)?.fields.get(access.name.text);
+        if (!type || (fieldType !== null && !typeEquals(fieldType, type)))
             return null;
-        fieldType = field.type;
-        fields.push({ shapeId: arm.shapeId, type: field.type });
+        fieldType = type;
+        fields.push({ receiver: arm, type });
     }
     if (fieldType === null)
         return null;
@@ -45,54 +47,62 @@ export function lowerUnionFieldWrite(lowerer, access, rhs) {
         { kind: "varDecl", localId: object.id, init: receiver, loc },
         { kind: "varDecl", localId: stored.id, init: value, loc },
     ];
-    let dispatch = [];
+    const result = varRef(stored.id, stored.type, loc);
+    let dispatch = result;
     for (let tag = fields.length - 1; tag >= 0; tag--) {
         const field = fields[tag];
-        const obj = field
-            ? {
+        let branch;
+        if (field) {
+            const obj = {
                 kind: "unionNarrow",
                 unionId,
                 tag,
                 value: objectRef,
-                type: { kind: "record", shapeId: field.shapeId },
-                loc,
-            }
-            : null;
-        const write = field && obj
-            ? {
-                kind: "recordSet",
-                obj,
-                shapeId: field.shapeId,
-                field: access.name.text,
-                value: varRef(stored.id, stored.type, loc),
-                loc,
-            }
-            : {
-                kind: "exprStmt",
-                expr: nodeThrowExpr(1, "", `Cannot set properties of ${arms[tag].kind === "nullT" ? "null" : "undefined"} (setting '${access.name.text}')`, VOID, loc),
+                type: field.receiver,
                 loc,
             };
+            const write = field.receiver.kind === "record"
+                ? {
+                    kind: "recordSet",
+                    obj,
+                    shapeId: field.receiver.shapeId,
+                    field: access.name.text,
+                    value: result,
+                    loc,
+                }
+                : {
+                    kind: "fieldSet",
+                    obj,
+                    className: field.receiver.className,
+                    field: access.name.text,
+                    value: result,
+                    loc,
+                };
+            branch = { kind: "seqExpr", stmts: [write], result, type: result.type, loc };
+        }
+        else {
+            branch = nodeThrowExpr(1, "", `Cannot set properties of ${arms[tag].kind === "nullT" ? "null" : "undefined"} (setting '${access.name.text}')`, result.type, loc);
+        }
         dispatch =
             tag === fields.length - 1
-                ? [write]
-                : [
-                    {
-                        kind: "if",
-                        cond: {
-                            kind: "unionIsTag",
-                            unionId,
-                            tag,
-                            value: objectRef,
-                            negated: false,
-                            type: BOOL,
-                            loc,
-                        },
-                        then: [write],
-                        else_: dispatch,
+                ? branch
+                : {
+                    kind: "ternary",
+                    cond: {
+                        kind: "unionIsTag",
+                        unionId,
+                        tag,
+                        value: objectRef,
+                        negated: false,
+                        type: BOOL,
                         loc,
                     },
-                ];
+                    then: branch,
+                    else_: dispatch,
+                    type: result.type,
+                    loc,
+                };
     }
-    return { kind: "block", body: [...body, ...dispatch], loc };
+    return { kind: "seqExpr", stmts: body, result: dispatch, type: result.type, loc };
 }
 //# sourceMappingURL=union-field-write.js.map

package/dist/frontend/lowering/expressions/union-field-write.js.map

@@ -1 +1 @@
-{"version":3,"file":"union-field-write.js","sourceRoot":"","sources":["../../../../src/frontend/lowering/expressions/union-field-write.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"union-field-write.js","sourceRoot":"","sources":["../../../../src/frontend/lowering/expressions/union-field-write.ts"],"names":[],"mappings":"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"}

package/dist/frontend/lowering/iterator-adapters.d.ts

@@ -0,0 +1,20 @@
+import { type IrExpr, type IrType, type SrcLoc } from "../../ir/ir.js";
+import type { Lowerer } from "./lowerer.js";
+/** The conversion into an iterator-typed slot (a generator type): a
+ * checked-dynamic iterator or a generator with other channel types steps
+ * through an interned adapter generator. Null when neither applies. */
+export declare function iteratorSlotAdapter(lowerer: Lowerer, expr: IrExpr, expected: IrType & {
+    kind: "generator";
+}): IrExpr | null;
+/** Drain a synchronous generator into a fresh `elem[]` — the eager
+ * consumers of an iterator (`[...it]`, `Array.from(it)`). Each step resumes
+ * the generator once and appends its value; completion stops the drain
+ * without appending the return value, as in JS. Null when the yielded
+ * values cannot be extracted into the element type. */
+export declare function generatorDrain(lowerer: Lowerer, source: IrExpr, elem: IrType, loc: SrcLoc): IrExpr | null;
+/** `list.values()`, `list.keys()` and `list.entries()` as values: a
+ * generator over the live array. Each step compares the index with the
+ * current length and reads the current element, so elements appended
+ * during iteration are visited and completion is final, as with the
+ * native array iterator. `type` is the call's generator type. */
+export declare function lowerArrayIteratorValue(lowerer: Lowerer, receiver: IrExpr, method: "values" | "keys" | "entries", type: IrType, loc: SrcLoc): IrExpr | null;