From 8fe90875cdbe1b61c51fa72f68a889ac701f0c86 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 8 Jan 2019 20:13:27 -0500 Subject: [PATCH] replaces calls to u3qc_hor with u3qc_gor --- include/jets/q.h | 1 - jets/d/in_bif.c | 2 +- jets/d/in_del.c | 2 +- jets/d/in_has.c | 2 +- jets/d/in_int.c | 2 +- jets/d/in_mer.c | 2 +- jets/d/in_put.c | 2 +- jets/d/in_uni.c | 4 ++-- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/jets/q.h b/include/jets/q.h index 5b9aaa4794..405259dea2 100644 --- a/include/jets/q.h +++ b/include/jets/q.h @@ -54,7 +54,6 @@ u3_noun u3qc_dvr(u3_atom, u3_atom); u3_noun u3qc_end(u3_atom, u3_atom, u3_atom); u3_noun u3qc_gor(u3_atom, u3_atom); -# define u3qc_hor u3qc_gor u3_noun u3qc_lsh(u3_atom, u3_atom, u3_atom); u3_noun u3qc_mas(u3_atom); u3_noun u3qc_met(u3_atom, u3_atom); diff --git a/jets/d/in_bif.c b/jets/d/in_bif.c index 4c5bdbeb91..5d93cc9d2b 100644 --- a/jets/d/in_bif.c +++ b/jets/d/in_bif.c @@ -25,7 +25,7 @@ u3_noun c, n_c, l_c, r_c; u3_noun d; - if ( c3y == u3qc_hor(b, n_a) ) { + if ( c3y == u3qc_gor(b, n_a) ) { c = _i_bif_putroot(l_a, b); u3r_trel(c, &n_c, &l_c, &r_c); d = u3nt(u3k(n_c), diff --git a/jets/d/in_del.c b/jets/d/in_del.c index 02390ccce8..17451ad69f 100644 --- a/jets/d/in_del.c +++ b/jets/d/in_del.c @@ -72,7 +72,7 @@ return u3m_bail(c3__exit); } else if ( c3n == u3r_sing(n_a, b) ) { - if ( c3y == u3qc_hor(b, n_a) ) { + if ( c3y == u3qc_gor(b, n_a) ) { return u3nt(u3k(n_a), u3qdi_del(l_a, b), u3k(r_a)); diff --git a/jets/d/in_has.c b/jets/d/in_has.c index fb142bc748..c794e2badf 100644 --- a/jets/d/in_has.c +++ b/jets/d/in_has.c @@ -24,7 +24,7 @@ return c3y; } else { - if ( c3y == u3qc_hor(b, n_a) ) { + if ( c3y == u3qc_gor(b, n_a) ) { return u3qdi_has(l_a, b); } else return u3qdi_has(r_a, b); diff --git a/jets/d/in_int.c b/jets/d/in_int.c index 3f39d32504..eeec46b0a3 100644 --- a/jets/d/in_int.c +++ b/jets/d/in_int.c @@ -44,7 +44,7 @@ u3qdi_int(l_a, l_b), u3qdi_int(r_a, r_b)); } - else if ( c3y == u3qc_hor(n_b, n_a) ) { + else if ( c3y == u3qc_gor(n_b, n_a) ) { return u3qdi_uni(u3qdi_int(l_a, u3nt(n_b, l_b, diff --git a/jets/d/in_mer.c b/jets/d/in_mer.c index 14fa6675f6..f3c68056e7 100644 --- a/jets/d/in_mer.c +++ b/jets/d/in_mer.c @@ -44,7 +44,7 @@ u3qdi_mer(l_a, l_b), u3qdi_mer(r_a, r_b)); } - else if ( c3y == u3qc_hor(n_b, n_a) ) { + else if ( c3y == u3qc_gor(n_b, n_a) ) { return u3qdi_mer(u3nt(n_a, u3qdi_mer(l_a, u3nt(n_b, diff --git a/jets/d/in_put.c b/jets/d/in_put.c index 10d2c43299..5726e10e48 100644 --- a/jets/d/in_put.c +++ b/jets/d/in_put.c @@ -27,7 +27,7 @@ return u3m_bail(c3__exit); } else { - if ( c3y == u3qc_hor(b, n_a) ) { + if ( c3y == u3qc_gor(b, n_a) ) { c = u3qdi_put(l_a, b); if ( c3y == u3qc_vor(n_a, u3h(c)) ) { diff --git a/jets/d/in_uni.c b/jets/d/in_uni.c index 85f07b8350..10df406faa 100644 --- a/jets/d/in_uni.c +++ b/jets/d/in_uni.c @@ -27,7 +27,7 @@ _in_uni(u3_noun a, u3_noun 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)); } - else if ( c3y == u3qc_hor(n_a, n_b) ) { + else if ( c3y == u3qc_gor(n_a, n_b) ) { naw = u3nt(u3k(n_a), u3k(l_a), u3_nul); sub = _in_uni(naw, l_b); neb = u3nt(u3k(n_b), sub, u3k(r_b)); @@ -47,7 +47,7 @@ _in_uni(u3_noun a, u3_noun b) else if ( c3y == u3r_sing(n_b, n_a) ) { return u3nt(u3k(n_b), _in_uni(l_a, l_b), _in_uni(r_a, r_b)); } - else if ( c3y == u3qc_hor(n_b, n_a) ) { + else if ( c3y == u3qc_gor(n_b, n_a) ) { neb = u3nt(u3k(n_b), u3k(l_b), u3_nul); sub = _in_uni(l_a, neb); naw = u3nt(u3k(n_a), sub, u3k(r_a));