#include <unistr.h> //u32_cpy\r
#include <unistdio.h> //ulc_fprintf\r
/* Local */\r
+#define eprintf_callback(...) exit(EXIT_FAILURE)\r
#include "print.h"\r
#include "apc.h"\r
#include "ir.h"\r
#include "pagenode.h"\r
-#undef do_error\r
-#define do_error(...) exit(-1)\r
#define XXH_PRIVATE_API\r
#include "../xxHash/xxhash.h"\r
/* Public */\r
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
struct ir_simplex_t { struct ir_setdata_header_t header; };\r
struct ir_link_t\r
{ struct ir_setdata_header_t header;\r
- struct ir_classld_t* classld;\r
struct ir_setld_t* setld;\r
+ struct ir_set_t* trg_set;\r
+ uint8_t* dlink;\r
enum ltype type;\r
};\r
union ir_setdata_t\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
int bytes_identical(const uint8_t*,const uint8_t*);\r
static inline\r
#define struct_alloc(_T) ((struct _T*) stack_alloc(&datapages, sizeof(struct _T)))\r
extern //apc.c\r
long sys_pagesize;\r
+extern //apc.c\r
+char* apc_package_name;\r
static\r
struct pagelist_t datapages, namepages, refhashpages;\r
static\r
-struct ir_class_t root_class = { .name = (uint8_t*)"." };\r
+struct ir_class_t root_class;\r
\r
/* Init */\r
int ir_init\r
{ pagelist_init(datapages, (size_t)SYS_PAGESIZE);\r
pagelist_init(namepages, (size_t)NAME_PAGESIZE);\r
pagelist_init(refhashpages, (size_t)SYS_PAGESIZE);\r
-\r
+ root_class.name = (uint8_t*) apc_package_name;\r
return 0;\r
}\r
\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
link = struct_alloc(ir_link_t);\r
struct_clear(link);\r
link->header.type = LDAT;\r
- link->type = link_type; \r
- link->classld = setld->classld;\r
+ link->type = link_type;\r
link->setld = setld;\r
if (link_type != OLINK && name != NULL)\r
link->header.data_name = name_alloc(name);\r
( struct ir_set_t* set )\r
{ return (union ir_setdata_t*) set->links; }\r
\r
+#define assert_link(linkdata) if (DEBUG) { \\r
+ if (linkdata->header.type != LDAT) \\r
+ eprintf("Data %s is not a link\n", linkdata->header.data_name); \\r
+ }\r
+\r
/* Return the link type */\r
enum ltype ir_linkdata_type\r
( union ir_setdata_t* linkdata )\r
-{ if (linkdata->header.type != LDAT)\r
- eprintf("Data %s is not a link\n", linkdata->header.data_name);\r
+{ assert_link(linkdata);\r
return linkdata->link.type;\r
}\r
\r
/* Return the link type */\r
uint32_t ir_linkdata_ref\r
( union ir_setdata_t* linkdata )\r
-{ if (linkdata->header.type != LDAT)\r
- eprintf("Data %s is not a link\n", linkdata->header.data_name);\r
+{ assert_link(linkdata);\r
return linkdata->link.setld->ref;\r
}\r
\r
-/* Resolve and return the link's target set */\r
+/* Return the current target set, resolving it first if not present */\r
struct ir_set_t* ir_linkdata_set\r
( union ir_setdata_t* linkdata )\r
+{ assert_link(linkdata);\r
+ if (linkdata->link.trg_set == NULL)\r
+ ir_linkdata_resolve_set(linkdata);\r
+ return linkdata->link.trg_set;\r
+}\r
+\r
+/* Resolve and assign the link's target set */\r
+static inline\r
+void ir_linkdata_resolve_set\r
+( union ir_setdata_t* linkdata )\r
{ struct ir_class_t* class_iter;\r
- struct ir_namelist_t* namelist_iter;\r
+ struct ir_namelist_t* namelist_iter,* namelist_iter_last;\r
struct ir_setld_t* setld;\r
struct ir_classld_t* classld;\r
struct ir_set_t* set;\r
set = NULL;\r
- if (linkdata->header.type != LDAT)\r
- eprintf("Data %s is not a link\n", linkdata->header.data_name);\r
+ class_iter = NULL;\r
+ assert_link(linkdata);\r
setld = linkdata->link.setld;\r
if (linkdata->link.setld == NULL)\r
eprintf("Link data is invalid\n");\r
- classld = linkdata->link.classld;\r
+ classld = setld->classld;\r
if (classld != NULL)\r
{ namelist_iter = classld->namelist;\r
if (classld->root_class == NULL)\r
eprintf("No root class for classld\n");\r
- for (class_iter = classld->root_class->nextchild;\r
- class_iter != NULL;\r
- class_iter = class_iter->nextsib)\r
+ class_iter = classld->root_class->nextchild;\r
+ namelist_iter_last = NULL;\r
+ while (class_iter != NULL)\r
{ if (classnames_identical(class_iter->name, namelist_iter->name))\r
{ if (namelist_iter == classld->namelist_head)\r
break;\r
class_iter = class_iter->nextchild;\r
+ namelist_iter_last = namelist_iter;\r
namelist_iter = namelist_iter->nextsib;\r
}\r
+ else\r
+ class_iter = class_iter->nextsib;\r
}\r
if (class_iter == NULL)\r
- eprintf("Class resolution failed\n");\r
+ { if (namelist_iter_last)\r
+ eprintf("No such subclass \"%s\" of class \"%s\"\n",\r
+ namelist_iter->name,\r
+ namelist_iter_last->name);\r
+ else\r
+ { wprintf("No such class \"%s\"\n", namelist_iter->name);\r
+ return;\r
+ }\r
+ }\r
set = class_iter->root_set;\r
}\r
- else if (setld->ref)\r
+ else\r
set = ir_set_from_ref(setld->ref);\r
if (set == NULL)\r
eprintf("Initial set resolution failed\n");\r
namelist_iter = setld->namelist;\r
- while (set != NULL)\r
- { if (bytes_identical(set->name, namelist_iter->name))\r
- { if (namelist_iter == setld->namelist_head)\r
- break;\r
- set = set->nextchild;\r
- namelist_iter = namelist_iter->nextsib;\r
- }\r
+ namelist_iter_last = NULL;\r
+ if (setld->namelist != NULL)\r
+ { while (set != NULL)\r
+ { if (bytes_identical(set->name, namelist_iter->name))\r
+ { if (namelist_iter == setld->namelist_head)\r
+ break;\r
+ set = set->nextchild;\r
+ namelist_iter_last = namelist_iter;\r
+ namelist_iter = namelist_iter->nextsib;\r
+ }\r
+ else\r
+ set = set->nextsib;\r
+ }\r
+ if (set == NULL)\r
+ { if (namelist_iter_last)\r
+ eprintf("No such subset \"%s\" of set \"%s\"\n",\r
+ namelist_iter->name,\r
+ namelist_iter_last->name);\r
+ else\r
+ eprintf("No such set \"%s\" in class \"%s\"\n",\r
+ namelist_iter->name,\r
+ class_iter->name);\r
+ }\r
}\r
- return set;\r
+ linkdata->link.trg_set = set;\r
+}\r
+\r
+/* Assign a linkdatas trg_set */\r
+void ir_linkdata_assign_set\r
+( union ir_setdata_t* link, struct ir_set_t* set )\r
+{ assert_link(link);\r
+ link->link.trg_set = set;\r
+}\r
+\r
+/* Assign a linkdatas type */\r
+void ir_linkdata_assign_type\r
+( union ir_setdata_t* link, enum ltype type )\r
+{ assert_link(link);\r
+ link->link.type = type;\r
+}\r
+\r
+/* Get, or generate, the fully qualified name of the link's target set */\r
+uint8_t*\r
+ir_linkdata_dlink_name\r
+( union ir_setdata_t* link )\r
+{ struct ir_namelist_t* namelist_iter;\r
+ struct ir_setld_t* setld;\r
+ struct ir_classld_t* classld;\r
+ uint8_t* bytep;\r
+ size_t bytes;\r
+ char setpass;\r
+ uint8_t delimiter;\r
+ static const uint8_t dlink_prefix[] = { '/', '.', '.', '/' };\r
+# define dlink_prefix_len 4\r
+ assert_link(link);\r
+ if (link->link.dlink != NULL)\r
+ return link->link.dlink;\r
+ bytes = 0;\r
+ setld = link->link.setld;\r
+ if (setld == NULL)\r
+ eprintf("No setld in dlink\n");\r
+ classld = setld->classld;\r
+ if (classld == NULL)\r
+ eprintf("No classld in dlink\n");\r
+ if (classld->root_class != NULL)\r
+ eprintf("Cannot dlink local class \"%s\"\n", classld->root_class->name);\r
+ namelist_iter = classld->namelist;\r
+ setpass = 0;\r
+ count_bytes_in_namelist:\r
+ while (namelist_iter != NULL)\r
+ { bytep = namelist_iter->name;\r
+ while (*bytep++);\r
+ bytes += (bytep - namelist_iter->name);\r
+ namelist_iter = namelist_iter->nextsib;\r
+ }\r
+ if (setpass == 0)\r
+ { setpass = 1;\r
+ namelist_iter = setld->namelist;\r
+ goto count_bytes_in_namelist;\r
+ }\r
+ bytes += dlink_prefix_len;\r
+ link->link.dlink = stack_alloc(&namepages, bytes);\r
+ for (bytes = 0; bytes < dlink_prefix_len; bytes++)\r
+ link->link.dlink[bytes] = dlink_prefix[bytes];\r
+ namelist_iter = classld->namelist;\r
+ setpass = 0;\r
+ delimiter = APC_CLASS_DELIMITER;\r
+ copy_bytes_in_namelist:\r
+ while (namelist_iter != NULL)\r
+ { bytep = namelist_iter->name;\r
+ while (*bytep)\r
+ link->link.dlink[bytes++] = *bytep++;\r
+ link->link.dlink[bytes++] = delimiter;\r
+ namelist_iter = namelist_iter->nextsib;\r
+ }\r
+ if (setpass == 0)\r
+ { setpass = 1;\r
+ namelist_iter = setld->namelist;\r
+ delimiter = APC_SET_DELIMITER;\r
+ link->link.dlink[bytes - 1] = delimiter; //overwrite last delimiter\r
+ goto copy_bytes_in_namelist;\r
+ }\r
+ link->link.dlink[bytes] = '\0'; //tailing '\0' null termination\r
+ return link->link.dlink;\r
}\r
\r
/* Get a setdata's next sibling */\r
)\r
{ setdata->header.filepos = newpos; }\r
\r
+/* Assign a setdatas name */\r
+void ir_setdata_assign_name\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
-struct ir_frameinfo_t* ir_framedata_frameinfo\r
+int ir_framedata_width\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.w;\r
}\r
\r
+/* Return a framedata's frame info */\r
+int ir_framedata_height\r
+( union ir_setdata_t* framedata )\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
projects / henge / apc.git / blobdiff