ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-13 08:38:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

renames *_vor to *_mor

Browse Source
This commit is contained in:
Joe Bryan 2019-01-08 20:30:20 -05:00
parent 8fe90875cd
commit b33f6e4b42
16 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/jets/q.h
View File

@ -58,6 +58,7 @@
u3_noun u3qc_mas(u3_atom);
u3_noun u3qc_met(u3_atom, u3_atom);
u3_noun u3qc_mix(u3_atom, u3_atom);
u3_noun u3qc_mor(u3_atom, u3_atom);
u3_noun u3qc_muk(u3_atom, u3_atom, u3_atom);
u3_noun u3qc_peg(u3_atom, u3_atom);
u3_noun u3qc_pow(u3_atom, u3_atom);
@ -68,7 +69,6 @@
u3_noun u3qc_rsh(u3_atom, u3_atom, u3_atom);
u3_noun u3qc_swp(u3_atom, u3_atom);
u3_noun u3qc_sqt(u3_atom);
u3_noun u3qc_vor(u3_atom, u3_atom);
u3_noun u3qc__stage_gor(u3_atom, u3_atom);
# define u3qc__stage_hor u3qc__stage_gor

2
include/jets/w.h
View File

@ -58,6 +58,7 @@
u3_noun u3wc_mas(u3_noun);
u3_noun u3wc_met(u3_noun);
u3_noun u3wc_mix(u3_noun);
u3_noun u3wc_mor(u3_noun);
u3_noun u3wc_mug(u3_noun);
u3_noun u3wc_muk(u3_noun);
u3_noun u3wc_mur(u3_noun);
@ -70,7 +71,6 @@
u3_noun u3wc_rsh(u3_noun);
u3_noun u3wc_swp(u3_noun);
u3_noun u3wc_sqt(u3_noun);
u3_noun u3wc_vor(u3_noun);
u3_noun u3wc__stage_gor(u3_noun);
# define u3wc__stage_hor u3wc__stage_gor

8
jets/c/vor.c → jets/c/mor.c
View File

