Changeset 1560 for trunk/src/objects/RpTree.h

Timestamp:

Aug 28, 2009, 5:54:24 AM (15 years ago)

Author:

dkearney

Message:

updates to the object system, fixed up tree and xml parser objects, added some basic tests for them and adopted number object to accept xml text and configure itself from the parsed xml. added fermi3.cc example program which contains suggested interface from apps meeting.

File:

• trunk/src/objects/RpTree.h (modified) (5 diffs)

trunk/src/objects/RpTree.h

@@ -192 +192 @@
 
     unsigned int nChildren; /* # of children for this node. */
-    unsigned int inode;     /* Serial number of the node. */
+    // unsigned int inode;     /* Serial number of the node. */
+    size_t inode;           /* Serial number of the node. */
 
     unsigned short depth;   /* The depth of this node in the tree. */
@@ -281 +282 @@
         Rp_TreeNode parent, CONST char *name, int position));
 EXTERN Rp_TreeNode Rp_TreeCreateNodeWithId _ANSI_ARGS_((Rp_Tree tree,
-        Rp_TreeNode parent, CONST char *name, int position, int inode));
+        Rp_TreeNode parent, CONST char *name, size_t inode, int position));
 
 EXTERN int Rp_TreeDeleteNode _ANSI_ARGS_((Rp_Tree tree, Rp_TreeNode node));
@@ -288 +289 @@
         Rp_TreeNode parent, Rp_TreeNode before));
 
-EXTERN Rp_TreeNode Rp_TreeGetNode _ANSI_ARGS_((Rp_Tree tree,
-        unsigned int inode));
+EXTERN Rp_TreeNode Rp_TreeGetNode _ANSI_ARGS_((Rp_Tree tree, size_t inode));
 
 EXTERN Rp_TreeNode Rp_TreeFindChild _ANSI_ARGS_((Rp_TreeNode parent,
+        CONST char *name));
+
+EXTERN Rp_TreeNode Rp_TreeFindChildNext _ANSI_ARGS_((Rp_TreeNode child,
         CONST char *name));
 
@@ -391 +394 @@
         Rp_TreeApplyProc *proc, ClientData clientData));
 
+EXTERN int Rp_TreeApplyXML _ANSI_ARGS_((Rp_TreeNode root,
+        Rp_TreeApplyProc *proc, ClientData clientData));
+
 EXTERN int Rp_TreeSortNode _ANSI_ARGS_((Rp_Tree tree, Rp_TreeNode node,
         Rp_TreeCompareNodesProc *proc));
@@ -399 +405 @@
 // EXTERN int Rp_TreeExists _ANSI_ARGS_((CONST char *name));
 
-EXTERN int Rp_TreeGetToken _ANSI_ARGS_((CONST char *name,
-        Rp_Tree *treePtr));
+// EXTERN int Rp_TreeGetToken _ANSI_ARGS_((CONST char *name,
+//         Rp_Tree *treePtr));
+
+EXTERN int Rp_TreeGetTokenFromToken _ANSI_ARGS_((
+        CONST Rp_Tree tree, Rp_Tree *newToken));
 
 EXTERN void Rp_TreeReleaseToken _ANSI_ARGS_((Rp_Tree tree));