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

removes unused +mer:in jet

Browse Source
This commit is contained in:
Joe Bryan 2019-05-24 14:14:59 -07:00
parent e213694d44
commit f36505f031
4 changed files with 0 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/urbit/include/jets/q.h
View File

@ -87,7 +87,6 @@
u3_noun u3qdi_gas(u3_noun, u3_noun);
u3_noun u3qdi_has(u3_noun, u3_noun);
u3_noun u3qdi_int(u3_noun, u3_noun);
u3_noun u3qdi_mer(u3_noun, u3_noun);
u3_noun u3qdi_put(u3_noun, u3_noun);
u3_noun u3qdi_tap(u3_noun);
u3_noun u3qdi_uni(u3_noun, u3_noun);

1
pkg/urbit/include/jets/w.h
View File

@ -96,7 +96,6 @@
u3_noun u3wdi_gas(u3_noun);
u3_noun u3wdi_has(u3_noun);
u3_noun u3wdi_int(u3_noun);
u3_noun u3wdi_mer(u3_noun);
u3_noun u3wdi_put(u3_noun);
u3_noun u3wdi_tap(u3_noun);
u3_noun u3wdi_uni(u3_noun);

80
pkg/urbit/jets/d/in_mer.c
View File

@ -1,80 +0,0 @@
/* j/4/in_mer.c
**
*/
#include "all.h"
/* functions
*/
u3_noun
u3qdi_mer(u3_noun a,
u3_noun b)
{
if ( u3_nul == a ) {
return u3k(b);
}
else if ( u3_nul == b ) {
return u3k(a);
}
else {
u3_noun l_a, n_a, r_a, lr_a; // XX copy tree boilerplate to other pt4
u3_noun l_b, n_b, r_b, lr_b;
u3_noun c;
if ( (c3n == u3r_cell(a, &n_a, &lr_a)) ) {
return u3m_bail(c3__exit);
}
else if ( (c3n == u3r_cell(b, &n_b, &lr_b)) ) {
return u3m_bail(c3__exit);
}
else {
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;
}
if ( c3n == u3r_cell(lr_a, &l_a, &r_a) ) {
return u3m_bail(c3__exit);
}
else if ( c3n == u3r_cell(lr_b, &l_b, &r_b) ) {
return u3m_bail(c3__exit);
}
else if ( c3y == u3r_sing(n_a, n_b) ) {
return u3nt(u3k(n_a),
u3qdi_mer(l_a, l_b),
u3qdi_mer(r_a, r_b));
}
else if ( c3y == u3qc_gor(n_b, n_a) ) {
return u3qdi_mer(u3nt(n_a,
u3qdi_mer(l_a,
u3nt(n_b,
l_b,
u3_nul)),
r_a),
r_b);
}
else {
return u3qdi_mer(u3nt(n_a,
l_a,
u3qdi_mer(r_a,
u3nt(n_b,
u3_nul,
r_b))),
l_b);
}
}
}
}
u3_noun
u3wdi_mer(u3_noun cor)
{
u3_noun a, b;
if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) {
return u3m_bail(c3__exit);
}
else {
return u3qdi_mer(a, b);
}
}

6
pkg/urbit/jets/tree.c
View File

@ -1538,11 +1538,6 @@ static c3_c* _141_two_xeb_ha[] = {
0
};
// XX not in +in core -- add there or remove here
//
static u3j_harm _141_two__in_mer_a[] = {{".2", u3wdi_mer}, {}};
static c3_c* _141_two__in_mer_ha[] = {0};
// https://github.com/urbit/urbit/issues/328
// static u3j_harm _141_two__in_int_a[] = {{".2", u3wdi_int}, {}};
// static c3_c* _141_two__in_int_ha[] = {0};
@ -1573,7 +1568,6 @@ static u3j_core _141_two__in_d[] =
{ "dif", 7, _141_two__in_dif_a, 0, _141_two__in_dif_ha },
{ "gas", 7, _141_two__in_gas_a, 0, _141_two__in_gas_ha },
{ "has", 7, _141_two__in_has_a, 0, _141_two__in_has_ha },
{ "mer", 7, _141_two__in_mer_a, 0, _141_two__in_mer_ha },
// { "int", 7, _141_two__in_int_a, 0, _141_two__in_int_ha },
{ "put", 7, _141_two__in_put_a, 0, _141_two__in_put_ha },
{ "tap", 7, _141_two__in_tap_a, 0, _141_two__in_tap_ha },