X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=blobdiff_plain;f=src%2Fparser.y;h=07cf5b825ed10c585dc4fcfbbd72bd2b6e9557f9;hp=959890df0f4a25c93beb93e4e0ffe9f098681122;hb=6035780f8e8c7ba47ae517ad6cf7e47515e847fd;hpb=598910007024e398205daba6ee894309e19743e1 diff --git a/src/parser.y b/src/parser.y index 959890d..07cf5b8 100644 --- a/src/parser.y +++ b/src/parser.y @@ -100,13 +100,13 @@ data_spec: SS NAME frame_spec { $$ = ir_framesheet($2,$3.d,$3.w,$3.h); } | MAP NAME frame_spec { $$ = ir_mapsheet($2,$3.d,$3.w,$3.h); } | AUDIO NAME { $$ = ir_audio($2); } -| LINK set_ld { $$ = ir_link_odat($2); } -| LINK set_ld MAP { $$ = ir_link_mdat($2,NULL); } -| LINK set_ld MAP NAME { $$ = ir_link_mdat($2,$4); } -| LINK set_ld SS { $$ = ir_link_vdat($2,NULL); } -| LINK set_ld SS NAME { $$ = ir_link_vdat($2,$4); } -| LINK set_ld AUDIO { $$ = ir_link_adat($2,NULL); } -| LINK set_ld AUDIO NAME { $$ = ir_link_adat($2,$4); } +| LINK set_ld { $$ = ir_link(OLINK, $2, NULL); } +| LINK set_ld MAP { $$ = ir_link(MLINK, $2,NULL); } +| LINK set_ld MAP NAME { $$ = ir_link(MLINK, $2,$4); } +| LINK set_ld SS { $$ = ir_link(VLINK, $2,NULL); } +| LINK set_ld SS NAME { $$ = ir_link(VLINK, $2,$4); } +| LINK set_ld AUDIO { $$ = ir_link(ALINK, $2,NULL); } +| LINK set_ld AUDIO NAME { $$ = ir_link(ALINK, $2,$4); } ; set_spec: