ir_linkdata_dlink_name

diff --git a/src/ir.c b/src/ir.c
index d2829d6..12a7188 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -64,9 +64,9 @@ struct ir_framebox_t
 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
@@ -597,8 +597,6 @@ union ir_setdata_t* ir_link
   struct_clear(link);\r
   link->header.type = LDAT;\r
   link->type = link_type;\r
-  if (setld != NULL)\r
-    link->classld = setld->classld;\r
   link->setld = setld;\r
   if (link_type != OLINK && name != NULL)\r
     link->header.data_name = name_alloc(name);\r
@@ -663,7 +661,7 @@ void ir_linkdata_resolve_set
   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
@@ -687,7 +685,9 @@ void ir_linkdata_resolve_set
                    namelist_iter->name,\r
                    namelist_iter_last->name);\r
          else\r
-           eprintf("No such class \"%s\"\n", namelist_iter->name);\r
+           { wprintf("No such class \"%s\"\n", namelist_iter->name);\r
+             return;\r
+           }\r
        }\r
       set = class_iter->root_set;\r
     }\r
@@ -737,6 +737,64 @@ void ir_linkdata_assign_type
   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
+  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++;\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 += 2; //trailing '\0' and preceding '.'\r
+  link->link.dlink = stack_alloc(&namepages, bytes);\r
+  bytes = 0;\r
+  link->link.dlink[bytes++] = '.'; //dlinks start with '.'\r
+  namelist_iter = classld->namelist;\r
+  setpass = 0;\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
+      namelist_iter = namelist_iter->nextsib;\r
+    }\r
+  if (setpass == 0)\r
+    { setpass = 1;\r
+      namelist_iter = setld->namelist;\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
 union ir_setdata_t* ir_setdata_nextsib\r
 ( union ir_setdata_t* setdata )\r

diff --git a/src/ir.h b/src/ir.h
index 8f6f647..3dd4264 100644 (file)
--- a/src/ir.h
+++ b/src/ir.h
@@ -99,6 +99,7 @@ uint32_t     ir_linkdata_ref(linkdata);
 ir_set       ir_linkdata_set(linkdata);\r
 void         ir_linkdata_assign_set(linkdata,ir_set);\r
 void         ir_linkdata_assign_type(linkdata,enum ltype);\r
+uint8_t*     ir_linkdata_dlink_name(linkdata);\r
 ir_setdata   ir_setdata_nextsib(ir_setdata);\r
 uint8_t*     ir_setdata_name(ir_setdata);\r
 uint8_t*     ir_setdata_filename(ir_setdata);\r