Added wtkt macro expansion

This commit is contained in:
Luke Patmore 2014-06-10 17:51:43 -07:00
parent ce0ad53cc2
commit 810f83bc6f
2 changed files with 14 additions and 10 deletions

View File

@ -122,6 +122,17 @@
_open_in_wtbr(wir_r, tp_gen));
}
}
_open_do_pqr(wtkt) // ?^
{
// [%wtkt *] [%wtcl [%wtts [%axil %atom %$] p.gen] r.gen q.gen]
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, r_gen),
u2_rx(wir_r, q_gen));
}
_open_do_pq(wtgl) // ?<
{
return u2_bq
@ -208,7 +219,6 @@
***/
_open_do_pq(clhp) // :-
{
printf("wongwong!\n");
return u2_bc
(wir_r, u2_rx(wir_r, p_gen),
u2_rx(wir_r, q_gen));
@ -529,42 +539,34 @@
_open_p (brdt);
_open_pq (brcb);
_open_pq (brkt);
_open_pq (clcb);
_open_pq (clhp);
_open_pqrs(clkt);
_open_pqr (clls);
_open_p (cltr);
_open_p (clsg);
_open_pq (cncl);
_open_pq (cndt);
_open_pqrs(cnkt);
_open_pq (cnhp);
_open_pqr (cnls);
_open_pqr (cnsg);
_open_pq (sgts);
_open_pq (sgbr);
_open_pq (sggl);
_open_pq (sgbc);
_open_pqrs(sgcn);
_open_pq (sgls);
_open_pq (smcl);
// _open_pq (smsg);
_open_pq (tsgl);
_open_pq (tshp);
_open_pq (tsls);
_open_pqr (wtdt);
_open_pq (wtgl);
_open_p (wtzp);
_open_p (wtbr);
_open_pqr (wtkt); //testing
_open_p (wtpm);
// _open_pqr (wtls);
// _open_pqr (wtsg);
_open_pq (wthp);
_open_pq (wtgr);

View File

@ -22,6 +22,7 @@
# define c3__at c3_s2('a','t')
# define c3__atom c3_s4('a','t','o','m')
# define c3__axe c3_s3('a','x','e')
# define c3__axil c3_s4('a','x','i','l')
# define c3__axis c3_s4('a','x','i','s')
# define c3__bac c3_s3('b','a','c')
# define c3__bach c3_s4('b','a','c','h')
@ -1104,6 +1105,7 @@
# define c3__wtgr c3_s4('w','t','g','r')
# define c3__wthp c3_s4('w','t','h','p')
# define c3__wthx c3_s4('w','t','h','x')
# define c3__wtkt c3_s4('w','t','k','t')
# 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')