root class is name of package, apc_package_name available to extern

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

diff --git a/src/ir.c b/src/ir.c
index 4ef2e5a..3577d48 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,27 +620,38 @@ 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
-   Fails on error, cannot return NULL\r
-*/\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,* namelist_iter_last;\r
   struct ir_setld_t* setld;\r
@@ -643,8 +659,7 @@ struct ir_set_t* ir_linkdata_set
   struct ir_set_t* set;\r
   set = NULL;\r
   class_iter = NULL;\r
-  if (linkdata->header.type != LDAT)\r
-    eprintf("Data %s is not a link\n", linkdata->header.data_name);\r
+  assert_link(linkdata);\r
   setld = linkdata->link.setld;\r
   if (linkdata->link.setld == NULL)\r
     eprintf("Link data is invalid\n");\r
@@ -705,7 +720,7 @@ struct ir_set_t* ir_linkdata_set
                    class_iter->name);\r
        }\r
     }\r
-  return set;\r
+  linkdata->link.trg_set = set;\r
 }\r
 \r
 /* Get a setdata's next sibling */\r