From 4cf4ca57d9e19a65e6f60acc00ecc404c36cb5e2 Mon Sep 17 00:00:00 2001 From: Luke Patmore Date: Thu, 12 Jun 2014 15:22:25 -0700 Subject: [PATCH 1/2] Added moar ap.c macro expansions. --- gen164/6/ap.c | 38 ++++++++++++++++++++++++++++++++++++-- include/c/motes.h | 5 +++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/gen164/6/ap.c b/gen164/6/ap.c index 6643c52fe..e310fe778 100644 --- a/gen164/6/ap.c +++ b/gen164/6/ap.c @@ -68,13 +68,11 @@ return u2_bt(wir_r, c3__tsgr, u2_rx(wir_r, q_gen), u2_rx(wir_r, p_gen)); } - _open_do_pq(tshp) // =- { return u2_bt(wir_r, c3__tsls, u2_rx(wir_r, q_gen), u2_rx(wir_r, p_gen)); } - _open_do_pq(tsls) // =+ { return u2_bt @@ -223,6 +221,22 @@ } /*** **** +***/ + _open_do_p(zpgr) // !> + { + return u2_bq + (wir_r, c3__cnhp, + u2_bc(wir_r, c3__cnzy, c3__onan), + u2_bt(wir_r, c3__zpsm, + u2_bc(wir_r, c3__bctr, + u2_bc(wir_r, c3__herb, + u2_bc(wir_r, c3__cnzy, + c3__abel))), + u2_rx(wir_r, p_gen)), + u2_nul); + } +/*** +**** ***/ _open_do_pq(clhp) // :- { @@ -236,6 +250,13 @@ (wir_r, u2_rx(wir_r, q_gen), u2_rx(wir_r, p_gen)); } + _open_do_p(clcn) // :% + { + return u2_bc + (wir_r, u2_bc(wir_r, c3__clsg, + u2_rx(wir_r, p_gen)), + u2_bc(wir_r, c3__bczp, c3__null)); + } _open_do_pqrs(clkt) // :^ { return u2_bq @@ -406,6 +427,7 @@ } _open_do_pq(brkt) // |^ { + //[%brkt *] [%tsgr [%brcn (~(put by q.gen) %$ [%ash p.gen])] [%cnzy %$]] u2_noun diz = u2_bc(wir_r, c3__ash, u2_rx(wir_r, p_gen)); u2_noun ret = u2_bt (wir_r, @@ -425,6 +447,12 @@ u2_rx(wir_r, p_gen), u2_rx(wir_r, q_gen))); } + _open_do_p(brwt) // |? + { + return u2_bt(wir_r, c3__ktwt, + c3__brdt, + u2_rx(wir_r, p_gen)); + } /*** **** ***/ @@ -616,12 +644,16 @@ } else return _open_in_##stem(wir_r, p_gen, q_gen, r_gen, s_gen); _open_p (bczp); + _open_p (brhp); _open_p (brdt); _open_pq (brcb); _open_pq (brkt); _open_pq (brls); + _open_p (brwt); + _open_pq (clcb); + _open_p (clcn); _open_pq (clhp); _open_pqrs(clkt); _open_pqr (clls); @@ -666,6 +698,8 @@ _open_pqr (wtls); _open_pqr (wtkt); _open_p (wtpm); + + _open_p (zpgr); } } diff --git a/include/c/motes.h b/include/c/motes.h index f94460125..3942115b2 100644 --- a/include/c/motes.h +++ b/include/c/motes.h @@ -5,6 +5,7 @@ /** Definitions. **/ +# define c3__abel c3_s4('a','b','e','l') # define c3__abo c3_s3('a','b','o') # define c3__actd c3_s4('a','c','t','d') # define c3__add c3_s3('a','d','d') @@ -130,6 +131,7 @@ # define c3__brtg c3_s4('b','r','t','g') # define c3__brtr c3_s4('b','r','t','r') # define c3__brts c3_s4('b','r','t','s') +# define c3__brwt c3_s4('b','r','w','t') # define c3__brzp c3_s4('b','r','z','p') # define c3__bud c3_s3('b','u','d') # define c3__bull c3_s4('b','u','l','l') @@ -178,6 +180,7 @@ # define c3__clat c3_s4('c','l','a','t') # define c3__clay c3_s4('c','l','a','y') # define c3__clcb c3_s4('c','l','c','b') +# define c3__clcn c3_s4('c','l','c','n') # define c3__clep c3_s4('c','l','e','p') # define c3__clet c3_s4('c','l','e','t') # define c3__clhp c3_s4('c','l','h','p') @@ -467,6 +470,7 @@ # define c3__helo c3_s4('h','e','l','o') # define c3__hep c3_s3('h','e','p') # define c3__hept c3_s4('h','e','p','t') +# define c3__herb c3_s4('h','e','r','b') # define c3__hevy c3_s4('h','e','v','y') # define c3__hez c3_s3('h','e','z') # define c3__hide c3_s4('h','i','d','e') @@ -708,6 +712,7 @@ # define c3__off c3_s3('o','f','f') # define c3__old c3_s3('o','l','d') # define c3__on c3_s2('o','n') +# define c3__onan c3_s4('o','n','a','n') # define c3__one c3_s3('o','n','e') # define c3__only c3_s4('o','n','l','y') # define c3__op c3_s2('o','p') From 147a423a3f59b852a196f46868ee48358504c086 Mon Sep 17 00:00:00 2001 From: Luke Patmore Date: Fri, 13 Jun 2014 13:52:13 -0700 Subject: [PATCH 2/2] Improvements to ap.c --- gen164/6/ap.c | 43 +++++++++++++++++++++++++++++++++++++++++-- include/c/motes.h | 2 ++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/gen164/6/ap.c b/gen164/6/ap.c index e310fe778..4b837d854 100644 --- a/gen164/6/ap.c +++ b/gen164/6/ap.c @@ -210,6 +210,27 @@ u2_rz(wir_r, tul); return ret; + + } + _open_do_pqr(wtpt) // ?@ + { + return u2_bq(wir_r, c3__wtcl, + u2_bt(wir_r, c3__wtts, + u2_bt(wir_r, c3__axil, + c3__atom, + u2_blip), + u2_rx(wir_r, p_gen)), + u2_rx(wir_r, q_gen), + u2_rx(wir_r, r_gen)); + } + _open_do_pqr(wtsg) // ?~ + { + return u2_bq(wir_r, c3__wtcl, + u2_bt(wir_r, c3__wtts, + u2_bc(wir_r, c3__axil, c3__null), + u2_rx(wir_r, p_gen)), + u2_rx(wir_r, q_gen), + u2_rx(wir_r, r_gen)); } _open_do_p(wtzp) // ?! { @@ -545,6 +566,18 @@ u2_bq(wir_r, c3__memo, c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)), u2_rx(wir_r, q_gen)); } + _open_do_pqrs(sgwt) // ~? + { + return u2_bq(wir_r, c3__tsgl, + u2_rx(wir_r, s_gen), + c3__wtdt, + u2_bq(wir_r, u2_rx(wir_r, q_gen), + u2_bc(wir_r, u2_nul, _1), + c3__sgpm, + u2_bt(wir_r, u2_rx(wir_r, p_gen), + u2_rx(wir_r, r_gen), + u2_bc(wir_r, u2_nul, _1)))); + } /*** **** ***/ @@ -645,7 +678,8 @@ _open_p (bczp); - _open_p (brhp); + /* _open_p (brhp); */ //buggered + _open_p (brdt); _open_pq (brcb); _open_pq (brkt); @@ -682,6 +716,7 @@ _open_pqrs(sgcn); _open_pq (sgfs); _open_pq (sgls); + _open_pqrs(sgwt); _open_pq (smcl); @@ -691,9 +726,13 @@ _open_pqr (wtdt); _open_pq (wtgl); + _open_pqr (wtpt); + _open_pqr (wtsg); _open_p (wtzp); _open_p (wtbr); - _open_pq (wthp); + + /* _open_pq (wthp); */ //buggered + _open_pq (wtgr); _open_pqr (wtls); _open_pqr (wtkt); diff --git a/include/c/motes.h b/include/c/motes.h index 3942115b2..d11e58e8b 100644 --- a/include/c/motes.h +++ b/include/c/motes.h @@ -903,6 +903,7 @@ # define c3__sgsg c3_s4('s','g','s','g') # define c3__sgsp c3_s4('s','g','s','p') # 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__show c3_s4('s','h','o','w') # define c3__shud c3_s4('s','h','u','d') @@ -1123,6 +1124,7 @@ # define c3__wtls c3_s4('w','t','l','s') # define c3__wtms c3_s4('w','t','m','s') # define c3__wtpm c3_s4('w','t','p','m') +# define c3__wtpt c3_s4('w','t','p','t') # define c3__wtsg c3_s4('w','t','s','g') # define c3__wtts c3_s4('w','t','t','s') # define c3__wtzp c3_s4('w','t','z','p')