From 66ca74dbe7a4ffe75a65ba72430f3e5339a31b55 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 10 Mar 2016 18:22:44 -0800 Subject: [PATCH] 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,