linkdata_set comments and debug statements

diff --git a/src/ir.c b/src/ir.c
index 527f472..4ef2e5a 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -631,15 +631,18 @@ uint32_t ir_linkdata_ref
   return linkdata->link.setld->ref;\r
 }\r
 \r
-/* Resolve and return the link's target set */\r
+/* Resolve and return the link's target set\r
+   Fails on error, cannot return NULL\r
+*/\r
 struct ir_set_t* ir_linkdata_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
+  class_iter = NULL;\r
   if (linkdata->header.type != LDAT)\r
     eprintf("Data %s is not a link\n", linkdata->header.data_name);\r
   setld = linkdata->link.setld;\r
@@ -651,18 +654,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,15 +681,29 @@ 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
 }\r