@ -1,4 +1,4 @@
/* j/3/vor.c
/* j/3/mor.c
**
*/
#include "all.h"
@ -7,7 +7,7 @@
/* functions
*/
u3_noun
u3qc_vor(u3_atom a,
u3qc_mor(u3_atom a,
u3_atom b)
{
c3_w c_w = u3r_mug(u3r_mug(a));
@ -19,13 +19,13 @@
else return (c_w < d_w) ? c3y : c3n;
}
u3_noun
u3wc_vor(u3_noun cor)
u3wc_mor(u3_noun cor)
{
u3_noun a, b;
if ( (c3n == u3r_mean(cor, u3x_sam_2, &a, u3x_sam_3, &b, 0)) ) {
return u3m_bail(c3__exit);
} else {
return u3qc_vor(a, b);
return u3qc_mor(a, b);
}
}

2
jets/d/by_del.c
View File

@ -31,7 +31,7 @@
return u3m_bail(c3__exit);
}
else {
if ( c3y == u3qc_vor(u3h(n_l_a), u3h(n_r_a)) ) {
if ( c3y == u3qc_mor(u3h(n_l_a), u3h(n_r_a)) ) {
u3_noun new_right = u3nt(u3k(n_a),
u3k(r_l_a),
u3k(r_a));

2
jets/d/by_dif.c
View File

@ -25,7 +25,7 @@
|| c3n == u3r_cell(n_e, &p_n_e, &q_n_e) ) {
return u3m_bail(c3__exit);
} else {
if ( c3y == u3qc_vor(p_n_d, p_n_e) ) {
if ( c3y == u3qc_mor(p_n_d, p_n_e) ) {
return u3nt(u3k(n_d),
u3k(l_d),
_b_dif_join(u3k(r_d), u3k(e)));

2
jets/d/by_int.c
View File

@ -40,7 +40,7 @@
else if ( c3n == u3r_cell(n_b, &p_n_b, &q_n_b) ) {
return u3m_bail(c3__exit);
}
else if ( c3y == u3qc_vor(p_n_a, p_n_b) ) {
else if ( c3y == u3qc_mor(p_n_a, p_n_b) ) {
if ( c3y == u3r_sing(p_n_a, p_n_b) ) {
return u3nt(
u3k(n_b),

4
jets/d/by_put.c
View File

@ -41,7 +41,7 @@
if ( c3y == u3qc_gor(b, pn_a) ) {
d = u3qdb_put(l_a, b, c);
if ( c3y == u3qc_vor(pn_a, u3h(u3h(d))) ) {
if ( c3y == u3qc_mor(pn_a, u3h(u3h(d))) ) {
return u3nt(u3k(n_a),
d,
u3k(r_a));
@ -64,7 +64,7 @@
else {
d = u3qdb_put(r_a, b, c);
if ( c3y == u3qc_vor(pn_a, u3h(u3h(d))) ) {
if ( c3y == u3qc_mor(pn_a, u3h(u3h(d))) ) {
return u3nt(u3k(n_a),
u3k(l_a),
d);

2
jets/d/by_uni.c
View File

@ -40,7 +40,7 @@
else if ( c3n == u3r_cell(lr_b, &l_b, &r_b) ) {
return u3m_bail(c3__exit);
}
else if ( c3y == u3qc_vor(p_n_a, p_n_b) ) {
else if ( c3y == u3qc_mor(p_n_a, p_n_b) ) {
if ( c3y == u3r_sing(p_n_a, p_n_b) ) {
return u3nt(u3k(n_b),
u3qdb_uni(u3k(l_a),

2
jets/d/in_del.c
View File

@ -29,7 +29,7 @@
return u3m_bail(c3__exit);
}
else {
if ( c3y == u3qc_vor(n_l_a, n_r_a) ) {
if ( c3y == u3qc_mor(n_l_a, n_r_a) ) {
u3_noun new_right = u3nt(u3k(n_a),
u3k(r_l_a),
u3k(r_a));

2
jets/d/in_dif.c
View File

@ -21,7 +21,7 @@
|| c3n == u3r_trel(e, &n_e, &l_e, &r_e) ) {
return u3m_bail(c3__exit);
} else {
if ( c3y == u3qc_vor(n_d, n_e) ) {
if ( c3y == u3qc_mor(n_d, n_e) ) {
return u3nt(u3k(n_d),
u3k(l_d),
_i_dif_join(u3k(r_d), u3k(e)));

2
jets/d/in_int.c
View File

@ -28,7 +28,7 @@
return u3m_bail(c3__exit);
}
else {
if ( c3y == u3qc_vor(n_b, n_a) ) {
if ( c3y == u3qc_mor(n_b, n_a) ) {
c = a; a = b; b = c;
c = n_a; n_a = n_b; n_b = c;
c = lr_a; lr_a = lr_b; lr_b = c;

2
jets/d/in_mer.c
View File

@ -28,7 +28,7 @@
return u3m_bail(c3__exit);
}
else {
if ( c3y == u3qc_vor(n_b, n_a) ) {
if ( c3y == u3qc_mor(n_b, n_a) ) {
c = a; a = b; b = c;
c = n_a; n_a = n_b; n_b = c;
c = lr_a; lr_a = lr_b; lr_b = c;

4
jets/d/in_put.c
View File

@ -30,7 +30,7 @@
if ( c3y == u3qc_gor(b, n_a) ) {
c = u3qdi_put(l_a, b);
if ( c3y == u3qc_vor(n_a, u3h(c)) ) {
if ( c3y == u3qc_mor(n_a, u3h(c)) ) {
return u3nt(u3k(n_a),
c,
u3k(r_a));
@ -52,7 +52,7 @@
else {
c = u3qdi_put(r_a, b);
if ( c3y == u3qc_vor(n_a, u3h(c)) ) {
if ( c3y == u3qc_mor(n_a, u3h(c)) ) {
return u3nt(u3k(n_a),
u3k(l_a),
c);

2
jets/d/in_uni.c
View File

@ -23,7 +23,7 @@ _in_uni(u3_noun a, u3_noun b)
{
return u3m_bail(c3__exit);
}
else if ( c3n == u3qc_vor(n_a, n_b) ) {
else if ( c3n == u3qc_mor(n_a, n_b) ) {
if ( c3y == u3r_sing(n_a, n_b) ) {
return u3nt(u3k(n_b), _in_uni(l_a, l_b), _in_uni(r_a, r_b));
}

9
jets/tree.c
View File

@ -938,6 +938,8 @@ static u3j_harm _141_two_met_a[] = {{".2", u3wc_met, c3y}, {}};
static c3_c* _141_two_met_ha[] = {0};
static u3j_harm _141_two_mix_a[] = {{".2", u3wc_mix, c3y}, {}};
static c3_c* _141_two_mix_ha[] = {0};
static u3j_harm _141_two_mor_a[] = {{".2", u3wc_mor, c3y}, {}};
static c3_c* _141_two_mor_ha[] = {0};
static u3j_harm _141_two_mug_a[] = {{".2", u3wc_mug, c3y}, {}};
static c3_c* _141_two_mug_ha[] = {0};
static u3j_harm _141_two_muk_a[] = {{".2", u3wc_muk, c3y}, {}};
@ -962,8 +964,6 @@ static u3j_harm _141_two_swp_a[] = {{".2", u3wc_swp, c3y}, {}};
static c3_c* _141_two_swp_ha[] = {0};
static u3j_harm _141_two_sqt_a[] = {{".2", u3wc_sqt, c3y}, {}};
static c3_c* _141_two_sqt_ha[] = {0};
static u3j_harm _141_two_vor_a[] = {{".2", u3wc_vor, c3y}, {}};
static c3_c* _141_two_vor_ha[] = {0};
static u3j_harm _141_two_xeb_a[] = {{".2", u3wc_xeb, c3y}, {}};
static c3_c* _141_two_xeb_ha[] = {0};
@ -1184,6 +1184,7 @@ static u3j_core _141_two_d[] =
{ "mat", 7, _141_two_mat_a, 0, _141_two_mat_ha },
{ "met", 7, _141_two_met_a, 0, _141_two_met_ha },
{ "mix", 7, _141_two_mix_a, 0, _141_two_mix_ha },
{ "mor", 7, _141_two_mor_a, 0, _141_two_mor_ha },
{ "mug", 7, _141_two_mug_a, 0, _141_two_mug_ha },
{ "muk", 59, _141_two_muk_a, 0, _141_two_muk_ha },
{ "mur", 7, _141_two_mur_a, 0, _141_two_mur_ha },
@ -1197,7 +1198,9 @@ static u3j_core _141_two_d[] =
{ "peg", 7, _141_two_peg_a, 0, _141_two_peg_ha },
{ "pow", 7, _141_two_pow_a, 0, _141_two_pow_ha },
{ "sqt", 7, _141_two_sqt_a, 0, _141_two_sqt_ha },
{ "vor", 7, _141_two_vor_a, 0, _141_two_vor_ha },
// temporary alias for staging +vor -> +mor
//
{ "vor", 7, _141_two_mor_a, 0, _141_two_mor_ha },
{ "stage-vor", 7, _141_two_stage_vor_a, 0, _141_two_stage_vor_ha },
{ "xeb", 7, _141_two_xeb_a, 0, _141_two_xeb_ha },

2
meson.build
View File

@ -63,6 +63,7 @@ jets_c_src = [
'jets/c/mas.c',
'jets/c/met.c',
'jets/c/mix.c',
'jets/c/mor.c',
'jets/c/mug.c',
'jets/c/muk.c',
'jets/c/mur.c',
@ -76,7 +77,6 @@ jets_c_src = [
'jets/c/rsh.c',
'jets/c/swp.c',
'jets/c/sqt.c',
'jets/c/vor.c',
'jets/stage/c/gor.c',
'jets/stage/c/hor.c',