@scriptc/compiler 0.2.7 → 0.2.8

package/dist/frontend/lowering/class-assertions.js

@@ -1,5 +1,6 @@
 import { nodeThrowExpr, varRef } from "../../ir/build.js";
-import { BOOL, typeEquals, typeKey, } from "../../ir/ir.js";
+import { BOOL, isUnitType, typeEquals, typeKey, } from "../../ir/ir.js";
+import { isSafeToRepeat } from "./expressions/evaluation-safety.js";
 /** Whether any stored payload can supply a checked view of this class. */
 export function canAssertClassValue(lowerer, source, target) {
     if (source.kind === "union")
@@ -46,6 +47,61 @@ export function checkedClassAssertion(lowerer, value, target, loc) {
         if (lowerer.isSubclassOf(source.type.className, target.className))
             return convert(source);
     }
+    // A plain read can be tested where it is used: the class-id range test
+    // runs inline and successful projections borrow the operand, while the
+    // mismatch arm throws the helper's exact TypeError. Other operands keep
+    // the helper so they are evaluated exactly once.
+    if (isSafeToRepeat(source)) {
+        if (!union)
+            return convert(source);
+        let checked = failure();
+        for (let tag = union.arms.length - 1; tag >= 0; tag--) {
+            const arm = union.arms[tag];
+            if (!compatible(arm))
+                continue;
+            const isTag = {
+                kind: "unionIsTag",
+                unionId: union.id,
+                tag,
+                negated: false,
+                value: source,
+                type: BOOL,
+                loc,
+            };
+            const payload = {
+                kind: "unionNarrow",
+                unionId: union.id,
+                tag,
+                value: source,
+                type: arm,
+                loc,
+            };
+            let cond = isTag;
+            let then = payload;
+            if (lowerer.isSubclassOf(arm.className, target.className) && !typeEquals(arm, target)) {
+                then = { kind: "upcast", value: payload, type: target, loc };
+            }
+            else if (!typeEquals(arm, target)) {
+                cond = {
+                    kind: "logical",
+                    op: "&&",
+                    left: isTag,
+                    right: {
+                        kind: "instanceOf",
+                        value: payload,
+                        className: target.className,
+                        type: BOOL,
+                        loc,
+                    },
+                    type: BOOL,
+                    loc,
+                };
+                then = { kind: "downcast", value: payload, type: target, loc };
+            }
+            checked = { kind: "ternary", cond, then, else_: checked, type: target, loc };
+        }
+        return checked;
+    }
     const key = `classassert:${typeKey(source.type)}:${typeKey(target)}`;
     let name = lowerer.coercions.retags.get(key);
     if (!name) {
@@ -101,4 +157,164 @@ export function checkedClassAssertion(lowerer, value, target, loc) {
     }
     return { kind: "call", callee: name, args: [source], type: target, loc };
 }
+/** `value as Sub | undefined`: an assertion into a union whose class arm is
+ * narrower than the stored one. Every other arm must already have an
+ * identical destination arm. The stored class is checked before the
+ * descendant view is exposed (as `value as Sub` does), and the present
+ * value keeps its identity. Null when no arm needs a checked downcast. */
+export function checkedClassUnionAssertion(lowerer, value, target, loc) {
+    const targetArms = lowerer.unions.get(target.unionId)?.arms;
+    if (!targetArms)
+        return null;
+    const sourceUnion = value.type.kind === "union" ? lowerer.unions.get(value.type.unionId) : null;
+    if (value.type.kind === "union" && !sourceUnion)
+        return null;
+    const sourceArms = sourceUnion ? sourceUnion.arms : [value.type];
+    const routes = [];
+    let downcasts = false;
+    for (const arm of sourceArms) {
+        const same = targetArms.findIndex((candidate) => typeEquals(candidate, arm));
+        if (same >= 0) {
+            routes.push({ kind: "same", tag: same });
+            continue;
+        }
+        if (arm.kind !== "object")
+            return null;
+        const related = (relation) => targetArms.flatMap((candidate, tag) => candidate.kind === "object" && relation(candidate.className) ? [tag] : []);
+        const depth = (tag) => {
+            const candidate = targetArms[tag];
+            return targetArms.filter((other) => candidate.kind === "object" &&
+                other.kind === "object" &&
+                lowerer.isSubclassOf(candidate.className, other.className)).length;
+        };
+        const subs = related((name) => lowerer.isSubclassOf(name, arm.className)).sort((a, b) => depth(b) - depth(a));
+        const supers = related((name) => lowerer.isSubclassOf(arm.className, name)).sort((a, b) => depth(b) - depth(a));
+        if (subs.length === 0)
+            return null;
+        downcasts = true;
+        routes.push({ kind: "down", tags: subs, fallback: supers[0] ?? null });
+    }
+    if (!downcasts)
+        return null;
+    const key = `classunionassert:${typeKey(value.type)}:${typeKey(target)}`;
+    let name = lowerer.coercions.retags.get(key);
+    if (!name) {
+        name = `%class.assert.${lowerer.coercions.retags.size}`;
+        lowerer.coercions.retags.set(key, name);
+        const input = varRef("value.0", value.type, loc);
+        const locals = [{ id: "value.0", name: "value", type: value.type, mutable: false }];
+        const wrap = (tag, payload) => ({
+            kind: "unionWrap",
+            unionId: target.unionId,
+            tag,
+            value: payload,
+            type: target,
+            loc,
+        });
+        const body = [];
+        for (let source = 0; source < sourceArms.length; source++) {
+            const arm = sourceArms[source];
+            const route = routes[source];
+            const branch = [];
+            let payload = input;
+            if (sourceUnion) {
+                if (isUnitType(arm)) {
+                    payload = {
+                        kind: "unitLit",
+                        unit: arm.kind === "undefinedT" ? "undefined" : "null",
+                        type: arm,
+                        loc,
+                    };
+                }
+                else {
+                    const localId = `arm.${source}`;
+                    locals.push({ id: localId, name: "arm", type: arm, mutable: false });
+                    branch.push({
+                        kind: "varDecl",
+                        localId,
+                        init: {
+                            kind: "unionNarrow",
+                            unionId: sourceUnion.id,
+                            tag: source,
+                            value: input,
+                            type: arm,
+                            loc,
+                        },
+                        loc,
+                    });
+                    payload = varRef(localId, arm, loc);
+                }
+            }
+            if (route.kind === "same") {
+                branch.push({ kind: "return", value: wrap(route.tag, payload), loc });
+            }
+            else {
+                for (const tag of route.tags) {
+                    const sub = targetArms[tag];
+                    branch.push({
+                        kind: "if",
+                        cond: { kind: "instanceOf", value: payload, className: sub.className, type: BOOL, loc },
+                        then: [
+                            {
+                                kind: "return",
+                                value: wrap(tag, { kind: "downcast", value: payload, type: sub, loc }),
+                                loc,
+                            },
+                        ],
+                        else_: null,
+                        loc,
+                    });
+                }
+                const fallback = route.fallback;
+                branch.push({
+                    kind: "return",
+                    value: fallback === null
+                        ? nodeThrowExpr(1, "", `Value is not an instance of '${lowerer.fmt(target)}'`, target, loc)
+                        : wrap(fallback, {
+                            kind: "upcast",
+                            value: payload,
+                            type: targetArms[fallback],
+                            loc,
+                        }),
+                    loc,
+                });
+            }
+            if (!sourceUnion) {
+                body.push(...branch);
+                continue;
+            }
+            body.push({
+                kind: "if",
+                cond: {
+                    kind: "unionIsTag",
+                    unionId: sourceUnion.id,
+                    tag: source,
+                    negated: false,
+                    value: input,
+                    type: BOOL,
+                    loc,
+                },
+                then: branch,
+                else_: null,
+                loc,
+            });
+        }
+        if (sourceUnion) {
+            body.push({
+                kind: "return",
+                value: nodeThrowExpr(1, "", `Value is not an instance of '${lowerer.fmt(target)}'`, target, loc),
+                loc,
+            });
+        }
+        lowerer.liftedFns.push({
+            name,
+            params: [{ localId: "value.0", name: "value", type: value.type }],
+            locals,
+            returnType: target,
+            body,
+            loc,
+        });
+    }
+    return { kind: "call", callee: name, args: [value], type: target, loc };
+}
 //# sourceMappingURL=class-assertions.js.map

package/dist/frontend/lowering/class-assertions.js.map

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

package/dist/frontend/lowering/class-dynamic-dispatch.js

@@ -266,7 +266,10 @@ export function trackClassFieldCreation(lowerer, functions) {
         (isClassOwnEnumerableFieldName(field) ||
             symbolMemberKey(lowerer, lowerer.classes.get(className), field, loc) !== null);
     for (const fn of functions) {
-        const instrumented = new WeakSet();
+        // The transform revisits the replacement it returns. An instrumented
+        // write is recognized by its receiver, a temporary created here.
+        const receivers = new Set();
+        const instrumented = (obj) => obj.kind === "varRef" && receivers.has(obj.localId);
         const local = (type, loc) => {
             const id = `%fieldCreated.${fn.locals.length}`;
             fn.locals.push({ id, name: id, type, mutable: false });
@@ -275,12 +278,12 @@ export function trackClassFieldCreation(lowerer, functions) {
         fn.body = transformStmtList(fn.body, {
             stmt: (statement) => {
                 if (statement.kind !== "fieldSet" ||
-                    instrumented.has(statement) ||
+                    instrumented(statement.obj) ||
                     !tracked(statement.className, statement.field))
                     return statement;
                 const receiver = local(statement.obj.type, statement.loc);
+                receivers.add(receiver.localId);
                 const store = { ...statement, obj: receiver };
-                instrumented.add(store);
                 return {
                     kind: "block",
                     body: [
@@ -293,12 +296,12 @@ export function trackClassFieldCreation(lowerer, functions) {
             },
             expr: (expression) => {
                 if (expression.kind !== "fieldIncDec" ||
-                    instrumented.has(expression) ||
+                    instrumented(expression.obj) ||
                     !tracked(expression.className, expression.field))
                     return expression;
                 const receiver = local(expression.obj.type, expression.loc), result = local(expression.type, expression.loc);
+                receivers.add(receiver.localId);
                 const update = { ...expression, obj: receiver };
-                instrumented.add(update);
                 return {
                     kind: "seqExpr",
                     stmts: [