From 94d4bb0b49bf699bc9965becaacfb9d861ef74f6 Mon Sep 17 00:00:00 2001 From: Matthew LeVan Date: Sat, 19 Aug 2023 18:20:13 -0400 Subject: [PATCH 1/4] build: upgrade `zlib` to v1.3 --- WORKSPACE.bazel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index 56a347ed6d..2cad948ace 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -358,10 +358,10 @@ versioned_http_archive( versioned_http_archive( name = "zlib", build_file = "//bazel/third_party/zlib:zlib.BUILD", - sha256 = "b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30", + sha256 = "ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e", strip_prefix = "zlib-{version}", url = "https://www.zlib.net/zlib-{version}.tar.gz", - version = "1.2.13", + version = "1.3", ) # From 3a06580796def107bfa66a52f1b4e450f240d7fe Mon Sep 17 00:00:00 2001 From: Sidnym Ladrut Date: Mon, 4 Sep 2023 23:36:43 +0000 Subject: [PATCH 2/4] add 'mate' jet --- pkg/noun/jets/b/mate.c | 30 ++++++++++++++++++++++++++++++ pkg/noun/jets/q.h | 2 ++ pkg/noun/jets/tree.c | 3 +++ pkg/noun/jets/w.h | 2 ++ 4 files changed, 37 insertions(+) create mode 100644 pkg/noun/jets/b/mate.c diff --git a/pkg/noun/jets/b/mate.c b/pkg/noun/jets/b/mate.c new file mode 100644 index 0000000000..77e4fbb819 --- /dev/null +++ b/pkg/noun/jets/b/mate.c @@ -0,0 +1,30 @@ +/// @file + +#include "jets/q.h" +#include "jets/w.h" + +#include "noun.h" + + + u3_noun + u3qb_mate(u3_noun a, + u3_noun b) + { + if ( u3_nul == b ) { + return u3k(a); + } else if ( u3_nul == a ) { + return u3k(b); + } else if ( c3y == u3r_sing(a, b) ) { + return u3k(a); + } else { + return u3m_bail(c3__fail); + } + } + u3_noun + u3wb_mate(u3_noun cor) + { + u3_noun a, b; + u3x_mean(cor, u3x_sam_2, &a, u3x_sam_3, &b, 0); + return u3qb_mate(a, b); + } + diff --git a/pkg/noun/jets/q.h b/pkg/noun/jets/q.h index 33c63ef42b..8a7c398c3c 100644 --- a/pkg/noun/jets/q.h +++ b/pkg/noun/jets/q.h @@ -32,6 +32,7 @@ u3_noun u3qb_lien(u3_noun, u3_noun); u3_noun u3qb_murn(u3_noun, u3_noun); u3_noun u3qb_need(u3_noun); + u3_noun u3qb_mate(u3_noun, u3_noun); u3_noun u3qb_reap(u3_atom, u3_noun); u3_noun u3qb_reel(u3_noun, u3_noun); u3_noun u3qb_roll(u3_noun, u3_noun); @@ -254,3 +255,4 @@ void u3qf_test(const c3_c*, u3_noun); #endif /* ifndef U3_JETS_Q_H */ + diff --git a/pkg/noun/jets/tree.c b/pkg/noun/jets/tree.c index c15e29ba8e..e2ce880293 100644 --- a/pkg/noun/jets/tree.c +++ b/pkg/noun/jets/tree.c @@ -2139,6 +2139,7 @@ static c3_c* _k140_ha[] = { /* new jets */ + static u3j_harm _139_two_mate_a[] = {{".2", u3wb_mate, c3y}, {}}; static u3j_harm _139_hex_json_de_a[] = {{".2", u3we_json_de}, {}}; static u3j_harm _139_hex_json_en_a[] = {{".2", u3we_json_en}, {}}; static u3j_core _139_hex_json_d[] = @@ -2282,6 +2283,7 @@ static u3j_core _139_two_d[] = { "lien", 7, _140_two_lien_a, 0, no_hashes }, { "murn", 7, _140_two_murn_a, 0, no_hashes }, { "need", 7, _140_two_need_a, 0, no_hashes }, + { "mate", 7, _139_two_mate_a, 0, no_hashes }, { "reap", 7, _140_two_reap_a, 0, no_hashes }, { "reel", 7, _140_two_reel_a, 0, no_hashes }, { "roll", 7, _140_two_roll_a, 0, no_hashes }, @@ -2438,3 +2440,4 @@ u3j_Dash = { 0, 0 }; + diff --git a/pkg/noun/jets/w.h b/pkg/noun/jets/w.h index d838416c03..8b9873c684 100644 --- a/pkg/noun/jets/w.h +++ b/pkg/noun/jets/w.h @@ -32,6 +32,7 @@ u3_noun u3wb_lien(u3_noun); u3_noun u3wb_murn(u3_noun); u3_noun u3wb_need(u3_noun); + u3_noun u3wb_mate(u3_noun); u3_noun u3wb_reap(u3_noun); u3_noun u3wb_reel(u3_noun); u3_noun u3wb_roll(u3_noun); @@ -332,3 +333,4 @@ u3_noun u3wfu_rest(u3_noun); #endif /* ifndef U3_JETS_W_H */ + From fb332c070728e17fc5fcb64355295766d2982213 Mon Sep 17 00:00:00 2001 From: Sidnym Ladrut Date: Wed, 6 Sep 2023 16:33:20 +0000 Subject: [PATCH 3/4] add fixes propsed by ~master-morzod --- pkg/noun/jets/b/mate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/noun/jets/b/mate.c b/pkg/noun/jets/b/mate.c index 77e4fbb819..f8dbd31654 100644 --- a/pkg/noun/jets/b/mate.c +++ b/pkg/noun/jets/b/mate.c @@ -14,10 +14,10 @@ return u3k(a); } else if ( u3_nul == a ) { return u3k(b); - } else if ( c3y == u3r_sing(a, b) ) { + } else if ( c3y == u3r_sing(u3t(a), u3t(b)) ) { return u3k(a); } else { - return u3m_bail(c3__fail); + return u3m_error("mate"); } } u3_noun From 0335f048f857c5064c35237b552561bac932c290 Mon Sep 17 00:00:00 2001 From: Sidnym Ladrut Date: Sun, 17 Sep 2023 19:39:13 +0000 Subject: [PATCH 4/4] add fixes proposed by ~finmep-lanteb --- pkg/noun/jets/tree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/noun/jets/tree.c b/pkg/noun/jets/tree.c index e2ce880293..03c7b64e48 100644 --- a/pkg/noun/jets/tree.c +++ b/pkg/noun/jets/tree.c @@ -2139,7 +2139,6 @@ static c3_c* _k140_ha[] = { /* new jets */ - static u3j_harm _139_two_mate_a[] = {{".2", u3wb_mate, c3y}, {}}; static u3j_harm _139_hex_json_de_a[] = {{".2", u3we_json_de}, {}}; static u3j_harm _139_hex_json_en_a[] = {{".2", u3we_json_en}, {}}; static u3j_core _139_hex_json_d[] = @@ -2273,6 +2272,8 @@ static u3j_core _139_two__in_d[] = {} }; +static u3j_harm _139_two_mate_a[] = {{".2", u3wb_mate, c3y}, {}}; + static u3j_core _139_two_d[] = { { "tri", 3, 0, _139_tri_d, no_hashes, _140_tri_ho },