added stb, more binaryout changes"

[henge/apc.git] / src / ir.c

diff --git a/src/ir.c b/src/ir.c
index 527f472..52ae051 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -67,6 +67,7 @@ struct ir_link_t
 { 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
@@ -98,6 +99,8 @@ struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*,uint8_t*);
 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
@@ -110,10 +113,12 @@ uint8_t* classname_alloc(const uint8_t*);
 #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
@@ -121,7 +126,7 @@ int ir_init
 { 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
@@ -615,33 +620,46 @@ union ir_setdata_t* ir_set_link
 ( 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
@@ -651,18 +669,26 @@ struct ir_set_t* ir_linkdata_set
       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
@@ -670,19 +696,43 @@ struct ir_set_t* ir_linkdata_set
   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
+/* Assign a linkdatas trg_set */\r
+void ir_linkdata_assign_set\r
+( struct ir_link_t* link, struct ir_set_t* set )\r
+{ link->trg_set = set; }\r
+\r
+/* Assign a linkdatas type */\r
+void ir_linkdata_assign_type\r
+( struct ir_link_t* link, ltype type; )\r
+{ link->type = type; }\r
+\r
 /* Get a setdata's next sibling */\r
 union ir_setdata_t* ir_setdata_nextsib\r
 ( union ir_setdata_t* setdata )\r
@@ -710,6 +760,11 @@ void ir_setdata_assign_fpos
 )\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
 /* Return a framebox's specified framesheet */\r
 union ir_setdata_t* ir_framebox_framesheet\r
 ( union ir_setdata_t* fbox,\r