Skip to content

nock: lose subject in autocons more eagerly #827

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
pkova merged 1 commit into from
May 23, 2025
Merged

nock: lose subject in autocons more eagerly #827

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
11 changes: 5 additions & 6 deletions pkg/noun/nock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,8 @@ _n_nock_on(u3_noun bus, u3_noun fol)
X(SWAP, "swap", &&do_swap), /* 3 */ \
X(TOSS, "toss", &&do_toss), /* 4 */ \
/* auto-cons */ \
X(AUTO, "auto", &&do_auto), /* 5: keep */ \
X(AULT, "ault", &&do_ault), /* 6: lose */ \
X(AUTO, "auto", &&do_auto), /* 5: kept */ \
X(AULT, "ault", &&do_ault), /* 6: lost */ \
/* general purposes */ \
X(SNOC, "snoc", &&do_snoc), /* 7: keep */ \
X(SNOL, "snol", &&do_snol), /* 8: lose */ \
Expand Down Expand Up @@ -1230,7 +1230,7 @@ _n_comp(u3_noun* ops, u3_noun fol, c3_o los_o, c3_o tel_o)
if ( c3y == u3du(cod) ) {
tot_w += _n_comp(ops, cod, c3n, c3n);
++tot_w; _n_emit(ops, SWAP);
tot_w += _n_comp(ops, arg, c3n, c3n);
tot_w += _n_comp(ops, arg, los_o, c3n);
++tot_w; _n_emit(ops, (c3y == los_o ) ? AULT : AUTO);
}
else switch ( cod ) {
Expand Down Expand Up @@ -2131,9 +2131,8 @@ _n_burn(u3n_prog* pog_u, u3_noun bus, c3_ys mov, c3_ys off)
*top = u3nc(*top, x); // [pro bus]
BURN();

do_ault: // [tel bus hed]
x = _n_pep(mov, off); // [bus hed]
_n_toss(mov, off); // [hed]
do_ault: // [tel hed]
x = _n_pep(mov, off); // [hed]
top = _n_peek(off);
*top = u3nc(*top, x); // [pro]
BURN();
Expand Down