Skip to content

emitter: a tail-position try returns in place #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shreeve merged 1 commit into from
Sep 16, 2026
Merged

emitter: a tail-position try returns in place #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
201 changes: 94 additions & 107 deletions dist/@rip/rip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14016,6 +14016,10 @@ ${pad ?? ""}`);
const ind = this.ind;
this.rejectYieldInIIFE(node);
this.b.emit(Emitter.containsAwait(node) ? "await (async () => { " : "(() => { ");
this.tryBranches(node, ind);
this.b.emit(" })()");
}
tryBranches(node, ind) {
this.mark(node, "$self", () => {
this.b.emit("try ");
const vbody = isBlock(node[1]) ? node[1] : ["block", node[1]];
Expand Down Expand Up @@ -14065,7 +14069,6 @@ ${pad ?? ""}`);
}
}
});
this.b.emit(" })()");
}
valueSwitch(node) {
const [, subject, cases, dflt] = node;
Expand Down Expand Up @@ -20723,9 +20726,7 @@ ${" ".repeat(ind)}`);
return;
}
if (h === "try") {
this.b.emit("return ");
this.withTailReturn(() => this.valueTry(stmt));
this.b.emit(";");
this.withTailReturn(() => this.tryBranches(stmt, ind));
return;
}
if (h === "switch" && stmt.length === 4) {
Expand Down Expand Up @@ -26505,43 +26506,41 @@ makeSourceCell = function(fetchFn, staleTime, onSettle = null) {
if (!background)
loading.value = true;
let wasLoaded = loaded;
return await (async () => {
try {
pending = fetchFn(controller?.signal);
if (!(pending != null && typeof pending.then === "function")) {
throw new TypeError("Rip App: source fetch must return a Promise");
}
result = await pending;
if (mine !== generation)
return result;
failure.value = null;
data.value = result;
loaded = true;
loadedAt = Date.now();
freshUntil = preload && !preloadConsumed ? loadedAt + PRELOAD_FRESH_MS : 0;
try {
pending = fetchFn(controller?.signal);
if (!(pending != null && typeof pending.then === "function")) {
throw new TypeError("Rip App: source fetch must return a Promise");
}
result = await pending;
if (mine !== generation)
return result;
} catch (error) {
if (mine !== generation)
return;
if (error?.name === "AbortError")
return;
failure.value = error;
if (!wasLoaded) {
loaded = false;
loadedAt = 0;
throw error;
}
failure.value = null;
data.value = result;
loaded = true;
loadedAt = Date.now();
freshUntil = preload && !preloadConsumed ? loadedAt + PRELOAD_FRESH_MS : 0;
return result;
} catch (error) {
if (mine !== generation)
return;
} finally {
if (mine === generation) {
loading.value = false;
inflight = null;
inflightPreload = false;
preloadConsumed = false;
onSettle?.();
}
if (error?.name === "AbortError")
return;
failure.value = error;
if (!wasLoaded) {
loaded = false;
loadedAt = 0;
throw error;
}
})();
return;
} finally {
if (mine === generation) {
loading.value = false;
inflight = null;
inflightPreload = false;
preloadConsumed = false;
onSettle?.();
}
}
};
let start = function(background = false, preload = false) {
let pending = load(background, preload);
Expand Down Expand Up @@ -27370,16 +27369,14 @@ function createMutation(fn, opts = {}) {
}
if (!(me === generation))
return;
return await (async () => {
try {
_succeeded.value = true;
await opts.onSuccess?.(r);
return r;
} finally {
if (me === generation)
_pending.value = false;
}
})();
try {
_succeeded.value = true;
await opts.onSuccess?.(r);
return r;
} finally {
if (me === generation)
_pending.value = false;
}
};
Object.defineProperty(mutation, "pending", { get() {
return _pending.value;
Expand Down Expand Up @@ -27661,13 +27658,11 @@ fail = function(message) {
throw new Error(`Rip App: ${message}`);
};
var decodeSegment = function(segment) {
return (() => {
try {
return decodeURIComponent(segment);
} catch (error) {
return null;
}
})();
try {
return decodeURIComponent(segment);
} catch (error) {
return null;
}
};
validRoot = function(root) {
if (root === "")
Expand Down Expand Up @@ -29254,30 +29249,28 @@ function createRenderer(opts) {
let mine = ++generation;
if (Array.isArray(router) || typeof router === "string" ? router.includes("navigating") : ("navigating" in router))
router.navigating = true;
return await (async () => {
try {
return await performMount(info, mine, componentRegistry);
} catch (caught) {
error = caught;
if (mine !== generation)
return null;
failure = (() => {
if (error?.name === "GateFailure") {
return error;
} else {
file = info?.route?.file ?? "<route>";
return failureFor(error?.path ?? file, file, error);
}
})();
onError?.(failure);
if (!(current != null))
showFatalCard(failure);
throw failure;
} finally {
if (mine === generation && (Array.isArray(router) || typeof router === "string" ? router.includes("navigating") : ("navigating" in router)))
router.navigating = false;
}
})();
try {
return await performMount(info, mine, componentRegistry);
} catch (caught) {
error = caught;
if (mine !== generation)
return null;
failure = (() => {
if (error?.name === "GateFailure") {
return error;
} else {
file = info?.route?.file ?? "<route>";
return failureFor(error?.path ?? file, file, error);
}
})();
onError?.(failure);
if (!(current != null))
showFatalCard(failure);
throw failure;
} finally {
if (mine === generation && (Array.isArray(router) || typeof router === "string" ? router.includes("navigating") : ("navigating" in router)))
router.navigating = false;
}
};
let renderer = null;
renderer = {
Expand Down Expand Up @@ -30201,26 +30194,24 @@ function connectFeed(client, opts = {}) {
let verdict;
if (failed || closed)
return false;
return await (async () => {
try {
verdict = await client.apply(change);
if (verdict === "rejected") {
if (validHash2(change?.hash))
rejectedHash = change?.hash;
return false;
}
if (verdict === "reload" || !verdict) {
reload("change could not be applied");
return false;
}
rejectedHash = null;
return true;
} catch (error) {
report("[Rip] publication change failed:", error);
reload("change failed");
try {
verdict = await client.apply(change);
if (verdict === "rejected") {
if (validHash2(change?.hash))
rejectedHash = change?.hash;
return false;
}
})();
if (verdict === "reload" || !verdict) {
reload("change could not be applied");
return false;
}
rejectedHash = null;
return true;
} catch (error) {
report("[Rip] publication change failed:", error);
reload("change failed");
return false;
}
};
let enqueue = function(change, owner) {
tail = tail.then(async function() {
Expand Down Expand Up @@ -30304,11 +30295,9 @@ function connectFeed(client, opts = {}) {
return;
report("[Rip] publication reconnect check failed:", error);
ready = false;
return (() => {
try {
return socket?.close();
} catch {}
})();
try {
return socket?.close();
} catch {}
});
tail = task.then(function() {
return true;
Expand Down Expand Up @@ -30414,11 +30403,9 @@ function connectFeed(client, opts = {}) {
if (closed || failed || owner !== connection || ready)
return;
report("[Rip] publication subscription acknowledgement timed out");
return (() => {
try {
return socket.close();
} catch {}
})();
try {
return socket.close();
} catch {}
}, ackTimeout);
return;
};
Expand Down
8 changes: 4 additions & 4 deletions dist/@rip/rip.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified dist/@rip/rip.min.js.br
View file
Open in desktop
Binary file not shown.
13 changes: 9 additions & 4 deletions src/emitter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7343,6 +7343,14 @@ class Emitter {
const ind = this.ind;
this.rejectYieldInIIFE(node);
this.b.emit(Emitter.containsAwait(node) ? 'await (async () => { ' : '(() => { ');
this.tryBranches(node, ind);
this.b.emit(' })()');
}

// The try with every branch returning its value: the body of the
// value form's IIFE, and the whole of a tail-position try, which
// returns from the enclosing function in place.
tryBranches(node, ind) {
this.mark(node, '$self', () => {
this.b.emit('try ');
// An inline body (`x = try f()`) is its own one-statement
Expand Down Expand Up @@ -7392,7 +7400,6 @@ class Emitter {
}
}
});
this.b.emit(' })()');
}

valueSwitch(node) {
Expand Down Expand Up @@ -16202,9 +16209,7 @@ class Emitter {
return;
}
if (h === 'try') {
this.b.emit('return ');
this.withTailReturn(() => this.valueTry(stmt));
this.b.emit(';');
this.withTailReturn(() => this.tryBranches(stmt, ind));
return;
}
if (h === 'switch' && stmt.length === 4) {
Expand Down
4 changes: 2 additions & 2 deletions test/corpus/expected/lowerings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ let tailMulti = function(v) {
}
};
let tailTry = function() {
return (() => { try {
try {
return risky();
} catch (e) {
return 42;
} })();
}
};
let tailSwitch = function(v) {
return (() => { switch (v) {
Expand Down
2 changes: 1 addition & 1 deletion test/corpus/expected/lowerings.map.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":3,"file":"lowerings.rip.js","sources":["lowerings.rip"],"sourcesContent":["# composition matrix rows for value-usage lowerings: statement\n# constructs in expression and tail positions — if→ternary (simple) and\n# IIFE (multi-statement), try/switch→IIFE with returns, loops→\n# accumulator IIFEs, postfix-if-ELSE ternaries with the assignment\n# hoist, statement-position comprehensions — instantiated so every row\n# evals.\nflag = true\nn = 7\n\nt1 = if flag then 1 else 2\nt2 = if flag then 1\nt3 = unless flag then 1 else 2\nt4 = if n > 5 then \"big\" else if n > 2 then \"mid\" else \"small\"\nt5 = (if flag then 1 else 2) + 3\nt6 = [if flag then 10 else 20, 30]\n\nseen = \"\"\nm1 = if flag\n seen += \"a\"\n n + 1\nelse\n 0\n\np1 = 5 if flag else 6\np2 = (n + 1) if n > 100 else (n - 1)\ndouble = (x) -> x * 2\np3 = double n if flag else 0\n\nrisky = -> throw \"bad\"\ntv = try\n risky()\ncatch e\n \"caught\"\n\nsw = switch n\n when 7 then \"seven\"\n else \"other\"\n\ni = 0\nacc = while i < 3\n i += 1\n i * 10\n\nevens = for v in [1, 2, 3, 4]\n v * 2\n\nlp = loop\n break\n\nsum = 0\ntally = (v) -> sum += v\ntally v for v in [1, 2, 3]\n\ntailIf = (v) ->\n if v > 0\n \"pos\"\n else\n \"neg\"\n\ntailMulti = (v) ->\n if v > 0\n w = v * 2\n w + 1\n else\n 0\n\ntailTry = ->\n try\n risky()\n catch e\n 42\n\ntailSwitch = (v) ->\n switch v\n when 7 then \"lucky\"\n else \"plain\"\n\ntailFor = (xs) ->\n for x in xs\n x + 100\n\nresults = [t1, t2, t3, t4, t5, m1, p1, p2, p3, tv, sw, acc, evens, sum, tailIf(n), tailMulti(2), tailTry(), tailSwitch(7), tailFor([1])]\n"],"names":["p1","p2","p3","flag","true","n","t1","t2","t3","t4","t5","t6","seen","m1","double","x","risky","tv","e","sw","i","acc","evens","v","lp","sum","tally","tailIf","tailMulti","w","tailTry","tailSwitch","tailFor","xs","results"],"mappings":"AAMA,IAiBAA,IACAC,IAEAC;;IApBAC,OAAOC;IACPC,IAAI;IAEJC,KAAQH,OAAU;IAClBI,KAAQJ,OAAU;IAClBK,KAAY,CAAAL,OAAU,IAAO;IAC7BM,KAAK,CAAGJ,EAAE,EAAE,KAAO,UAAcA,EAAE,EAAE,KAAO;IAC5CK,KAAK,CAAIP,OAAU,SAAY;IAC/BQ,KAAK,EAAIR,OAAU;IAEnBS,OAAO;IACPC,cAAK,IAAGV;EACNS,KAAK,GAAG;UACRP,IAAI;;;;AAIN,MAAUF,WAAU;AACpB,MAAgBE,EAAE,EAAE,OAAdA,IAAI,MAAoBA,IAAI;IAClCS,SAAS,SAACC,GAAM;UAAAA,EAAE,EAAE;;AACpB,MAAiBZ,OAAZW,YAAsB;IAE3BE,QAAQ,WAAG;EAAA,MAAM;;IACjBC,cAAK;SACHD,KAAK;SACDE;;;IAGNC,cAAK,QAAOd;;;;;;IAIZe,IAAI;IACJC;;EAAM,OAAMD,EAAE,EAAE;IACdA,EAAE,GAAG;iBACLA,EAAE,EAAE;;;;IAENE;;EAAQ,SAAIC,KAAK,CAAC;iBAChBA,EAAE,EAAE;;;;IAENC;;EAAK;;;;;IAGLC,MAAM;IACNC,QAAQ,SAACH,GAAM;UAAAE,IAAI,GAAGF;;AACtB,cAAiB,CAAC;EAAlBG;;IAEAC,SAAS,SAACJ,GACR;UAAA,CAAGA,EAAE,EAAE,KACL;;IAIJK,YAAY,SAACL,GACX;MACEM;EADF,KAAGN,EAAE,EAAE;IACLM,IAAIN,EAAE,EAAE;YACRM,IAAI;;;;;IAIRC,UAAU,WACR;kBAAA;WACEd,KAAK;WACDE;;;;IAGRa,aAAa,SAACR,GACZ;kBAAA,QAAOA;;;;;;;IAITS,UAAU,SAACC,IACT;;EAAA,SAAIlB,KAAKkB;kBACPlB,IAAI;;;;IAERmB,UAAU,CAAC,6DAA6DP,MAAM,KAAKC,SAAS,KAAKE,OAAO,IAAIC,UAAU,KAAKC,OAAO,CAAC,CAAC"}
{"version":3,"file":"lowerings.rip.js","sources":["lowerings.rip"],"sourcesContent":["# composition matrix rows for value-usage lowerings: statement\n# constructs in expression and tail positions — if→ternary (simple) and\n# IIFE (multi-statement), try/switch→IIFE with returns, loops→\n# accumulator IIFEs, postfix-if-ELSE ternaries with the assignment\n# hoist, statement-position comprehensions — instantiated so every row\n# evals.\nflag = true\nn = 7\n\nt1 = if flag then 1 else 2\nt2 = if flag then 1\nt3 = unless flag then 1 else 2\nt4 = if n > 5 then \"big\" else if n > 2 then \"mid\" else \"small\"\nt5 = (if flag then 1 else 2) + 3\nt6 = [if flag then 10 else 20, 30]\n\nseen = \"\"\nm1 = if flag\n seen += \"a\"\n n + 1\nelse\n 0\n\np1 = 5 if flag else 6\np2 = (n + 1) if n > 100 else (n - 1)\ndouble = (x) -> x * 2\np3 = double n if flag else 0\n\nrisky = -> throw \"bad\"\ntv = try\n risky()\ncatch e\n \"caught\"\n\nsw = switch n\n when 7 then \"seven\"\n else \"other\"\n\ni = 0\nacc = while i < 3\n i += 1\n i * 10\n\nevens = for v in [1, 2, 3, 4]\n v * 2\n\nlp = loop\n break\n\nsum = 0\ntally = (v) -> sum += v\ntally v for v in [1, 2, 3]\n\ntailIf = (v) ->\n if v > 0\n \"pos\"\n else\n \"neg\"\n\ntailMulti = (v) ->\n if v > 0\n w = v * 2\n w + 1\n else\n 0\n\ntailTry = ->\n try\n risky()\n catch e\n 42\n\ntailSwitch = (v) ->\n switch v\n when 7 then \"lucky\"\n else \"plain\"\n\ntailFor = (xs) ->\n for x in xs\n x + 100\n\nresults = [t1, t2, t3, t4, t5, m1, p1, p2, p3, tv, sw, acc, evens, sum, tailIf(n), tailMulti(2), tailTry(), tailSwitch(7), tailFor([1])]\n"],"names":["p1","p2","p3","flag","true","n","t1","t2","t3","t4","t5","t6","seen","m1","double","x","risky","tv","e","sw","i","acc","evens","v","lp","sum","tally","tailIf","tailMulti","w","tailTry","tailSwitch","tailFor","xs","results"],"mappings":"AAMA,IAiBAA,IACAC,IAEAC;;IApBAC,OAAOC;IACPC,IAAI;IAEJC,KAAQH,OAAU;IAClBI,KAAQJ,OAAU;IAClBK,KAAY,CAAAL,OAAU,IAAO;IAC7BM,KAAK,CAAGJ,EAAE,EAAE,KAAO,UAAcA,EAAE,EAAE,KAAO;IAC5CK,KAAK,CAAIP,OAAU,SAAY;IAC/BQ,KAAK,EAAIR,OAAU;IAEnBS,OAAO;IACPC,cAAK,IAAGV;EACNS,KAAK,GAAG;UACRP,IAAI;;;;AAIN,MAAUF,WAAU;AACpB,MAAgBE,EAAE,EAAE,OAAdA,IAAI,MAAoBA,IAAI;IAClCS,SAAS,SAACC,GAAM;UAAAA,EAAE,EAAE;;AACpB,MAAiBZ,OAAZW,YAAsB;IAE3BE,QAAQ,WAAG;EAAA,MAAM;;IACjBC,cAAK;SACHD,KAAK;SACDE;;;IAGNC,cAAK,QAAOd;;;;;;IAIZe,IAAI;IACJC;;EAAM,OAAMD,EAAE,EAAE;IACdA,EAAE,GAAG;iBACLA,EAAE,EAAE;;;;IAENE;;EAAQ,SAAIC,KAAK,CAAC;iBAChBA,EAAE,EAAE;;;;IAENC;;EAAK;;;;;IAGLC,MAAM;IACNC,QAAQ,SAACH,GAAM;UAAAE,IAAI,GAAGF;;AACtB,cAAiB,CAAC;EAAlBG;;IAEAC,SAAS,SAACJ,GACR;UAAA,CAAGA,EAAE,EAAE,KACL;;IAIJK,YAAY,SAACL,GACX;MACEM;EADF,KAAGN,EAAE,EAAE;IACLM,IAAIN,EAAE,EAAE;YACRM,IAAI;;;;;IAIRC,UAAU,WACR;EAAA;WACEd,KAAK;WACDE;;;;IAGRa,aAAa,SAACR,GACZ;kBAAA,QAAOA;;;;;;;IAITS,UAAU,SAACC,IACT;;EAAA,SAAIlB,KAAKkB;kBACPlB,IAAI;;;;IAERmB,UAAU,CAAC,6DAA6DP,MAAM,KAAKC,SAAS,KAAKE,OAAO,IAAIC,UAAU,KAAKC,OAAO,CAAC,CAAC"}
Loading