urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 20:02:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Moar ap.c fixes, added macro expansions

Browse Source
This commit is contained in:
Luke Patmore 2014-06-13 15:30:36 -07:00
parent 147a423a3f
commit 396c2d1c7f
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gen164/6/ap.c
View File

@ -63,6 +63,27 @@
/*** /***
**** ****
***/ ***/
_open_do_pq(tscl) // =:
{
return u2_bt(wir_r, c3__tsgr,
u2_bt(wir_r, c3__cncb,
u2_bc(wir_r, u2_bc(wir_r, u2_nul, _1),
u2_nul),
u2_rx(wir_r, p_gen)),
u2_rx(wir_r, q_gen));
}
_open_do_pqr(tsdt) // =.
{
return
u2_bt(wir_r, c3__tsgr,
u2_bt(wir_r, c3__cncb,
u2_bc(wir_r, u2_bc(wir_r, u2_nul, _1),
u2_nul),
u2_bc(wir_r, u2_bc(wir_r, u2_rx(wir_r, p_gen),
u2_rx(wir_r, q_gen)),
u2_nul)),
u2_rx(wir_r, r_gen));
}
_open_do_pq(tsgl) // =< _open_do_pq(tsgl) // =<
{ {
return u2_bt(wir_r, c3__tsgr, u2_rx(wir_r, q_gen), return u2_bt(wir_r, c3__tsgr, u2_rx(wir_r, q_gen),
@ -96,9 +117,9 @@
_open_do_p(brhp) // |- _open_do_p(brhp) // |-
{ {
return u2_bt return u2_bt
(wir_r, c3__tsgr, (wir_r, c3__tsgl,
u2_bc(wir_r, c3__brdt, u2_rx(wir_r, p_gen)), u2_bc(wir_r, c3__cnzy, u2_blip),
u2_bc(wir_r, c3__cnzy, u2_blip)); u2_bc(wir_r, c3__brdt, u2_rx(wir_r, p_gen)));
} }
_open_do_p(brdt) // |. _open_do_p(brdt) // |.
{ {
@ -131,7 +152,6 @@
} }
_open_do_pqr(wtkt) // ?^ _open_do_pqr(wtkt) // ?^
{ {
// [%wtkt *] [%wtcl [%wtts [%axil %atom %$] p.gen] r.gen q.gen]
return u2_bq return u2_bq
(wir_r, c3__wtcl, (wir_r, c3__wtcl,
u2_bt(wir_r, c3__wtts, u2_bt(wir_r, c3__wtts,
@ -163,6 +183,7 @@
u2_rx(wir_r, q_gen), u2_rx(wir_r, q_gen),
u2_bc(wir_r, c3__zpzp, u2_nul)); u2_bc(wir_r, c3__zpzp, u2_nul));
} }
#if 0
_open_do_pq(wthp) // ?- _open_do_pq(wthp) // ?-
{ {
if ( (u2_nul == q_gen) ) { if ( (u2_nul == q_gen) ) {
@ -184,6 +205,7 @@
_open_in_wthp(wir_r, p_gen, tq_gen)); _open_in_wthp(wir_r, p_gen, tq_gen));
} }
} }
#endif
_open_do_p(wtpm) // ?& _open_do_p(wtpm) // ?&
{ {
if ( (u2_nul == p_gen) ) { if ( (u2_nul == p_gen) ) {
@ -678,10 +700,9 @@
_open_p (bczp); _open_p (bczp);
/* _open_p (brhp); */ //buggered
_open_p (brdt); _open_p (brdt);
_open_pq (brcb); _open_pq (brcb);
_open_p (brhp);
_open_pq (brkt); _open_pq (brkt);
_open_pq (brls); _open_pq (brls);
_open_p (brwt); _open_p (brwt);
@ -720,6 +741,8 @@
_open_pq (smcl); _open_pq (smcl);
_open_pq (tscl);
_open_pqr (tsdt);
_open_pq (tsgl); _open_pq (tsgl);
_open_pq (tshp); _open_pq (tshp);
_open_pq (tsls); _open_pq (tsls);

3
include/c/motes.h
View File

@ -1041,6 +1041,9 @@
# define c3__trop c3_s4('t','r','o','p') # define c3__trop c3_s4('t','r','o','p')
# define c3__trup c3_s4('t','r','u','p') # define c3__trup c3_s4('t','r','u','p')
# define c3__try c3_s3('t','r','y') # define c3__try c3_s3('t','r','y')
# define c3__tsbr c3_s4('t','s','b','r')
# define c3__tscl c3_s4('t','s','c','l')
# define c3__tsdt c3_s4('t','s','d','t')
# define c3__tsgl c3_s4('t','s','g','l') # define c3__tsgl c3_s4('t','s','g','l')
# define c3__tsgr c3_s4('t','s','g','r') # define c3__tsgr c3_s4('t','s','g','r')
# define c3__tshp c3_s4('t','s','h','p') # define c3__tshp c3_s4('t','s','h','p')