From 63ea041ecf4187fe7abeb0d9499f84d0fb8c6e10 Mon Sep 17 00:00:00 2001 From: Curtis Yarvin Date: Tue, 24 Apr 2018 22:29:31 -0700 Subject: [PATCH] Renamed %form to %hint. --- include/jets/q.h | 4 ++-- include/jets/w.h | 2 +- jets/f/help.c | 8 ++++---- jets/f/ut_crop.c | 6 +++--- jets/f/ut_find.c | 2 +- jets/f/ut_fish.c | 2 +- jets/f/ut_fuse.c | 4 ++-- jets/f/ut_mint.c | 4 ++-- jets/f/ut_mull.c | 4 ++-- jets/f/ut_nest.c | 4 ++-- jets/f/ut_peek.c | 2 +- jets/f/ut_play.c | 2 +- jets/f/ut_repo.c | 2 +- jets/tree.c | 4 ++-- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/jets/q.h b/include/jets/q.h index e8297405a..c46e076e3 100644 --- a/include/jets/q.h +++ b/include/jets/q.h @@ -204,7 +204,7 @@ u3_noun u3qf_forq(u3_noun, u3_noun); u3_noun u3qf_fork(u3_noun); u3_noun u3qf_grof(u3_noun); - u3_noun u3qf_form(u3_noun, u3_noun); + u3_noun u3qf_hint(u3_noun, u3_noun); u3_noun u3qf_hike(u3_noun, u3_noun); u3_noun u3qf_look(u3_noun, u3_noun); u3_noun u3qf_loot(u3_noun, u3_noun); @@ -282,7 +282,7 @@ u3_noun u3qz_forq(u3_noun, u3_noun); u3_noun u3qz_fork(u3_noun); u3_noun u3qz_grof(u3_noun); - u3_noun u3qz_form(u3_noun, u3_noun); + u3_noun u3qz_hint(u3_noun, u3_noun); u3_noun u3qz_hike(u3_noun, u3_noun); u3_noun u3qz_look(u3_noun, u3_noun); u3_noun u3qz_loot(u3_noun, u3_noun); diff --git a/include/jets/w.h b/include/jets/w.h index 82b6ba6b4..94adfc557 100644 --- a/include/jets/w.h +++ b/include/jets/w.h @@ -233,7 +233,7 @@ u3_noun u3wf_flor(u3_noun); u3_noun u3wf_forq(u3_noun); u3_noun u3wf_fork(u3_noun); - u3_noun u3wf_form(u3_noun); + u3_noun u3wf_hint(u3_noun); u3_noun u3wf_hike(u3_noun); u3_noun u3wf_look(u3_noun); u3_noun u3wf_loot(u3_noun); diff --git a/jets/f/help.c b/jets/f/help.c index def71f2ba..de3159255 100644 --- a/jets/f/help.c +++ b/jets/f/help.c @@ -7,7 +7,7 @@ /* functions */ u3_noun - u3qf_form(u3_noun sag, + u3qf_hint(u3_noun sag, u3_noun tip) { if ( c3__void == tip ) { @@ -16,17 +16,17 @@ if ( c3__noun == tip ) { return c3__noun; } - else return u3nt(c3__form, u3k(sag), u3k(tip)); + else return u3nt(c3__hint, u3k(sag), u3k(tip)); } u3_noun - u3wf_form(u3_noun cor) + u3wf_hint(u3_noun cor) { u3_noun sag, tip; if ( c3n == u3r_mean(cor, u3x_sam_2, &sag, u3x_sam_3, &tip, 0) ) { return u3m_bail(c3__fail); } else { - return u3qf_form(sag, tip); + return u3qf_hint(sag, tip); } } diff --git a/jets/f/ut_crop.c b/jets/f/ut_crop.c index 6c5380987..cc7d6c62a 100644 --- a/jets/f/ut_crop.c +++ b/jets/f/ut_crop.c @@ -142,10 +142,10 @@ } else return _crop_sint(van, sut, ref, bix); } - case c3__form: u3x_cell(u3t(sut), &p_sut, &q_sut); + case c3__hint: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun foz = _crop_dext(van, q_sut, ref, bix); - u3_noun ret = u3qf_form(p_sut, foz); + u3_noun ret = u3qf_hint(p_sut, foz); u3z(foz); return ret; @@ -204,7 +204,7 @@ default: return u3m_bail(c3__fail); case c3__core: - case c3__form: + case c3__hint: case c3__face: u3x_cell(u3t(ref), &p_ref, &q_ref); { return _crop_dext(van, sut, q_ref, bix); diff --git a/jets/f/ut_find.c b/jets/f/ut_find.c index 943d90ea2..8be815c71 100644 --- a/jets/f/ut_find.c +++ b/jets/f/ut_find.c @@ -675,7 +675,7 @@ // fprintf(stderr, "core\r\n"); return _find_buck_core(van, sut, way, p_heg, q_heg, axe, lon, gil); } - case c3__form: + case c3__hint: { u3_noun fop = u3qfu_repo(van, sut); u3_noun pro = _find_bucx(van, fop, way, p_heg, q_heg, axe, lon, gil); diff --git a/jets/f/ut_fish.c b/jets/f/ut_fish.c index 8656d23e8..d0dd7deb6 100644 --- a/jets/f/ut_fish.c +++ b/jets/f/ut_fish.c @@ -92,7 +92,7 @@ case c3__core: { return u3m_error("fish-core"); } - case c3__form: + case c3__hint: case c3__face: { if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { return u3m_bail(c3__fail); diff --git a/jets/f/ut_fuse.c b/jets/f/ut_fuse.c index 42bfbdc73..686de70a7 100644 --- a/jets/f/ut_fuse.c +++ b/jets/f/ut_fuse.c @@ -124,10 +124,10 @@ { return _fuse_repo(van, sut, ref, bix); } - case c3__form: u3x_cell(u3t(sut), &p_sut, &q_sut); + case c3__hint: u3x_cell(u3t(sut), &p_sut, &q_sut); { u3_noun vot = _fuse_in(van, q_sut, ref, bix); - u3_noun ret = u3qf_form(p_sut, vot); + u3_noun ret = u3qf_hint(p_sut, vot); u3z(vot); return ret; diff --git a/jets/f/ut_mint.c b/jets/f/ut_mint.c index dc79ae222..3445c7050 100644 --- a/jets/f/ut_mint.c +++ b/jets/f/ut_mint.c @@ -544,7 +544,7 @@ { u3_noun hum = _mint_in(van, sut, gol, q_gen); - u3_noun ret = u3nc(u3qf_form(p_gen, u3h(hum)), + u3_noun ret = u3nc(u3qf_hint(p_gen, u3h(hum)), u3k(u3t(hum))); u3z(hum); return ret; @@ -556,7 +556,7 @@ u3_noun hep = u3nc(c3__docs, u3k(p_gen)); u3_noun hum = _mint_in(van, sut, gol, q_gen); - u3_noun ret = u3nc(u3qf_form(hep, u3h(hum)), + u3_noun ret = u3nc(u3qf_hint(hep, u3h(hum)), u3k(u3t(hum))); u3z(hep); diff --git a/jets/f/ut_mull.c b/jets/f/ut_mull.c index a0448077d..869f4ef70 100644 --- a/jets/f/ut_mull.c +++ b/jets/f/ut_mull.c @@ -525,8 +525,8 @@ _mull_used(); { u3_noun vat = _mull_in(van, sut, gol, dox, q_gen); - u3_noun ret = u3nc(u3qf_form(p_gen, u3h(vat)), - u3qf_form(p_gen, u3t(vat))); + u3_noun ret = u3nc(u3qf_hint(p_gen, u3h(vat)), + u3qf_hint(p_gen, u3t(vat))); u3z(vat); return ret; diff --git a/jets/f/ut_nest.c b/jets/f/ut_nest.c index 3d6236c29..c95c45cda 100644 --- a/jets/f/ut_nest.c +++ b/jets/f/ut_nest.c @@ -283,7 +283,7 @@ else return _nest_sint(van, sut, tel, ref, seg, reg, gil); } } - case c3__form: + case c3__hint: case c3__face: { if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { return u3m_bail(c3__fail); @@ -447,7 +447,7 @@ u3z(gam); return hiv; } - case c3__form: + case c3__hint: case c3__face: { if ( c3n == u3r_trel(ref, 0, &p_ref, &q_ref) ) { return u3m_bail(c3__fail); diff --git a/jets/f/ut_peek.c b/jets/f/ut_peek.c index 64234e73d..ba8d0e670 100644 --- a/jets/f/ut_peek.c +++ b/jets/f/ut_peek.c @@ -128,7 +128,7 @@ return pro; } } - case c3__form: + case c3__hint: case c3__face: { if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { return u3m_bail(c3__fail); diff --git a/jets/f/ut_play.c b/jets/f/ut_play.c index 34218c4cc..5ad9171d4 100644 --- a/jets/f/ut_play.c +++ b/jets/f/ut_play.c @@ -382,7 +382,7 @@ _play_used(); { u3_noun boc = _play_x(van, sut, q_gen); - u3_noun ret = u3qf_form(p_gen, boc); + u3_noun ret = u3qf_hint(p_gen, boc); u3z(boc); return ret; diff --git a/jets/f/ut_repo.c b/jets/f/ut_repo.c index 8b19f21b5..0e82bf813 100644 --- a/jets/f/ut_repo.c +++ b/jets/f/ut_repo.c @@ -34,7 +34,7 @@ return u3nt(c3__cell, c3__noun, u3k(p_sut)); } } - case c3__form: + case c3__hint: case c3__face: { if ( c3n == u3r_cell(u3t(sut), &p_sut, &q_sut)) { return u3m_bail(c3__fail); diff --git a/jets/tree.c b/jets/tree.c index eac9856ea..feb1af482 100644 --- a/jets/tree.c +++ b/jets/tree.c @@ -105,7 +105,7 @@ static u3j_core _143_hex_d[] = static u3j_harm _143_pen_comb_a[] = {{".2", u3wf_comb}, {}}; static u3j_harm _143_pen_cons_a[] = {{".2", u3wf_cons}, {}}; static u3j_harm _143_pen_core_a[] = {{".2", u3wf_core}, {}}; - static u3j_harm _143_pen_form_a[] = {{".2", u3wf_form}, {}}; + static u3j_harm _143_pen_hint_a[] = {{".2", u3wf_hint}, {}}; static u3j_harm _143_pen_face_a[] = {{".2", u3wf_face}, {}}; static u3j_harm _143_pen_fitz_a[] = {{".2", u3wf_fitz}, {}}; static u3j_harm _143_pen_flan_a[] = {{".2", u3wf_flan}, {}}; @@ -179,7 +179,7 @@ static u3j_core _143_pen_d[] = { "flip", _143_pen_flip_a }, { "flor", _143_pen_flor_a }, { "fork", _143_pen_fork_a }, - { "form", _143_pen_form_a }, + { "hint", _143_pen_hint_a }, { "hike", _143_pen_hike_a }, { "look", _143_pen_look_a }, { "loot", _143_pen_loot_a },