urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-21 01:41:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

jets: more cleanups from review.

Browse Source
This commit is contained in:
Elliot Glaysher 2020-05-06 15:23:45 -07:00
parent a05360f97a
commit de91adb61a
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/urbit/jets/e/scow.c
View File

@ -204,7 +204,7 @@ _print_p(u3_atom cor, u3_atom p)
} }
u3_noun list = 0; u3_noun list = 0;
for (u3_atom imp = 0; imp != dyy; ++imp) { for (c3_w imp = 0; imp != dyy; ++imp) {
u3_noun log = u3qc_end(4, 1, u3k(sxz)); u3_noun log = u3qc_end(4, 1, u3k(sxz));
u3_noun prefix = u3qc_rsh(3, 1, u3k(log)); u3_noun prefix = u3qc_rsh(3, 1, u3k(log));
u3_noun suffix = u3qc_end(3, 1, log); u3_noun suffix = u3qc_end(3, 1, log);
@ -249,7 +249,7 @@ _print_ud(u3_atom ud)
list = u3nc(u3ka_add(u3qa_mod(ud, 10), '0'), list); list = u3nc(u3ka_add(u3qa_mod(ud, 10), '0'), list);
between++; between++;
ud = u3ka_div(ud, 10); ud = u3ka_div(ud, 10);
} while (c3n == u3r_sing(ud, 0)); } while (ud != 0);
return list; return list;
} }
@ -274,7 +274,7 @@ _print_uv(u3_atom uv)
list = u3nc(to_digit(tig), list); list = u3nc(to_digit(tig), list);
between++; between++;
uv = u3ka_div(uv, 32); uv = u3ka_div(uv, 32);
} while (c3n == u3r_sing(uv, 0)); } while (uv != 0);
return u3nt('0', 'v', list); return u3nt('0', 'v', list);
} }
@ -299,7 +299,7 @@ _print_uw(u3_atom uw)
list = u3nc(to_w_digit(tig), list); list = u3nc(to_w_digit(tig), list);
between++; between++;
uw = u3ka_div(uw, 64); uw = u3ka_div(uw, 64);
} while (c3n == u3r_sing(uw, 0)); } while (uw != 0);
return u3nt('0', 'w', list); return u3nt('0', 'w', list);
} }
@ -311,10 +311,12 @@ u3we_scow(u3_noun cor)
u3_noun atom; u3_noun atom;
if (c3n == u3r_mean(cor, u3x_sam_2, &mod, if (c3n == u3r_mean(cor, u3x_sam_2, &mod,
u3x_sam_3, &atom, 0) || u3x_sam_3, &atom, 0)) {
!_(u3a_is_cat(mod))) { return u3m_bail(c3__exit);
u3l_log("u3we_scow fail\r\n"); }
return u3m_bail(c3__fail);
if (!_(u3a_is_cat(mod))) {
return u3_none;
} }
switch (mod) { switch (mod) {
@ -345,10 +347,12 @@ u3we_scot(u3_noun cor)
u3_noun atom; u3_noun atom;
if (c3n == u3r_mean(cor, u3x_sam_2, &mod, if (c3n == u3r_mean(cor, u3x_sam_2, &mod,
u3x_sam_3, &atom, 0) || u3x_sam_3, &atom, 0)) {
!_(u3a_is_cat(mod))) { return u3m_bail(c3__exit);
u3l_log("u3we_scot fail\r\n"); }
return u3m_bail(c3__fail);
if (!_(u3a_is_cat(mod))) {
return u3_none;
} }
u3_noun tape; u3_noun tape;

9
pkg/urbit/jets/e/slaw.c
View File

@ -259,7 +259,7 @@ _parse_p(u3_noun cor, u3_noun txt) {
if (*cur != 0) { if (*cur != 0) {
// We've parsed all of a comet shape, and there's still more in the // We've parsed all of a comet shape, and there's still more in the
// string. Error. // string. Bail back to the interpreter.
u3a_free(c); u3a_free(c);
return u3_none; return u3_none;
} }
@ -485,11 +485,14 @@ u3we_slaw(u3_noun cor)
u3_noun txt; u3_noun txt;
if (c3n == u3r_mean(cor, u3x_sam_2, &mod, if (c3n == u3r_mean(cor, u3x_sam_2, &mod,
u3x_sam_3, &txt, 0) || u3x_sam_3, &txt, 0)) {
!_(u3a_is_cat(mod))) {
return u3m_bail(c3__exit); return u3m_bail(c3__exit);
} }
if (!_(u3a_is_cat(mod))) {
return u3_none;
}
switch (mod) { switch (mod) {
case c3__da: case c3__da:
return _parse_da(cor, txt); return _parse_da(cor, txt);