X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=blobdiff_plain;f=src%2Fir.c;h=52ae0515596210e00dda78731732f4c26dec3c23;hp=527f472d60ef76a88fe8dc0b3170c664a02b2631;hb=52b3767316142be128199f8f3a5eccd51d464d08;hpb=4c410fa3dee5d5153f7f0daac7840a8e40d96633 diff --git a/src/ir.c b/src/ir.c index 527f472..52ae051 100644 --- a/src/ir.c +++ b/src/ir.c @@ -67,6 +67,7 @@ struct ir_link_t { struct ir_setdata_header_t header; struct ir_classld_t* classld; struct ir_setld_t* setld; + struct ir_set_t* trg_set; enum ltype type; }; union ir_setdata_t @@ -98,6 +99,8 @@ struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*,uint8_t*); static inline union ir_setdata_t* ir_framedata (enum dtype,const uint8_t*,apc_facing,int,int); static inline +void ir_linkdata_resolve_set(union ir_setdata_t*); +static inline int bytes_identical(const uint8_t*,const uint8_t*); static inline int classnames_identical(const uint8_t*,const uint8_t*); @@ -110,10 +113,12 @@ uint8_t* classname_alloc(const uint8_t*); #define struct_alloc(_T) ((struct _T*) stack_alloc(&datapages, sizeof(struct _T))) extern //apc.c long sys_pagesize; +extern //apc.c +char* apc_package_name; static struct pagelist_t datapages, namepages, refhashpages; static -struct ir_class_t root_class = { .name = (uint8_t*)"." }; +struct ir_class_t root_class; /* Init */ int ir_init @@ -121,7 +126,7 @@ int ir_init { pagelist_init(datapages, (size_t)SYS_PAGESIZE); pagelist_init(namepages, (size_t)NAME_PAGESIZE); pagelist_init(refhashpages, (size_t)SYS_PAGESIZE); - + root_class.name = (uint8_t*) apc_package_name; return 0; } @@ -615,33 +620,46 @@ union ir_setdata_t* ir_set_link ( struct ir_set_t* set ) { return (union ir_setdata_t*) set->links; } +#define assert_link(linkdata) do { \ + if (linkdata->header.type != LDAT) \ + eprintf("Data %s is not a link\n", linkdata->header.data_name); \ + } while (0) + /* Return the link type */ enum ltype ir_linkdata_type ( union ir_setdata_t* linkdata ) -{ if (linkdata->header.type != LDAT) - eprintf("Data %s is not a link\n", linkdata->header.data_name); +{ assert_link(linkdata); return linkdata->link.type; } /* Return the link type */ uint32_t ir_linkdata_ref ( union ir_setdata_t* linkdata ) -{ if (linkdata->header.type != LDAT) - eprintf("Data %s is not a link\n", linkdata->header.data_name); +{ assert_link(linkdata); return linkdata->link.setld->ref; } -/* Resolve and return the link's target set */ +/* Return the current target set, resolving it first if not present */ struct ir_set_t* ir_linkdata_set ( union ir_setdata_t* linkdata ) +{ assert_link(linkdata); + if (linkdata->link.trg_set == NULL) + ir_linkdata_resolve_set(linkdata); + return linkdata->link.trg_set; +} + +/* Resolve and assign the link's target set */ +static inline +void ir_linkdata_resolve_set +( union ir_setdata_t* linkdata ) { struct ir_class_t* class_iter; - struct ir_namelist_t* namelist_iter; + struct ir_namelist_t* namelist_iter,* namelist_iter_last; struct ir_setld_t* setld; struct ir_classld_t* classld; struct ir_set_t* set; set = NULL; - if (linkdata->header.type != LDAT) - eprintf("Data %s is not a link\n", linkdata->header.data_name); + class_iter = NULL; + assert_link(linkdata); setld = linkdata->link.setld; if (linkdata->link.setld == NULL) eprintf("Link data is invalid\n"); @@ -651,18 +669,26 @@ struct ir_set_t* ir_linkdata_set if (classld->root_class == NULL) eprintf("No root class for classld\n"); class_iter = classld->root_class->nextchild; + namelist_iter_last = NULL; while (class_iter != NULL) { if (classnames_identical(class_iter->name, namelist_iter->name)) { if (namelist_iter == classld->namelist_head) break; class_iter = class_iter->nextchild; + namelist_iter_last = namelist_iter; namelist_iter = namelist_iter->nextsib; } else class_iter = class_iter->nextsib; } if (class_iter == NULL) - eprintf("Class resolution failed\n"); + { if (namelist_iter_last) + eprintf("No such subclass \"%s\" of class \"%s\"\n", + namelist_iter->name, + namelist_iter_last->name); + else + eprintf("No such class \"%s\"\n", namelist_iter->name); + } set = class_iter->root_set; } else @@ -670,19 +696,43 @@ struct ir_set_t* ir_linkdata_set if (set == NULL) eprintf("Initial set resolution failed\n"); namelist_iter = setld->namelist; - while (set != NULL) - { if (bytes_identical(set->name, namelist_iter->name)) - { if (namelist_iter == setld->namelist_head) - break; - set = set->nextchild; - namelist_iter = namelist_iter->nextsib; - } - else - set = set->nextsib; + namelist_iter_last = NULL; + if (setld->namelist != NULL) + { while (set != NULL) + { if (bytes_identical(set->name, namelist_iter->name)) + { if (namelist_iter == setld->namelist_head) + break; + set = set->nextchild; + namelist_iter_last = namelist_iter; + namelist_iter = namelist_iter->nextsib; + } + else + set = set->nextsib; + } + if (set == NULL) + { if (namelist_iter_last) + eprintf("No such subset \"%s\" of set \"%s\"\n", + namelist_iter->name, + namelist_iter_last->name); + else + eprintf("No such set \"%s\" in class \"%s\"\n", + namelist_iter->name, + class_iter->name); + } } - return set; + linkdata->link.trg_set = set; } +/* Assign a linkdatas trg_set */ +void ir_linkdata_assign_set +( struct ir_link_t* link, struct ir_set_t* set ) +{ link->trg_set = set; } + +/* Assign a linkdatas type */ +void ir_linkdata_assign_type +( struct ir_link_t* link, ltype type; ) +{ link->type = type; } + /* Get a setdata's next sibling */ union ir_setdata_t* ir_setdata_nextsib ( union ir_setdata_t* setdata ) @@ -710,6 +760,11 @@ void ir_setdata_assign_fpos ) { setdata->header.filepos = newpos; } +/* Assign a setdatas name */ +void ir_setdata_assign_name +( union ir_setdata_t* setdata, uint8_t* name ) +{ setdata->header.data_name = name;} + /* Return a framebox's specified framesheet */ union ir_setdata_t* ir_framebox_framesheet ( union ir_setdata_t* fbox,