X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=blobdiff_plain;f=src%2Fir.c;h=63556545b04c6494fb53ae974372fd8b1aa7ecd1;hp=e88ac364c2243a7bbbaf8ef870749f5b6cabee5a;hb=2d355679ac2a1e225f158ab8064566174e9e1402;hpb=5f13e2b92707358f5a9a297afdfcbb7851fdc736

diff --git a/src/ir.c b/src/ir.c
index e88ac36..6355654 100644
--- a/src/ir.c
+++ b/src/ir.c
@@ -632,7 +632,7 @@ uint8_t* name_alloc
  copy:
   name = (uint8_t*)namepages.head->header.head;
   iter = name_src;
-  for (head_mem = PL_HEADMEM(namepages); *iter && *iter != '_' && head_mem; head_mem--)
+  for (head_mem = PL_HEADMEM(namepages); *iter && *iter != '_' && *iter != '.' && head_mem; head_mem--)
     *(namepages.head->header.head)++ = *iter++;
   if (head_mem < 1) //not enough room
     { pagelist_alloc(namepages);
@@ -661,56 +661,52 @@ uint8_t* classname_alloc
   return name;
 }
 
-static void crawl_class(struct ir_class_t*,int);
+static void crawl_class(struct ir_class_t*);
 static void crawl_set(struct ir_set_t*,int);
 void     ir_test(void)
 { uprintf("IR From Directory: %s\n",getcwd(NULL,255));
-  crawl_class(&root_class,0);
+  crawl_class(&root_class);
+  if (root_class.root_set != NULL)
+    crawl_set(root_class.root_set, 0);
 }
 
-#define pspace(num) for (i = 0; i < (num); i++) putchar(' ')
 static
 void crawl_class
-( struct ir_class_t* class,
-  int depth
-)
+( struct ir_class_t* class )
 { struct ir_class_t* iter;
-  /*if(chdir((char*)class->name))
-    eprintf("CHDIR %U\n",class->name);
-  else
-  wprintf("chdir %U\n",class->name);*/
-  if (class->nextchild != NULL)
-    { iter = class->nextchild;
-      do {
-	crawl_class(iter,depth + 1);
-	/*if (chdir(".."))
-	  eprintf("CHDIR ..\n");*/
-      } while ((iter = iter->nextsib) != NULL);
+  for (iter = class->nextchild; iter != NULL; iter = iter->nextsib)
+    { wprintf("%U/\n", iter->name);
+      if(chdir((char*)iter->name))
+	eprintf("CHDIR %U from %s\n",iter->name,getcwd(NULL,255));
+      crawl_class(iter);
+      if (iter->root_set != NULL)
+        crawl_set(iter->root_set, 0);
+      uprintf("%U\\\n",iter->name);
+      if (chdir(".."))
+	eprintf("CHDIR ..\n");
     }
-  wprintf("%U/\n", class->name);
-  if (class->root_set != NULL)
-    crawl_set(class->root_set,0);
-  uprintf("\n%U\\\n",class->name);
 }
 
+#define push_setp(setp) (*(struct ir_set_t**)stack_alloc(sizeof(struct ir_set_t*)) = setp)
+#define pop_setp()      (*(struct ir_set_t**)pagelist_pop(&datapages, sizeof(struct ir_set_t*)))
 static
 void crawl_set
 ( struct ir_set_t* set,
   int depth
 )
 { struct ir_set_t* iter;
-  int i = depth * 10;
-  pspace(i);
-  i = 0;
-  for(iter = set->nextchild; iter != NULL; iter = iter->nextchild)
-    { uprintf("[%8U]", iter->name);
-    }
-  for(iter = set->nextchild; iter != NULL; iter = iter->nextchild)
-    { if (iter->nextsib != NULL)
-        crawl_set(iter->nextsib, i);
+  int i;
+  i = depth * 12;
+  while (i--)
+    putchar('.');
+  i = depth;
+  for(iter = set; iter != NULL; iter = iter->nextchild)
+    { uprintf("[%10U]", iter->name);
+      push_setp(iter);
       i++;
     }
-  for(iter = set->nextchild; iter != NULL; iter = iter->nextchild)
-    crawl_set(iter, depth + 1);
   putchar('\n');
+  while (--i >= depth)
+    if (((iter = pop_setp())->nextsib) != NULL)
+      crawl_set(iter->nextsib,i);
 }