{ 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
enum ltype type;\r
};\r
union ir_setdata_t\r
static inline\r
union ir_setdata_t* ir_framedata (enum dtype,const uint8_t*,apc_facing,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
int classnames_identical(const uint8_t*,const uint8_t*);\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
( struct ir_set_t* set )\r
{ return (union ir_setdata_t*) set->links; }\r
\r
+#define assert_link(linkdata) do { \\r
+ if (linkdata->header.type != LDAT) \\r
+ eprintf("Data %s is not a link\n", linkdata->header.data_name); \\r
+ } while (0)\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
if (classld->root_class == NULL)\r
eprintf("No root class for classld\n");\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
+ eprintf("No such class \"%s\"\n", namelist_iter->name);\r
+ }\r
set = class_iter->root_set;\r
}\r
else\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
- else\r
- set = set->nextsib;\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
/* Get a setdata's next sibling */\r