From c08d259f7444e5cab5e7ea2675b11becd1214d6f Mon Sep 17 00:00:00 2001
From: ken <ken@mihrtec.com>
Date: Sun, 19 Feb 2017 20:36:28 -0800
Subject: [PATCH] ir_linkdata_dlink_name

---
 src/ir.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 src/ir.h |  1 +
 2 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/src/ir.c b/src/ir.c
index d2829d6..12a7188 100644
--- 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; };
 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;
+  uint8_t*                   dlink;
   enum ltype                 type;
 };
 union ir_setdata_t
@@ -597,8 +597,6 @@ union ir_setdata_t* ir_link
   struct_clear(link);
   link->header.type = LDAT;
   link->type = link_type;
-  if (setld != NULL)
-    link->classld = setld->classld;
   link->setld = setld;
   if (link_type != OLINK && name != NULL)
     link->header.data_name = name_alloc(name);
@@ -663,7 +661,7 @@ void ir_linkdata_resolve_set
   setld = linkdata->link.setld;
   if (linkdata->link.setld == NULL)
     eprintf("Link data is invalid\n");
-  classld = linkdata->link.classld;
+  classld = setld->classld;
   if (classld != NULL)
     { namelist_iter = classld->namelist;
       if (classld->root_class == NULL)
@@ -687,7 +685,9 @@ void ir_linkdata_resolve_set
 		    namelist_iter->name,
 		    namelist_iter_last->name);
 	  else
-	    eprintf("No such class \"%s\"\n", namelist_iter->name);
+	    { wprintf("No such class \"%s\"\n", namelist_iter->name);
+	      return;
+	    }
 	}
       set = class_iter->root_set;
     }
@@ -737,6 +737,64 @@ void ir_linkdata_assign_type
   link->link.type = type;
 }
 
+/* Get, or generate, the fully qualified name of the link's target set */
+uint8_t*
+ir_linkdata_dlink_name
+( union ir_setdata_t* link )
+{ struct ir_namelist_t* namelist_iter;
+  struct ir_setld_t*    setld;
+  struct ir_classld_t*  classld;
+  uint8_t*              bytep;
+  size_t                bytes;
+  char                  setpass;
+  assert_link(link);
+  if (link->link.dlink != NULL)
+    return link->link.dlink;
+  bytes = 0;
+  setld = link->link.setld;
+  if (setld == NULL)
+    eprintf("No setld in dlink\n");
+  classld = setld->classld;
+  if (classld == NULL)
+    eprintf("No classld in dlink\n");
+  if (classld->root_class != NULL)
+    eprintf("Cannot dlink local class \"%s\"\n", classld->root_class->name);
+  namelist_iter = classld->namelist;
+  setpass = 0;
+ count_bytes_in_namelist:
+  while (namelist_iter != NULL)
+    { bytep = namelist_iter->name;
+      while (*bytep++)
+	bytes++;
+      namelist_iter = namelist_iter->nextsib;
+    }
+  if (setpass == 0)
+    { setpass = 1;
+      namelist_iter = setld->namelist;
+      goto count_bytes_in_namelist;
+    }
+  bytes += 2; //trailing '\0' and preceding '.'
+  link->link.dlink = stack_alloc(&namepages, bytes);
+  bytes = 0;
+  link->link.dlink[bytes++] = '.'; //dlinks start with '.'
+  namelist_iter = classld->namelist;
+  setpass = 0;
+ copy_bytes_in_namelist:
+  while (namelist_iter != NULL)
+    { bytep = namelist_iter->name;
+      while (*bytep)
+	link->link.dlink[bytes++] = *bytep++;
+      namelist_iter = namelist_iter->nextsib;
+    }
+  if (setpass == 0)
+    { setpass = 1;
+      namelist_iter = setld->namelist;
+      goto copy_bytes_in_namelist;
+    }
+  link->link.dlink[bytes] = '\0'; //tailing '\0' null termination
+  return link->link.dlink;
+}
+
 /* Get a setdata's next sibling */
 union ir_setdata_t* ir_setdata_nextsib
 ( union ir_setdata_t* setdata )
diff --git a/src/ir.h b/src/ir.h
index 8f6f647..3dd4264 100644
--- a/src/ir.h
+++ b/src/ir.h
@@ -99,6 +99,7 @@ uint32_t     ir_linkdata_ref(linkdata);
 ir_set       ir_linkdata_set(linkdata);
 void         ir_linkdata_assign_set(linkdata,ir_set);
 void         ir_linkdata_assign_type(linkdata,enum ltype);
+uint8_t*     ir_linkdata_dlink_name(linkdata);
 ir_setdata   ir_setdata_nextsib(ir_setdata);
 uint8_t*     ir_setdata_name(ir_setdata);
 uint8_t*     ir_setdata_filename(ir_setdata);
-- 
2.18.0