Changeset 15187

Timestamp:

Oct 3, 2007, 12:53:47 PM (19 years ago)

Author:

jhoblitt

Message:

change pxNodeAlloc() to only create nodes and not try to link them
add pxNodeAddChild() and pxNodeAddParent()

Location:

trunk/ippTools/src

Files:

• pxtree.c (modified) (4 diffs)
• pxtree.h (modified) (2 diffs)

trunk/ippTools/src/pxtree.c

@@ -34 +34 @@
 }
 
-pxNode *pxNodeAlloc(const char *name, pxNode *parent)
+pxNode *pxNodeAlloc(const char *name)
 {
     PS_ASSERT_PTR_NON_NULL(name, NULL);
@@ -41 +41 @@
 
     node->name = psStringCopy(name);
-
-    // parent == NULL basically means that this is the root node
-    if (!parent) {
-        node->parent = NULL;
-    } else {
-        // add this node to it's parent's children list
-        psListAdd(parent->children, PS_LIST_TAIL, node);
-        node->parent = psMemIncrRefCounter(parent);
-    }
-
+    node->parent = NULL;
     node->children = psListAlloc(NULL);
 
@@ -58 +49 @@
 }
 
+pxNode *pxNodeAddParent(pxNode *node, pxNode *parent)
+{
+    // add this node to it's parent's children list
+    psListAdd(parent->children, PS_LIST_TAIL, node);
+    // and set the parent pointer
+    node->parent = psMemIncrRefCounter(parent);
+
+    return node;
+}
+
+pxNode *pxNodeAddChild(pxNode *node, pxNode *child)
+{
+    // add the child node to this nodes list of children
+    psListAdd(node->children, PS_LIST_TAIL, child);
+    // if the child already has a parent, release the ref count
+    if (child->parent) {
+        psMemDecrRefCounter(child->parent);
+    }
+    // [re]parent the child
+    child->parent = psMemIncrRefCounter(node);
+
+    return node;
+}
 
 void pxNodePrint(FILE *stream, pxNode *node)
@@ -145 +159 @@
             continue;
         }
-        pxNode *parent = psHashLookup(nodeNames, item->data.str);
-        pxNode *node = pxNodeAlloc(item->name, parent);
-        psHashAdd(nodeNames, item->name, node);
+
+        // try to find a node with this name
+        pxNode *node = psHashLookup(nodeNames, item->name);
+        if (!node) {
+            // create a new node with this name
+            node = pxNodeAlloc(item->name);
+            // add it to the hash of nodes
+            psHashAdd(nodeNames, item->name, node);
+        }
+
+        // does this node declare a child?
+        if (item->data.str) {
+            // try to find a node with this name
+            pxNode *child = psHashLookup(nodeNames, item->data.str);
+            if (!child ) {
+                // create a new node with this name
+                child = pxNodeAlloc(item->data.str);
+                // add it to the hash of nodes
+                psHashAdd(nodeNames, item->data.str, child);
+            }
+            pxNodeAddChild(node, child);
+        }
+
         psFree(node);
     }

trunk/ippTools/src/pxtree.h

@@ -36 +36 @@
 
 pxNode *pxNodeAlloc(
-    const char *name,
-    pxNode  *parent
+    const char *name
 ) PS_ATTR_MALLOC;
+
+pxNode *pxNodeAddParent(pxNode *node, pxNode *parent);
+pxNode *pxNodeAddChild(pxNode *node, pxNode *child);
 
 void pxNodePrint(
@@ -59 +61 @@
 pxNode *pxTreeFromMetadata(psMetadata *md);
 
-
-/*
-bool pxNodeAddChild(
-    pxNode  *parent,
-    pxNode  *child
-);
-*/
-
 #endif // PXTREE_H