int ir_condenser(void);\r
/* Set data mem */\r
enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT };\r
+struct ir_facinglist_t;\r
+struct ir_facinglist_t\r
+{ struct ir_facinglist_t* nextsib;\r
+ apc_facing facing;\r
+};\r
struct ir_namelist_t;\r
struct ir_namelist_t\r
{ struct ir_namelist_t* nextsib;\r
};\r
struct ir_framedata_t\r
{ struct ir_setdata_header_t header;\r
- struct ir_frameinfo_t frameinfo;\r
+ apc_facing facing;\r
+ int w, h;\r
+ struct ir_facinglist_t* mirrorlist,* nextmirror;\r
};\r
struct ir_framebox_t\r
{ struct ir_setdata_header_t header;\r
static inline\r
struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*,uint8_t*);\r
static inline\r
-union ir_setdata_t* ir_framedata (enum dtype,const uint8_t*,apc_facing,int,int);\r
+union ir_setdata_t* ir_framedata (enum dtype,const uint8_t*,facinglist,int,int);\r
static inline\r
void ir_linkdata_resolve_set(union ir_setdata_t*);\r
static inline\r
switch (setdata->header.type)\r
{ case FSDAT:\r
framebox = ir_set_add_framebox(set, setdata->header.data_name);\r
- if (framebox->framesheets[setdata->framesheet.frameinfo.facing].header.data_name != NULL)\r
+ if (framebox->framesheets[setdata->framesheet.facing].header.data_name != NULL)\r
wprintf("Duplicate framesheet [%i] %s\n",\r
- setdata->framesheet.frameinfo.facing, setdata->header.data_name);\r
- framebox->framesheets[setdata->framesheet.frameinfo.facing] = setdata->framesheet;\r
+ setdata->framesheet.facing, setdata->header.data_name);\r
+ framebox->framesheets[setdata->framesheet.facing] = setdata->framesheet;\r
break;\r
case MSDAT:\r
framebox = ir_set_add_framebox(set, setdata->header.data_name);\r
- if (framebox->mapsheets[setdata->mapsheet.frameinfo.facing].header.data_name != NULL)\r
+ if (framebox->mapsheets[setdata->mapsheet.facing].header.data_name != NULL)\r
wprintf("Duplicate mapsheet [%i] %s\n",\r
- setdata->mapsheet.frameinfo.facing, setdata->header.data_name);\r
- framebox->mapsheets[setdata->mapsheet.frameinfo.facing] = setdata->mapsheet;\r
+ setdata->mapsheet.facing, setdata->header.data_name);\r
+ framebox->mapsheets[setdata->mapsheet.facing] = setdata->mapsheet;\r
break;\r
case ADAT:\r
if (set->audio == NULL)\r
}\r
\r
union ir_setdata_t* ir_framesheet\r
-( const uint8_t* name,\r
- apc_facing d,\r
- int width,\r
- int height\r
+( const uint8_t* name,\r
+ struct ir_facinglist_t* facinglist,\r
+ int width,\r
+ int height\r
)\r
-{ return ir_framedata(FSDAT, name, d, width, height); }\r
+{ return ir_framedata(FSDAT, name, facinglist, width, height); }\r
\r
union ir_setdata_t* ir_mapsheet\r
-( const uint8_t* name,\r
- apc_facing d,\r
- int width,\r
- int height\r
+( const uint8_t* name,\r
+ struct ir_facinglist_t* facinglist,\r
+ int width,\r
+ int height\r
)\r
-{ return ir_framedata(MSDAT, name, d, width, height); }\r
+{ return ir_framedata(MSDAT, name, facinglist, width, height); }\r
\r
static inline\r
union ir_setdata_t* ir_framedata\r
-( enum dtype type,\r
- const uint8_t* name,\r
- apc_facing d,\r
- int width,\r
- int height\r
+( enum dtype type,\r
+ const uint8_t* name,\r
+ struct ir_facinglist_t* facinglist,\r
+ int width,\r
+ int height\r
)\r
{ struct ir_framedata_t* framedata = struct_alloc(ir_framedata_t);\r
struct_clear(framedata);\r
eprintf("Null name in set allocation\n");\r
framedata->header.type = type;\r
framedata->header.data_name = name_alloc(name);\r
- framedata->frameinfo.facing = d;\r
- framedata->frameinfo.w = width;\r
- framedata->frameinfo.h = height;\r
+ if (facinglist != NULL)\r
+ { framedata->facing = facinglist->facing;\r
+ framedata->mirrorlist = facinglist->nextsib;\r
+ }\r
+ else\r
+ { framedata->facing = SFACE;\r
+ framedata->mirrorlist = NULL;\r
+ }\r
+ framedata->nextmirror = framedata->mirrorlist;\r
+ framedata->w = width;\r
+ framedata->h = height;\r
return (union ir_setdata_t*) framedata;\r
}\r
\r
( union ir_setdata_t* setdata, uint8_t* name )\r
{ setdata->header.data_name = name;}\r
\r
+/* Create a new facinglist from an apc_facing */\r
+struct ir_facinglist_t* ir_facinglist\r
+( apc_facing facing )\r
+{ struct ir_facinglist_t* list = struct_alloc(ir_facinglist_t);\r
+ list->facing = facing;\r
+ return list;\r
+}\r
+\r
+/* Add a child to the facing list */\r
+struct ir_facinglist_t* ir_facinglist_push\r
+( struct ir_facinglist_t* list,\r
+ apc_facing facing\r
+)\r
+{ struct ir_facinglist_t* iter = list;\r
+ if (iter != NULL)\r
+ { while (iter->nextsib != NULL)\r
+ iter = iter->nextsib;\r
+ iter->nextsib = struct_alloc(ir_facinglist_t);\r
+ iter->nextsib->facing = facing;\r
+ }\r
+ return list;\r
+}\r
+\r
+#define assert_framebox(fbox) if (DEBUG) { \\r
+ if (fbox->header.type != FBDAT) \\r
+ eprintf("Data %s is not a framebox\n", fbox->header.data_name); \\r
+ }\r
+\r
/* Return a framebox's specified framesheet */\r
union ir_setdata_t* ir_framebox_framesheet\r
( union ir_setdata_t* fbox,\r
apc_facing facing\r
)\r
-{ if (fbox->header.type != FBDAT)\r
- eprintf("Data %s is not a framebox\n", fbox->header.data_name);\r
+{ assert_framebox(fbox);\r
return (union ir_setdata_t*) &fbox->framebox.framesheets[facing];\r
}\r
\r
( union ir_setdata_t* fbox,\r
apc_facing facing\r
)\r
-{ if (fbox->header.type != FBDAT)\r
- eprintf("Data %s is not a framebox\n", fbox->header.data_name);\r
+{ assert_framebox(fbox);\r
return (union ir_setdata_t*) &fbox->framebox.mapsheets[facing];\r
}\r
\r
+#define assert_framedata(fdat) if (DEBUG) { \\r
+ if (fdat->header.type != MSDAT && fdat->header.type != FSDAT) \\r
+ eprintf("Data %s is not a framedata\n", fdat->header.data_name); \\r
+ }\r
+\r
+/* Return a framedata's frame info */\r
+int ir_framedata_width\r
+( union ir_setdata_t* framedata )\r
+{ assert_framedata(framedata);\r
+ return framedata->mapsheet.w;\r
+}\r
+\r
/* Return a framedata's frame info */\r
-struct ir_frameinfo_t* ir_framedata_frameinfo\r
+int ir_framedata_height\r
( union ir_setdata_t* framedata )\r
-{ if (framedata->header.type != MSDAT && framedata->header.type != FSDAT)\r
- eprintf("Data %s is not a framedata\n", framedata->header.data_name);\r
- return &framedata->mapsheet.frameinfo;\r
+{ assert_framedata(framedata);\r
+ return framedata->mapsheet.h;\r
}\r
\r
+/* Return the next facing in the framedata's facing list, and reset the\r
+ 'nextmirror' head to mirrorlist, so that 'ir_framedata_nextmirror' will now\r
+ refer to the second facing in the framedata */\r
+apc_facing ir_framedata_firstfacing\r
+( union ir_setdata_t* framedata )\r
+{ assert_framedata(framedata);\r
+ framedata->mapsheet.nextmirror = framedata->mapsheet.mirrorlist;\r
+ return framedata->mapsheet.facing;\r
+}\r
+\r
+/* Return the next facing for this framedata, incrementing the 'nextmirror'\r
+ head. Returns FACING_MAX when there are no more facings to return. */\r
+apc_facing ir_framedata_nextfacing\r
+( union ir_setdata_t* framedata )\r
+{ apc_facing facing;\r
+ assert_framedata(framedata);\r
+ if (framedata->mapsheet.nextmirror == NULL)\r
+ return FACING_MAX;\r
+ facing = framedata->mapsheet.nextmirror->facing;\r
+ framedata->mapsheet.nextmirror = framedata->mapsheet.nextmirror->nextsib;\r
+ return facing;\r
+}\r
\r
/** Allocators **/\r
static\r
#include <unitypes.h>\r
#include "apc.h"\r
\r
-struct ir_frameinfo_t\r
-{ int facing, w, h; };\r
-typedef union ir_setdata_t* ir_setdata;\r
-typedef struct ir_frameinfo_t* ir_frameinfo;\r
-typedef struct ir_set_t* ir_set;\r
-typedef struct ir_class_t* ir_class;\r
-typedef struct ir_setld_t* ir_setld;\r
-typedef struct ir_classld_t* ir_classld;\r
+typedef union ir_setdata_t* ir_setdata;\r
+typedef struct ir_frameinfo_t* ir_frameinfo;\r
+typedef struct ir_set_t* ir_set;\r
+typedef struct ir_class_t* ir_class;\r
+typedef struct ir_setld_t* ir_setld;\r
+typedef struct ir_classld_t* ir_classld;\r
+typedef struct ir_facinglist_t* facinglist;\r
/* Classes and Sets\r
Classes are rooted at a special root class, representing the current working\r
directory at scan-time, named ".". The root class can always be identified\r
void ir_set_assign_data(ir_set,ir_setdata);\r
void ir_set_assign_ref(ir_set,uint32_t);\r
void ir_data_assign_path(ir_setdata,const uint8_t*);\r
-ir_setdata ir_framesheet(const uint8_t*, apc_facing, int,int);\r
-ir_setdata ir_mapsheet(const uint8_t*, apc_facing, int,int);\r
+ir_setdata ir_framesheet(const uint8_t*,facinglist,int,int);\r
+ir_setdata ir_mapsheet(const uint8_t*,facinglist,int,int);\r
ir_setdata ir_audio(const uint8_t*);\r
ir_setdata ir_link(enum ltype,ir_setld,const uint8_t*);\r
+/* Facing Lists for creating frame/mapsheets */\r
+facinglist ir_facinglist(apc_facing);\r
+facinglist ir_facinglist_push(facinglist,apc_facing);\r
/* Output */\r
-framebox ir_set_framebox(ir_set);\r
-audiodata ir_set_audio(ir_set);\r
-linkdata ir_set_link(ir_set);\r
-enum ltype ir_linkdata_type(linkdata);\r
-uint32_t ir_linkdata_ref(linkdata);\r
-ir_set ir_linkdata_set(linkdata);\r
-void ir_linkdata_assign_set(linkdata,ir_set);\r
-void ir_linkdata_assign_type(linkdata,enum ltype);\r
-uint8_t* ir_linkdata_dlink_name(linkdata);\r
-ir_setdata ir_setdata_nextsib(ir_setdata);\r
-uint8_t* ir_setdata_name(ir_setdata);\r
-uint8_t* ir_setdata_filename(ir_setdata);\r
-long ir_setdata_fpos(ir_setdata);\r
-void ir_setdata_assign_fpos(ir_setdata,long);\r
-framedata ir_framebox_framesheet(framebox,apc_facing);\r
-framedata ir_framebox_mapsheet(framebox,apc_facing);\r
-ir_frameinfo ir_framedata_frameinfo(framedata);\r
+framebox ir_set_framebox(ir_set);\r
+audiodata ir_set_audio(ir_set);\r
+linkdata ir_set_link(ir_set);\r
+enum ltype ir_linkdata_type(linkdata);\r
+uint32_t ir_linkdata_ref(linkdata);\r
+ir_set ir_linkdata_set(linkdata);\r
+void ir_linkdata_assign_set(linkdata,ir_set);\r
+void ir_linkdata_assign_type(linkdata,enum ltype);\r
+uint8_t* ir_linkdata_dlink_name(linkdata);\r
+ir_setdata ir_setdata_nextsib(ir_setdata);\r
+uint8_t* ir_setdata_name(ir_setdata);\r
+uint8_t* ir_setdata_filename(ir_setdata);\r
+long ir_setdata_fpos(ir_setdata);\r
+void ir_setdata_assign_fpos(ir_setdata,long);\r
+void ir_setdata_assign_name(ir_setdata,uint8_t*);\r
+/* Framedata */\r
+framedata ir_framebox_framesheet(framebox,apc_facing);\r
+framedata ir_framebox_mapsheet(framebox,apc_facing);\r
+int ir_framedata_width(framedata);\r
+int ir_framedata_height(framedata);\r
+apc_facing ir_framedata_firstfacing(framedata);\r
+apc_facing ir_framedata_nextfacing(framedata);\r
/* Reference Linking Data \r
Create linking data to sets or classes that will be resolved at a later\r
stage. Class references can be created from an ir_class object, if\r
#include "ir.h"
#include "apc.h"
typedef struct class_state_t yycstate;
- struct frame_spec_t { apc_facing d; int w, h; };
+ struct frame_spec_t { facinglist list; int w, h; };
}
%code provides {
yycstate* yycstate_new(void);
ir_setld ld;
ir_setdata data;
struct frame_spec_t frame_spec;
+ facinglist facinglist;
}
/* Operators */
%token CLOPEN //(
%token <face> FACING
%token <str> NAME
/* Types */
-%type<data> data_spec
-%type<set> set_spec
-%type<ld> set_ld set_link
-%type<frame_spec> frame_spec
+%type<data> data_spec
+%type<set> set_spec
+%type<ld> set_ld set_link
+%type<frame_spec> frame_spec
+%type<facinglist> facing_list
%%
/* Syntax Directed Translation Scheme of the APC grammar */
progn:
;
data_spec:
- SS NAME frame_spec { $$ = ir_framesheet($2,$3.d,$3.w,$3.h); }
-| SS frame_spec { $$ = ir_framesheet(DEFAULT_VARIANT,$2.d,$2.w,$2.h); }
-| MAP NAME frame_spec { $$ = ir_mapsheet($2,$3.d,$3.w,$3.h); }
-| MAP frame_spec { $$ = ir_mapsheet(DEFAULT_VARIANT,$2.d,$2.w,$2.h); }
+ SS NAME frame_spec { $$ = ir_framesheet($2,$3.list,$3.w,$3.h); }
+| SS frame_spec { $$ = ir_framesheet(DEFAULT_VARIANT,$2.list,$2.w,$2.h); }
+| MAP NAME frame_spec { $$ = ir_mapsheet($2,$3.list,$3.w,$3.h); }
+| MAP frame_spec { $$ = ir_mapsheet(DEFAULT_VARIANT,$2.list,$2.w,$2.h); }
| AUDIO NAME { $$ = ir_audio($2); }
| LINK set_ld { $$ = ir_link(OLINK, $2, NULL); }
| LINK set_ld MAP { $$ = ir_link(MLINK, $2,NULL); }
| REF { $$ = ir_setld_from_ref($1); }
;
+facing_list:
+ facing_list FACING { $$ = ir_facinglist_push($1,$2); }
+| FACING { $$ = ir_facinglist($1); }
+
frame_spec:
- NUM NUM { $$ = (struct frame_spec_t) {SFACE,$1,$2}; }
-| FACING { $$ = (struct frame_spec_t) {$1,0,0}; }
-| FACING NUM NUM { $$ = (struct frame_spec_t) {$1,$2,$3}; }
-| %empty { $$ = (struct frame_spec_t) {SFACE,0,0}; }
+ NUM NUM { $$ = (struct frame_spec_t) {NULL,$1,$2}; }
+| facing_list { $$ = (struct frame_spec_t) {$1,0,0}; }
+| facing_list NUM NUM { $$ = (struct frame_spec_t) {$1,$2,$3}; }
+| %empty { $$ = (struct frame_spec_t) {NULL,0,0}; }
;
%%