From daba0838ff1a5925463150ff45999a018922d3d7 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 9 Mar 2016 12:57:36 -0800 Subject: [PATCH 01/21] Testing. --- jets/tree.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/jets/tree.c b/jets/tree.c index 1f9bc6b96..f3bf26f6b 100644 --- a/jets/tree.c +++ b/jets/tree.c @@ -414,6 +414,34 @@ static u3j_core _arvo_d[] = {} }; + + u3_noun + u3qa_dope(u3_atom a) + { + fprintf(stderr, "c dope %x\r\n", a); + return (a * a * a); + } + u3_noun + u3wa_dope(u3_noun cor) + { + u3_noun a; + + if ( (c3n == u3r_mean(cor, u3x_sam, &a, 0)) || + (c3n == u3ud(a)) ) + { + return u3m_bail(c3__exit); + } else { + return u3wa_dope(a); + } + } + +static u3j_harm _mood__hoon_dope_a[] = {{".2", u3wa_dope, c3y}, {}}; + +static u3j_core _zuse_d[] = + { { "dope", _mood__hoon_dope_a }, + {} + }; + static u3j_core _mood__hoon_d[] = { { "add", _mood__hoon_add_a }, { "dec", _mood__hoon_dec_a }, @@ -543,6 +571,7 @@ static u3j_core _mood__hoon_d[] = // { "al", _mood__hoon__al_a }, { "ut", _mood__hoon__ut_a, _mood__hoon__ut_d }, { "arvo", 0, _arvo_d }, + { "zuse", 0, _zuse_d }, #endif {} }; From d8a61dc07e15e795aa92d5e547cb241149b3b734 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 9 Mar 2016 15:56:23 -0800 Subject: [PATCH 02/21] Move diff code to zuse. --- jets/tree.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/jets/tree.c b/jets/tree.c index f3bf26f6b..66e0ca2e8 100644 --- a/jets/tree.c +++ b/jets/tree.c @@ -1,4 +1,4 @@ -/* j/dash.c +/* j/teee.c ** */ #include "all.h" @@ -411,10 +411,12 @@ static u3j_core _down_d[] = static u3j_core _arvo_d[] = { { "down", 0, _down_d }, + { "lore", _mood__hoon_lore_a }, + { "loss", _mood__hoon_loss_a }, + { "lune", _mood__hoon_lune_a }, {} }; - u3_noun u3qa_dope(u3_atom a) { @@ -435,13 +437,6 @@ static u3j_core _arvo_d[] = } } -static u3j_harm _mood__hoon_dope_a[] = {{".2", u3wa_dope, c3y}, {}}; - -static u3j_core _zuse_d[] = - { { "dope", _mood__hoon_dope_a }, - {} - }; - static u3j_core _mood__hoon_d[] = { { "add", _mood__hoon_add_a }, { "dec", _mood__hoon_dec_a }, @@ -511,10 +506,6 @@ static u3j_core _mood__hoon_d[] = { "jam", _mood__hoon_jam_a }, { "mat", _mood__hoon_mat_a }, { "rub", _mood__hoon_rub_a }, - { "lore", _mood__hoon_lore_a }, - { "loss", _mood__hoon_loss_a }, - { "lune", _mood__hoon_lune_a }, - { "mink", _mood__hoon_mink_a }, { "mule", _mood__hoon_mule_a }, { "repg", _mood__hoon_repg_a }, { "rexp", _mood__hoon_rexp_a }, @@ -571,7 +562,6 @@ static u3j_core _mood__hoon_d[] = // { "al", _mood__hoon__al_a }, { "ut", _mood__hoon__ut_a, _mood__hoon__ut_d }, { "arvo", 0, _arvo_d }, - { "zuse", 0, _zuse_d }, #endif {} }; From 0563b1b27572df63b52a53f6130c8fb1e6f038c4 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 10 Mar 2016 09:15:43 -0800 Subject: [PATCH 03/21] 150 jet structures. --- jets/tree.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/jets/tree.c b/jets/tree.c index 66e0ca2e8..02ae28391 100644 --- a/jets/tree.c +++ b/jets/tree.c @@ -570,17 +570,49 @@ static u3j_core _mood_d[] = { { "hoon", 0, _mood__hoon_d }, {} }; - static u3j_core _k151_d[] = { { "mood", 0, _mood_d }, {} }; + +static u3j_core _hex_d[] = + { {} + }; +static u3j_core _pen_d[] = + { { "hex", 0, _hex_d }, + {} + }; +static u3j_core _tri_d[] = + { { "qua", 0, _qua_d }, + {} + }; +static u3j_core _two_d[] = + { { "tri", 0, _tri_d }, + {} + }; +static u3j_core _one_d[] = + { { "two", 0, _two_d }, + {} + }; +static u3j_core _k150_d[] = + { { "one", 0, _one_d }, + {} + }; + +static u3j_core _d[] = { + { "k151", 0, _k151_d}, + { "k150", 0, _k150_d}, + {} +}; + + static u3j_core _d[] = { { "k151", 0, _k151_d}, {} }; + u3j_dash u3j_Dash = { _d, From 66ca74dbe7a4ffe75a65ba72430f3e5339a31b55 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 10 Mar 2016 18:22:44 -0800 Subject: [PATCH 04/21] Boots and solids. --- jets/tree.c | 560 +++++++++++++++++++++++++++++++++++++++++++++++++++- noun/jets.c | 2 +- 2 files changed, 551 insertions(+), 11 deletions(-) diff --git a/jets/tree.c b/jets/tree.c index 02ae28391..79159c05c 100644 --- a/jets/tree.c +++ b/jets/tree.c @@ -1,8 +1,9 @@ -/* j/teee.c +/* j/tree.c ** */ #include "all.h" +/**************************************************************old (151) */ static u3j_harm _mood__hoon_add_a[] = {{".2", u3wa_add, c3y}, {}}; static u3j_harm _mood__hoon_dec_a[] = {{".2", u3wa_dec, c3y}, {}}; static u3j_harm _mood__hoon_div_a[] = {{".2", u3wa_div, c3y}, {}}; @@ -506,6 +507,10 @@ static u3j_core _mood__hoon_d[] = { "jam", _mood__hoon_jam_a }, { "mat", _mood__hoon_mat_a }, { "rub", _mood__hoon_rub_a }, + { "lore", _mood__hoon_lore_a }, + { "loss", _mood__hoon_loss_a }, + { "lune", _mood__hoon_lune_a }, + { "mink", _mood__hoon_mink_a }, { "mule", _mood__hoon_mule_a }, { "repg", _mood__hoon_repg_a }, { "rexp", _mood__hoon_rexp_a }, @@ -575,24 +580,565 @@ static u3j_core _k151_d[] = {} }; +/************************************************************** new (150)*/ + + static u3j_harm _hex_down_mark_a[] = {{".2", u3wg_down, c3y}, {}}; + static u3j_core _hex_down_d[] = + { { "mark", _hex_down_mark_a }, + {} + }; + + static u3j_harm _hex_lore_a[] = {{".2", u3we_lore}, {}}; + static u3j_harm _hex_loss_a[] = {{".2", u3we_loss}, {}}; + static u3j_harm _hex_lune_a[] = {{".2", u3we_lune}, {}}; static u3j_core _hex_d[] = - { {} + { { "down", 0, _hex_down_d }, + { "lore", _hex_lore_a }, + { "loss", _hex_loss_a }, + { "lune", _hex_lune_a }, + {} }; + +/* layer five +*/ + static u3j_harm _pen_cell_a[] = {{".2", u3wf_cell}, {}}; + static u3j_harm _pen_comb_a[] = {{".2", u3wf_comb}, {}}; + static u3j_harm _pen_cons_a[] = {{".2", u3wf_cons}, {}}; + static u3j_harm _pen_core_a[] = {{".2", u3wf_core}, {}}; + static u3j_harm _pen_face_a[] = {{".2", u3wf_face}, {}}; + static u3j_harm _pen_fitz_a[] = {{".2", u3wf_fitz}, {}}; + static u3j_harm _pen_flan_a[] = {{".2", u3wf_flan}, {}}; + static u3j_harm _pen_flip_a[] = {{".2", u3wf_flip}, {}}; + static u3j_harm _pen_flor_a[] = {{".2", u3wf_flor}, {}}; + static u3j_harm _pen_fork_a[] = {{".2", u3wf_fork}, {}}; + static u3j_harm _pen_hike_a[] = {{".2", u3wf_hike}, {}}; + static u3j_harm _pen_look_a[] = {{".2", u3wf_look}, {}}; + + static u3j_harm _pen__ut_burn_a[] = {{".2", u3wfu_burn}, {}}; + static u3j_harm _pen__ut_conk_a[] = {{".2", u3wfu_conk}, {}}; + static u3j_harm _pen__ut_crop_a[] = {{".2", u3wfu_crop}, {}}; + // static u3j_harm _pen__ut_fire_a[] = {{".2", u3wfu_fire}, {}}; + static u3j_harm _pen__ut_fond_a[] = {{".2", u3wfu_fond}, {}}; + static u3j_harm _pen__ut_fish_a[] = {{".2", u3wfu_fish}, {}}; + static u3j_harm _pen__ut_fuse_a[] = {{".2", u3wfu_fuse}, {}}; + static u3j_harm _pen__ut_mint_a[] = {{".2", u3wfu_mint}, {}}; + static u3j_harm _pen__ut_mull_a[] = {{".2", u3wfu_mull}, {}}; + static u3j_harm _pen__ut_nest_a[] = {{".2", u3wfu_nest}, {}}; + static u3j_harm _pen__ut_park_a[] = {{".2", u3wfu_park}, {}}; + static u3j_harm _pen__ut_peek_a[] = {{".2", u3wfu_peek}, {}}; + static u3j_harm _pen__ut_play_a[] = {{".2", u3wfu_play}, {}}; + static u3j_harm _pen__ut_rest_a[] = {{".2", u3wfu_rest}, {}}; + static u3j_harm _pen__ut_toss_a[] = {{".2", u3wfu_toss}, {}}; + static u3j_harm _pen__ut_wrap_a[] = {{".2", u3wfu_wrap}, {}}; + static u3j_core _pen__ut_d[] = + { + { "burn", _pen__ut_burn_a }, + { "conk", _pen__ut_conk_a }, + { "crop", _pen__ut_crop_a }, + { "fond", _pen__ut_fond_a }, + // { "fire", _pen__ut_fire_a }, + { "fish", _pen__ut_fish_a }, + { "fuse", _pen__ut_fuse_a }, + { "mint", _pen__ut_mint_a }, + { "mull", _pen__ut_mull_a }, + { "nest", _pen__ut_nest_a }, + { "park", _pen__ut_park_a }, + { "peek", _pen__ut_peek_a }, + { "play", _pen__ut_play_a }, + { "rest", _pen__ut_rest_a }, + { "toss", _pen__ut_toss_a }, + { "wrap", _pen__ut_wrap_a }, + {} + }; + static u3j_harm _pen__ut_a[] = + { {"burn", u3wfu_burn}, + {"repo", u3wfu_repo}, + {} + }; + +#if 0 + static u3j_harm _pen__ap_a[] = + { {"open", u3wfp_open}, + {"rake", u3wfp_rake}, + {} + }; + static u3j_harm _pen__al_a[] = + { {"bunt", u3wfl_bunt}, + {"whip", u3wfl_whip}, + {} + }; +#endif + static u3j_core _pen_d[] = { { "hex", 0, _hex_d }, + + { "cell", _pen_cell_a }, + { "comb", _pen_comb_a }, + { "cons", _pen_cons_a }, + { "core", _pen_core_a }, + { "face", _pen_face_a }, + { "fitz", _pen_fitz_a }, + { "flan", _pen_flan_a }, + { "flip", _pen_flip_a }, + { "flor", _pen_flor_a }, + { "fork", _pen_fork_a }, + { "hike", _pen_hike_a }, + { "look", _pen_look_a }, + + // { "ap", _pen__ap_a }, + // { "al", _pen__al_a }, + { "ut", _pen__ut_a, _pen__ut_d }, + {} }; + +/* layer four +*/ + static u3j_harm _qua_trip_a[] = {{".2", u3we_trip}, {}}; + + static u3j_harm _qua__po_ind_a[] = {{".2", u3wcp_ind}, {}}; + static u3j_harm _qua__po_ins_a[] = {{".2", u3wcp_ins}, {}}; + static u3j_harm _qua__po_tod_a[] = {{".2", u3wcp_tod}, {}}; + static u3j_harm _qua__po_tos_a[] = {{".2", u3wcp_tos}, {}}; + static u3j_core _qua__po_d[] = + { { "ind", _qua__po_ind_a }, + { "ins", _qua__po_ins_a }, + { "tod", _qua__po_tod_a }, + { "tos", _qua__po_tos_a }, + {} + }; + + static u3j_harm _qua__bend_fun_a[] = {{".2", u3we_bend_fun}, {}}; + static u3j_core _qua__bend_d[] = + { { "fun", _qua__bend_fun_a }, + {} + }; + + static u3j_harm _qua__cold_fun_a[] = {{".2", u3we_cold_fun}, {}}; + static u3j_core _qua__cold_d[] = + { { "fun", _qua__cold_fun_a }, + {} + }; + + static u3j_harm _qua__cook_fun_a[] = {{".2", u3we_cook_fun}, {}}; + static u3j_core _qua__cook_d[] = + { { "fun", _qua__cook_fun_a }, + {} + }; + + static u3j_harm _qua__comp_fun_a[] = {{".2", u3we_comp_fun}, {}}; + static u3j_core _qua__comp_d[] = + { { "fun", _qua__comp_fun_a }, + {} + }; + + static u3j_harm _qua__easy_fun_a[] = {{".2", u3we_easy_fun}, {}}; + static u3j_core _qua__easy_d[] = + { { "fun", _qua__easy_fun_a }, + {} + }; + + static u3j_harm _qua__glue_fun_a[] = {{".2", u3we_glue_fun}, {}}; + static u3j_core _qua__glue_d[] = + { { "fun", _qua__glue_fun_a }, + {} + }; + + static u3j_harm _qua__here_fun_a[] = {{".2", u3we_here_fun}, {}}; + static u3j_core _qua__here_d[] = + { { "fun", _qua__here_fun_a }, + {} + }; + + static u3j_harm _qua__just_fun_a[] = {{".2", u3we_just_fun}, {}}; + static u3j_core _qua__just_d[] = + { { "fun", _qua__just_fun_a }, + {} + }; + + static u3j_harm _qua__mask_fun_a[] = {{".2", u3we_mask_fun}, {}}; + static u3j_core _qua__mask_d[] = + { { "fun", _qua__mask_fun_a }, + {} + }; + + static u3j_harm _qua__shim_fun_a[] = {{".2", u3we_shim_fun}, {}}; + static u3j_core _qua__shim_d[] = + { { "fun", _qua__shim_fun_a }, + {} + }; + + static u3j_harm _qua__stag_fun_a[] = {{".2", u3we_stag_fun}, {}}; + static u3j_core _qua__stag_d[] = + { { "fun", _qua__stag_fun_a }, + {} + }; + + static u3j_harm _qua__stew_fun_a[] = {{".2", u3we_stew_fun}, {}}; + static u3j_core _qua__stew_d[] = + { { "fun", _qua__stew_fun_a }, + {} + }; + + static u3j_harm _qua__stir_fun_a[] = {{".2", u3we_stir_fun}, {}}; + static u3j_core _qua__stir_d[] = + { { "fun", _qua__stir_fun_a }, + {} + }; + + static u3j_harm _qua_pfix_a[] = {{".2", u3we_pfix}, {}}; + static u3j_harm _qua_plug_a[] = {{".2", u3we_plug}, {}}; + static u3j_harm _qua_pose_a[] = {{".2", u3we_pose}, {}}; + static u3j_harm _qua_sfix_a[] = {{".2", u3we_sfix}, {}}; + + static u3j_harm _qua_mink_a[] = {{".2", u3we_mink}, {}}; + static u3j_harm _qua_mule_a[] = {{".2", u3we_mule}, {}}; + +static u3j_core _qua_d[] = + { { "pen", 0, _pen_d }, + + { "po", 0, _qua__po_d }, + + { "trip", _qua_trip_a }, + + { "bend", 0, _qua__bend_d }, + { "cold", 0, _qua__cold_d }, + { "comp", 0, _qua__comp_d }, + { "cook", 0, _qua__cook_d }, + { "easy", 0, _qua__easy_d }, + { "glue", 0, _qua__glue_d }, + { "here", 0, _qua__here_d }, + { "just", 0, _qua__just_d }, + { "mask", 0, _qua__mask_d }, + { "shim", 0, _qua__shim_d }, + { "stag", 0, _qua__stag_d }, + { "stew", 0, _qua__stew_d }, + { "stir", 0, _qua__stir_d }, + + { "pfix", _qua_pfix_a }, + { "plug", _qua_plug_a }, + { "pose", _qua_pose_a }, + { "sfix", _qua_sfix_a }, + + { "mink", _qua_mink_a }, + { "mule", _qua_mule_a }, + {} + }; + +/* layer three +*/ + static u3j_harm _tri__rd_add_a[] = {{".2", u3wer_add}, {}}; + static u3j_harm _tri__rd_sub_a[] = {{".2", u3wer_sub}, {}}; + static u3j_harm _tri__rd_mul_a[] = {{".2", u3wer_mul}, {}}; + static u3j_harm _tri__rd_div_a[] = {{".2", u3wer_div}, {}}; + static u3j_harm _tri__rd_sqt_a[] = {{".2", u3wer_sqt}, {}}; + static u3j_harm _tri__rd_fma_a[] = {{".2", u3wer_fma}, {}}; + static u3j_harm _tri__rd_lth_a[] = {{".2", u3wer_lth}, {}}; + static u3j_harm _tri__rd_lte_a[] = {{".2", u3wer_lte}, {}}; + static u3j_harm _tri__rd_equ_a[] = {{".2", u3wer_equ}, {}}; + static u3j_harm _tri__rd_gte_a[] = {{".2", u3wer_gte}, {}}; + static u3j_harm _tri__rd_gth_a[] = {{".2", u3wer_gth}, {}}; + static u3j_core _tri__rd_d[] = + { { "add", _tri__rd_add_a }, + { "sub", _tri__rd_sub_a }, + { "mul", _tri__rd_mul_a }, + { "div", _tri__rd_div_a }, + { "sqt", _tri__rd_sqt_a }, + { "fma", _tri__rd_fma_a }, + { "lth", _tri__rd_lth_a }, + { "lte", _tri__rd_lte_a }, + { "equ", _tri__rd_equ_a }, + { "gte", _tri__rd_gte_a }, + { "gth", _tri__rd_gth_a }, + {} + }; + + static u3j_harm _tri__cofl__drg_a[] = {{".2", u3wef_drg}, {}}; + static u3j_harm _tri__cofl__lug_a[] = {{".2", u3wef_lug}, {}}; + static u3j_core _tri__cofl_d[] = + { { "drg", _tri__cofl__drg_a }, + { "lug", _tri__cofl__lug_a }, + {} + }; + + static u3j_harm _tri__rs_add_a[] = {{".2", u3wet_add}, {}}; + static u3j_harm _tri__rs_sub_a[] = {{".2", u3wet_sub}, {}}; + static u3j_harm _tri__rs_mul_a[] = {{".2", u3wet_mul}, {}}; + static u3j_harm _tri__rs_div_a[] = {{".2", u3wet_div}, {}}; + static u3j_harm _tri__rs_sqt_a[] = {{".2", u3wet_sqt}, {}}; + static u3j_harm _tri__rs_fma_a[] = {{".2", u3wet_fma}, {}}; + static u3j_harm _tri__rs_lth_a[] = {{".2", u3wet_lth}, {}}; + static u3j_harm _tri__rs_lte_a[] = {{".2", u3wet_lte}, {}}; + static u3j_harm _tri__rs_equ_a[] = {{".2", u3wet_equ}, {}}; + static u3j_harm _tri__rs_gte_a[] = {{".2", u3wet_gte}, {}}; + static u3j_harm _tri__rs_gth_a[] = {{".2", u3wet_gth}, {}}; + static u3j_core _tri__rs_d[] = + { { "add", _tri__rs_add_a }, + { "sub", _tri__rs_sub_a }, + { "mul", _tri__rs_mul_a }, + { "div", _tri__rs_div_a }, + { "sqt", _tri__rs_sqt_a }, + { "fma", _tri__rs_fma_a }, + { "lth", _tri__rs_lth_a }, + { "lte", _tri__rs_lte_a }, + { "equ", _tri__rs_equ_a }, + { "gte", _tri__rs_gte_a }, + { "gth", _tri__rs_gth_a }, + {} + }; + + static u3j_harm _tri__rq_add_a[] = {{".2", u3weq_add}, {}}; + static u3j_harm _tri__rq_sub_a[] = {{".2", u3weq_sub}, {}}; + static u3j_harm _tri__rq_mul_a[] = {{".2", u3weq_mul}, {}}; + static u3j_harm _tri__rq_div_a[] = {{".2", u3weq_div}, {}}; + static u3j_harm _tri__rq_sqt_a[] = {{".2", u3weq_sqt}, {}}; + static u3j_harm _tri__rq_fma_a[] = {{".2", u3weq_fma}, {}}; + static u3j_harm _tri__rq_lth_a[] = {{".2", u3weq_lth}, {}}; + static u3j_harm _tri__rq_lte_a[] = {{".2", u3weq_lte}, {}}; + static u3j_harm _tri__rq_equ_a[] = {{".2", u3weq_equ}, {}}; + static u3j_harm _tri__rq_gte_a[] = {{".2", u3weq_gte}, {}}; + static u3j_harm _tri__rq_gth_a[] = {{".2", u3weq_gth}, {}}; + static u3j_core _tri__rq_d[] = + { { "add", _tri__rq_add_a }, + { "sub", _tri__rq_sub_a }, + { "mul", _tri__rq_mul_a }, + { "div", _tri__rq_div_a }, + { "sqt", _tri__rq_sqt_a }, + { "fma", _tri__rq_fma_a }, + { "lth", _tri__rq_lth_a }, + { "lte", _tri__rq_lte_a }, + { "equ", _tri__rq_equ_a }, + { "gte", _tri__rq_gte_a }, + { "gth", _tri__rq_gth_a }, + {} + }; + + static u3j_harm _tri__aesc_en_a[] = {{".2", u3wea_en}, {}}; + static u3j_harm _tri__aesc_de_a[] = {{".2", u3wea_de}, {}}; + static u3j_core _tri__aesc_d[] = + { { "en", _tri__aesc_en_a }, + { "de", _tri__aesc_de_a }, + {} + }; + + static u3j_harm _tri__og_raw_a[] = {{".2", u3weo_raw}, {}}; + static u3j_core _tri__og_d[] = + { { "raw", _tri__og_raw_a }, + {} + }; + + static u3j_harm _tri_shax_a[] = {{".2", u3we_shax}, {}}; + static u3j_harm _tri_shay_a[] = {{".2", u3we_shay}, {}}; + static u3j_harm _tri_shas_a[] = {{".2", u3we_shas}, {}}; + static u3j_harm _tri_shal_a[] = {{".2", u3we_shal}, {}}; + static u3j_core _tri_d[] = { { "qua", 0, _qua_d }, + + { "cofl", 0, _tri__cofl_d }, + { "rd", 0, _tri__rd_d }, + { "rs", 0, _tri__rs_d }, + { "rq", 0, _tri__rq_d }, + { "og", 0, _tri__og_d }, + { "shax", _tri_shax_a }, + { "shay", _tri_shay_a }, + { "shas", _tri_shas_a }, + { "shal", _tri_shal_a }, + { "aesc", 0, _tri__aesc_d }, + {} }; + +/* layer two +*/ + static u3j_harm _two_flop_a[] = {{".2", u3wb_flop, c3y}, {}}; + static u3j_harm _two_lent_a[] = {{".2", u3wb_lent, c3y}, {}}; + static u3j_harm _two_levy_a[] = {{".2", u3wb_levy, c3y}, {}}; + static u3j_harm _two_lien_a[] = {{".2", u3wb_lien, c3y}, {}}; + static u3j_harm _two_murn_a[] = {{".2", u3wb_murn, c3y}, {}}; + static u3j_harm _two_need_a[] = {{".2", u3wb_need, c3y}, {}}; + static u3j_harm _two_reap_a[] = {{".2", u3wb_reap, c3y}, {}}; + static u3j_harm _two_reel_a[] = {{".2", u3wb_reel, c3y}, {}}; + static u3j_harm _two_roll_a[] = {{".2", u3wb_roll, c3y}, {}}; + static u3j_harm _two_skid_a[] = {{".2", u3wb_skid, c3y}, {}}; + static u3j_harm _two_skim_a[] = {{".2", u3wb_skim, c3y}, {}}; + static u3j_harm _two_skip_a[] = {{".2", u3wb_skip, c3y}, {}}; + static u3j_harm _two_scag_a[] = {{".2", u3wb_scag, c3y}, {}}; + static u3j_harm _two_slag_a[] = {{".2", u3wb_slag, c3y}, {}}; + static u3j_harm _two_snag_a[] = {{".2", u3wb_snag, c3y}, {}}; + // static u3j_harm _two_sort_a[] = {{".2", u3wb_sort, c3y}, {}}; + static u3j_harm _two_turn_a[] = {{".2", u3wb_turn, c3y}, {}}; + static u3j_harm _two_weld_a[] = {{".2", u3wb_weld, c3y}, {}}; + + static u3j_harm _two_bex_a[] = {{".2", u3wc_bex, c3y}, {}}; + static u3j_harm _two_xeb_a[] = {{".2", u3wc_xeb, c3y}, {}}; + static u3j_harm _two_can_a[] = {{".2", u3wc_can, c3y}, {}}; + static u3j_harm _two_cat_a[] = {{".2", u3wc_cat, c3y}, {}}; + static u3j_harm _two_cut_a[] = {{".2", u3wc_cut, c3y}, {}}; + static u3j_harm _two_end_a[] = {{".2", u3wc_end, c3y}, {}}; + static u3j_harm _two_lsh_a[] = {{".2", u3wc_lsh, c3y}, {}}; + static u3j_harm _two_met_a[] = {{".2", u3wc_met, c3y}, {}}; + static u3j_harm _two_rap_a[] = {{".2", u3wc_rap, c3y}, {}}; + static u3j_harm _two_rip_a[] = {{".2", u3wc_rip, c3y}, {}}; + static u3j_harm _two_rsh_a[] = {{".2", u3wc_rsh, c3y}, {}}; + + static u3j_harm _two_con_a[] = {{".2", u3wc_con, c3y}, {}}; + static u3j_harm _two_dis_a[] = {{".2", u3wc_dis, c3y}, {}}; + static u3j_harm _two_mix_a[] = {{".2", u3wc_mix, c3y}, {}}; + + static u3j_harm _two_mug_a[] = {{".2", u3wc_mug, c3y}, {}}; + + static u3j_harm _two_dor_a[] = {{".2", u3wc_dor, c3y}, {}}; + static u3j_harm _two_gor_a[] = {{".2", u3wc_gor, c3y}, {}}; + static u3j_harm _two_hor_a[] = {{".2", u3wc_hor, c3y}, {}}; + static u3j_harm _two_vor_a[] = {{".2", u3wc_vor, c3y}, {}}; + + static u3j_harm _two_pow_a[] = {{".2", u3wc_pow, c3y}, {}}; + static u3j_harm _two_sqt_a[] = {{".2", u3wc_sqt, c3y}, {}}; + + static u3j_harm _two__in_bif_a[] = {{".2", u3wdi_bif}, {}}; + static u3j_harm _two__in_dif_a[] = {{".2", u3wdi_dif}, {}}; + static u3j_harm _two__in_gas_a[] = {{".2", u3wdi_gas}, {}}; + static u3j_harm _two__in_has_a[] = {{".2", u3wdi_has}, {}}; + static u3j_harm _two__in_mer_a[] = {{".2", u3wdi_mer}, {}}; + // static u3j_harm _two__in_int_a[] = {{".2", u3wdi_int}, {}}; + static u3j_harm _two__in_put_a[] = {{".2", u3wdi_put}, {}}; + static u3j_harm _two__in_tap_a[] = {{".2", u3wdi_tap}, {}}; + // static u3j_harm _two__in_uni_a[] = {{".2", u3wdi_uni}, {}}; + static u3j_core _two__in_d[] = + { { "bif", _two__in_bif_a }, + { "dif", _two__in_dif_a }, + { "gas", _two__in_gas_a }, + { "has", _two__in_has_a }, + { "mer", _two__in_mer_a }, + // { "int", _two__in_int_a }, + { "put", _two__in_put_a }, + { "tap", _two__in_tap_a }, + // { "uni", _two__in_uni_a }, + {} + }; + + static u3j_harm _two__by_bif_a[] = {{".2", u3wdb_bif, c3y}, {}}; + static u3j_harm _two__by_dif_a[] = {{".2", u3wdb_dif, c3y}, {}}; + static u3j_harm _two__by_gas_a[] = {{".2", u3wdb_gas, c3y}, {}}; + static u3j_harm _two__by_get_a[] = {{".2", u3wdb_get, c3y}, {}}; + static u3j_harm _two__by_has_a[] = {{".2", u3wdb_has, c3y}, {}}; + // static u3j_harm _two__by_int_a[] = {{".2", u3wdb_int, c3y}, {}}; + static u3j_harm _two__by_put_a[] = {{".2", u3wdb_put, c3y}, {}}; + static u3j_harm _two__by_tap_a[] = {{".2", u3wdb_tap, c3y}, {}}; + // static u3j_harm _two__by_uni_a[] = {{".2", u3wdb_uni, c3y}, {}}; + static u3j_core _two__by_d[] = + { { "bif", _two__by_bif_a }, + { "dif", _two__by_dif_a }, + { "gas", _two__by_gas_a }, + { "get", _two__by_get_a }, + { "has", _two__by_has_a }, + // { "int", _two__by_int_a }, + { "put", _two__by_put_a }, + { "tap", _two__by_tap_a }, + // { "uni", _two__by_uni_a }, + {} + }; + + static u3j_harm _two_cue_a[] = {{".2", u3we_cue}, {}}; + static u3j_harm _two_jam_a[] = {{".2", u3we_jam}, {}}; + static u3j_harm _two_mat_a[] = {{".2", u3we_mat}, {}}; + static u3j_harm _two_rub_a[] = {{".2", u3we_rub}, {}}; + static u3j_core _two_d[] = { { "tri", 0, _tri_d }, - {} + { "flop", _two_flop_a }, + { "lent", _two_lent_a }, + { "levy", _two_levy_a }, + { "lien", _two_lien_a }, + { "murn", _two_murn_a }, + { "need", _two_need_a }, + { "reap", _two_reap_a }, + { "reel", _two_reel_a }, + { "roll", _two_roll_a }, + { "skid", _two_skid_a }, + { "skim", _two_skim_a }, + { "skip", _two_skip_a }, + { "scag", _two_scag_a }, + { "slag", _two_slag_a }, + { "snag", _two_snag_a }, +// { "sort", _two_sort_a }, + { "turn", _two_turn_a }, + { "weld", _two_weld_a }, + + { "bex", _two_bex_a }, + { "xeb", _two_xeb_a }, + { "can", _two_can_a }, + { "cat", _two_cat_a }, + { "cut", _two_cut_a }, + { "end", _two_end_a }, + { "lsh", _two_lsh_a }, + { "met", _two_met_a }, + { "rap", _two_rap_a }, + { "rip", _two_rip_a }, + { "rsh", _two_rsh_a }, + + { "con", _two_con_a }, + { "dis", _two_dis_a }, + { "mix", _two_mix_a }, + + { "mug", _two_mug_a }, + + { "dor", _two_dor_a }, + { "gor", _two_gor_a }, + { "hor", _two_hor_a }, + { "vor", _two_vor_a }, + + { "pow", _two_pow_a }, + { "sqt", _two_sqt_a }, + + { "by", 0, _two__by_d }, + { "in", 0, _two__in_d }, + + { "cue", _two_cue_a }, + { "jam", _two_jam_a }, + { "mat", _two_mat_a }, + { "rub", _two_rub_a }, }; + + +/* layer one +*/ + static u3j_harm _one_add_a[] = {{".2", u3wa_add, c3y}, {}}; + static u3j_harm _one_dec_a[] = {{".2", u3wa_dec, c3y}, {}}; + static u3j_harm _one_div_a[] = {{".2", u3wa_div, c3y}, {}}; + static u3j_harm _one_dvr_a[] = {{".2", u3wc_dvr, c3y}, {}}; + static u3j_harm _one_gte_a[] = {{".2", u3wa_gte, c3y}, {}}; + static u3j_harm _one_gth_a[] = {{".2", u3wa_gth, c3y}, {}}; + static u3j_harm _one_lte_a[] = {{".2", u3wa_lte, c3y}, {}}; + static u3j_harm _one_lth_a[] = {{".2", u3wa_lth, c3y}, {}}; + static u3j_harm _one_mod_a[] = {{".2", u3wa_mod, c3y}, {}}; + static u3j_harm _one_mul_a[] = {{".2", u3wa_mul, c3y}, {}}; + static u3j_harm _one_sub_a[] = {{".2", u3wa_sub, c3y}, {}}; + + static u3j_harm _one_cap_a[] = {{".2", u3wc_cap, c3y}, {}}; + static u3j_harm _one_peg_a[] = {{".2", u3wc_peg, c3y}, {}}; + static u3j_harm _one_mas_a[] = {{".2", u3wc_mas, c3y}, {}}; + static u3j_core _one_d[] = { { "two", 0, _two_d }, + { "add", _one_add_a }, + { "dec", _one_dec_a }, + { "div", _one_div_a }, + { "dvr", _one_dvr_a }, + { "gte", _one_gte_a }, + { "gth", _one_gth_a }, + { "lte", _one_lte_a }, + { "lth", _one_lth_a }, + { "mod", _one_mod_a }, + { "mul", _one_mul_a }, + { "sub", _one_sub_a }, + + { "cap", _one_cap_a }, + { "mas", _one_mas_a }, + { "peg", _one_peg_a }, + {} }; static u3j_core _k150_d[] = @@ -600,19 +1146,13 @@ static u3j_core _k150_d[] = {} }; + static u3j_core _d[] = { { "k151", 0, _k151_d}, { "k150", 0, _k150_d}, {} }; - -static u3j_core _d[] = { - { "k151", 0, _k151_d}, - {} -}; - - u3j_dash u3j_Dash = { _d, diff --git a/noun/jets.c b/noun/jets.c index 419452cfd..523498125 100644 --- a/noun/jets.c +++ b/noun/jets.c @@ -770,7 +770,7 @@ _cj_mine(u3_noun cey, u3_noun cor) #if 0 u3m_p("new jet", bal); - fprintf(stderr, " bat %x, jax %d\r\n", u3r_mug(bat), jax_l); + // fprintf(stderr, " bat %x, jax %d\r\n", u3r_mug(bat), jax_l); #endif u3h_put(u3R->jed.har_p, From 29617c0694fa0c68d67be96827287bbf7268fa34 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 30 Mar 2016 15:14:11 -0700 Subject: [PATCH 05/21] Learning. --- jets/f/ut_buss.c | 17 +++++++++-------- jets/f/ut_mint.c | 6 ++++++ jets/f/ut_mull.c | 6 ++++++ jets/f/ut_play.c | 6 ++++++ 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/jets/f/ut_buss.c b/jets/f/ut_buss.c index 89478b244..578abc705 100644 --- a/jets/f/ut_buss.c +++ b/jets/f/ut_buss.c @@ -12,15 +12,16 @@ u3_noun cog, u3_noun gen) { - u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); - u3_noun gat = u3j_hook(von, "buss"); + u3_noun cug, ret; - return u3n_kick_on(u3i_molt(gat, - u3x_sam_2, - u3k(cog), - u3x_sam_3, - u3k(gen), - 0)); + cug = u3nc(u3nt(u3nt(u3k(cog), u3_nul, u3k(gen)), + u3_nul, + u3_nul), + u3_nul); + ret = u3qf_face(cug, sut); + + u3z(cug); + return ret; } /* boilerplate diff --git a/jets/f/ut_mint.c b/jets/f/ut_mint.c index 9ee623102..3f6fca3f4 100644 --- a/jets/f/ut_mint.c +++ b/jets/f/ut_mint.c @@ -605,6 +605,12 @@ return ret; } + case c3__tune: p_gen = u3t(gen); + _mint_used(); + { + return u3nc(u3qf_face(p_gen, sut), u3nc(0, 1)); + } + case c3__burn: p_gen = u3t(gen); _mint_used(); { diff --git a/jets/f/ut_mull.c b/jets/f/ut_mull.c index b4b21f12c..f8c9f4181 100644 --- a/jets/f/ut_mull.c +++ b/jets/f/ut_mull.c @@ -570,6 +570,12 @@ u3z(vat); return ret; } + + case c3__tune: p_gen = u3t(gen); + _mull_used(); + { + return u3nc(u3qf_face(p_gen, sut), u3qf_face(p_gen, sut)); + } case c3__burn: p_gen = u3t(gen); _mull_used(); diff --git a/jets/f/ut_play.c b/jets/f/ut_play.c index b276907bb..78afe68e3 100644 --- a/jets/f/ut_play.c +++ b/jets/f/ut_play.c @@ -351,6 +351,12 @@ return ret; } + case c3__tune: p_gen = u3t(gen); + _play_used(); + { + return u3qf_face(p_gen, sut); + } + case c3__burn: p_gen = u3t(gen); _play_used(); { From 0f6e59d8a07648359b7338c870fac880f67bc489 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 4 Aug 2016 10:59:59 -0700 Subject: [PATCH 06/21] Moar ghetto. --- include/c/motes.h | 1 + include/noun/trace.h | 5 ++++ noun/nock.c | 8 +++++++ noun/trace.c | 54 ++++++++++++++++++++++++++++++++++++++------ vere/raft.c | 6 +++-- 5 files changed, 65 insertions(+), 9 deletions(-) diff --git a/include/c/motes.h b/include/c/motes.h index 8f5c88391..a6fe30165 100644 --- a/include/c/motes.h +++ b/include/c/motes.h @@ -963,6 +963,7 @@ # define c3__sgts c3_s4('s','g','t','s') # define c3__sgwt c3_s4('s','g','w','t') # define c3__sgzp c3_s4('s','g','z','p') +# define c3__shiv c3_s4('s','h','i','v') # define c3__show c3_s4('s','h','o','w') # define c3__shud c3_s4('s','h','u','d') # define c3__shut c3_s4('s','h','u','t') diff --git a/include/noun/trace.h b/include/noun/trace.h index e629639c8..439581a81 100644 --- a/include/noun/trace.h +++ b/include/noun/trace.h @@ -69,6 +69,11 @@ void u3t_slog(u3_noun hod); + /* u3t_shiv(): atom-only print. + */ + void + u3t_shiv(u3_noun hod); + /* u3t_heck(): profile point. */ void diff --git a/noun/nock.c b/noun/nock.c index aff13332f..7301bb79c 100644 --- a/noun/nock.c +++ b/noun/nock.c @@ -93,6 +93,14 @@ _n_hint(u3_noun zep, return _n_nock_on(bus, nex); } + case c3__shiv: { + u3t_off(noc_o); + u3t_shiv(hod); + u3t_on(noc_o); + + return _n_nock_on(bus, nex); + } + case c3__germ: { u3_noun pro = _n_nock_on(bus, nex); diff --git a/noun/trace.c b/noun/trace.c index 55efebad4..6ddd21322 100644 --- a/noun/trace.c +++ b/noun/trace.c @@ -38,32 +38,54 @@ u3t_drop(void) extern void u3_lo_tank(c3_l tab_l, u3_noun tac); -/* u3t_slog(): print directly. +#ifdef GHETTO +/* _t_ghetto(): ghetto timelapse. */ void -u3t_slog(u3_noun hod) +_t_ghetto(void) { -#ifdef GHETTO static int old; static struct timeval b4, f2, d0; + static c3_d b4_d; c3_w ms_w; if ( old ) { gettimeofday(&f2, 0); timersub(&f2, &b4, &d0); ms_w = (d0.tv_sec * 1000) + (d0.tv_usec / 1000); - if (ms_w > 10) { - printf("%6d.%02dms ", ms_w, (int) (d0.tv_usec % 1000) / 10); + if (ms_w > 1) { +#if 0 + printf("%6d.%02dms: %9d ", + ms_w, (int) (d0.tv_usec % 1000) / 10, + ((int) (u3R->pro.nox_d - b4_d))); +#else + printf("%6d.%02dms ", + ms_w, (int) (d0.tv_usec % 1000) / 10); +#endif gettimeofday(&b4, 0); + b4_d = u3R->pro.nox_d; } else { printf(" "); } } - else gettimeofday(&b4, 0); + else { + gettimeofday(&b4, 0); + b4_d = u3R->pro.nox_d; + } old = 1; - +} #endif + +/* u3t_slog(): print directly. +*/ +void +u3t_slog(u3_noun hod) +{ +#ifdef GHETTO + _t_ghetto(); +#endif + if ( c3y == u3du(hod) ) { u3_noun pri = u3h(hod); @@ -77,6 +99,24 @@ u3t_slog(u3_noun hod) u3z(hod); } +/* u3t_shiv(): quick print. +*/ +void +u3t_shiv(u3_noun hod) +{ +#ifdef GHETTO + _t_ghetto(); +#endif + + if ( c3n == u3ud(hod) ) { + } + else { + c3_c *str_c = u3r_string(hod); + printf("%s\r\n", str_c); + free(str_c); + } +} + /* u3t_heck(): profile point. */ void diff --git a/vere/raft.c b/vere/raft.c index e89a2ae87..c9382ce04 100644 --- a/vere/raft.c +++ b/vere/raft.c @@ -1566,9 +1566,11 @@ _raft_punk(u3_noun ovo) #ifdef GHETTO struct timeval b4, f2, d0; gettimeofday(&b4, 0); +#if 0 if( c3__belt != u3h(u3t(ovo)) ){ - uL(fprintf(uH, "%%soft %s\n", txt_c)); + uL(fprintf(uH, ":%s\n", txt_c)); } +#endif #endif gon = u3m_soft(sec_w, u3v_poke, u3k(ovo)); @@ -1582,7 +1584,7 @@ _raft_punk(u3_noun ovo) ms_w = (d0.tv_sec * 1000) + (d0.tv_usec / 1000); clr_w = ms_w > 1000 ? 1 : ms_w < 100 ? 2 : 3; // red, green, yellow if(c3__belt != u3h(u3t(ovo)) || clr_w != 2){ - uL(fprintf(uH, "\x1b[3%dm%%punk %s %4d.%02dms\x1b[0m\n", + uL(fprintf(uH, "\x1b[3%dm%%%s %4d.%02dms\x1b[0m\n", clr_w, txt_c, ms_w, (int) (d0.tv_usec % 1000) / 10)); } free(txt_c); From fb32d124563d32c15d348f8d4c4b59057e9a7bdf Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 4 Aug 2016 15:41:44 -0700 Subject: [PATCH 07/21] Moar ghetto printfs. --- Makefile | 2 +- vere/raft.c | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index fff488b12..36b6b1213 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,7 @@ endif # NOTFORCHECKIN - restore -O3 # -DGHETTO \ # -DHUSH -CFLAGS= $(COSFLAGS) $(DEBUGFLAGS) -ffast-math \ +CFLAGS= $(COSFLAGS) $(DEBUGFLAGS) -DGHETTO -ffast-math \ -funsigned-char \ -I/usr/local/include \ $(OPTLOCALINC) \ diff --git a/vere/raft.c b/vere/raft.c index c9382ce04..fae4445f7 100644 --- a/vere/raft.c +++ b/vere/raft.c @@ -1566,11 +1566,6 @@ _raft_punk(u3_noun ovo) #ifdef GHETTO struct timeval b4, f2, d0; gettimeofday(&b4, 0); -#if 0 - if( c3__belt != u3h(u3t(ovo)) ){ - uL(fprintf(uH, ":%s\n", txt_c)); - } -#endif #endif gon = u3m_soft(sec_w, u3v_poke, u3k(ovo)); @@ -1662,7 +1657,26 @@ _raft_push(u3_raft* raf_u, c3_w* bob_w, c3_w len_w) if ( 1 == raf_u->pop_w ) { c3_assert(u3_raty_lead == raf_u->typ_e); + +#ifdef GHETTO + struct timeval b4, f2, d0; + gettimeofday(&b4, 0); +#endif + raf_u->ent_d = u3_sist_pack(raf_u->tem_w, c3__ov, bob_w, len_w); + +#ifdef GHETTO + c3_w ms_w; + c3_w clr_w; + + gettimeofday(&f2, 0); + timersub(&f2, &b4, &d0); + ms_w = (d0.tv_sec * 1000) + (d0.tv_usec / 1000); + clr_w = ms_w > 1000 ? 1 : ms_w < 100 ? 2 : 3; // red, green, yellow + uL(fprintf(uH, "\x1b[3%dm %4d.%02dms\x1b[0m\n", + clr_w, ms_w, (int) (d0.tv_usec % 1000) / 10)); +#endif + raf_u->lat_w = raf_u->tem_w; // XX if ( !uv_is_active((uv_handle_t*)&raf_u->tim_u) ) { From e7f37d5a1468506f3931fc12fdea5fed9a979924 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Fri, 5 Aug 2016 15:40:52 -0700 Subject: [PATCH 08/21] Don't be ghetto. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 36b6b1213..fff488b12 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,7 @@ endif # NOTFORCHECKIN - restore -O3 # -DGHETTO \ # -DHUSH -CFLAGS= $(COSFLAGS) $(DEBUGFLAGS) -DGHETTO -ffast-math \ +CFLAGS= $(COSFLAGS) $(DEBUGFLAGS) -ffast-math \ -funsigned-char \ -I/usr/local/include \ $(OPTLOCALINC) \ From f5bef736361202310f52f0660f9c17cd52a9c38d Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Fri, 5 Aug 2016 15:45:45 -0700 Subject: [PATCH 09/21] Correct merge. --- jets/tree.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/jets/tree.c b/jets/tree.c index 76103a153..b00c5df08 100644 --- a/jets/tree.c +++ b/jets/tree.c @@ -623,7 +623,6 @@ static u3j_core _hex_d[] = static u3j_harm _pen__ut_mint_a[] = {{".2", u3wfu_mint}, {}}; static u3j_harm _pen__ut_mull_a[] = {{".2", u3wfu_mull}, {}}; static u3j_harm _pen__ut_nest_a[] = {{".2", u3wfu_nest}, {}}; - static u3j_harm _pen__ut_park_a[] = {{".2", u3wfu_park}, {}}; static u3j_harm _pen__ut_peek_a[] = {{".2", u3wfu_peek}, {}}; static u3j_harm _pen__ut_play_a[] = {{".2", u3wfu_play}, {}}; static u3j_harm _pen__ut_rest_a[] = {{".2", u3wfu_rest}, {}}; @@ -641,7 +640,6 @@ static u3j_core _hex_d[] = { "mint", _pen__ut_mint_a }, { "mull", _pen__ut_mull_a }, { "nest", _pen__ut_nest_a }, - { "park", _pen__ut_park_a }, { "peek", _pen__ut_peek_a }, { "play", _pen__ut_play_a }, { "rest", _pen__ut_rest_a }, From 956094664df6386124a2d47ee1eacb725647268c Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Tue, 6 Sep 2016 10:56:27 -0700 Subject: [PATCH 10/21] Clean up flags. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7e3bedd4a..4b3b0f38e 100644 --- a/Makefile +++ b/Makefile @@ -69,12 +69,12 @@ ifneq ($(UNAME),FreeBSD) CC=gcc CXX=g++ CXXFLAGS=$(CFLAGS) -CLD=g++ $(CFLAGS) -L/usr/local/lib -L$(OPTLOCALLFLAGS) -L$(OPENSSLLFLAGS) +CLD=g++ $(CFLAGS) -L/usr/local/lib $(OPTLOCALLFLAGS) $(OPENSSLLFLAGS) else CC=cc CXX=c++ CXXFLAGS=$(CFLAGS) -CLD=c++ $(CFLAGS) -L/usr/local/lib -L$(OPTLOCALLFLAGS) -L$(OPENSSLLFLAGS) +CLD=c++ $(CFLAGS) -L/usr/local/lib $(OPTLOCALLFLAGS) $(OPENSSLLFLAGS) endif ifeq ($(OS),osx) From 43e1588ba2ab05810ab815bfc43852bf5a44b28e Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Sat, 8 Oct 2016 21:41:50 -0700 Subject: [PATCH 11/21] Add %use rune (=,). --- include/jets/q.h | 1 + jets/f/ut_buss.c | 55 +++++++++++++++++++++++++++++++++++++++++------- jets/f/ut_mint.c | 10 +++++++++ jets/f/ut_mull.c | 13 ++++++++++++ jets/f/ut_play.c | 10 +++++++++ 5 files changed, 81 insertions(+), 8 deletions(-) diff --git a/include/jets/q.h b/include/jets/q.h index acaeea878..19cbc6394 100644 --- a/include/jets/q.h +++ b/include/jets/q.h @@ -211,6 +211,7 @@ # define u3qfu_van_fab 119 u3_noun u3qfu_burn(u3_noun, u3_noun); + u3_noun u3qfu_busk(u3_noun, u3_noun, u3_noun); u3_noun u3qfu_buss(u3_noun, u3_noun, u3_noun, u3_noun); u3_noun u3qfu_bust(u3_noun, u3_noun, u3_noun); u3_noun u3qfu_conk(u3_noun, u3_noun, u3_noun); diff --git a/jets/f/ut_buss.c b/jets/f/ut_buss.c index 578abc705..eda325520 100644 --- a/jets/f/ut_buss.c +++ b/jets/f/ut_buss.c @@ -12,16 +12,29 @@ u3_noun cog, u3_noun gen) { - u3_noun cug, ret; + u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); + u3_noun gat = u3j_hook(von, "buss"); - cug = u3nc(u3nt(u3nt(u3k(cog), u3_nul, u3k(gen)), - u3_nul, - u3_nul), - u3_nul); - ret = u3qf_face(cug, sut); + return u3n_kick_on(u3i_molt(gat, + u3x_sam_2, + u3k(cog), + u3x_sam_3, + u3k(gen), + 0)); + } - u3z(cug); - return ret; + u3_noun + _cqfu_busk(u3_noun van, + u3_noun sut, + u3_noun gen) + { + u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); + u3_noun gat = u3j_hook(von, "busk"); + + return u3n_kick_on(u3i_molt(gat, + u3x_sam, + u3k(gen), + 0)); } /* boilerplate @@ -52,3 +65,29 @@ { return _cqfu_buss(van, sut, cog, gen); } + + + u3_noun + u3wfu_busk(u3_noun cor) + { + u3_noun sut, gen, van; + + if ( (c3n == u3r_mean(cor, u3x_sam, &gen, + u3x_con, &van, + 0)) || + (u3_none == (sut = u3r_at(u3x_sam, van))) ) + { + return u3m_bail(c3__fail); + } else { + return _cqfu_busk(van, sut, gen); + } + } + + u3_noun + u3qfu_busk(u3_noun van, + u3_noun sut, + u3_noun gen) + { + return _cqfu_busk(van, sut, gen); + } + diff --git a/jets/f/ut_mint.c b/jets/f/ut_mint.c index b964fb761..fdcf923bc 100644 --- a/jets/f/ut_mint.c +++ b/jets/f/ut_mint.c @@ -676,6 +676,16 @@ return ret; } + case c3__use: u3x_cell(u3t(gen), &p_gen, &q_gen); + _mint_used(); + { + u3_noun boc = u3qfu_busk(van, sut, p_gen); + u3_noun ret = _mint_in(van, boc, gol, q_gen); + + u3z(boc); + return ret; + } + case c3__make: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { diff --git a/jets/f/ut_mull.c b/jets/f/ut_mull.c index f8c9f4181..89970527f 100644 --- a/jets/f/ut_mull.c +++ b/jets/f/ut_mull.c @@ -620,6 +620,19 @@ return ret; } + case c3__use: u3x_cell(u3t(gen), &p_gen, &q_gen); + _mull_used(); + { + u3_noun boc = u3qfu_busk(van, sut, p_gen); + u3_noun nuf = u3qfu_busk(van, dox, p_gen); + u3_noun ret = _mull_in(van, boc, gol, nuf, q_gen); + + u3z(boc); + u3z(nuf); + + return ret; + } + case c3__make: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { diff --git a/jets/f/ut_play.c b/jets/f/ut_play.c index 78afe68e3..645824943 100644 --- a/jets/f/ut_play.c +++ b/jets/f/ut_play.c @@ -389,6 +389,16 @@ return ret; } + case c3__use: u3x_cell(u3t(gen), &p_gen, &q_gen); + _play_used(); + { + u3_noun boc = u3qfu_busk(van, sut, p_gen); + u3_noun ret = _play_x(van, boc, q_gen); + + u3z(boc); + return ret; + } + case c3__make: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { From 87f1b8d1358f3b42f025287f647caa31159aac99 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Sun, 9 Oct 2016 14:29:08 -0700 Subject: [PATCH 12/21] Make =, work. --- include/c/motes.h | 1 + jets/f/ut_find.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/c/motes.h b/include/c/motes.h index a6fe30165..446994766 100644 --- a/include/c/motes.h +++ b/include/c/motes.h @@ -702,6 +702,7 @@ # define c3__mold c3_s4('m','o','l','d') # define c3__mong c3_s4('m','o','n','g') # define c3__mono c3_s4('m','o','n','o') +# define c3__mook c3_s4('m','o','o','k') # define c3__moot c3_s4('m','o','o','t') # define c3__mor c3_s3('m','o','r') # define c3__moze c3_s4('m','o','z','e') diff --git a/jets/f/ut_find.c b/jets/f/ut_find.c index 130e0c5fe..cabc42bea 100644 --- a/jets/f/ut_find.c +++ b/jets/f/ut_find.c @@ -419,8 +419,8 @@ else { u3_noun iqp_sut = u3h(qp_sut); // twig u3_noun tiv = u3qfu_mint // (pair span nock) - (van, sut, c3__noun, iqp_sut); - u3_noun tqp_sut = u3t(qp_sut); // (list (pair span nock)) + (van, q_sut, c3__noun, iqp_sut); + u3_noun tqp_sut = u3t(qp_sut); // (list twig) u3_noun p_tiv = u3h(tiv); // span u3_noun q_tiv = u3t(tiv); // nock u3_noun fid = _find_buck // pony @@ -434,7 +434,7 @@ u3_noun ret; ret = _find_buck_face_next - (van, sut, q_sut, tqp_sut, way, p_heg, q_heg, u3t(u3t(fid)), lon, gil); + (van, sut, q_sut, tqp_sut, way, u3t(u3t(fid)), q_heg, axe, lon, gil); u3z(fid); u3z(tiv); return ret; @@ -452,7 +452,7 @@ } u3z(fid); - vat = u3qfu_fine(van, q_sut, tor); + vat = u3qfu_fine(van, sut, tor); u3z(tor); ret = u3nq From 891a1bf909aad2348600cdaffa85882aa48d750e Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 10 Oct 2016 10:17:58 -0700 Subject: [PATCH 13/21] Fix :use. --- jets/f/ut_find.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jets/f/ut_find.c b/jets/f/ut_find.c index cabc42bea..ee08c508a 100644 --- a/jets/f/ut_find.c +++ b/jets/f/ut_find.c @@ -410,13 +410,16 @@ u3_noun lon, u3_noun gil) { - if ( u3_nul == qp_sut ) { + // if ( u3_nul == qp_sut ) { + if ( 1 ) { u3_noun nol = u3nc(u3_nul, u3k(lon)); u3_noun ret = _find_buck(van, q_sut, way, p_heg, q_heg, axe, nol, gil); u3z(nol); return ret; } else { + fprintf(stderr, "fbfun\r\n"); + u3_noun iqp_sut = u3h(qp_sut); // twig u3_noun tiv = u3qfu_mint // (pair span nock) (van, q_sut, c3__noun, iqp_sut); @@ -433,6 +436,8 @@ else if ( (c3n == u3h(fid)) && (c3y == u3h(u3t(fid))) ) { u3_noun ret; + fprintf(stderr, "fbout\r\n"); + ret = _find_buck_face_next (van, sut, q_sut, tqp_sut, way, u3t(u3t(fid)), q_heg, axe, lon, gil); u3z(fid); From ceffdf577ab6cc3a37f3f883ba52c8b8ffb6c83e Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 10 Oct 2016 16:56:43 -0700 Subject: [PATCH 14/21] =, seems to work. --- jets/f/ut_find.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/jets/f/ut_find.c b/jets/f/ut_find.c index ee08c508a..daac336b6 100644 --- a/jets/f/ut_find.c +++ b/jets/f/ut_find.c @@ -410,16 +410,14 @@ u3_noun lon, u3_noun gil) { - // if ( u3_nul == qp_sut ) { - if ( 1 ) { + if ( u3_nul == qp_sut ) { + // if ( 1 ) { u3_noun nol = u3nc(u3_nul, u3k(lon)); u3_noun ret = _find_buck(van, q_sut, way, p_heg, q_heg, axe, nol, gil); u3z(nol); return ret; } else { - fprintf(stderr, "fbfun\r\n"); - u3_noun iqp_sut = u3h(qp_sut); // twig u3_noun tiv = u3qfu_mint // (pair span nock) (van, q_sut, c3__noun, iqp_sut); @@ -436,8 +434,6 @@ else if ( (c3n == u3h(fid)) && (c3y == u3h(u3t(fid))) ) { u3_noun ret; - fprintf(stderr, "fbout\r\n"); - ret = _find_buck_face_next (van, sut, q_sut, tqp_sut, way, u3t(u3t(fid)), q_heg, axe, lon, gil); u3z(fid); @@ -464,7 +460,7 @@ (c3n, c3n, u3k(u3h(vat)), - u3qf_comb(u3t(vat), u3qf_comb(dog, q_tiv))); + u3qf_comb(u3qf_comb(dog, q_tiv), u3t(vat))); u3z(vat); u3z(dog); From bbe35d6c1dc5111a3f741323cb58785ff78e74be Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Sat, 22 Oct 2016 12:09:50 -0700 Subject: [PATCH 15/21] Fix crua reference. --- vere/raft.c | 2 +- vere/sist.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vere/raft.c b/vere/raft.c index fae4445f7..00357987e 100644 --- a/vere/raft.c +++ b/vere/raft.c @@ -2045,7 +2045,7 @@ u3_raft_work(void) ron = u3ke_jam(u3nc(u3k(u3A->now), ovo)); c3_assert(u3A->key); - ron = u3dc("en:crua", u3k(u3A->key), ron); + ron = u3dc("en:crua:crypto", u3k(u3A->key), ron); len_w = u3r_met(5, ron); bob_w = c3_malloc(len_w * 4L); diff --git a/vere/sist.c b/vere/sist.c index d83a43d9e..7c3b03ae4 100644 --- a/vere/sist.c +++ b/vere/sist.c @@ -985,7 +985,7 @@ _sist_rest() if ( u3A->key ) { u3_noun dep; - dep = u3dc("de:crua", u3k(u3A->key), ron); + dep = u3dc("de:crua:crypto", u3k(u3A->key), ron); if ( c3n == u3du(dep) ) { uL(fprintf(uH, "record (%s) is corrupt (k)\n", ful_c)); u3_lo_bail(); From cb9f3162f5b8b3da651165051efe56f260dcdda0 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 24 Oct 2016 13:41:00 -0700 Subject: [PATCH 16/21] Adjust to new zuse. --- vere/raft.c | 2 +- vere/sist.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vere/raft.c b/vere/raft.c index fae4445f7..00357987e 100644 --- a/vere/raft.c +++ b/vere/raft.c @@ -2045,7 +2045,7 @@ u3_raft_work(void) ron = u3ke_jam(u3nc(u3k(u3A->now), ovo)); c3_assert(u3A->key); - ron = u3dc("en:crua", u3k(u3A->key), ron); + ron = u3dc("en:crua:crypto", u3k(u3A->key), ron); len_w = u3r_met(5, ron); bob_w = c3_malloc(len_w * 4L); diff --git a/vere/sist.c b/vere/sist.c index d83a43d9e..7c3b03ae4 100644 --- a/vere/sist.c +++ b/vere/sist.c @@ -985,7 +985,7 @@ _sist_rest() if ( u3A->key ) { u3_noun dep; - dep = u3dc("de:crua", u3k(u3A->key), ron); + dep = u3dc("de:crua:crypto", u3k(u3A->key), ron); if ( c3n == u3du(dep) ) { uL(fprintf(uH, "record (%s) is corrupt (k)\n", ful_c)); u3_lo_bail(); From d40015b808b0bee4dae318fe7c171fe4223ec3c5 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 27 Oct 2016 17:26:40 -0700 Subject: [PATCH 17/21] Move ++perk to ++peel; change jets. --- Makefile | 2 +- include/jets/q.h | 2 +- include/jets/w.h | 2 +- jets/f/ut_find.c | 2 +- jets/f/ut_peek.c | 2 +- jets/f/{ut_perk.c => ut_peel.c} | 12 ++++++------ jets/tree.c | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) rename jets/f/{ut_perk.c => ut_peel.c} (84%) diff --git a/Makefile b/Makefile index 4b3b0f38e..7a4b77ec5 100644 --- a/Makefile +++ b/Makefile @@ -333,7 +333,7 @@ J_F_OFILES_UT=\ jets/f/ut_mull.o \ jets/f/ut_nest.o \ jets/f/ut_peek.o \ - jets/f/ut_perk.o \ + jets/f/ut_peel.o \ jets/f/ut_play.o \ jets/f/ut_repo.o \ jets/f/ut_rest.o \ diff --git a/include/jets/q.h b/include/jets/q.h index 19cbc6394..993735faa 100644 --- a/include/jets/q.h +++ b/include/jets/q.h @@ -237,7 +237,7 @@ u3_noun u3qfu_nost(u3_noun, u3_noun, u3_noun, u3_noun); u3_noun u3qfu_orth(u3_noun, u3_noun, u3_noun); u3_noun u3qfu_peek(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu_perk(u3_noun, u3_noun, u3_noun, u3_noun); + u3_noun u3qfu_peel(u3_noun, u3_noun, u3_noun, u3_noun); u3_noun u3qfu_play(u3_noun, u3_noun, u3_noun); u3_noun u3qfu_repo(u3_noun, u3_noun); u3_noun u3qfu_rest(u3_noun, u3_noun, u3_noun); diff --git a/include/jets/w.h b/include/jets/w.h index 9848b5db0..45d2cba32 100644 --- a/include/jets/w.h +++ b/include/jets/w.h @@ -250,7 +250,7 @@ u3_noun u3wfu_mull(u3_noun); u3_noun u3wfu_nest(u3_noun); u3_noun u3wfu_peek(u3_noun); - u3_noun u3wfu_perk(u3_noun); + u3_noun u3wfu_peel(u3_noun); u3_noun u3wfu_play(u3_noun); u3_noun u3wfu_repo(u3_noun); u3_noun u3wfu_rest(u3_noun); diff --git a/jets/f/ut_find.c b/jets/f/ut_find.c index daac336b6..c2f6081f8 100644 --- a/jets/f/ut_find.c +++ b/jets/f/ut_find.c @@ -207,7 +207,7 @@ return pro; } else { - u3_noun pec = u3qfu_perk(van, sut, way, pq_sut); + u3_noun pec = u3qfu_peel(van, sut, way, pq_sut); u3_noun pro; if ( c3n == u3h(pec) ) { diff --git a/jets/f/ut_peek.c b/jets/f/ut_peek.c index f52a5d9d4..d476d25c2 100644 --- a/jets/f/ut_peek.c +++ b/jets/f/ut_peek.c @@ -83,7 +83,7 @@ u3_atom lat = u3qc_mas(axe); if ( 3 == now ) { - u3_noun pec = u3qfu_perk(van, sut, way, pq_sut); + u3_noun pec = u3qfu_peel(van, sut, way, pq_sut); u3_noun sam = u3h(pec); u3_noun con = u3t(pec); diff --git a/jets/f/ut_perk.c b/jets/f/ut_peel.c similarity index 84% rename from jets/f/ut_perk.c rename to jets/f/ut_peel.c index cf326e7b8..717a62543 100644 --- a/jets/f/ut_perk.c +++ b/jets/f/ut_peel.c @@ -1,4 +1,4 @@ -/* j/6/ut_perk.c +/* j/6/ut_peel.c ** */ #include "all.h" @@ -7,7 +7,7 @@ /* logic */ u3_noun - _cqfu_perk(u3_noun van, + _cqfu_peel(u3_noun van, u3_noun sut, u3_noun way, u3_noun met) @@ -28,7 +28,7 @@ /* boilerplate */ u3_noun - u3wfu_perk(u3_noun cor) + u3wfu_peel(u3_noun cor) { u3_noun sut, way, met, van; @@ -40,16 +40,16 @@ { return u3m_bail(c3__fail); } else { - return _cqfu_perk(van, sut, way, met); + return _cqfu_peel(van, sut, way, met); } } u3_noun - u3qfu_perk(u3_noun van, + u3qfu_peel(u3_noun van, u3_noun sut, u3_noun way, u3_noun met) { - return _cqfu_perk(van, sut, way, met); + return _cqfu_peel(van, sut, way, met); } diff --git a/jets/tree.c b/jets/tree.c index ecd6bba4b..c49b2b4a8 100644 --- a/jets/tree.c +++ b/jets/tree.c @@ -360,7 +360,7 @@ static u3j_harm _mood__hoon__ut_mint_a[] = {{".2", u3wfu_mint}, {}}; static u3j_harm _mood__hoon__ut_mull_a[] = {{".2", u3wfu_mull}, {}}; static u3j_harm _mood__hoon__ut_nest_a[] = {{".2", u3wfu_nest}, {}}; static u3j_harm _mood__hoon__ut_peek_a[] = {{".2", u3wfu_peek}, {}}; -static u3j_harm _mood__hoon__ut_perk_a[] = {{".2", u3wfu_perk}, {}}; +static u3j_harm _mood__hoon__ut_peel_a[] = {{".2", u3wfu_peel}, {}}; static u3j_harm _mood__hoon__ut_play_a[] = {{".2", u3wfu_play}, {}}; static u3j_harm _mood__hoon__ut_rest_a[] = {{".2", u3wfu_rest}, {}}; static u3j_harm _mood__hoon__ut_toss_a[] = {{".2", u3wfu_toss}, {}}; @@ -379,7 +379,7 @@ static u3j_core _mood__hoon__ut_d[] = { "mull", _mood__hoon__ut_mull_a }, { "nest", _mood__hoon__ut_nest_a }, { "peek", _mood__hoon__ut_peek_a }, - { "perk", _mood__hoon__ut_perk_a }, + { "peel", _mood__hoon__ut_peel_a }, { "play", _mood__hoon__ut_play_a }, { "rest", _mood__hoon__ut_rest_a }, { "toss", _mood__hoon__ut_toss_a }, From eea379f256fb18f7008062d5dcc1e3589eed30d5 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 31 Oct 2016 09:37:04 -0700 Subject: [PATCH 18/21] With crypto namespaced. --- vere/raft.c | 2 +- vere/sist.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vere/raft.c b/vere/raft.c index 00357987e..ccdd9e9a4 100644 --- a/vere/raft.c +++ b/vere/raft.c @@ -2045,7 +2045,7 @@ u3_raft_work(void) ron = u3ke_jam(u3nc(u3k(u3A->now), ovo)); c3_assert(u3A->key); - ron = u3dc("en:crua:crypto", u3k(u3A->key), ron); + ron = u3dc("en:crua:crypto:ames", u3k(u3A->key), ron); len_w = u3r_met(5, ron); bob_w = c3_malloc(len_w * 4L); diff --git a/vere/sist.c b/vere/sist.c index 7c3b03ae4..3ea375bb9 100644 --- a/vere/sist.c +++ b/vere/sist.c @@ -985,7 +985,7 @@ _sist_rest() if ( u3A->key ) { u3_noun dep; - dep = u3dc("de:crua:crypto", u3k(u3A->key), ron); + dep = u3dc("de:crua:crypto:ames", u3k(u3A->key), ron); if ( c3n == u3du(dep) ) { uL(fprintf(uH, "record (%s) is corrupt (k)\n", ful_c)); u3_lo_bail(); From 8af3e8dc5da06326358e8e99a9a54f12c0ba51ab Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Fri, 25 Nov 2016 17:45:16 -0800 Subject: [PATCH 19/21] Boot new sequence, not done yet. --- noun/manage.c | 6 ++++-- noun/vortex.c | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/noun/manage.c b/noun/manage.c index 7d29ad2a5..67670736c 100644 --- a/noun/manage.c +++ b/noun/manage.c @@ -1560,8 +1560,10 @@ _boot_home(c3_c *dir_c, c3_c *pil_c) result = curl_easy_perform(curl); fclose(file); if ( result != CURLE_OK ) { - fprintf(stderr, "failed to fetch %s: %s\n", url_c, curl_easy_strerror(result)); - fprintf(stderr, "please fetch it manually and specify the location with -B\n"); + fprintf(stderr, "failed to fetch %s: %s\n", + url_c, + curl_easy_strerror(result)); + fprintf(stderr, "please fetch it by hand, then run -B $filename\n"); exit(1); } curl_easy_cleanup(curl); diff --git a/noun/vortex.c b/noun/vortex.c index 7b4851d01..2bd183904 100644 --- a/noun/vortex.c +++ b/noun/vortex.c @@ -33,6 +33,33 @@ u3v_make(c3_c* pas_c) u3z(sys); } +/* u3v_boot(): correct bootstrap sequence. +*/ +void +u3v_remake(c3_c* pas_c, + c3_c* who_c, + c3_c* why_c) +{ + u3_noun sys = u3ke_cue(u3m_file(pas_c)); + u3_noun eva; // event-one + u3_noun evb; // event-two + u3_noun evc; // compiler-formula + u3_noun evd; // compiler-source + u3_noun eve; // arvo-source + u3_noun evf; // main-sequence + + u3r_mean(sys, 2, &eva, + 6, &evb, + 14, &evc, + 30, &evd, + + if ( (c3n == u3r_mean(cor, u3x_sam_2, &gol, + u3x_sam_3, &gen, + u3x_con, &van, + 0)) || + +} + /* u3v_jack(): execute kernel formula to bind jets. */ void From 1548fc7f519bf1ab203c5f32af525de20bd5c77b Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Fri, 25 Nov 2016 11:27:27 -0800 Subject: [PATCH 20/21] 149 and 150. --- jets/tree.c | 2034 ++++++++++++++++++++++++--------------------------- 1 file changed, 974 insertions(+), 1060 deletions(-) diff --git a/jets/tree.c b/jets/tree.c index c49b2b4a8..1dff8ffeb 100644 --- a/jets/tree.c +++ b/jets/tree.c @@ -3,1221 +3,1135 @@ */ #include "all.h" -/**************************************************************old (151) */ -static u3j_harm _mood__hoon_add_a[] = {{".2", u3wa_add, c3y}, {}}; -static u3j_harm _mood__hoon_dec_a[] = {{".2", u3wa_dec, c3y}, {}}; -static u3j_harm _mood__hoon_div_a[] = {{".2", u3wa_div, c3y}, {}}; -static u3j_harm _mood__hoon_gte_a[] = {{".2", u3wa_gte, c3y}, {}}; -static u3j_harm _mood__hoon_gth_a[] = {{".2", u3wa_gth, c3y}, {}}; -static u3j_harm _mood__hoon_lte_a[] = {{".2", u3wa_lte, c3y}, {}}; -static u3j_harm _mood__hoon_lth_a[] = {{".2", u3wa_lth, c3y}, {}}; -static u3j_harm _mood__hoon_mod_a[] = {{".2", u3wa_mod, c3y}, {}}; -static u3j_harm _mood__hoon_mul_a[] = {{".2", u3wa_mul, c3y}, {}}; -static u3j_harm _mood__hoon_sub_a[] = {{".2", u3wa_sub, c3y}, {}}; - -static u3j_harm _mood__hoon_bind_a[] = {{".2", u3wb_bind, c3y}, {}}; -static u3j_harm _mood__hoon_clap_a[] = {{".2", u3wb_clap, c3y}, {}}; -static u3j_harm _mood__hoon_drop_a[] = {{".2", u3wb_drop, c3y}, {}}; -static u3j_harm _mood__hoon_flop_a[] = {{".2", u3wb_flop, c3y}, {}}; -static u3j_harm _mood__hoon_lent_a[] = {{".2", u3wb_lent, c3y}, {}}; -static u3j_harm _mood__hoon_levy_a[] = {{".2", u3wb_levy, c3y}, {}}; -static u3j_harm _mood__hoon_lien_a[] = {{".2", u3wb_lien, c3y}, {}}; -static u3j_harm _mood__hoon_murn_a[] = {{".2", u3wb_murn, c3y}, {}}; -static u3j_harm _mood__hoon_need_a[] = {{".2", u3wb_need, c3y}, {}}; -static u3j_harm _mood__hoon_reap_a[] = {{".2", u3wb_reap, c3y}, {}}; -static u3j_harm _mood__hoon_reel_a[] = {{".2", u3wb_reel, c3y}, {}}; -static u3j_harm _mood__hoon_roll_a[] = {{".2", u3wb_roll, c3y}, {}}; -static u3j_harm _mood__hoon_skid_a[] = {{".2", u3wb_skid, c3y}, {}}; -static u3j_harm _mood__hoon_skim_a[] = {{".2", u3wb_skim, c3y}, {}}; -static u3j_harm _mood__hoon_skip_a[] = {{".2", u3wb_skip, c3y}, {}}; -static u3j_harm _mood__hoon_scag_a[] = {{".2", u3wb_scag, c3y}, {}}; -static u3j_harm _mood__hoon_slag_a[] = {{".2", u3wb_slag, c3y}, {}}; -static u3j_harm _mood__hoon_snag_a[] = {{".2", u3wb_snag, c3y}, {}}; -// static u3j_harm _mood__hoon_sort_a[] = {{".2", u3wb_sort, c3y}, {}}; -static u3j_harm _mood__hoon_turn_a[] = {{".2", u3wb_turn, c3y}, {}}; -static u3j_harm _mood__hoon_weld_a[] = {{".2", u3wb_weld, c3y}, {}}; - -static u3j_harm _mood__hoon_bex_a[] = {{".2", u3wc_bex, c3y}, {}}; -static u3j_harm _mood__hoon_xeb_a[] = {{".2", u3wc_xeb, c3y}, {}}; -static u3j_harm _mood__hoon_can_a[] = {{".2", u3wc_can, c3y}, {}}; -static u3j_harm _mood__hoon_cap_a[] = {{".2", u3wc_cap, c3y}, {}}; -static u3j_harm _mood__hoon_cat_a[] = {{".2", u3wc_cat, c3y}, {}}; -static u3j_harm _mood__hoon_con_a[] = {{".2", u3wc_con, c3y}, {}}; -static u3j_harm _mood__hoon_cut_a[] = {{".2", u3wc_cut, c3y}, {}}; -static u3j_harm _mood__hoon_dis_a[] = {{".2", u3wc_dis, c3y}, {}}; -static u3j_harm _mood__hoon_dor_a[] = {{".2", u3wc_dor, c3y}, {}}; -static u3j_harm _mood__hoon_dvr_a[] = {{".2", u3wc_dvr, c3y}, {}}; -static u3j_harm _mood__hoon_end_a[] = {{".2", u3wc_end, c3y}, {}}; -static u3j_harm _mood__hoon_gor_a[] = {{".2", u3wc_gor, c3y}, {}}; -static u3j_harm _mood__hoon_hor_a[] = {{".2", u3wc_hor, c3y}, {}}; -static u3j_harm _mood__hoon_lsh_a[] = {{".2", u3wc_lsh, c3y}, {}}; -static u3j_harm _mood__hoon_mas_a[] = {{".2", u3wc_mas, c3y}, {}}; -static u3j_harm _mood__hoon_met_a[] = {{".2", u3wc_met, c3y}, {}}; -static u3j_harm _mood__hoon_mix_a[] = {{".2", u3wc_mix, c3y}, {}}; -static u3j_harm _mood__hoon_mug_a[] = {{".2", u3wc_mug, c3y}, {}}; -static u3j_harm _mood__hoon_muk_a[] = {{".2", u3wc_muk, c3y}, {}}; -static u3j_harm _mood__hoon_peg_a[] = {{".2", u3wc_peg, c3y}, {}}; -static u3j_harm _mood__hoon_pow_a[] = {{".2", u3wc_pow, c3y}, {}}; -static u3j_harm _mood__hoon_rap_a[] = {{".2", u3wc_rap, c3y}, {}}; -static u3j_harm _mood__hoon_rep_a[] = {{".2", u3wc_rep, c3y}, {}}; -static u3j_harm _mood__hoon_rip_a[] = {{".2", u3wc_rip, c3y}, {}}; -static u3j_harm _mood__hoon_rsh_a[] = {{".2", u3wc_rsh, c3y}, {}}; -static u3j_harm _mood__hoon_sqt_a[] = {{".2", u3wc_sqt, c3y}, {}}; -static u3j_harm _mood__hoon_vor_a[] = {{".2", u3wc_vor, c3y}, {}}; - -static u3j_harm _mood__hoon__po_ind_a[] = {{".2", u3wcp_ind}, {}}; -static u3j_harm _mood__hoon__po_ins_a[] = {{".2", u3wcp_ins}, {}}; -static u3j_harm _mood__hoon__po_tod_a[] = {{".2", u3wcp_tod}, {}}; -static u3j_harm _mood__hoon__po_tos_a[] = {{".2", u3wcp_tos}, {}}; -static u3j_core _mood__hoon__po_d[] = - { { "ind", _mood__hoon__po_ind_a }, - { "ins", _mood__hoon__po_ins_a }, - { "tod", _mood__hoon__po_tod_a }, - { "tos", _mood__hoon__po_tos_a }, - {} - }; - -static u3j_harm _mood__hoon__by_bif_a[] = {{".2", u3wdb_bif, c3y}, {}}; -static u3j_harm _mood__hoon__by_dif_a[] = {{".2", u3wdb_dif, c3y}, {}}; -static u3j_harm _mood__hoon__by_gas_a[] = {{".2", u3wdb_gas, c3y}, {}}; -static u3j_harm _mood__hoon__by_get_a[] = {{".2", u3wdb_get, c3y}, {}}; -static u3j_harm _mood__hoon__by_has_a[] = {{".2", u3wdb_has, c3y}, {}}; -// static u3j_harm _mood__hoon__by_int_a[] = {{".2", u3wdb_int, c3y}, {}}; -static u3j_harm _mood__hoon__by_put_a[] = {{".2", u3wdb_put, c3y}, {}}; -static u3j_harm _mood__hoon__by_tap_a[] = {{".2", u3wdb_tap, c3y}, {}}; -// static u3j_harm _mood__hoon__by_uni_a[] = {{".2", u3wdb_uni, c3y}, {}}; -static u3j_core _mood__hoon__by_d[] = - { { "bif", _mood__hoon__by_bif_a }, - { "dif", _mood__hoon__by_dif_a }, - { "gas", _mood__hoon__by_gas_a }, - { "get", _mood__hoon__by_get_a }, - { "has", _mood__hoon__by_has_a }, - // { "int", _mood__hoon__by_int_a }, - { "put", _mood__hoon__by_put_a }, - { "tap", _mood__hoon__by_tap_a }, - // { "uni", _mood__hoon__by_uni_a }, - {} - }; - -static u3j_harm _mood__hoon__in_bif_a[] = {{".2", u3wdi_bif}, {}}; -static u3j_harm _mood__hoon__in_dif_a[] = {{".2", u3wdi_dif}, {}}; -static u3j_harm _mood__hoon__in_gas_a[] = {{".2", u3wdi_gas}, {}}; -static u3j_harm _mood__hoon__in_has_a[] = {{".2", u3wdi_has}, {}}; -static u3j_harm _mood__hoon__in_mer_a[] = {{".2", u3wdi_mer}, {}}; -// static u3j_harm _mood__hoon__in_int_a[] = {{".2", u3wdi_int}, {}}; -static u3j_harm _mood__hoon__in_put_a[] = {{".2", u3wdi_put}, {}}; -static u3j_harm _mood__hoon__in_tap_a[] = {{".2", u3wdi_tap}, {}}; -// static u3j_harm _mood__hoon__in_uni_a[] = {{".2", u3wdi_uni}, {}}; -static u3j_core _mood__hoon__in_d[] = - { { "bif", _mood__hoon__in_bif_a }, - { "dif", _mood__hoon__in_dif_a }, - { "gas", _mood__hoon__in_gas_a }, - { "has", _mood__hoon__in_has_a }, - { "mer", _mood__hoon__in_mer_a }, - // { "int", _mood__hoon__in_int_a }, - { "put", _mood__hoon__in_put_a }, - { "tap", _mood__hoon__in_tap_a }, - // { "uni", _mood__hoon__in_uni_a }, - {} - }; - -static u3j_harm _mood__hoon_cue_a[] = {{".2", u3we_cue}, {}}; -static u3j_harm _mood__hoon_jam_a[] = {{".2", u3we_jam}, {}}; -static u3j_harm _mood__hoon_mat_a[] = {{".2", u3we_mat}, {}}; -static u3j_harm _mood__hoon_rub_a[] = {{".2", u3we_rub}, {}}; -static u3j_harm _mood__hoon_lore_a[] = {{".2", u3we_lore}, {}}; -static u3j_harm _mood__hoon_loss_a[] = {{".2", u3we_loss}, {}}; -static u3j_harm _mood__hoon_lune_a[] = {{".2", u3we_lune}, {}}; -static u3j_harm _mood__hoon_mink_a[] = {{".2", u3we_mink}, {}}; -static u3j_harm _mood__hoon_mule_a[] = {{".2", u3we_mule}, {}}; -static u3j_harm _mood__hoon_trip_a[] = {{".2", u3we_trip}, {}}; - -static u3j_harm _mood__hoon__aesc_en_a[] = {{".2", u3wea_en}, {}}; -static u3j_harm _mood__hoon__aesc_de_a[] = {{".2", u3wea_de}, {}}; -static u3j_core _mood__hoon__aesc_d[] = - { { "en", _mood__hoon__aesc_en_a }, - { "de", _mood__hoon__aesc_de_a }, - {} - }; - -static u3j_harm _mood__hoon__bend_fun_a[] = {{".2", u3we_bend_fun}, {}}; -static u3j_core _mood__hoon__bend_d[] = - { { "fun", _mood__hoon__bend_fun_a }, - {} - }; -static u3j_harm _mood__hoon__cold_fun_a[] = {{".2", u3we_cold_fun}, {}}; -static u3j_core _mood__hoon__cold_d[] = - { { "fun", _mood__hoon__cold_fun_a }, - {} - }; -static u3j_harm _mood__hoon__cook_fun_a[] = {{".2", u3we_cook_fun}, {}}; -static u3j_core _mood__hoon__cook_d[] = - { { "fun", _mood__hoon__cook_fun_a }, - {} - }; -static u3j_harm _mood__hoon__comp_fun_a[] = {{".2", u3we_comp_fun}, {}}; -static u3j_core _mood__hoon__comp_d[] = - { { "fun", _mood__hoon__comp_fun_a }, - {} - }; -static u3j_harm _mood__hoon__easy_fun_a[] = {{".2", u3we_easy_fun}, {}}; -static u3j_core _mood__hoon__easy_d[] = - { { "fun", _mood__hoon__easy_fun_a }, - {} - }; -static u3j_harm _mood__hoon__glue_fun_a[] = {{".2", u3we_glue_fun}, {}}; -static u3j_core _mood__hoon__glue_d[] = - { { "fun", _mood__hoon__glue_fun_a }, - {} - }; -static u3j_harm _mood__hoon__here_fun_a[] = {{".2", u3we_here_fun}, {}}; -static u3j_core _mood__hoon__here_d[] = - { { "fun", _mood__hoon__here_fun_a }, - {} - }; -static u3j_harm _mood__hoon__just_fun_a[] = {{".2", u3we_just_fun}, {}}; -static u3j_core _mood__hoon__just_d[] = - { { "fun", _mood__hoon__just_fun_a }, - {} - }; -static u3j_harm _mood__hoon__mask_fun_a[] = {{".2", u3we_mask_fun}, {}}; -static u3j_core _mood__hoon__mask_d[] = - { { "fun", _mood__hoon__mask_fun_a }, - {} - }; -static u3j_harm _mood__hoon__shim_fun_a[] = {{".2", u3we_shim_fun}, {}}; -static u3j_core _mood__hoon__shim_d[] = - { { "fun", _mood__hoon__shim_fun_a }, - {} - }; -static u3j_harm _mood__hoon__stag_fun_a[] = {{".2", u3we_stag_fun}, {}}; -static u3j_core _mood__hoon__stag_d[] = - { { "fun", _mood__hoon__stag_fun_a }, - {} - }; -static u3j_harm _mood__hoon__stew_fun_a[] = {{".2", u3we_stew_fun}, {}}; -static u3j_core _mood__hoon__stew_d[] = - { { "fun", _mood__hoon__stew_fun_a }, - {} - }; -static u3j_harm _mood__hoon__stir_fun_a[] = {{".2", u3we_stir_fun}, {}}; -static u3j_core _mood__hoon__stir_d[] = - { { "fun", _mood__hoon__stir_fun_a }, - {} - }; - -static u3j_harm _mood__hoon__og_raw_a[] = {{".2", u3weo_raw}, {}}; -static u3j_core _mood__hoon__og_d[] = - { { "raw", _mood__hoon__og_raw_a }, - {} - }; - -static u3j_harm _mood__hoon__cofl__drg_a[] = {{".2", u3wef_drg}, {}}; -static u3j_harm _mood__hoon__cofl__lug_a[] = {{".2", u3wef_lug}, {}}; -static u3j_core _mood__hoon__cofl_d[] = - { { "drg", _mood__hoon__cofl__drg_a }, - { "lug", _mood__hoon__cofl__lug_a }, - {} - }; - -static u3j_harm _mood__hoon__rd_add_a[] = {{".2", u3wer_add}, {}}; -static u3j_harm _mood__hoon__rd_sub_a[] = {{".2", u3wer_sub}, {}}; -static u3j_harm _mood__hoon__rd_mul_a[] = {{".2", u3wer_mul}, {}}; -static u3j_harm _mood__hoon__rd_div_a[] = {{".2", u3wer_div}, {}}; -static u3j_harm _mood__hoon__rd_sqt_a[] = {{".2", u3wer_sqt}, {}}; -static u3j_harm _mood__hoon__rd_fma_a[] = {{".2", u3wer_fma}, {}}; -static u3j_harm _mood__hoon__rd_lth_a[] = {{".2", u3wer_lth}, {}}; -static u3j_harm _mood__hoon__rd_lte_a[] = {{".2", u3wer_lte}, {}}; -static u3j_harm _mood__hoon__rd_equ_a[] = {{".2", u3wer_equ}, {}}; -static u3j_harm _mood__hoon__rd_gte_a[] = {{".2", u3wer_gte}, {}}; -static u3j_harm _mood__hoon__rd_gth_a[] = {{".2", u3wer_gth}, {}}; -static u3j_core _mood__hoon__rd_d[] = - { { "add", _mood__hoon__rd_add_a }, - { "sub", _mood__hoon__rd_sub_a }, - { "mul", _mood__hoon__rd_mul_a }, - { "div", _mood__hoon__rd_div_a }, - { "sqt", _mood__hoon__rd_sqt_a }, - { "fma", _mood__hoon__rd_fma_a }, - { "lth", _mood__hoon__rd_lth_a }, - { "lte", _mood__hoon__rd_lte_a }, - { "equ", _mood__hoon__rd_equ_a }, - { "gte", _mood__hoon__rd_gte_a }, - { "gth", _mood__hoon__rd_gth_a }, - {} - }; - -static u3j_harm _mood__hoon__rs_add_a[] = {{".2", u3wet_add}, {}}; -static u3j_harm _mood__hoon__rs_sub_a[] = {{".2", u3wet_sub}, {}}; -static u3j_harm _mood__hoon__rs_mul_a[] = {{".2", u3wet_mul}, {}}; -static u3j_harm _mood__hoon__rs_div_a[] = {{".2", u3wet_div}, {}}; -static u3j_harm _mood__hoon__rs_sqt_a[] = {{".2", u3wet_sqt}, {}}; -static u3j_harm _mood__hoon__rs_fma_a[] = {{".2", u3wet_fma}, {}}; -static u3j_harm _mood__hoon__rs_lth_a[] = {{".2", u3wet_lth}, {}}; -static u3j_harm _mood__hoon__rs_lte_a[] = {{".2", u3wet_lte}, {}}; -static u3j_harm _mood__hoon__rs_equ_a[] = {{".2", u3wet_equ}, {}}; -static u3j_harm _mood__hoon__rs_gte_a[] = {{".2", u3wet_gte}, {}}; -static u3j_harm _mood__hoon__rs_gth_a[] = {{".2", u3wet_gth}, {}}; -static u3j_core _mood__hoon__rs_d[] = - { { "add", _mood__hoon__rs_add_a }, - { "sub", _mood__hoon__rs_sub_a }, - { "mul", _mood__hoon__rs_mul_a }, - { "div", _mood__hoon__rs_div_a }, - { "sqt", _mood__hoon__rs_sqt_a }, - { "fma", _mood__hoon__rs_fma_a }, - { "lth", _mood__hoon__rs_lth_a }, - { "lte", _mood__hoon__rs_lte_a }, - { "equ", _mood__hoon__rs_equ_a }, - { "gte", _mood__hoon__rs_gte_a }, - { "gth", _mood__hoon__rs_gth_a }, - {} - }; - -static u3j_harm _mood__hoon__rq_add_a[] = {{".2", u3weq_add}, {}}; -static u3j_harm _mood__hoon__rq_sub_a[] = {{".2", u3weq_sub}, {}}; -static u3j_harm _mood__hoon__rq_mul_a[] = {{".2", u3weq_mul}, {}}; -static u3j_harm _mood__hoon__rq_div_a[] = {{".2", u3weq_div}, {}}; -static u3j_harm _mood__hoon__rq_sqt_a[] = {{".2", u3weq_sqt}, {}}; -static u3j_harm _mood__hoon__rq_fma_a[] = {{".2", u3weq_fma}, {}}; -static u3j_harm _mood__hoon__rq_lth_a[] = {{".2", u3weq_lth}, {}}; -static u3j_harm _mood__hoon__rq_lte_a[] = {{".2", u3weq_lte}, {}}; -static u3j_harm _mood__hoon__rq_equ_a[] = {{".2", u3weq_equ}, {}}; -static u3j_harm _mood__hoon__rq_gte_a[] = {{".2", u3weq_gte}, {}}; -static u3j_harm _mood__hoon__rq_gth_a[] = {{".2", u3weq_gth}, {}}; -static u3j_core _mood__hoon__rq_d[] = - { { "add", _mood__hoon__rq_add_a }, - { "sub", _mood__hoon__rq_sub_a }, - { "mul", _mood__hoon__rq_mul_a }, - { "div", _mood__hoon__rq_div_a }, - { "sqt", _mood__hoon__rq_sqt_a }, - { "fma", _mood__hoon__rq_fma_a }, - { "lth", _mood__hoon__rq_lth_a }, - { "lte", _mood__hoon__rq_lte_a }, - { "equ", _mood__hoon__rq_equ_a }, - { "gte", _mood__hoon__rq_gte_a }, - { "gth", _mood__hoon__rq_gth_a }, - {} - }; - -static u3j_harm _mood__hoon__coed__ed_puck_a[] = {{".2", u3wee_puck}, {}}; -static u3j_harm _mood__hoon__coed__ed_sign_a[] = {{".2", u3wee_sign}, {}}; -static u3j_harm _mood__hoon__coed__ed_veri_a[] = {{".2", u3wee_veri}, {}}; -static u3j_harm _mood__hoon__coed__ed_shar_a[] = {{".2", u3wee_shar}, {}}; - -static u3j_core _mood__hoon__coed__ed_d[] = - { { "sign", _mood__hoon__coed__ed_sign_a }, - { "puck", _mood__hoon__coed__ed_puck_a }, - { "veri", _mood__hoon__coed__ed_veri_a }, - { "shar", _mood__hoon__coed__ed_shar_a }, - {} - }; -static u3j_core _mood__hoon__coed_d[] = - { { "ed", 0, _mood__hoon__coed__ed_d }, - {} - }; - -static u3j_harm _mood__hoon__scr_hsh_a[] = {{".2", u3wes_hsh}, {}}; -static u3j_harm _mood__hoon__scr_hsl_a[] = {{".2", u3wes_hsl}, {}}; -static u3j_harm _mood__hoon__scr_pbk_a[] = {{".2", u3wes_pbk}, {}}; -static u3j_harm _mood__hoon__scr_pbl_a[] = {{".2", u3wes_pbl}, {}}; -static u3j_core _mood__hoon__scr_d[] = - { { "hsh", _mood__hoon__scr_hsh_a }, - { "hsl", _mood__hoon__scr_hsl_a }, - { "pbk", _mood__hoon__scr_pbk_a }, - { "pbl", _mood__hoon__scr_pbl_a }, - {} - }; - -static u3j_harm _mood__hoon_pfix_a[] = {{".2", u3we_pfix}, {}}; -static u3j_harm _mood__hoon_plug_a[] = {{".2", u3we_plug}, {}}; -static u3j_harm _mood__hoon_pose_a[] = {{".2", u3we_pose}, {}}; -static u3j_harm _mood__hoon_sfix_a[] = {{".2", u3we_sfix}, {}}; -static u3j_harm _mood__hoon_shax_a[] = {{".2", u3we_shax}, {}}; -static u3j_harm _mood__hoon_shay_a[] = {{".2", u3we_shay}, {}}; -static u3j_harm _mood__hoon_shas_a[] = {{".2", u3we_shas}, {}}; -static u3j_harm _mood__hoon_shal_a[] = {{".2", u3we_shal}, {}}; - -static u3j_harm _mood__hoon_cell_a[] = {{".2", u3wf_cell}, {}}; -static u3j_harm _mood__hoon_comb_a[] = {{".2", u3wf_comb}, {}}; -static u3j_harm _mood__hoon_cons_a[] = {{".2", u3wf_cons}, {}}; -static u3j_harm _mood__hoon_core_a[] = {{".2", u3wf_core}, {}}; -static u3j_harm _mood__hoon_face_a[] = {{".2", u3wf_face}, {}}; -static u3j_harm _mood__hoon_fitz_a[] = {{".2", u3wf_fitz}, {}}; -static u3j_harm _mood__hoon_flan_a[] = {{".2", u3wf_flan}, {}}; -static u3j_harm _mood__hoon_flip_a[] = {{".2", u3wf_flip}, {}}; -static u3j_harm _mood__hoon_flor_a[] = {{".2", u3wf_flor}, {}}; -static u3j_harm _mood__hoon_fork_a[] = {{".2", u3wf_fork}, {}}; -static u3j_harm _mood__hoon_hike_a[] = {{".2", u3wf_hike}, {}}; -static u3j_harm _mood__hoon_look_a[] = {{".2", u3wf_look}, {}}; - -static u3j_harm _mood__hoon__ut_burn_a[] = {{".2", u3wfu_burn}, {}}; -static u3j_harm _mood__hoon__ut_conk_a[] = {{".2", u3wfu_conk}, {}}; -static u3j_harm _mood__hoon__ut_crop_a[] = {{".2", u3wfu_crop}, {}}; -// static u3j_harm _mood__hoon__ut_fire_a[] = {{".2", u3wfu_fire}, {}}; -static u3j_harm _mood__hoon__ut_fond_a[] = {{".2", u3wfu_fond}, {}}; -static u3j_harm _mood__hoon__ut_fish_a[] = {{".2", u3wfu_fish}, {}}; -static u3j_harm _mood__hoon__ut_fuse_a[] = {{".2", u3wfu_fuse}, {}}; -static u3j_harm _mood__hoon__ut_mint_a[] = {{".2", u3wfu_mint}, {}}; -static u3j_harm _mood__hoon__ut_mull_a[] = {{".2", u3wfu_mull}, {}}; -static u3j_harm _mood__hoon__ut_nest_a[] = {{".2", u3wfu_nest}, {}}; -static u3j_harm _mood__hoon__ut_peek_a[] = {{".2", u3wfu_peek}, {}}; -static u3j_harm _mood__hoon__ut_peel_a[] = {{".2", u3wfu_peel}, {}}; -static u3j_harm _mood__hoon__ut_play_a[] = {{".2", u3wfu_play}, {}}; -static u3j_harm _mood__hoon__ut_rest_a[] = {{".2", u3wfu_rest}, {}}; -static u3j_harm _mood__hoon__ut_toss_a[] = {{".2", u3wfu_toss}, {}}; -static u3j_harm _mood__hoon__ut_wrap_a[] = {{".2", u3wfu_wrap}, {}}; - -static u3j_core _mood__hoon__ut_d[] = - { - { "burn", _mood__hoon__ut_burn_a }, - { "conk", _mood__hoon__ut_conk_a }, - { "crop", _mood__hoon__ut_crop_a }, - { "fond", _mood__hoon__ut_fond_a }, - // { "fire", _mood__hoon__ut_fire_a }, - { "fish", _mood__hoon__ut_fish_a }, - { "fuse", _mood__hoon__ut_fuse_a }, - { "mint", _mood__hoon__ut_mint_a }, - { "mull", _mood__hoon__ut_mull_a }, - { "nest", _mood__hoon__ut_nest_a }, - { "peek", _mood__hoon__ut_peek_a }, - { "peel", _mood__hoon__ut_peel_a }, - { "play", _mood__hoon__ut_play_a }, - { "rest", _mood__hoon__ut_rest_a }, - { "toss", _mood__hoon__ut_toss_a }, - { "wrap", _mood__hoon__ut_wrap_a }, - {} - }; -static u3j_harm _mood__hoon__ut_a[] = - { {"burn", u3wfu_burn}, - {"repo", u3wfu_repo}, - {} - }; - -#if 0 -static u3j_harm _mood__hoon__ap_a[] = - { // {"hack", u3wfp_open}, - // {"late", u3wfp_open}, - {"open", u3wfp_open}, - {"rake", u3wfp_rake}, - {} - }; -static u3j_harm _mood__hoon__al_a[] = - { {"bunt", u3wfl_bunt}, - {"whip", u3wfl_whip}, - {} - }; -#endif - -static u3j_harm _down_mark_a[] = {{".2", u3wg_down, c3y}, {}}; -static u3j_core _down_d[] = - { { "mark", _down_mark_a }, - {} - }; - -static u3j_harm _zuse__aes_ecba_en_a[] = {{".2", u3wea_ecba_en}, {}}; -static u3j_harm _zuse__aes_ecba_de_a[] = {{".2", u3wea_ecba_de}, {}}; -static u3j_harm _zuse__aes_ecbb_en_a[] = {{".2", u3wea_ecbb_en}, {}}; -static u3j_harm _zuse__aes_ecbb_de_a[] = {{".2", u3wea_ecbb_de}, {}}; -static u3j_harm _zuse__aes_ecbc_en_a[] = {{".2", u3wea_ecbc_en}, {}}; -static u3j_harm _zuse__aes_ecbc_de_a[] = {{".2", u3wea_ecbc_de}, {}}; - -static u3j_harm _zuse__aes_cbca_en_a[] = {{".2", u3wea_cbca_en}, {}}; -static u3j_harm _zuse__aes_cbca_de_a[] = {{".2", u3wea_cbca_de}, {}}; -static u3j_harm _zuse__aes_cbcb_en_a[] = {{".2", u3wea_cbcb_en}, {}}; -static u3j_harm _zuse__aes_cbcb_de_a[] = {{".2", u3wea_cbcb_de}, {}}; -static u3j_harm _zuse__aes_cbcc_en_a[] = {{".2", u3wea_cbcc_en}, {}}; -static u3j_harm _zuse__aes_cbcc_de_a[] = {{".2", u3wea_cbcc_de}, {}}; - -static u3j_core _zuse__aes_ecba_d[] = - { { "en", _zuse__aes_ecba_en_a }, - { "de", _zuse__aes_ecba_de_a }, - {} - }; - -static u3j_core _zuse__aes_ecbb_d[] = - { { "en", _zuse__aes_ecbb_en_a }, - { "de", _zuse__aes_ecbb_de_a }, - {} - }; - -static u3j_core _zuse__aes_ecbc_d[] = - { { "en", _zuse__aes_ecbc_en_a }, - { "de", _zuse__aes_ecbc_de_a }, - {} - }; - -static u3j_core _zuse__aes_cbca_d[] = - { { "en", _zuse__aes_cbca_en_a }, - { "de", _zuse__aes_cbca_de_a }, - {} - }; - -static u3j_core _zuse__aes_cbcb_d[] = - { { "en", _zuse__aes_cbcb_en_a }, - { "de", _zuse__aes_cbcb_de_a }, - {} - }; - -static u3j_core _zuse__aes_cbcc_d[] = - { { "en", _zuse__aes_cbcc_en_a }, - { "de", _zuse__aes_cbcc_de_a }, - {} - }; - -static u3j_core _zuse__aes_d[] = - { { "ecba", 0, _zuse__aes_ecba_d }, - { "ecbb", 0, _zuse__aes_ecbb_d }, - { "ecbc", 0, _zuse__aes_ecbc_d }, - { "cbca", 0, _zuse__aes_cbca_d }, - { "cbcb", 0, _zuse__aes_cbcb_d }, - { "cbcc", 0, _zuse__aes_cbcc_d }, - {} - }; - -/* -static u3j_core _zuse_d[] = - { { "aes", 0, _zuse__aes_d }, - {} - }; -*/ - -static u3j_core _arvo_d[] = - { { "down", 0, _down_d }, - { "lore", _mood__hoon_lore_a }, - { "loss", _mood__hoon_loss_a }, - { "lune", _mood__hoon_lune_a }, - { "aes", 0, _zuse__aes_d }, - {} - }; - - u3_noun - u3qa_dope(u3_atom a) - { - fprintf(stderr, "c dope %x\r\n", a); - return (a * a * a); - } - u3_noun - u3wa_dope(u3_noun cor) - { - u3_noun a; - - if ( (c3n == u3r_mean(cor, u3x_sam, &a, 0)) || - (c3n == u3ud(a)) ) - { - return u3m_bail(c3__exit); - } else { - return u3wa_dope(a); - } - } - -static u3j_core _mood__hoon_d[] = - { { "add", _mood__hoon_add_a }, - { "dec", _mood__hoon_dec_a }, - { "div", _mood__hoon_div_a }, - { "gte", _mood__hoon_gte_a }, - { "gth", _mood__hoon_gth_a }, - { "lte", _mood__hoon_lte_a }, - { "lth", _mood__hoon_lth_a }, - { "mod", _mood__hoon_mod_a }, - { "mul", _mood__hoon_mul_a }, - { "sub", _mood__hoon_sub_a }, -#if 1 - { "bind", _mood__hoon_bind_a }, - { "clap", _mood__hoon_clap_a }, - { "drop", _mood__hoon_drop_a }, - { "flop", _mood__hoon_flop_a }, - { "lent", _mood__hoon_lent_a }, - { "levy", _mood__hoon_levy_a }, - { "lien", _mood__hoon_lien_a }, - { "murn", _mood__hoon_murn_a }, - { "need", _mood__hoon_need_a }, - { "reap", _mood__hoon_reap_a }, - { "reel", _mood__hoon_reel_a }, - { "roll", _mood__hoon_roll_a }, - { "skid", _mood__hoon_skid_a }, - { "skim", _mood__hoon_skim_a }, - { "skip", _mood__hoon_skip_a }, - { "scag", _mood__hoon_scag_a }, - { "slag", _mood__hoon_slag_a }, - { "snag", _mood__hoon_snag_a }, -// { "sort", _mood__hoon_sort_a }, - { "turn", _mood__hoon_turn_a }, - { "weld", _mood__hoon_weld_a }, - - { "bex", _mood__hoon_bex_a }, - { "xeb", _mood__hoon_xeb_a }, - { "can", _mood__hoon_can_a }, - { "cap", _mood__hoon_cap_a }, - { "cat", _mood__hoon_cat_a }, - { "con", _mood__hoon_con_a }, - { "cut", _mood__hoon_cut_a }, - { "dis", _mood__hoon_dis_a }, - { "dor", _mood__hoon_dor_a }, - { "dvr", _mood__hoon_dvr_a }, - { "end", _mood__hoon_end_a }, - { "gor", _mood__hoon_gor_a }, - { "hor", _mood__hoon_hor_a }, - { "lsh", _mood__hoon_lsh_a }, - { "mas", _mood__hoon_mas_a }, - { "met", _mood__hoon_met_a }, - { "mix", _mood__hoon_mix_a }, - { "mug", _mood__hoon_mug_a }, - { "muk", _mood__hoon_muk_a }, - { "peg", _mood__hoon_peg_a }, - { "pow", _mood__hoon_pow_a }, - { "rap", _mood__hoon_rap_a }, - { "rep", _mood__hoon_rep_a }, - { "rip", _mood__hoon_rip_a }, - { "rsh", _mood__hoon_rsh_a }, - { "sqt", _mood__hoon_sqt_a }, - { "vor", _mood__hoon_vor_a }, - - { "po", 0, _mood__hoon__po_d }, - - { "by", 0, _mood__hoon__by_d }, - { "in", 0, _mood__hoon__in_d }, - - { "cue", _mood__hoon_cue_a }, - { "jam", _mood__hoon_jam_a }, - { "mat", _mood__hoon_mat_a }, - { "rub", _mood__hoon_rub_a }, - { "lore", _mood__hoon_lore_a }, - { "loss", _mood__hoon_loss_a }, - { "lune", _mood__hoon_lune_a }, - { "mink", _mood__hoon_mink_a }, - { "mule", _mood__hoon_mule_a }, - { "trip", _mood__hoon_trip_a }, - - { "aesc", 0, _mood__hoon__aesc_d }, - { "bend", 0, _mood__hoon__bend_d }, - { "cold", 0, _mood__hoon__cold_d }, - { "comp", 0, _mood__hoon__comp_d }, - { "cook", 0, _mood__hoon__cook_d }, - { "easy", 0, _mood__hoon__easy_d }, - { "coed", 0, _mood__hoon__coed_d }, - { "glue", 0, _mood__hoon__glue_d }, - { "here", 0, _mood__hoon__here_d }, - { "just", 0, _mood__hoon__just_d }, - { "mask", 0, _mood__hoon__mask_d }, - { "shim", 0, _mood__hoon__shim_d }, - { "stag", 0, _mood__hoon__stag_d }, - { "stew", 0, _mood__hoon__stew_d }, - { "stir", 0, _mood__hoon__stir_d }, - - { "cofl", 0, _mood__hoon__cofl_d }, - { "rd", 0, _mood__hoon__rd_d }, - { "rs", 0, _mood__hoon__rs_d }, - { "rq", 0, _mood__hoon__rq_d }, - { "og", 0, _mood__hoon__og_d }, - { "coed", 0, _mood__hoon__coed_d }, - { "scr", 0, _mood__hoon__scr_d }, - - { "pfix", _mood__hoon_pfix_a }, - { "plug", _mood__hoon_plug_a }, - { "pose", _mood__hoon_pose_a }, - { "sfix", _mood__hoon_sfix_a }, - - { "shax", _mood__hoon_shax_a }, - { "shay", _mood__hoon_shay_a }, - { "shas", _mood__hoon_shas_a }, - { "shal", _mood__hoon_shal_a }, - - { "cell", _mood__hoon_cell_a }, - { "comb", _mood__hoon_comb_a }, - { "cons", _mood__hoon_cons_a }, - { "core", _mood__hoon_core_a }, - { "face", _mood__hoon_face_a }, - { "fitz", _mood__hoon_fitz_a }, - { "flan", _mood__hoon_flan_a }, - { "flip", _mood__hoon_flip_a }, - { "flor", _mood__hoon_flor_a }, - { "fork", _mood__hoon_fork_a }, - { "hike", _mood__hoon_hike_a }, - { "look", _mood__hoon_look_a }, - - // { "ap", _mood__hoon__ap_a }, - // { "al", _mood__hoon__al_a }, - { "ut", _mood__hoon__ut_a, _mood__hoon__ut_d }, - { "arvo", 0, _arvo_d }, -#endif - {} - }; - -static u3j_core _mood_d[] = - { { "hoon", 0, _mood__hoon_d }, - {} - }; -static u3j_core _k151_d[] = - { { "mood", 0, _mood_d }, - {} - }; - -/************************************************************** new (150)*/ - - static u3j_harm _hex_down_mark_a[] = {{".2", u3wg_down, c3y}, {}}; - static u3j_core _hex_down_d[] = - { { "mark", _hex_down_mark_a }, + static u3j_harm _149_hex_down_mark_a[] = {{".2", u3wg_down, c3y}, {}}; + static u3j_core _149_hex_down_d[] = + { { "mark", _149_hex_down_mark_a }, {} }; - static u3j_harm _hex_lore_a[] = {{".2", u3we_lore}, {}}; - static u3j_harm _hex_loss_a[] = {{".2", u3we_loss}, {}}; - static u3j_harm _hex_lune_a[] = {{".2", u3we_lune}, {}}; + static u3j_harm _149_hex_lore_a[] = {{".2", u3we_lore}, {}}; + static u3j_harm _149_hex_loss_a[] = {{".2", u3we_loss}, {}}; + static u3j_harm _149_hex_lune_a[] = {{".2", u3we_lune}, {}}; -static u3j_core _hex_d[] = - { { "down", 0, _hex_down_d }, - { "lore", _hex_lore_a }, - { "loss", _hex_loss_a }, - { "lune", _hex_lune_a }, +static u3j_core _149_hex_d[] = + { { "down", 0, _149_hex_down_d }, + { "lore", _149_hex_lore_a }, + { "loss", _149_hex_loss_a }, + { "lune", _149_hex_lune_a }, {} }; /* layer five */ - static u3j_harm _pen_cell_a[] = {{".2", u3wf_cell}, {}}; - static u3j_harm _pen_comb_a[] = {{".2", u3wf_comb}, {}}; - static u3j_harm _pen_cons_a[] = {{".2", u3wf_cons}, {}}; - static u3j_harm _pen_core_a[] = {{".2", u3wf_core}, {}}; - static u3j_harm _pen_face_a[] = {{".2", u3wf_face}, {}}; - static u3j_harm _pen_fitz_a[] = {{".2", u3wf_fitz}, {}}; - static u3j_harm _pen_flan_a[] = {{".2", u3wf_flan}, {}}; - static u3j_harm _pen_flip_a[] = {{".2", u3wf_flip}, {}}; - static u3j_harm _pen_flor_a[] = {{".2", u3wf_flor}, {}}; - static u3j_harm _pen_fork_a[] = {{".2", u3wf_fork}, {}}; - static u3j_harm _pen_hike_a[] = {{".2", u3wf_hike}, {}}; - static u3j_harm _pen_look_a[] = {{".2", u3wf_look}, {}}; + static u3j_harm _149_pen_cell_a[] = {{".2", u3wf_cell}, {}}; + static u3j_harm _149_pen_comb_a[] = {{".2", u3wf_comb}, {}}; + static u3j_harm _149_pen_cons_a[] = {{".2", u3wf_cons}, {}}; + static u3j_harm _149_pen_core_a[] = {{".2", u3wf_core}, {}}; + static u3j_harm _149_pen_face_a[] = {{".2", u3wf_face}, {}}; + static u3j_harm _149_pen_fitz_a[] = {{".2", u3wf_fitz}, {}}; + static u3j_harm _149_pen_flan_a[] = {{".2", u3wf_flan}, {}}; + static u3j_harm _149_pen_flip_a[] = {{".2", u3wf_flip}, {}}; + static u3j_harm _149_pen_flor_a[] = {{".2", u3wf_flor}, {}}; + static u3j_harm _149_pen_fork_a[] = {{".2", u3wf_fork}, {}}; + static u3j_harm _149_pen_hike_a[] = {{".2", u3wf_hike}, {}}; + static u3j_harm _149_pen_look_a[] = {{".2", u3wf_look}, {}}; - static u3j_harm _pen__ut_burn_a[] = {{".2", u3wfu_burn}, {}}; - static u3j_harm _pen__ut_conk_a[] = {{".2", u3wfu_conk}, {}}; - static u3j_harm _pen__ut_crop_a[] = {{".2", u3wfu_crop}, {}}; - // static u3j_harm _pen__ut_fire_a[] = {{".2", u3wfu_fire}, {}}; - static u3j_harm _pen__ut_fond_a[] = {{".2", u3wfu_fond}, {}}; - static u3j_harm _pen__ut_fish_a[] = {{".2", u3wfu_fish}, {}}; - static u3j_harm _pen__ut_fuse_a[] = {{".2", u3wfu_fuse}, {}}; - static u3j_harm _pen__ut_mint_a[] = {{".2", u3wfu_mint}, {}}; - static u3j_harm _pen__ut_mull_a[] = {{".2", u3wfu_mull}, {}}; - static u3j_harm _pen__ut_nest_a[] = {{".2", u3wfu_nest}, {}}; - static u3j_harm _pen__ut_peek_a[] = {{".2", u3wfu_peek}, {}}; - static u3j_harm _pen__ut_play_a[] = {{".2", u3wfu_play}, {}}; - static u3j_harm _pen__ut_rest_a[] = {{".2", u3wfu_rest}, {}}; - static u3j_harm _pen__ut_toss_a[] = {{".2", u3wfu_toss}, {}}; - static u3j_harm _pen__ut_wrap_a[] = {{".2", u3wfu_wrap}, {}}; - static u3j_core _pen__ut_d[] = + static u3j_harm _149_pen__ut_burn_a[] = {{".2", u3wfu_burn}, {}}; + static u3j_harm _149_pen__ut_conk_a[] = {{".2", u3wfu_conk}, {}}; + static u3j_harm _149_pen__ut_crop_a[] = {{".2", u3wfu_crop}, {}}; + // static u3j_harm _149_pen__ut_fire_a[] = {{".2", u3wfu_fire}, {}}; + static u3j_harm _149_pen__ut_fond_a[] = {{".2", u3wfu_fond}, {}}; + static u3j_harm _149_pen__ut_fish_a[] = {{".2", u3wfu_fish}, {}}; + static u3j_harm _149_pen__ut_fuse_a[] = {{".2", u3wfu_fuse}, {}}; + static u3j_harm _149_pen__ut_mint_a[] = {{".2", u3wfu_mint}, {}}; + static u3j_harm _149_pen__ut_mull_a[] = {{".2", u3wfu_mull}, {}}; + static u3j_harm _149_pen__ut_nest_a[] = {{".2", u3wfu_nest}, {}}; + static u3j_harm _149_pen__ut_peek_a[] = {{".2", u3wfu_peek}, {}}; + static u3j_harm _149_pen__ut_play_a[] = {{".2", u3wfu_play}, {}}; + static u3j_harm _149_pen__ut_rest_a[] = {{".2", u3wfu_rest}, {}}; + static u3j_harm _149_pen__ut_toss_a[] = {{".2", u3wfu_toss}, {}}; + static u3j_harm _149_pen__ut_wrap_a[] = {{".2", u3wfu_wrap}, {}}; + static u3j_core _149_pen__ut_d[] = { - { "burn", _pen__ut_burn_a }, - { "conk", _pen__ut_conk_a }, - { "crop", _pen__ut_crop_a }, - { "fond", _pen__ut_fond_a }, - // { "fire", _pen__ut_fire_a }, - { "fish", _pen__ut_fish_a }, - { "fuse", _pen__ut_fuse_a }, - { "mint", _pen__ut_mint_a }, - { "mull", _pen__ut_mull_a }, - { "nest", _pen__ut_nest_a }, - { "peek", _pen__ut_peek_a }, - { "play", _pen__ut_play_a }, - { "rest", _pen__ut_rest_a }, - { "toss", _pen__ut_toss_a }, - { "wrap", _pen__ut_wrap_a }, + { "burn", _149_pen__ut_burn_a }, + { "conk", _149_pen__ut_conk_a }, + { "crop", _149_pen__ut_crop_a }, + { "fond", _149_pen__ut_fond_a }, + // { "fire", _149_pen__ut_fire_a }, + { "fish", _149_pen__ut_fish_a }, + { "fuse", _149_pen__ut_fuse_a }, + { "mint", _149_pen__ut_mint_a }, + { "mull", _149_pen__ut_mull_a }, + { "nest", _149_pen__ut_nest_a }, + { "peek", _149_pen__ut_peek_a }, + { "play", _149_pen__ut_play_a }, + { "rest", _149_pen__ut_rest_a }, + { "toss", _149_pen__ut_toss_a }, + { "wrap", _149_pen__ut_wrap_a }, {} }; - static u3j_harm _pen__ut_a[] = + static u3j_harm _149_pen__ut_a[] = { {"burn", u3wfu_burn}, {"repo", u3wfu_repo}, {} }; #if 0 - static u3j_harm _pen__ap_a[] = + static u3j_harm _149_pen__ap_a[] = { {"open", u3wfp_open}, {"rake", u3wfp_rake}, {} }; - static u3j_harm _pen__al_a[] = + static u3j_harm _149_pen__al_a[] = { {"bunt", u3wfl_bunt}, {"whip", u3wfl_whip}, {} }; #endif -static u3j_core _pen_d[] = - { { "hex", 0, _hex_d }, +static u3j_core _149_pen_d[] = + { { "hex", 0, _149_hex_d }, - { "cell", _pen_cell_a }, - { "comb", _pen_comb_a }, - { "cons", _pen_cons_a }, - { "core", _pen_core_a }, - { "face", _pen_face_a }, - { "fitz", _pen_fitz_a }, - { "flan", _pen_flan_a }, - { "flip", _pen_flip_a }, - { "flor", _pen_flor_a }, - { "fork", _pen_fork_a }, - { "hike", _pen_hike_a }, - { "look", _pen_look_a }, + { "cell", _149_pen_cell_a }, + { "comb", _149_pen_comb_a }, + { "cons", _149_pen_cons_a }, + { "core", _149_pen_core_a }, + { "face", _149_pen_face_a }, + { "fitz", _149_pen_fitz_a }, + { "flan", _149_pen_flan_a }, + { "flip", _149_pen_flip_a }, + { "flor", _149_pen_flor_a }, + { "fork", _149_pen_fork_a }, + { "hike", _149_pen_hike_a }, + { "look", _149_pen_look_a }, - // { "ap", _pen__ap_a }, - // { "al", _pen__al_a }, - { "ut", _pen__ut_a, _pen__ut_d }, + // { "ap", _149_pen__ap_a }, + // { "al", _149_pen__al_a }, + { "ut", _149_pen__ut_a, _149_pen__ut_d }, {} }; /* layer four */ - static u3j_harm _qua_trip_a[] = {{".2", u3we_trip}, {}}; + static u3j_harm _149_qua_trip_a[] = {{".2", u3we_trip}, {}}; - static u3j_harm _qua__po_ind_a[] = {{".2", u3wcp_ind}, {}}; - static u3j_harm _qua__po_ins_a[] = {{".2", u3wcp_ins}, {}}; - static u3j_harm _qua__po_tod_a[] = {{".2", u3wcp_tod}, {}}; - static u3j_harm _qua__po_tos_a[] = {{".2", u3wcp_tos}, {}}; - static u3j_core _qua__po_d[] = - { { "ind", _qua__po_ind_a }, - { "ins", _qua__po_ins_a }, - { "tod", _qua__po_tod_a }, - { "tos", _qua__po_tos_a }, + static u3j_harm _149_qua__po_ind_a[] = {{".2", u3wcp_ind}, {}}; + static u3j_harm _149_qua__po_ins_a[] = {{".2", u3wcp_ins}, {}}; + static u3j_harm _149_qua__po_tod_a[] = {{".2", u3wcp_tod}, {}}; + static u3j_harm _149_qua__po_tos_a[] = {{".2", u3wcp_tos}, {}}; + static u3j_core _149_qua__po_d[] = + { { "ind", _149_qua__po_ind_a }, + { "ins", _149_qua__po_ins_a }, + { "tod", _149_qua__po_tod_a }, + { "tos", _149_qua__po_tos_a }, {} }; - static u3j_harm _qua__bend_fun_a[] = {{".2", u3we_bend_fun}, {}}; - static u3j_core _qua__bend_d[] = - { { "fun", _qua__bend_fun_a }, + static u3j_harm _149_qua__bend_fun_a[] = {{".2", u3we_bend_fun}, {}}; + static u3j_core _149_qua__bend_d[] = + { { "fun", _149_qua__bend_fun_a }, {} }; - static u3j_harm _qua__cold_fun_a[] = {{".2", u3we_cold_fun}, {}}; - static u3j_core _qua__cold_d[] = - { { "fun", _qua__cold_fun_a }, + static u3j_harm _149_qua__cold_fun_a[] = {{".2", u3we_cold_fun}, {}}; + static u3j_core _149_qua__cold_d[] = + { { "fun", _149_qua__cold_fun_a }, {} }; - static u3j_harm _qua__cook_fun_a[] = {{".2", u3we_cook_fun}, {}}; - static u3j_core _qua__cook_d[] = - { { "fun", _qua__cook_fun_a }, + static u3j_harm _149_qua__cook_fun_a[] = {{".2", u3we_cook_fun}, {}}; + static u3j_core _149_qua__cook_d[] = + { { "fun", _149_qua__cook_fun_a }, {} }; - static u3j_harm _qua__comp_fun_a[] = {{".2", u3we_comp_fun}, {}}; - static u3j_core _qua__comp_d[] = - { { "fun", _qua__comp_fun_a }, + static u3j_harm _149_qua__comp_fun_a[] = {{".2", u3we_comp_fun}, {}}; + static u3j_core _149_qua__comp_d[] = + { { "fun", _149_qua__comp_fun_a }, {} }; - static u3j_harm _qua__easy_fun_a[] = {{".2", u3we_easy_fun}, {}}; - static u3j_core _qua__easy_d[] = - { { "fun", _qua__easy_fun_a }, + static u3j_harm _149_qua__easy_fun_a[] = {{".2", u3we_easy_fun}, {}}; + static u3j_core _149_qua__easy_d[] = + { { "fun", _149_qua__easy_fun_a }, {} }; - static u3j_harm _qua__glue_fun_a[] = {{".2", u3we_glue_fun}, {}}; - static u3j_core _qua__glue_d[] = - { { "fun", _qua__glue_fun_a }, + static u3j_harm _149_qua__glue_fun_a[] = {{".2", u3we_glue_fun}, {}}; + static u3j_core _149_qua__glue_d[] = + { { "fun", _149_qua__glue_fun_a }, {} }; - static u3j_harm _qua__here_fun_a[] = {{".2", u3we_here_fun}, {}}; - static u3j_core _qua__here_d[] = - { { "fun", _qua__here_fun_a }, + static u3j_harm _149_qua__here_fun_a[] = {{".2", u3we_here_fun}, {}}; + static u3j_core _149_qua__here_d[] = + { { "fun", _149_qua__here_fun_a }, {} }; - static u3j_harm _qua__just_fun_a[] = {{".2", u3we_just_fun}, {}}; - static u3j_core _qua__just_d[] = - { { "fun", _qua__just_fun_a }, + static u3j_harm _149_qua__just_fun_a[] = {{".2", u3we_just_fun}, {}}; + static u3j_core _149_qua__just_d[] = + { { "fun", _149_qua__just_fun_a }, {} }; - static u3j_harm _qua__mask_fun_a[] = {{".2", u3we_mask_fun}, {}}; - static u3j_core _qua__mask_d[] = - { { "fun", _qua__mask_fun_a }, + static u3j_harm _149_qua__mask_fun_a[] = {{".2", u3we_mask_fun}, {}}; + static u3j_core _149_qua__mask_d[] = + { { "fun", _149_qua__mask_fun_a }, {} }; - static u3j_harm _qua__shim_fun_a[] = {{".2", u3we_shim_fun}, {}}; - static u3j_core _qua__shim_d[] = - { { "fun", _qua__shim_fun_a }, + static u3j_harm _149_qua__shim_fun_a[] = {{".2", u3we_shim_fun}, {}}; + static u3j_core _149_qua__shim_d[] = + { { "fun", _149_qua__shim_fun_a }, {} }; - static u3j_harm _qua__stag_fun_a[] = {{".2", u3we_stag_fun}, {}}; - static u3j_core _qua__stag_d[] = - { { "fun", _qua__stag_fun_a }, + static u3j_harm _149_qua__stag_fun_a[] = {{".2", u3we_stag_fun}, {}}; + static u3j_core _149_qua__stag_d[] = + { { "fun", _149_qua__stag_fun_a }, {} }; - static u3j_harm _qua__stew_fun_a[] = {{".2", u3we_stew_fun}, {}}; - static u3j_core _qua__stew_d[] = - { { "fun", _qua__stew_fun_a }, + static u3j_harm _149_qua__stew_fun_a[] = {{".2", u3we_stew_fun}, {}}; + static u3j_core _149_qua__stew_d[] = + { { "fun", _149_qua__stew_fun_a }, {} }; - static u3j_harm _qua__stir_fun_a[] = {{".2", u3we_stir_fun}, {}}; - static u3j_core _qua__stir_d[] = - { { "fun", _qua__stir_fun_a }, + static u3j_harm _149_qua__stir_fun_a[] = {{".2", u3we_stir_fun}, {}}; + static u3j_core _149_qua__stir_d[] = + { { "fun", _149_qua__stir_fun_a }, {} }; - static u3j_harm _qua_pfix_a[] = {{".2", u3we_pfix}, {}}; - static u3j_harm _qua_plug_a[] = {{".2", u3we_plug}, {}}; - static u3j_harm _qua_pose_a[] = {{".2", u3we_pose}, {}}; - static u3j_harm _qua_sfix_a[] = {{".2", u3we_sfix}, {}}; + static u3j_harm _149_qua_pfix_a[] = {{".2", u3we_pfix}, {}}; + static u3j_harm _149_qua_plug_a[] = {{".2", u3we_plug}, {}}; + static u3j_harm _149_qua_pose_a[] = {{".2", u3we_pose}, {}}; + static u3j_harm _149_qua_sfix_a[] = {{".2", u3we_sfix}, {}}; - static u3j_harm _qua_mink_a[] = {{".2", u3we_mink}, {}}; - static u3j_harm _qua_mule_a[] = {{".2", u3we_mule}, {}}; + static u3j_harm _149_qua_mink_a[] = {{".2", u3we_mink}, {}}; + static u3j_harm _149_qua_mule_a[] = {{".2", u3we_mule}, {}}; -static u3j_core _qua_d[] = - { { "pen", 0, _pen_d }, +static u3j_core _149_qua_d[] = + { { "pen", 0, _149_pen_d }, - { "po", 0, _qua__po_d }, + { "po", 0, _149_qua__po_d }, - { "trip", _qua_trip_a }, + { "trip", _149_qua_trip_a }, - { "bend", 0, _qua__bend_d }, - { "cold", 0, _qua__cold_d }, - { "comp", 0, _qua__comp_d }, - { "cook", 0, _qua__cook_d }, - { "easy", 0, _qua__easy_d }, - { "glue", 0, _qua__glue_d }, - { "here", 0, _qua__here_d }, - { "just", 0, _qua__just_d }, - { "mask", 0, _qua__mask_d }, - { "shim", 0, _qua__shim_d }, - { "stag", 0, _qua__stag_d }, - { "stew", 0, _qua__stew_d }, - { "stir", 0, _qua__stir_d }, + { "bend", 0, _149_qua__bend_d }, + { "cold", 0, _149_qua__cold_d }, + { "comp", 0, _149_qua__comp_d }, + { "cook", 0, _149_qua__cook_d }, + { "easy", 0, _149_qua__easy_d }, + { "glue", 0, _149_qua__glue_d }, + { "here", 0, _149_qua__here_d }, + { "just", 0, _149_qua__just_d }, + { "mask", 0, _149_qua__mask_d }, + { "shim", 0, _149_qua__shim_d }, + { "stag", 0, _149_qua__stag_d }, + { "stew", 0, _149_qua__stew_d }, + { "stir", 0, _149_qua__stir_d }, - { "pfix", _qua_pfix_a }, - { "plug", _qua_plug_a }, - { "pose", _qua_pose_a }, - { "sfix", _qua_sfix_a }, + { "pfix", _149_qua_pfix_a }, + { "plug", _149_qua_plug_a }, + { "pose", _149_qua_pose_a }, + { "sfix", _149_qua_sfix_a }, - { "mink", _qua_mink_a }, - { "mule", _qua_mule_a }, + { "mink", _149_qua_mink_a }, + { "mule", _149_qua_mule_a }, {} }; /* layer three */ - static u3j_harm _tri__rd_add_a[] = {{".2", u3wer_add}, {}}; - static u3j_harm _tri__rd_sub_a[] = {{".2", u3wer_sub}, {}}; - static u3j_harm _tri__rd_mul_a[] = {{".2", u3wer_mul}, {}}; - static u3j_harm _tri__rd_div_a[] = {{".2", u3wer_div}, {}}; - static u3j_harm _tri__rd_sqt_a[] = {{".2", u3wer_sqt}, {}}; - static u3j_harm _tri__rd_fma_a[] = {{".2", u3wer_fma}, {}}; - static u3j_harm _tri__rd_lth_a[] = {{".2", u3wer_lth}, {}}; - static u3j_harm _tri__rd_lte_a[] = {{".2", u3wer_lte}, {}}; - static u3j_harm _tri__rd_equ_a[] = {{".2", u3wer_equ}, {}}; - static u3j_harm _tri__rd_gte_a[] = {{".2", u3wer_gte}, {}}; - static u3j_harm _tri__rd_gth_a[] = {{".2", u3wer_gth}, {}}; - static u3j_core _tri__rd_d[] = - { { "add", _tri__rd_add_a }, - { "sub", _tri__rd_sub_a }, - { "mul", _tri__rd_mul_a }, - { "div", _tri__rd_div_a }, - { "sqt", _tri__rd_sqt_a }, - { "fma", _tri__rd_fma_a }, - { "lth", _tri__rd_lth_a }, - { "lte", _tri__rd_lte_a }, - { "equ", _tri__rd_equ_a }, - { "gte", _tri__rd_gte_a }, - { "gth", _tri__rd_gth_a }, + static u3j_harm _149_tri__rd_add_a[] = {{".2", u3wer_add}, {}}; + static u3j_harm _149_tri__rd_sub_a[] = {{".2", u3wer_sub}, {}}; + static u3j_harm _149_tri__rd_mul_a[] = {{".2", u3wer_mul}, {}}; + static u3j_harm _149_tri__rd_div_a[] = {{".2", u3wer_div}, {}}; + static u3j_harm _149_tri__rd_sqt_a[] = {{".2", u3wer_sqt}, {}}; + static u3j_harm _149_tri__rd_fma_a[] = {{".2", u3wer_fma}, {}}; + static u3j_harm _149_tri__rd_lth_a[] = {{".2", u3wer_lth}, {}}; + static u3j_harm _149_tri__rd_lte_a[] = {{".2", u3wer_lte}, {}}; + static u3j_harm _149_tri__rd_equ_a[] = {{".2", u3wer_equ}, {}}; + static u3j_harm _149_tri__rd_gte_a[] = {{".2", u3wer_gte}, {}}; + static u3j_harm _149_tri__rd_gth_a[] = {{".2", u3wer_gth}, {}}; + static u3j_core _149_tri__rd_d[] = + { { "add", _149_tri__rd_add_a }, + { "sub", _149_tri__rd_sub_a }, + { "mul", _149_tri__rd_mul_a }, + { "div", _149_tri__rd_div_a }, + { "sqt", _149_tri__rd_sqt_a }, + { "fma", _149_tri__rd_fma_a }, + { "lth", _149_tri__rd_lth_a }, + { "lte", _149_tri__rd_lte_a }, + { "equ", _149_tri__rd_equ_a }, + { "gte", _149_tri__rd_gte_a }, + { "gth", _149_tri__rd_gth_a }, {} }; - static u3j_harm _tri__cofl__drg_a[] = {{".2", u3wef_drg}, {}}; - static u3j_harm _tri__cofl__lug_a[] = {{".2", u3wef_lug}, {}}; - static u3j_core _tri__cofl_d[] = - { { "drg", _tri__cofl__drg_a }, - { "lug", _tri__cofl__lug_a }, + static u3j_harm _149_tri__cofl__drg_a[] = {{".2", u3wef_drg}, {}}; + static u3j_harm _149_tri__cofl__lug_a[] = {{".2", u3wef_lug}, {}}; + static u3j_core _149_tri__cofl_d[] = + { { "drg", _149_tri__cofl__drg_a }, + { "lug", _149_tri__cofl__lug_a }, {} }; - static u3j_harm _tri__rs_add_a[] = {{".2", u3wet_add}, {}}; - static u3j_harm _tri__rs_sub_a[] = {{".2", u3wet_sub}, {}}; - static u3j_harm _tri__rs_mul_a[] = {{".2", u3wet_mul}, {}}; - static u3j_harm _tri__rs_div_a[] = {{".2", u3wet_div}, {}}; - static u3j_harm _tri__rs_sqt_a[] = {{".2", u3wet_sqt}, {}}; - static u3j_harm _tri__rs_fma_a[] = {{".2", u3wet_fma}, {}}; - static u3j_harm _tri__rs_lth_a[] = {{".2", u3wet_lth}, {}}; - static u3j_harm _tri__rs_lte_a[] = {{".2", u3wet_lte}, {}}; - static u3j_harm _tri__rs_equ_a[] = {{".2", u3wet_equ}, {}}; - static u3j_harm _tri__rs_gte_a[] = {{".2", u3wet_gte}, {}}; - static u3j_harm _tri__rs_gth_a[] = {{".2", u3wet_gth}, {}}; - static u3j_core _tri__rs_d[] = - { { "add", _tri__rs_add_a }, - { "sub", _tri__rs_sub_a }, - { "mul", _tri__rs_mul_a }, - { "div", _tri__rs_div_a }, - { "sqt", _tri__rs_sqt_a }, - { "fma", _tri__rs_fma_a }, - { "lth", _tri__rs_lth_a }, - { "lte", _tri__rs_lte_a }, - { "equ", _tri__rs_equ_a }, - { "gte", _tri__rs_gte_a }, - { "gth", _tri__rs_gth_a }, + static u3j_harm _149_tri__rs_add_a[] = {{".2", u3wet_add}, {}}; + static u3j_harm _149_tri__rs_sub_a[] = {{".2", u3wet_sub}, {}}; + static u3j_harm _149_tri__rs_mul_a[] = {{".2", u3wet_mul}, {}}; + static u3j_harm _149_tri__rs_div_a[] = {{".2", u3wet_div}, {}}; + static u3j_harm _149_tri__rs_sqt_a[] = {{".2", u3wet_sqt}, {}}; + static u3j_harm _149_tri__rs_fma_a[] = {{".2", u3wet_fma}, {}}; + static u3j_harm _149_tri__rs_lth_a[] = {{".2", u3wet_lth}, {}}; + static u3j_harm _149_tri__rs_lte_a[] = {{".2", u3wet_lte}, {}}; + static u3j_harm _149_tri__rs_equ_a[] = {{".2", u3wet_equ}, {}}; + static u3j_harm _149_tri__rs_gte_a[] = {{".2", u3wet_gte}, {}}; + static u3j_harm _149_tri__rs_gth_a[] = {{".2", u3wet_gth}, {}}; + static u3j_core _149_tri__rs_d[] = + { { "add", _149_tri__rs_add_a }, + { "sub", _149_tri__rs_sub_a }, + { "mul", _149_tri__rs_mul_a }, + { "div", _149_tri__rs_div_a }, + { "sqt", _149_tri__rs_sqt_a }, + { "fma", _149_tri__rs_fma_a }, + { "lth", _149_tri__rs_lth_a }, + { "lte", _149_tri__rs_lte_a }, + { "equ", _149_tri__rs_equ_a }, + { "gte", _149_tri__rs_gte_a }, + { "gth", _149_tri__rs_gth_a }, {} }; - static u3j_harm _tri__rq_add_a[] = {{".2", u3weq_add}, {}}; - static u3j_harm _tri__rq_sub_a[] = {{".2", u3weq_sub}, {}}; - static u3j_harm _tri__rq_mul_a[] = {{".2", u3weq_mul}, {}}; - static u3j_harm _tri__rq_div_a[] = {{".2", u3weq_div}, {}}; - static u3j_harm _tri__rq_sqt_a[] = {{".2", u3weq_sqt}, {}}; - static u3j_harm _tri__rq_fma_a[] = {{".2", u3weq_fma}, {}}; - static u3j_harm _tri__rq_lth_a[] = {{".2", u3weq_lth}, {}}; - static u3j_harm _tri__rq_lte_a[] = {{".2", u3weq_lte}, {}}; - static u3j_harm _tri__rq_equ_a[] = {{".2", u3weq_equ}, {}}; - static u3j_harm _tri__rq_gte_a[] = {{".2", u3weq_gte}, {}}; - static u3j_harm _tri__rq_gth_a[] = {{".2", u3weq_gth}, {}}; - static u3j_core _tri__rq_d[] = - { { "add", _tri__rq_add_a }, - { "sub", _tri__rq_sub_a }, - { "mul", _tri__rq_mul_a }, - { "div", _tri__rq_div_a }, - { "sqt", _tri__rq_sqt_a }, - { "fma", _tri__rq_fma_a }, - { "lth", _tri__rq_lth_a }, - { "lte", _tri__rq_lte_a }, - { "equ", _tri__rq_equ_a }, - { "gte", _tri__rq_gte_a }, - { "gth", _tri__rq_gth_a }, + static u3j_harm _149_tri__rq_add_a[] = {{".2", u3weq_add}, {}}; + static u3j_harm _149_tri__rq_sub_a[] = {{".2", u3weq_sub}, {}}; + static u3j_harm _149_tri__rq_mul_a[] = {{".2", u3weq_mul}, {}}; + static u3j_harm _149_tri__rq_div_a[] = {{".2", u3weq_div}, {}}; + static u3j_harm _149_tri__rq_sqt_a[] = {{".2", u3weq_sqt}, {}}; + static u3j_harm _149_tri__rq_fma_a[] = {{".2", u3weq_fma}, {}}; + static u3j_harm _149_tri__rq_lth_a[] = {{".2", u3weq_lth}, {}}; + static u3j_harm _149_tri__rq_lte_a[] = {{".2", u3weq_lte}, {}}; + static u3j_harm _149_tri__rq_equ_a[] = {{".2", u3weq_equ}, {}}; + static u3j_harm _149_tri__rq_gte_a[] = {{".2", u3weq_gte}, {}}; + static u3j_harm _149_tri__rq_gth_a[] = {{".2", u3weq_gth}, {}}; + static u3j_core _149_tri__rq_d[] = + { { "add", _149_tri__rq_add_a }, + { "sub", _149_tri__rq_sub_a }, + { "mul", _149_tri__rq_mul_a }, + { "div", _149_tri__rq_div_a }, + { "sqt", _149_tri__rq_sqt_a }, + { "fma", _149_tri__rq_fma_a }, + { "lth", _149_tri__rq_lth_a }, + { "lte", _149_tri__rq_lte_a }, + { "equ", _149_tri__rq_equ_a }, + { "gte", _149_tri__rq_gte_a }, + { "gth", _149_tri__rq_gth_a }, {} }; - static u3j_harm _tri__aesc_en_a[] = {{".2", u3wea_en}, {}}; - static u3j_harm _tri__aesc_de_a[] = {{".2", u3wea_de}, {}}; - static u3j_core _tri__aesc_d[] = - { { "en", _tri__aesc_en_a }, - { "de", _tri__aesc_de_a }, + static u3j_harm _149_tri__aesc_en_a[] = {{".2", u3wea_en}, {}}; + static u3j_harm _149_tri__aesc_de_a[] = {{".2", u3wea_de}, {}}; + static u3j_core _149_tri__aesc_d[] = + { { "en", _149_tri__aesc_en_a }, + { "de", _149_tri__aesc_de_a }, {} }; - static u3j_harm _tri__og_raw_a[] = {{".2", u3weo_raw}, {}}; - static u3j_core _tri__og_d[] = - { { "raw", _tri__og_raw_a }, + static u3j_harm _149_tri__og_raw_a[] = {{".2", u3weo_raw}, {}}; + static u3j_core _149_tri__og_d[] = + { { "raw", _149_tri__og_raw_a }, {} }; - static u3j_harm _tri_shax_a[] = {{".2", u3we_shax}, {}}; - static u3j_harm _tri_shay_a[] = {{".2", u3we_shay}, {}}; - static u3j_harm _tri_shas_a[] = {{".2", u3we_shas}, {}}; - static u3j_harm _tri_shal_a[] = {{".2", u3we_shal}, {}}; + static u3j_harm _149_tri_shax_a[] = {{".2", u3we_shax}, {}}; + static u3j_harm _149_tri_shay_a[] = {{".2", u3we_shay}, {}}; + static u3j_harm _149_tri_shas_a[] = {{".2", u3we_shas}, {}}; + static u3j_harm _149_tri_shal_a[] = {{".2", u3we_shal}, {}}; -static u3j_core _tri_d[] = - { { "qua", 0, _qua_d }, +static u3j_core _149_tri_d[] = + { { "qua", 0, _149_qua_d }, - { "cofl", 0, _tri__cofl_d }, - { "rd", 0, _tri__rd_d }, - { "rs", 0, _tri__rs_d }, - { "rq", 0, _tri__rq_d }, - { "og", 0, _tri__og_d }, - { "shax", _tri_shax_a }, - { "shay", _tri_shay_a }, - { "shas", _tri_shas_a }, - { "shal", _tri_shal_a }, - { "aesc", 0, _tri__aesc_d }, + { "cofl", 0, _149_tri__cofl_d }, + { "rd", 0, _149_tri__rd_d }, + { "rs", 0, _149_tri__rs_d }, + { "rq", 0, _149_tri__rq_d }, + { "og", 0, _149_tri__og_d }, + { "shax", _149_tri_shax_a }, + { "shay", _149_tri_shay_a }, + { "shas", _149_tri_shas_a }, + { "shal", _149_tri_shal_a }, + { "aesc", 0, _149_tri__aesc_d }, {} }; /* layer two */ - static u3j_harm _two_flop_a[] = {{".2", u3wb_flop, c3y}, {}}; - static u3j_harm _two_lent_a[] = {{".2", u3wb_lent, c3y}, {}}; - static u3j_harm _two_levy_a[] = {{".2", u3wb_levy, c3y}, {}}; - static u3j_harm _two_lien_a[] = {{".2", u3wb_lien, c3y}, {}}; - static u3j_harm _two_murn_a[] = {{".2", u3wb_murn, c3y}, {}}; - static u3j_harm _two_need_a[] = {{".2", u3wb_need, c3y}, {}}; - static u3j_harm _two_reap_a[] = {{".2", u3wb_reap, c3y}, {}}; - static u3j_harm _two_reel_a[] = {{".2", u3wb_reel, c3y}, {}}; - static u3j_harm _two_roll_a[] = {{".2", u3wb_roll, c3y}, {}}; - static u3j_harm _two_skid_a[] = {{".2", u3wb_skid, c3y}, {}}; - static u3j_harm _two_skim_a[] = {{".2", u3wb_skim, c3y}, {}}; - static u3j_harm _two_skip_a[] = {{".2", u3wb_skip, c3y}, {}}; - static u3j_harm _two_scag_a[] = {{".2", u3wb_scag, c3y}, {}}; - static u3j_harm _two_slag_a[] = {{".2", u3wb_slag, c3y}, {}}; - static u3j_harm _two_snag_a[] = {{".2", u3wb_snag, c3y}, {}}; - // static u3j_harm _two_sort_a[] = {{".2", u3wb_sort, c3y}, {}}; - static u3j_harm _two_turn_a[] = {{".2", u3wb_turn, c3y}, {}}; - static u3j_harm _two_weld_a[] = {{".2", u3wb_weld, c3y}, {}}; + static u3j_harm _149_two_flop_a[] = {{".2", u3wb_flop, c3y}, {}}; + static u3j_harm _149_two_lent_a[] = {{".2", u3wb_lent, c3y}, {}}; + static u3j_harm _149_two_levy_a[] = {{".2", u3wb_levy, c3y}, {}}; + static u3j_harm _149_two_lien_a[] = {{".2", u3wb_lien, c3y}, {}}; + static u3j_harm _149_two_murn_a[] = {{".2", u3wb_murn, c3y}, {}}; + static u3j_harm _149_two_need_a[] = {{".2", u3wb_need, c3y}, {}}; + static u3j_harm _149_two_reap_a[] = {{".2", u3wb_reap, c3y}, {}}; + static u3j_harm _149_two_reel_a[] = {{".2", u3wb_reel, c3y}, {}}; + static u3j_harm _149_two_roll_a[] = {{".2", u3wb_roll, c3y}, {}}; + static u3j_harm _149_two_skid_a[] = {{".2", u3wb_skid, c3y}, {}}; + static u3j_harm _149_two_skim_a[] = {{".2", u3wb_skim, c3y}, {}}; + static u3j_harm _149_two_skip_a[] = {{".2", u3wb_skip, c3y}, {}}; + static u3j_harm _149_two_scag_a[] = {{".2", u3wb_scag, c3y}, {}}; + static u3j_harm _149_two_slag_a[] = {{".2", u3wb_slag, c3y}, {}}; + static u3j_harm _149_two_snag_a[] = {{".2", u3wb_snag, c3y}, {}}; + // static u3j_harm _149_two_sort_a[] = {{".2", u3wb_sort, c3y}, {}}; + static u3j_harm _149_two_turn_a[] = {{".2", u3wb_turn, c3y}, {}}; + static u3j_harm _149_two_weld_a[] = {{".2", u3wb_weld, c3y}, {}}; - static u3j_harm _two_bex_a[] = {{".2", u3wc_bex, c3y}, {}}; - static u3j_harm _two_xeb_a[] = {{".2", u3wc_xeb, c3y}, {}}; - static u3j_harm _two_can_a[] = {{".2", u3wc_can, c3y}, {}}; - static u3j_harm _two_cat_a[] = {{".2", u3wc_cat, c3y}, {}}; - static u3j_harm _two_cut_a[] = {{".2", u3wc_cut, c3y}, {}}; - static u3j_harm _two_end_a[] = {{".2", u3wc_end, c3y}, {}}; - static u3j_harm _two_lsh_a[] = {{".2", u3wc_lsh, c3y}, {}}; - static u3j_harm _two_met_a[] = {{".2", u3wc_met, c3y}, {}}; - static u3j_harm _two_rap_a[] = {{".2", u3wc_rap, c3y}, {}}; - static u3j_harm _two_rip_a[] = {{".2", u3wc_rip, c3y}, {}}; - static u3j_harm _two_rsh_a[] = {{".2", u3wc_rsh, c3y}, {}}; + static u3j_harm _149_two_bex_a[] = {{".2", u3wc_bex, c3y}, {}}; + static u3j_harm _149_two_xeb_a[] = {{".2", u3wc_xeb, c3y}, {}}; + static u3j_harm _149_two_can_a[] = {{".2", u3wc_can, c3y}, {}}; + static u3j_harm _149_two_cat_a[] = {{".2", u3wc_cat, c3y}, {}}; + static u3j_harm _149_two_cut_a[] = {{".2", u3wc_cut, c3y}, {}}; + static u3j_harm _149_two_end_a[] = {{".2", u3wc_end, c3y}, {}}; + static u3j_harm _149_two_lsh_a[] = {{".2", u3wc_lsh, c3y}, {}}; + static u3j_harm _149_two_met_a[] = {{".2", u3wc_met, c3y}, {}}; + static u3j_harm _149_two_rap_a[] = {{".2", u3wc_rap, c3y}, {}}; + static u3j_harm _149_two_rip_a[] = {{".2", u3wc_rip, c3y}, {}}; + static u3j_harm _149_two_rsh_a[] = {{".2", u3wc_rsh, c3y}, {}}; - static u3j_harm _two_con_a[] = {{".2", u3wc_con, c3y}, {}}; - static u3j_harm _two_dis_a[] = {{".2", u3wc_dis, c3y}, {}}; - static u3j_harm _two_mix_a[] = {{".2", u3wc_mix, c3y}, {}}; + static u3j_harm _149_two_con_a[] = {{".2", u3wc_con, c3y}, {}}; + static u3j_harm _149_two_dis_a[] = {{".2", u3wc_dis, c3y}, {}}; + static u3j_harm _149_two_mix_a[] = {{".2", u3wc_mix, c3y}, {}}; - static u3j_harm _two_mug_a[] = {{".2", u3wc_mug, c3y}, {}}; + static u3j_harm _149_two_mug_a[] = {{".2", u3wc_mug, c3y}, {}}; - static u3j_harm _two_dor_a[] = {{".2", u3wc_dor, c3y}, {}}; - static u3j_harm _two_gor_a[] = {{".2", u3wc_gor, c3y}, {}}; - static u3j_harm _two_hor_a[] = {{".2", u3wc_hor, c3y}, {}}; - static u3j_harm _two_vor_a[] = {{".2", u3wc_vor, c3y}, {}}; + static u3j_harm _149_two_dor_a[] = {{".2", u3wc_dor, c3y}, {}}; + static u3j_harm _149_two_gor_a[] = {{".2", u3wc_gor, c3y}, {}}; + static u3j_harm _149_two_hor_a[] = {{".2", u3wc_hor, c3y}, {}}; + static u3j_harm _149_two_vor_a[] = {{".2", u3wc_vor, c3y}, {}}; - static u3j_harm _two_pow_a[] = {{".2", u3wc_pow, c3y}, {}}; - static u3j_harm _two_sqt_a[] = {{".2", u3wc_sqt, c3y}, {}}; + static u3j_harm _149_two_pow_a[] = {{".2", u3wc_pow, c3y}, {}}; + static u3j_harm _149_two_sqt_a[] = {{".2", u3wc_sqt, c3y}, {}}; - static u3j_harm _two__in_bif_a[] = {{".2", u3wdi_bif}, {}}; - static u3j_harm _two__in_dif_a[] = {{".2", u3wdi_dif}, {}}; - static u3j_harm _two__in_gas_a[] = {{".2", u3wdi_gas}, {}}; - static u3j_harm _two__in_has_a[] = {{".2", u3wdi_has}, {}}; - static u3j_harm _two__in_mer_a[] = {{".2", u3wdi_mer}, {}}; - // static u3j_harm _two__in_int_a[] = {{".2", u3wdi_int}, {}}; - static u3j_harm _two__in_put_a[] = {{".2", u3wdi_put}, {}}; - static u3j_harm _two__in_tap_a[] = {{".2", u3wdi_tap}, {}}; - // static u3j_harm _two__in_uni_a[] = {{".2", u3wdi_uni}, {}}; - static u3j_core _two__in_d[] = - { { "bif", _two__in_bif_a }, - { "dif", _two__in_dif_a }, - { "gas", _two__in_gas_a }, - { "has", _two__in_has_a }, - { "mer", _two__in_mer_a }, - // { "int", _two__in_int_a }, - { "put", _two__in_put_a }, - { "tap", _two__in_tap_a }, - // { "uni", _two__in_uni_a }, + static u3j_harm _149_two__in_bif_a[] = {{".2", u3wdi_bif}, {}}; + static u3j_harm _149_two__in_dif_a[] = {{".2", u3wdi_dif}, {}}; + static u3j_harm _149_two__in_gas_a[] = {{".2", u3wdi_gas}, {}}; + static u3j_harm _149_two__in_has_a[] = {{".2", u3wdi_has}, {}}; + static u3j_harm _149_two__in_mer_a[] = {{".2", u3wdi_mer}, {}}; + // static u3j_harm _149_two__in_int_a[] = {{".2", u3wdi_int}, {}}; + static u3j_harm _149_two__in_put_a[] = {{".2", u3wdi_put}, {}}; + static u3j_harm _149_two__in_tap_a[] = {{".2", u3wdi_tap}, {}}; + // static u3j_harm _149_two__in_uni_a[] = {{".2", u3wdi_uni}, {}}; + static u3j_core _149_two__in_d[] = + { { "bif", _149_two__in_bif_a }, + { "dif", _149_two__in_dif_a }, + { "gas", _149_two__in_gas_a }, + { "has", _149_two__in_has_a }, + { "mer", _149_two__in_mer_a }, + // { "int", _149_two__in_int_a }, + { "put", _149_two__in_put_a }, + { "tap", _149_two__in_tap_a }, + // { "uni", _149_two__in_uni_a }, {} }; - static u3j_harm _two__by_bif_a[] = {{".2", u3wdb_bif, c3y}, {}}; - static u3j_harm _two__by_dif_a[] = {{".2", u3wdb_dif, c3y}, {}}; - static u3j_harm _two__by_gas_a[] = {{".2", u3wdb_gas, c3y}, {}}; - static u3j_harm _two__by_get_a[] = {{".2", u3wdb_get, c3y}, {}}; - static u3j_harm _two__by_has_a[] = {{".2", u3wdb_has, c3y}, {}}; - // static u3j_harm _two__by_int_a[] = {{".2", u3wdb_int, c3y}, {}}; - static u3j_harm _two__by_put_a[] = {{".2", u3wdb_put, c3y}, {}}; - static u3j_harm _two__by_tap_a[] = {{".2", u3wdb_tap, c3y}, {}}; - // static u3j_harm _two__by_uni_a[] = {{".2", u3wdb_uni, c3y}, {}}; - static u3j_core _two__by_d[] = - { { "bif", _two__by_bif_a }, - { "dif", _two__by_dif_a }, - { "gas", _two__by_gas_a }, - { "get", _two__by_get_a }, - { "has", _two__by_has_a }, - // { "int", _two__by_int_a }, - { "put", _two__by_put_a }, - { "tap", _two__by_tap_a }, - // { "uni", _two__by_uni_a }, + static u3j_harm _149_two__by_bif_a[] = {{".2", u3wdb_bif, c3y}, {}}; + static u3j_harm _149_two__by_dif_a[] = {{".2", u3wdb_dif, c3y}, {}}; + static u3j_harm _149_two__by_gas_a[] = {{".2", u3wdb_gas, c3y}, {}}; + static u3j_harm _149_two__by_get_a[] = {{".2", u3wdb_get, c3y}, {}}; + static u3j_harm _149_two__by_has_a[] = {{".2", u3wdb_has, c3y}, {}}; + // static u3j_harm _149_two__by_int_a[] = {{".2", u3wdb_int, c3y}, {}}; + static u3j_harm _149_two__by_put_a[] = {{".2", u3wdb_put, c3y}, {}}; + static u3j_harm _149_two__by_tap_a[] = {{".2", u3wdb_tap, c3y}, {}}; + // static u3j_harm _149_two__by_uni_a[] = {{".2", u3wdb_uni, c3y}, {}}; + static u3j_core _149_two__by_d[] = + { { "bif", _149_two__by_bif_a }, + { "dif", _149_two__by_dif_a }, + { "gas", _149_two__by_gas_a }, + { "get", _149_two__by_get_a }, + { "has", _149_two__by_has_a }, + // { "int", _149_two__by_int_a }, + { "put", _149_two__by_put_a }, + { "tap", _149_two__by_tap_a }, + // { "uni", _149_two__by_uni_a }, {} }; - static u3j_harm _two_cue_a[] = {{".2", u3we_cue}, {}}; - static u3j_harm _two_jam_a[] = {{".2", u3we_jam}, {}}; - static u3j_harm _two_mat_a[] = {{".2", u3we_mat}, {}}; - static u3j_harm _two_rub_a[] = {{".2", u3we_rub}, {}}; + static u3j_harm _149_two_cue_a[] = {{".2", u3we_cue}, {}}; + static u3j_harm _149_two_jam_a[] = {{".2", u3we_jam}, {}}; + static u3j_harm _149_two_mat_a[] = {{".2", u3we_mat}, {}}; + static u3j_harm _149_two_rub_a[] = {{".2", u3we_rub}, {}}; -static u3j_core _two_d[] = - { { "tri", 0, _tri_d }, - { "flop", _two_flop_a }, - { "lent", _two_lent_a }, - { "levy", _two_levy_a }, - { "lien", _two_lien_a }, - { "murn", _two_murn_a }, - { "need", _two_need_a }, - { "reap", _two_reap_a }, - { "reel", _two_reel_a }, - { "roll", _two_roll_a }, - { "skid", _two_skid_a }, - { "skim", _two_skim_a }, - { "skip", _two_skip_a }, - { "scag", _two_scag_a }, - { "slag", _two_slag_a }, - { "snag", _two_snag_a }, -// { "sort", _two_sort_a }, - { "turn", _two_turn_a }, - { "weld", _two_weld_a }, +static u3j_core _149_two_d[] = + { { "tri", 0, _149_tri_d }, + { "flop", _149_two_flop_a }, + { "lent", _149_two_lent_a }, + { "levy", _149_two_levy_a }, + { "lien", _149_two_lien_a }, + { "murn", _149_two_murn_a }, + { "need", _149_two_need_a }, + { "reap", _149_two_reap_a }, + { "reel", _149_two_reel_a }, + { "roll", _149_two_roll_a }, + { "skid", _149_two_skid_a }, + { "skim", _149_two_skim_a }, + { "skip", _149_two_skip_a }, + { "scag", _149_two_scag_a }, + { "slag", _149_two_slag_a }, + { "snag", _149_two_snag_a }, +// { "sort", _149_two_sort_a }, + { "turn", _149_two_turn_a }, + { "weld", _149_two_weld_a }, - { "bex", _two_bex_a }, - { "xeb", _two_xeb_a }, - { "can", _two_can_a }, - { "cat", _two_cat_a }, - { "cut", _two_cut_a }, - { "end", _two_end_a }, - { "lsh", _two_lsh_a }, - { "met", _two_met_a }, - { "rap", _two_rap_a }, - { "rip", _two_rip_a }, - { "rsh", _two_rsh_a }, + { "bex", _149_two_bex_a }, + { "xeb", _149_two_xeb_a }, + { "can", _149_two_can_a }, + { "cat", _149_two_cat_a }, + { "cut", _149_two_cut_a }, + { "end", _149_two_end_a }, + { "lsh", _149_two_lsh_a }, + { "met", _149_two_met_a }, + { "rap", _149_two_rap_a }, + { "rip", _149_two_rip_a }, + { "rsh", _149_two_rsh_a }, - { "con", _two_con_a }, - { "dis", _two_dis_a }, - { "mix", _two_mix_a }, + { "con", _149_two_con_a }, + { "dis", _149_two_dis_a }, + { "mix", _149_two_mix_a }, - { "mug", _two_mug_a }, + { "mug", _149_two_mug_a }, - { "dor", _two_dor_a }, - { "gor", _two_gor_a }, - { "hor", _two_hor_a }, - { "vor", _two_vor_a }, + { "dor", _149_two_dor_a }, + { "gor", _149_two_gor_a }, + { "hor", _149_two_hor_a }, + { "vor", _149_two_vor_a }, - { "pow", _two_pow_a }, - { "sqt", _two_sqt_a }, + { "pow", _149_two_pow_a }, + { "sqt", _149_two_sqt_a }, - { "by", 0, _two__by_d }, - { "in", 0, _two__in_d }, + { "by", 0, _149_two__by_d }, + { "in", 0, _149_two__in_d }, - { "cue", _two_cue_a }, - { "jam", _two_jam_a }, - { "mat", _two_mat_a }, - { "rub", _two_rub_a }, + { "cue", _149_two_cue_a }, + { "jam", _149_two_jam_a }, + { "mat", _149_two_mat_a }, + { "rub", _149_two_rub_a }, }; /* layer one */ - static u3j_harm _one_add_a[] = {{".2", u3wa_add, c3y}, {}}; - static u3j_harm _one_dec_a[] = {{".2", u3wa_dec, c3y}, {}}; - static u3j_harm _one_div_a[] = {{".2", u3wa_div, c3y}, {}}; - static u3j_harm _one_dvr_a[] = {{".2", u3wc_dvr, c3y}, {}}; - static u3j_harm _one_gte_a[] = {{".2", u3wa_gte, c3y}, {}}; - static u3j_harm _one_gth_a[] = {{".2", u3wa_gth, c3y}, {}}; - static u3j_harm _one_lte_a[] = {{".2", u3wa_lte, c3y}, {}}; - static u3j_harm _one_lth_a[] = {{".2", u3wa_lth, c3y}, {}}; - static u3j_harm _one_mod_a[] = {{".2", u3wa_mod, c3y}, {}}; - static u3j_harm _one_mul_a[] = {{".2", u3wa_mul, c3y}, {}}; - static u3j_harm _one_sub_a[] = {{".2", u3wa_sub, c3y}, {}}; + static u3j_harm _149_one_add_a[] = {{".2", u3wa_add, c3y}, {}}; + static u3j_harm _149_one_dec_a[] = {{".2", u3wa_dec, c3y}, {}}; + static u3j_harm _149_one_div_a[] = {{".2", u3wa_div, c3y}, {}}; + static u3j_harm _149_one_dvr_a[] = {{".2", u3wc_dvr, c3y}, {}}; + static u3j_harm _149_one_gte_a[] = {{".2", u3wa_gte, c3y}, {}}; + static u3j_harm _149_one_gth_a[] = {{".2", u3wa_gth, c3y}, {}}; + static u3j_harm _149_one_lte_a[] = {{".2", u3wa_lte, c3y}, {}}; + static u3j_harm _149_one_lth_a[] = {{".2", u3wa_lth, c3y}, {}}; + static u3j_harm _149_one_mod_a[] = {{".2", u3wa_mod, c3y}, {}}; + static u3j_harm _149_one_mul_a[] = {{".2", u3wa_mul, c3y}, {}}; + static u3j_harm _149_one_sub_a[] = {{".2", u3wa_sub, c3y}, {}}; - static u3j_harm _one_cap_a[] = {{".2", u3wc_cap, c3y}, {}}; - static u3j_harm _one_peg_a[] = {{".2", u3wc_peg, c3y}, {}}; - static u3j_harm _one_mas_a[] = {{".2", u3wc_mas, c3y}, {}}; + static u3j_harm _149_one_cap_a[] = {{".2", u3wc_cap, c3y}, {}}; + static u3j_harm _149_one_peg_a[] = {{".2", u3wc_peg, c3y}, {}}; + static u3j_harm _149_one_mas_a[] = {{".2", u3wc_mas, c3y}, {}}; -static u3j_core _one_d[] = - { { "two", 0, _two_d }, - { "add", _one_add_a }, - { "dec", _one_dec_a }, - { "div", _one_div_a }, - { "dvr", _one_dvr_a }, - { "gte", _one_gte_a }, - { "gth", _one_gth_a }, - { "lte", _one_lte_a }, - { "lth", _one_lth_a }, - { "mod", _one_mod_a }, - { "mul", _one_mul_a }, - { "sub", _one_sub_a }, +static u3j_core _149_one_d[] = + { { "two", 0, _149_two_d }, + { "add", _149_one_add_a }, + { "dec", _149_one_dec_a }, + { "div", _149_one_div_a }, + { "dvr", _149_one_dvr_a }, + { "gte", _149_one_gte_a }, + { "gth", _149_one_gth_a }, + { "lte", _149_one_lte_a }, + { "lth", _149_one_lth_a }, + { "mod", _149_one_mod_a }, + { "mul", _149_one_mul_a }, + { "sub", _149_one_sub_a }, - { "cap", _one_cap_a }, - { "mas", _one_mas_a }, - { "peg", _one_peg_a }, + { "cap", _149_one_cap_a }, + { "mas", _149_one_mas_a }, + { "peg", _149_one_peg_a }, + + {} + }; +static u3j_core _k149_d[] = + { { "one", 0, _149_one_d }, + {} + }; + +/*************** 150*/ + + static u3j_harm _150_hex_down_mark_a[] = {{".2", u3wg_down, c3y}, {}}; + static u3j_core _150_hex_down_d[] = + { { "mark", _150_hex_down_mark_a }, + {} + }; + + static u3j_harm _150_hex_lore_a[] = {{".2", u3we_lore}, {}}; + static u3j_harm _150_hex_loss_a[] = {{".2", u3we_loss}, {}}; + static u3j_harm _150_hex_lune_a[] = {{".2", u3we_lune}, {}}; + +static u3j_core _150_hex_d[] = + { { "down", 0, _150_hex_down_d }, + { "lore", _150_hex_lore_a }, + { "loss", _150_hex_loss_a }, + { "lune", _150_hex_lune_a }, + {} + }; + +/* layer five +*/ + static u3j_harm _150_pen_cell_a[] = {{".2", u3wf_cell}, {}}; + static u3j_harm _150_pen_comb_a[] = {{".2", u3wf_comb}, {}}; + static u3j_harm _150_pen_cons_a[] = {{".2", u3wf_cons}, {}}; + static u3j_harm _150_pen_core_a[] = {{".2", u3wf_core}, {}}; + static u3j_harm _150_pen_face_a[] = {{".2", u3wf_face}, {}}; + static u3j_harm _150_pen_fitz_a[] = {{".2", u3wf_fitz}, {}}; + static u3j_harm _150_pen_flan_a[] = {{".2", u3wf_flan}, {}}; + static u3j_harm _150_pen_flip_a[] = {{".2", u3wf_flip}, {}}; + static u3j_harm _150_pen_flor_a[] = {{".2", u3wf_flor}, {}}; + static u3j_harm _150_pen_fork_a[] = {{".2", u3wf_fork}, {}}; + static u3j_harm _150_pen_hike_a[] = {{".2", u3wf_hike}, {}}; + static u3j_harm _150_pen_look_a[] = {{".2", u3wf_look}, {}}; + + static u3j_harm _150_pen__ut_burn_a[] = {{".2", u3wfu_burn}, {}}; + static u3j_harm _150_pen__ut_conk_a[] = {{".2", u3wfu_conk}, {}}; + static u3j_harm _150_pen__ut_crop_a[] = {{".2", u3wfu_crop}, {}}; + // static u3j_harm _150_pen__ut_fire_a[] = {{".2", u3wfu_fire}, {}}; + static u3j_harm _150_pen__ut_fond_a[] = {{".2", u3wfu_fond}, {}}; + static u3j_harm _150_pen__ut_fish_a[] = {{".2", u3wfu_fish}, {}}; + static u3j_harm _150_pen__ut_fuse_a[] = {{".2", u3wfu_fuse}, {}}; + static u3j_harm _150_pen__ut_mint_a[] = {{".2", u3wfu_mint}, {}}; + static u3j_harm _150_pen__ut_mull_a[] = {{".2", u3wfu_mull}, {}}; + static u3j_harm _150_pen__ut_nest_a[] = {{".2", u3wfu_nest}, {}}; + static u3j_harm _150_pen__ut_peek_a[] = {{".2", u3wfu_peek}, {}}; + static u3j_harm _150_pen__ut_play_a[] = {{".2", u3wfu_play}, {}}; + static u3j_harm _150_pen__ut_rest_a[] = {{".2", u3wfu_rest}, {}}; + static u3j_harm _150_pen__ut_toss_a[] = {{".2", u3wfu_toss}, {}}; + static u3j_harm _150_pen__ut_wrap_a[] = {{".2", u3wfu_wrap}, {}}; + static u3j_core _150_pen__ut_d[] = + { + { "burn", _150_pen__ut_burn_a }, + { "conk", _150_pen__ut_conk_a }, + { "crop", _150_pen__ut_crop_a }, + { "fond", _150_pen__ut_fond_a }, + // { "fire", _150_pen__ut_fire_a }, + { "fish", _150_pen__ut_fish_a }, + { "fuse", _150_pen__ut_fuse_a }, + { "mint", _150_pen__ut_mint_a }, + { "mull", _150_pen__ut_mull_a }, + { "nest", _150_pen__ut_nest_a }, + { "peek", _150_pen__ut_peek_a }, + { "play", _150_pen__ut_play_a }, + { "rest", _150_pen__ut_rest_a }, + { "toss", _150_pen__ut_toss_a }, + { "wrap", _150_pen__ut_wrap_a }, + {} + }; + static u3j_harm _150_pen__ut_a[] = + { {"burn", u3wfu_burn}, + {"repo", u3wfu_repo}, + {} + }; + +#if 0 + static u3j_harm _150_pen__ap_a[] = + { {"open", u3wfp_open}, + {"rake", u3wfp_rake}, + {} + }; + static u3j_harm _150_pen__al_a[] = + { {"bunt", u3wfl_bunt}, + {"whip", u3wfl_whip}, + {} + }; +#endif + +static u3j_core _150_pen_d[] = + { { "hex", 0, _150_hex_d }, + + { "cell", _150_pen_cell_a }, + { "comb", _150_pen_comb_a }, + { "cons", _150_pen_cons_a }, + { "core", _150_pen_core_a }, + { "face", _150_pen_face_a }, + { "fitz", _150_pen_fitz_a }, + { "flan", _150_pen_flan_a }, + { "flip", _150_pen_flip_a }, + { "flor", _150_pen_flor_a }, + { "fork", _150_pen_fork_a }, + { "hike", _150_pen_hike_a }, + { "look", _150_pen_look_a }, + + // { "ap", _150_pen__ap_a }, + // { "al", _150_pen__al_a }, + { "ut", _150_pen__ut_a, _150_pen__ut_d }, + + {} + }; + +/* layer four +*/ + static u3j_harm _150_qua_trip_a[] = {{".2", u3we_trip}, {}}; + + static u3j_harm _150_qua__po_ind_a[] = {{".2", u3wcp_ind}, {}}; + static u3j_harm _150_qua__po_ins_a[] = {{".2", u3wcp_ins}, {}}; + static u3j_harm _150_qua__po_tod_a[] = {{".2", u3wcp_tod}, {}}; + static u3j_harm _150_qua__po_tos_a[] = {{".2", u3wcp_tos}, {}}; + static u3j_core _150_qua__po_d[] = + { { "ind", _150_qua__po_ind_a }, + { "ins", _150_qua__po_ins_a }, + { "tod", _150_qua__po_tod_a }, + { "tos", _150_qua__po_tos_a }, + {} + }; + + static u3j_harm _150_qua__bend_fun_a[] = {{".2", u3we_bend_fun}, {}}; + static u3j_core _150_qua__bend_d[] = + { { "fun", _150_qua__bend_fun_a }, + {} + }; + + static u3j_harm _150_qua__cold_fun_a[] = {{".2", u3we_cold_fun}, {}}; + static u3j_core _150_qua__cold_d[] = + { { "fun", _150_qua__cold_fun_a }, + {} + }; + + static u3j_harm _150_qua__cook_fun_a[] = {{".2", u3we_cook_fun}, {}}; + static u3j_core _150_qua__cook_d[] = + { { "fun", _150_qua__cook_fun_a }, + {} + }; + + static u3j_harm _150_qua__comp_fun_a[] = {{".2", u3we_comp_fun}, {}}; + static u3j_core _150_qua__comp_d[] = + { { "fun", _150_qua__comp_fun_a }, + {} + }; + + static u3j_harm _150_qua__easy_fun_a[] = {{".2", u3we_easy_fun}, {}}; + static u3j_core _150_qua__easy_d[] = + { { "fun", _150_qua__easy_fun_a }, + {} + }; + + static u3j_harm _150_qua__glue_fun_a[] = {{".2", u3we_glue_fun}, {}}; + static u3j_core _150_qua__glue_d[] = + { { "fun", _150_qua__glue_fun_a }, + {} + }; + + static u3j_harm _150_qua__here_fun_a[] = {{".2", u3we_here_fun}, {}}; + static u3j_core _150_qua__here_d[] = + { { "fun", _150_qua__here_fun_a }, + {} + }; + + static u3j_harm _150_qua__just_fun_a[] = {{".2", u3we_just_fun}, {}}; + static u3j_core _150_qua__just_d[] = + { { "fun", _150_qua__just_fun_a }, + {} + }; + + static u3j_harm _150_qua__mask_fun_a[] = {{".2", u3we_mask_fun}, {}}; + static u3j_core _150_qua__mask_d[] = + { { "fun", _150_qua__mask_fun_a }, + {} + }; + + static u3j_harm _150_qua__shim_fun_a[] = {{".2", u3we_shim_fun}, {}}; + static u3j_core _150_qua__shim_d[] = + { { "fun", _150_qua__shim_fun_a }, + {} + }; + + static u3j_harm _150_qua__stag_fun_a[] = {{".2", u3we_stag_fun}, {}}; + static u3j_core _150_qua__stag_d[] = + { { "fun", _150_qua__stag_fun_a }, + {} + }; + + static u3j_harm _150_qua__stew_fun_a[] = {{".2", u3we_stew_fun}, {}}; + static u3j_core _150_qua__stew_d[] = + { { "fun", _150_qua__stew_fun_a }, + {} + }; + + static u3j_harm _150_qua__stir_fun_a[] = {{".2", u3we_stir_fun}, {}}; + static u3j_core _150_qua__stir_d[] = + { { "fun", _150_qua__stir_fun_a }, + {} + }; + + static u3j_harm _150_qua_pfix_a[] = {{".2", u3we_pfix}, {}}; + static u3j_harm _150_qua_plug_a[] = {{".2", u3we_plug}, {}}; + static u3j_harm _150_qua_pose_a[] = {{".2", u3we_pose}, {}}; + static u3j_harm _150_qua_sfix_a[] = {{".2", u3we_sfix}, {}}; + + static u3j_harm _150_qua_mink_a[] = {{".2", u3we_mink}, {}}; + static u3j_harm _150_qua_mule_a[] = {{".2", u3we_mule}, {}}; + +static u3j_core _150_qua_d[] = + { { "pen", 0, _150_pen_d }, + + { "po", 0, _150_qua__po_d }, + + { "trip", _150_qua_trip_a }, + + { "bend", 0, _150_qua__bend_d }, + { "cold", 0, _150_qua__cold_d }, + { "comp", 0, _150_qua__comp_d }, + { "cook", 0, _150_qua__cook_d }, + { "easy", 0, _150_qua__easy_d }, + { "glue", 0, _150_qua__glue_d }, + { "here", 0, _150_qua__here_d }, + { "just", 0, _150_qua__just_d }, + { "mask", 0, _150_qua__mask_d }, + { "shim", 0, _150_qua__shim_d }, + { "stag", 0, _150_qua__stag_d }, + { "stew", 0, _150_qua__stew_d }, + { "stir", 0, _150_qua__stir_d }, + + { "pfix", _150_qua_pfix_a }, + { "plug", _150_qua_plug_a }, + { "pose", _150_qua_pose_a }, + { "sfix", _150_qua_sfix_a }, + + { "mink", _150_qua_mink_a }, + { "mule", _150_qua_mule_a }, + {} + }; + +/* layer three +*/ + static u3j_harm _150_tri__rd_add_a[] = {{".2", u3wer_add}, {}}; + static u3j_harm _150_tri__rd_sub_a[] = {{".2", u3wer_sub}, {}}; + static u3j_harm _150_tri__rd_mul_a[] = {{".2", u3wer_mul}, {}}; + static u3j_harm _150_tri__rd_div_a[] = {{".2", u3wer_div}, {}}; + static u3j_harm _150_tri__rd_sqt_a[] = {{".2", u3wer_sqt}, {}}; + static u3j_harm _150_tri__rd_fma_a[] = {{".2", u3wer_fma}, {}}; + static u3j_harm _150_tri__rd_lth_a[] = {{".2", u3wer_lth}, {}}; + static u3j_harm _150_tri__rd_lte_a[] = {{".2", u3wer_lte}, {}}; + static u3j_harm _150_tri__rd_equ_a[] = {{".2", u3wer_equ}, {}}; + static u3j_harm _150_tri__rd_gte_a[] = {{".2", u3wer_gte}, {}}; + static u3j_harm _150_tri__rd_gth_a[] = {{".2", u3wer_gth}, {}}; + static u3j_core _150_tri__rd_d[] = + { { "add", _150_tri__rd_add_a }, + { "sub", _150_tri__rd_sub_a }, + { "mul", _150_tri__rd_mul_a }, + { "div", _150_tri__rd_div_a }, + { "sqt", _150_tri__rd_sqt_a }, + { "fma", _150_tri__rd_fma_a }, + { "lth", _150_tri__rd_lth_a }, + { "lte", _150_tri__rd_lte_a }, + { "equ", _150_tri__rd_equ_a }, + { "gte", _150_tri__rd_gte_a }, + { "gth", _150_tri__rd_gth_a }, + {} + }; + + static u3j_harm _150_tri__cofl__drg_a[] = {{".2", u3wef_drg}, {}}; + static u3j_harm _150_tri__cofl__lug_a[] = {{".2", u3wef_lug}, {}}; + static u3j_core _150_tri__cofl_d[] = + { { "drg", _150_tri__cofl__drg_a }, + { "lug", _150_tri__cofl__lug_a }, + {} + }; + + static u3j_harm _150_tri__rs_add_a[] = {{".2", u3wet_add}, {}}; + static u3j_harm _150_tri__rs_sub_a[] = {{".2", u3wet_sub}, {}}; + static u3j_harm _150_tri__rs_mul_a[] = {{".2", u3wet_mul}, {}}; + static u3j_harm _150_tri__rs_div_a[] = {{".2", u3wet_div}, {}}; + static u3j_harm _150_tri__rs_sqt_a[] = {{".2", u3wet_sqt}, {}}; + static u3j_harm _150_tri__rs_fma_a[] = {{".2", u3wet_fma}, {}}; + static u3j_harm _150_tri__rs_lth_a[] = {{".2", u3wet_lth}, {}}; + static u3j_harm _150_tri__rs_lte_a[] = {{".2", u3wet_lte}, {}}; + static u3j_harm _150_tri__rs_equ_a[] = {{".2", u3wet_equ}, {}}; + static u3j_harm _150_tri__rs_gte_a[] = {{".2", u3wet_gte}, {}}; + static u3j_harm _150_tri__rs_gth_a[] = {{".2", u3wet_gth}, {}}; + static u3j_core _150_tri__rs_d[] = + { { "add", _150_tri__rs_add_a }, + { "sub", _150_tri__rs_sub_a }, + { "mul", _150_tri__rs_mul_a }, + { "div", _150_tri__rs_div_a }, + { "sqt", _150_tri__rs_sqt_a }, + { "fma", _150_tri__rs_fma_a }, + { "lth", _150_tri__rs_lth_a }, + { "lte", _150_tri__rs_lte_a }, + { "equ", _150_tri__rs_equ_a }, + { "gte", _150_tri__rs_gte_a }, + { "gth", _150_tri__rs_gth_a }, + {} + }; + + static u3j_harm _150_tri__rq_add_a[] = {{".2", u3weq_add}, {}}; + static u3j_harm _150_tri__rq_sub_a[] = {{".2", u3weq_sub}, {}}; + static u3j_harm _150_tri__rq_mul_a[] = {{".2", u3weq_mul}, {}}; + static u3j_harm _150_tri__rq_div_a[] = {{".2", u3weq_div}, {}}; + static u3j_harm _150_tri__rq_sqt_a[] = {{".2", u3weq_sqt}, {}}; + static u3j_harm _150_tri__rq_fma_a[] = {{".2", u3weq_fma}, {}}; + static u3j_harm _150_tri__rq_lth_a[] = {{".2", u3weq_lth}, {}}; + static u3j_harm _150_tri__rq_lte_a[] = {{".2", u3weq_lte}, {}}; + static u3j_harm _150_tri__rq_equ_a[] = {{".2", u3weq_equ}, {}}; + static u3j_harm _150_tri__rq_gte_a[] = {{".2", u3weq_gte}, {}}; + static u3j_harm _150_tri__rq_gth_a[] = {{".2", u3weq_gth}, {}}; + static u3j_core _150_tri__rq_d[] = + { { "add", _150_tri__rq_add_a }, + { "sub", _150_tri__rq_sub_a }, + { "mul", _150_tri__rq_mul_a }, + { "div", _150_tri__rq_div_a }, + { "sqt", _150_tri__rq_sqt_a }, + { "fma", _150_tri__rq_fma_a }, + { "lth", _150_tri__rq_lth_a }, + { "lte", _150_tri__rq_lte_a }, + { "equ", _150_tri__rq_equ_a }, + { "gte", _150_tri__rq_gte_a }, + { "gth", _150_tri__rq_gth_a }, + {} + }; + + static u3j_harm _150_tri__aesc_en_a[] = {{".2", u3wea_en}, {}}; + static u3j_harm _150_tri__aesc_de_a[] = {{".2", u3wea_de}, {}}; + static u3j_core _150_tri__aesc_d[] = + { { "en", _150_tri__aesc_en_a }, + { "de", _150_tri__aesc_de_a }, + {} + }; + + static u3j_harm _150_tri__og_raw_a[] = {{".2", u3weo_raw}, {}}; + static u3j_core _150_tri__og_d[] = + { { "raw", _150_tri__og_raw_a }, + {} + }; + + static u3j_harm _150_tri_shax_a[] = {{".2", u3we_shax}, {}}; + static u3j_harm _150_tri_shay_a[] = {{".2", u3we_shay}, {}}; + static u3j_harm _150_tri_shas_a[] = {{".2", u3we_shas}, {}}; + static u3j_harm _150_tri_shal_a[] = {{".2", u3we_shal}, {}}; + +static u3j_core _150_tri_d[] = + { { "qua", 0, _150_qua_d }, + + { "cofl", 0, _150_tri__cofl_d }, + { "rd", 0, _150_tri__rd_d }, + { "rs", 0, _150_tri__rs_d }, + { "rq", 0, _150_tri__rq_d }, + { "og", 0, _150_tri__og_d }, + { "shax", _150_tri_shax_a }, + { "shay", _150_tri_shay_a }, + { "shas", _150_tri_shas_a }, + { "shal", _150_tri_shal_a }, + { "aesc", 0, _150_tri__aesc_d }, + + {} + }; + +/* layer two +*/ + static u3j_harm _150_two_flop_a[] = {{".2", u3wb_flop, c3y}, {}}; + static u3j_harm _150_two_lent_a[] = {{".2", u3wb_lent, c3y}, {}}; + static u3j_harm _150_two_levy_a[] = {{".2", u3wb_levy, c3y}, {}}; + static u3j_harm _150_two_lien_a[] = {{".2", u3wb_lien, c3y}, {}}; + static u3j_harm _150_two_murn_a[] = {{".2", u3wb_murn, c3y}, {}}; + static u3j_harm _150_two_need_a[] = {{".2", u3wb_need, c3y}, {}}; + static u3j_harm _150_two_reap_a[] = {{".2", u3wb_reap, c3y}, {}}; + static u3j_harm _150_two_reel_a[] = {{".2", u3wb_reel, c3y}, {}}; + static u3j_harm _150_two_roll_a[] = {{".2", u3wb_roll, c3y}, {}}; + static u3j_harm _150_two_skid_a[] = {{".2", u3wb_skid, c3y}, {}}; + static u3j_harm _150_two_skim_a[] = {{".2", u3wb_skim, c3y}, {}}; + static u3j_harm _150_two_skip_a[] = {{".2", u3wb_skip, c3y}, {}}; + static u3j_harm _150_two_scag_a[] = {{".2", u3wb_scag, c3y}, {}}; + static u3j_harm _150_two_slag_a[] = {{".2", u3wb_slag, c3y}, {}}; + static u3j_harm _150_two_snag_a[] = {{".2", u3wb_snag, c3y}, {}}; + // static u3j_harm _150_two_sort_a[] = {{".2", u3wb_sort, c3y}, {}}; + static u3j_harm _150_two_turn_a[] = {{".2", u3wb_turn, c3y}, {}}; + static u3j_harm _150_two_weld_a[] = {{".2", u3wb_weld, c3y}, {}}; + + static u3j_harm _150_two_bex_a[] = {{".2", u3wc_bex, c3y}, {}}; + static u3j_harm _150_two_xeb_a[] = {{".2", u3wc_xeb, c3y}, {}}; + static u3j_harm _150_two_can_a[] = {{".2", u3wc_can, c3y}, {}}; + static u3j_harm _150_two_cat_a[] = {{".2", u3wc_cat, c3y}, {}}; + static u3j_harm _150_two_cut_a[] = {{".2", u3wc_cut, c3y}, {}}; + static u3j_harm _150_two_end_a[] = {{".2", u3wc_end, c3y}, {}}; + static u3j_harm _150_two_lsh_a[] = {{".2", u3wc_lsh, c3y}, {}}; + static u3j_harm _150_two_met_a[] = {{".2", u3wc_met, c3y}, {}}; + static u3j_harm _150_two_rap_a[] = {{".2", u3wc_rap, c3y}, {}}; + static u3j_harm _150_two_rip_a[] = {{".2", u3wc_rip, c3y}, {}}; + static u3j_harm _150_two_rsh_a[] = {{".2", u3wc_rsh, c3y}, {}}; + + static u3j_harm _150_two_con_a[] = {{".2", u3wc_con, c3y}, {}}; + static u3j_harm _150_two_dis_a[] = {{".2", u3wc_dis, c3y}, {}}; + static u3j_harm _150_two_mix_a[] = {{".2", u3wc_mix, c3y}, {}}; + + static u3j_harm _150_two_mug_a[] = {{".2", u3wc_mug, c3y}, {}}; + + static u3j_harm _150_two_dor_a[] = {{".2", u3wc_dor, c3y}, {}}; + static u3j_harm _150_two_gor_a[] = {{".2", u3wc_gor, c3y}, {}}; + static u3j_harm _150_two_hor_a[] = {{".2", u3wc_hor, c3y}, {}}; + static u3j_harm _150_two_vor_a[] = {{".2", u3wc_vor, c3y}, {}}; + + static u3j_harm _150_two_pow_a[] = {{".2", u3wc_pow, c3y}, {}}; + static u3j_harm _150_two_sqt_a[] = {{".2", u3wc_sqt, c3y}, {}}; + + static u3j_harm _150_two__in_bif_a[] = {{".2", u3wdi_bif}, {}}; + static u3j_harm _150_two__in_dif_a[] = {{".2", u3wdi_dif}, {}}; + static u3j_harm _150_two__in_gas_a[] = {{".2", u3wdi_gas}, {}}; + static u3j_harm _150_two__in_has_a[] = {{".2", u3wdi_has}, {}}; + static u3j_harm _150_two__in_mer_a[] = {{".2", u3wdi_mer}, {}}; + // static u3j_harm _150_two__in_int_a[] = {{".2", u3wdi_int}, {}}; + static u3j_harm _150_two__in_put_a[] = {{".2", u3wdi_put}, {}}; + static u3j_harm _150_two__in_tap_a[] = {{".2", u3wdi_tap}, {}}; + // static u3j_harm _150_two__in_uni_a[] = {{".2", u3wdi_uni}, {}}; + static u3j_core _150_two__in_d[] = + { { "bif", _150_two__in_bif_a }, + { "dif", _150_two__in_dif_a }, + { "gas", _150_two__in_gas_a }, + { "has", _150_two__in_has_a }, + { "mer", _150_two__in_mer_a }, + // { "int", _150_two__in_int_a }, + { "put", _150_two__in_put_a }, + { "tap", _150_two__in_tap_a }, + // { "uni", _150_two__in_uni_a }, + {} + }; + + static u3j_harm _150_two__by_bif_a[] = {{".2", u3wdb_bif, c3y}, {}}; + static u3j_harm _150_two__by_dif_a[] = {{".2", u3wdb_dif, c3y}, {}}; + static u3j_harm _150_two__by_gas_a[] = {{".2", u3wdb_gas, c3y}, {}}; + static u3j_harm _150_two__by_get_a[] = {{".2", u3wdb_get, c3y}, {}}; + static u3j_harm _150_two__by_has_a[] = {{".2", u3wdb_has, c3y}, {}}; + // static u3j_harm _150_two__by_int_a[] = {{".2", u3wdb_int, c3y}, {}}; + static u3j_harm _150_two__by_put_a[] = {{".2", u3wdb_put, c3y}, {}}; + static u3j_harm _150_two__by_tap_a[] = {{".2", u3wdb_tap, c3y}, {}}; + // static u3j_harm _150_two__by_uni_a[] = {{".2", u3wdb_uni, c3y}, {}}; + static u3j_core _150_two__by_d[] = + { { "bif", _150_two__by_bif_a }, + { "dif", _150_two__by_dif_a }, + { "gas", _150_two__by_gas_a }, + { "get", _150_two__by_get_a }, + { "has", _150_two__by_has_a }, + // { "int", _150_two__by_int_a }, + { "put", _150_two__by_put_a }, + { "tap", _150_two__by_tap_a }, + // { "uni", _150_two__by_uni_a }, + {} + }; + + static u3j_harm _150_two_cue_a[] = {{".2", u3we_cue}, {}}; + static u3j_harm _150_two_jam_a[] = {{".2", u3we_jam}, {}}; + static u3j_harm _150_two_mat_a[] = {{".2", u3we_mat}, {}}; + static u3j_harm _150_two_rub_a[] = {{".2", u3we_rub}, {}}; + +static u3j_core _150_two_d[] = + { { "tri", 0, _150_tri_d }, + { "flop", _150_two_flop_a }, + { "lent", _150_two_lent_a }, + { "levy", _150_two_levy_a }, + { "lien", _150_two_lien_a }, + { "murn", _150_two_murn_a }, + { "need", _150_two_need_a }, + { "reap", _150_two_reap_a }, + { "reel", _150_two_reel_a }, + { "roll", _150_two_roll_a }, + { "skid", _150_two_skid_a }, + { "skim", _150_two_skim_a }, + { "skip", _150_two_skip_a }, + { "scag", _150_two_scag_a }, + { "slag", _150_two_slag_a }, + { "snag", _150_two_snag_a }, +// { "sort", _150_two_sort_a }, + { "turn", _150_two_turn_a }, + { "weld", _150_two_weld_a }, + + { "bex", _150_two_bex_a }, + { "xeb", _150_two_xeb_a }, + { "can", _150_two_can_a }, + { "cat", _150_two_cat_a }, + { "cut", _150_two_cut_a }, + { "end", _150_two_end_a }, + { "lsh", _150_two_lsh_a }, + { "met", _150_two_met_a }, + { "rap", _150_two_rap_a }, + { "rip", _150_two_rip_a }, + { "rsh", _150_two_rsh_a }, + + { "con", _150_two_con_a }, + { "dis", _150_two_dis_a }, + { "mix", _150_two_mix_a }, + + { "mug", _150_two_mug_a }, + + { "dor", _150_two_dor_a }, + { "gor", _150_two_gor_a }, + { "hor", _150_two_hor_a }, + { "vor", _150_two_vor_a }, + + { "pow", _150_two_pow_a }, + { "sqt", _150_two_sqt_a }, + + { "by", 0, _150_two__by_d }, + { "in", 0, _150_two__in_d }, + + { "cue", _150_two_cue_a }, + { "jam", _150_two_jam_a }, + { "mat", _150_two_mat_a }, + { "rub", _150_two_rub_a }, + }; + + +/* layer one +*/ + static u3j_harm _150_one_add_a[] = {{".2", u3wa_add, c3y}, {}}; + static u3j_harm _150_one_dec_a[] = {{".2", u3wa_dec, c3y}, {}}; + static u3j_harm _150_one_div_a[] = {{".2", u3wa_div, c3y}, {}}; + static u3j_harm _150_one_dvr_a[] = {{".2", u3wc_dvr, c3y}, {}}; + static u3j_harm _150_one_gte_a[] = {{".2", u3wa_gte, c3y}, {}}; + static u3j_harm _150_one_gth_a[] = {{".2", u3wa_gth, c3y}, {}}; + static u3j_harm _150_one_lte_a[] = {{".2", u3wa_lte, c3y}, {}}; + static u3j_harm _150_one_lth_a[] = {{".2", u3wa_lth, c3y}, {}}; + static u3j_harm _150_one_mod_a[] = {{".2", u3wa_mod, c3y}, {}}; + static u3j_harm _150_one_mul_a[] = {{".2", u3wa_mul, c3y}, {}}; + static u3j_harm _150_one_sub_a[] = {{".2", u3wa_sub, c3y}, {}}; + + static u3j_harm _150_one_cap_a[] = {{".2", u3wc_cap, c3y}, {}}; + static u3j_harm _150_one_peg_a[] = {{".2", u3wc_peg, c3y}, {}}; + static u3j_harm _150_one_mas_a[] = {{".2", u3wc_mas, c3y}, {}}; + +static u3j_core _150_one_d[] = + { { "two", 0, _150_two_d }, + { "add", _150_one_add_a }, + { "dec", _150_one_dec_a }, + { "div", _150_one_div_a }, + { "dvr", _150_one_dvr_a }, + { "gte", _150_one_gte_a }, + { "gth", _150_one_gth_a }, + { "lte", _150_one_lte_a }, + { "lth", _150_one_lth_a }, + { "mod", _150_one_mod_a }, + { "mul", _150_one_mul_a }, + { "sub", _150_one_sub_a }, + + { "cap", _150_one_cap_a }, + { "mas", _150_one_mas_a }, + { "peg", _150_one_peg_a }, {} }; static u3j_core _k150_d[] = - { { "one", 0, _one_d }, + { { "one", 0, _150_one_d }, {} }; static u3j_core _d[] = { - { "k151", 0, _k151_d}, + { "k149", 0, _k149_d}, { "k150", 0, _k150_d}, {} }; From 2951c0bdf574bfe24ee6d98e18fdd42f1ea04987 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Sat, 26 Nov 2016 17:37:41 -0800 Subject: [PATCH 21/21] Plastic boots with -m. --- include/noun/manage.h | 2 +- include/noun/vortex.h | 5 +++ include/vere/vere.h | 1 + noun/manage.c | 39 ++++++++++------ noun/retrieve.c | 102 +++++++++++++++++++++++++----------------- noun/vortex.c | 60 ++++++++++++++++--------- vere/loop.c | 21 +++++++-- vere/main.c | 8 +++- 8 files changed, 157 insertions(+), 81 deletions(-) diff --git a/include/noun/manage.h b/include/noun/manage.h index c0b2e741e..5f1b8c523 100644 --- a/include/noun/manage.h +++ b/include/noun/manage.h @@ -7,7 +7,7 @@ /* u3m_boot(): start the u3 system. */ void - u3m_boot(c3_o nuu_o, c3_o bug_o, c3_c* dir_c, c3_c *pil_c); + u3m_boot(c3_o nuu_o, c3_o bug_o, c3_o mad_o, c3_c* dir_c, c3_c *pil_c); /* u3m_bail(): bail out. Does not return. ** diff --git a/include/noun/vortex.h b/include/noun/vortex.h index e750c45b2..fe536fd12 100644 --- a/include/noun/vortex.h +++ b/include/noun/vortex.h @@ -64,6 +64,11 @@ u3_noun u3v_do(const c3_c* txt_c, u3_noun arg); + /* u3v_boot(): make a new pier by loading a pill. + */ + void + u3v_boot(c3_c* pas_c); + /* u3v_make(): make a new pier by loading a pill. */ void diff --git a/include/vere/vere.h b/include/vere/vere.h index 460d578a6..022563b9a 100644 --- a/include/vere/vere.h +++ b/include/vere/vere.h @@ -553,6 +553,7 @@ c3_o loh; // -L, local-only networking c3_o pro; // -P, profile c3_o veb; // -v, verbose (inverse of -q) + c3_o mad; // -m, mad pill c3_o nuu; // -c, new pier c3_o qui; // -q, quiet c3_o vno; // -V, turn on +verb diff --git a/noun/manage.c b/noun/manage.c index 67670736c..5c3f52ff1 100644 --- a/noun/manage.c +++ b/noun/manage.c @@ -1144,8 +1144,8 @@ u3m_grab(u3_noun som, ...) // terminate with u3_none */ u3_noun u3m_soft(c3_w sec_w, - u3_funk fun_f, - u3_noun arg) + u3_funk fun_f, + u3_noun arg) { u3_noun why; @@ -1497,10 +1497,12 @@ _cm_init(c3_o chk_o) } } -/* _boot_home(): create ship directory. */ +/* _boot_home(): create ship directory. +*/ static void -_boot_home(c3_c *dir_c, c3_c *pil_c) +_boot_home(c3_o mad_o, c3_c *dir_c, c3_c *pil_c) { + c3_c* nam_c = _(mad_o) ? "events.pill" : "urbit.pill"; c3_c ful_c[2048]; /* Create subdirectories. */ @@ -1524,7 +1526,7 @@ _boot_home(c3_c *dir_c, c3_c *pil_c) { { struct stat s; - snprintf(ful_c, 2048, "%s/.urb/urbit.pill", dir_c); + snprintf(ful_c, 2048, "%s/.urb/%s", dir_c, nam_c); if ( stat(ful_c, &s) == 0 ) { /* we're in a "logical boot". awful hack, but bail here */ printf("%s confirmed to exist\r\n", ful_c); @@ -1532,8 +1534,8 @@ _boot_home(c3_c *dir_c, c3_c *pil_c) } } if ( pil_c != 0 ) { - snprintf(ful_c, 2048, "cp %s %s/.urb/urbit.pill", - pil_c, dir_c); + snprintf(ful_c, 2048, "cp %s %s/.urb/%s", + pil_c, dir_c, nam_c); printf("%s\r\n", ful_c); if ( 0 != system(ful_c) ) { fprintf(stderr, "could not %s\n", ful_c); @@ -1545,7 +1547,7 @@ _boot_home(c3_c *dir_c, c3_c *pil_c) CURLcode result; FILE *file; - snprintf(ful_c, 2048, "%s/.urb/urbit.pill", dir_c); + snprintf(ful_c, 2048, "%s/.urb/%s", dir_c, nam_c); printf("fetching %s to %s\r\n", url_c, ful_c); if ( !(curl = curl_easy_init()) ) { fprintf(stderr, "failed to initialize libcurl\n"); @@ -1574,7 +1576,7 @@ _boot_home(c3_c *dir_c, c3_c *pil_c) /* u3m_boot(): start the u3 system. */ void -u3m_boot(c3_o nuu_o, c3_o bug_o, c3_c* dir_c, c3_c *pil_c) +u3m_boot(c3_o nuu_o, c3_o bug_o, c3_o mad_o, c3_c* dir_c, c3_c *pil_c) { /* Activate the loom. */ @@ -1601,14 +1603,23 @@ u3m_boot(c3_o nuu_o, c3_o bug_o, c3_c* dir_c, c3_c *pil_c) if ( _(nuu_o) ) { c3_c ful_c[2048]; - _boot_home(dir_c, pil_c); + _boot_home(mad_o, dir_c, pil_c); - snprintf(ful_c, 2048, "%s/.urb/urbit.pill", dir_c); + if ( _(mad_o) ) { + snprintf(ful_c, 2048, "%s/.urb/events.pill", dir_c); - printf("boot: loading %s\r\n", ful_c); - u3v_make(ful_c); + printf("boot: loading %s\r\n", ful_c); + u3v_boot(ful_c); + } + else { + snprintf(ful_c, 2048, "%s/.urb/urbit.pill", dir_c); + + printf("boot: loading %s\r\n", ful_c); + u3v_make(ful_c); + + u3v_jack(); + } - u3v_jack(); } else { u3v_hose(); diff --git a/noun/retrieve.c b/noun/retrieve.c index 4ffb96584..0912e4924 100644 --- a/noun/retrieve.c +++ b/noun/retrieve.c @@ -590,51 +590,66 @@ _sang_x(u3_noun a, u3_noun b) static void _sung_one(u3_noun* a, u3_noun* b) { + if ( *a == *b ) { return; - } - else { - c3_o asr_o = u3a_is_senior(u3R, *a); - c3_o bsr_o = u3a_is_senior(u3R, *b); - - if ( _(asr_o) && _(bsr_o) ) { - // You shouldn't have let this happen. We don't want to - // descend down to a lower road and free there, because - // synchronization - though this could be revisited under - // certain circumstances. + } else { + u3_road* rod_u = u3R; + while ( 1 ) { // - return; - } - if ( _(asr_o) && !_(bsr_o) ){ - u3z(*b); - *b = *a; - } - if ( _(bsr_o) && !_(asr_o) ) { - u3z(*a); - *a = *b; - } - if ( u3a_is_north(u3R) ) { - if ( *a <= *b ) { - u3k(*a); - u3z(*b); - *b = *a; - } else { - u3k(*b); - u3z(*a); - *a = *b; - } - } - else { - if ( *a >= *b ) { - u3k(*a); - u3z(*b); - *b = *a; - } else { - u3k(*b); - u3z(*a); - *a = *b; + // we can't perform this kind of butchery on the home road, + // where asynchronous things can allocate. + // + if ( u3R == &u3H->rod_u ) { + break; + } + else { + c3_o asr_o = u3a_is_senior(u3R, *a); + c3_o bsr_o = u3a_is_senior(u3R, *b); + + if ( _(asr_o) && _(bsr_o) ) { + // + // both are senior, so we address them on a higher road + // if possible. + // + u3R = u3to(u3_road, u3R->par_p); + continue; + } + + if ( _(asr_o) && !_(bsr_o) ){ + u3z(*b); + *b = *a; + } + if ( _(bsr_o) && !_(asr_o) ) { + u3z(*a); + *a = *b; + } + if ( u3a_is_north(u3R) ) { + if ( *a <= *b ) { + u3k(*a); + u3z(*b); + *b = *a; + } else { + u3k(*b); + u3z(*a); + *a = *b; + } + } + else { + if ( *a >= *b ) { + u3k(*a); + u3z(*b); + *b = *a; + } else { + u3k(*b); + u3z(*a); + *a = *b; + } + } + break; } } + u3R = rod_u; } } @@ -838,6 +853,13 @@ u3r_sing(u3_noun a, u3_noun b) c3_o u3r_sung(u3_noun a, u3_noun b) { + if ( a == b ) { return c3y; } + +#if 0 + if ( u3r_mug(a) == u3r_mug(b) ) { + fprintf(stderr, "collision on %x: %x/%x\r\n", u3r_mug(a), a, b); + } +#endif return _sung_x(a, b); } diff --git a/noun/vortex.c b/noun/vortex.c index 2bd183904..da6a2fd9e 100644 --- a/noun/vortex.c +++ b/noun/vortex.c @@ -4,7 +4,6 @@ #include #include "all.h" -int WISH; /* _cv_nock_wish(): call wish through hardcoded interface. */ static u3_noun @@ -12,10 +11,8 @@ _cv_nock_wish(u3_noun txt) { u3_noun fun, pro; - WISH = 1; fun = u3n_nock_on(u3k(u3A->roc), u3k(u3x_at(20, u3A->roc))); pro = u3n_slam_on(fun, txt); - WISH = 0; return pro; } @@ -33,31 +30,50 @@ u3v_make(c3_c* pas_c) u3z(sys); } +/* u3v_fire(): execute initial lifecycle. +*/ +u3_noun +u3v_fire(u3_noun sys) +{ + u3_noun fol = u3nt(2, u3nc(0, 3), u3nc(0, 2)); + + return u3n_nock_on(sys, fol); +} + +/* u3v_load(): loading sequence. +*/ +u3_noun +u3v_load(u3_noun pil) +{ + u3_noun sys = u3ke_cue(pil); + u3_noun cor = u3v_fire(sys); + u3_noun pro; + + pro = u3k(u3r_at(7, cor)); + + u3z(cor); + return pro; +} + /* u3v_boot(): correct bootstrap sequence. */ void -u3v_remake(c3_c* pas_c, - c3_c* who_c, - c3_c* why_c) +u3v_boot(c3_c* pas_c) { - u3_noun sys = u3ke_cue(u3m_file(pas_c)); - u3_noun eva; // event-one - u3_noun evb; // event-two - u3_noun evc; // compiler-formula - u3_noun evd; // compiler-source - u3_noun eve; // arvo-source - u3_noun evf; // main-sequence + u3_noun pil = u3m_file(pas_c); + u3_noun pru = u3m_soft(0, u3v_load, pil); - u3r_mean(sys, 2, &eva, - 6, &evb, - 14, &evc, - 30, &evd, + if ( u3h(pru) != 0 ) { + fprintf(stderr, "boot failed\r\n"); + exit(1); + } - if ( (c3n == u3r_mean(cor, u3x_sam_2, &gol, - u3x_sam_3, &gen, - u3x_con, &van, - 0)) || - + fprintf(stderr, "final state %x\r\n", u3r_mug(u3t(pru))); + + u3A->ken = 0; + u3A->roc = u3k(u3t(pru)); + + u3z(pru); } /* u3v_jack(): execute kernel formula to bind jets. diff --git a/vere/loop.c b/vere/loop.c index 382964416..fef150194 100644 --- a/vere/loop.c +++ b/vere/loop.c @@ -327,7 +327,7 @@ _lo_tape(FILE* fil_u, u3_noun tep) { u3_noun tap = tep; - while ( u3_nul != tap ) { + while ( c3y == u3du(tap) ) { c3_c car_c; if ( u3h(tap) >= 127 ) { @@ -380,9 +380,24 @@ u3_lo_punt(c3_l tab_l, u3_noun tac) // We are calling nock here, but hopefully need no protection. // while ( c3y == u3r_du(cat) ) { - u3_noun wol = u3dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); + if ( 0 == u3A->roc ) { + u3_noun act = u3h(cat); - _lo_wall(wol); + if ( c3__leaf == u3h(act) ) { + FILE* fil_u = u3_term_io_hija(); + + _lo_tape(fil_u, u3k(u3t(act))); + putc(13, fil_u); + putc(10, fil_u); + + u3_term_io_loja(0); + } + } + else { + u3_noun wol = u3dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); + + _lo_wall(wol); + } cat = u3t(cat); } u3z(tac); diff --git a/vere/main.c b/vere/main.c index d4c995886..e722568fc 100644 --- a/vere/main.c +++ b/vere/main.c @@ -68,6 +68,7 @@ _main_getopt(c3_i argc, c3_c** argv) u3_Host.ops_u.abo = c3n; u3_Host.ops_u.bat = c3n; u3_Host.ops_u.gab = c3n; + u3_Host.ops_u.mad = c3n; u3_Host.ops_u.loh = c3n; u3_Host.ops_u.dem = c3n; u3_Host.ops_u.fog = c3n; @@ -82,7 +83,7 @@ _main_getopt(c3_i argc, c3_c** argv) u3_Host.ops_u.rep = c3n; u3_Host.ops_u.kno_w = DefaultKernel; - while ( (ch_i=getopt(argc, argv,"G:B:A:I:w:t:f:k:l:n:p:r:LabcdgqvxFMPDXR")) != -1 ) { + while ( (ch_i=getopt(argc, argv,"G:B:A:I:w:t:f:k:l:n:p:r:LabcdgmqvxFMPDXR")) != -1 ) { switch ( ch_i ) { case 'M': { u3_Host.ops_u.mem = c3y; @@ -117,6 +118,10 @@ _main_getopt(c3_i argc, c3_c** argv) u3_Host.ops_u.tex = c3y; break; } + case 'm': { + u3_Host.ops_u.mad = c3y; + break; + } case 'X': { u3_Host.ops_u.fog = c3y; break; @@ -540,6 +545,7 @@ main(c3_i argc, } u3m_boot(u3_Host.ops_u.nuu, u3_Host.ops_u.gab, + u3_Host.ops_u.mad, u3_Host.dir_c, u3_Host.ops_u.pil_c);