Changeset 1560 for trunk/src/objects/RpPath.cc

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/RpPath.cc (modified) (26 diffs)

trunk/src/objects/RpPath.cc

@@ -23 +23 @@
 #include "RpChainHelper.h"
 #include <cstring>
+#include <cstdlib>
 
 using namespace Rappture;
@@ -60 +61 @@
     _ifs = b._ifs;
 
+    //FIXME: i think this is broken
     Rp_ChainCopy (_pathList, b._pathList, Rp_ChainCharCpyFxn);
 }
@@ -105 +107 @@
     _ifs = '.';
     _pathList = Rp_ChainCreate();
+    _currLink = Rp_ChainFirstLink(_pathList);
     return;
 }
@@ -134 +137 @@
     int end,
     int idOpenParen,
-    int idCloseParen)
+    int idCloseParen,
+    size_t degree)
 {
     componentStruct *c = new componentStruct();
@@ -143 +147 @@
     c->type = NULL;
     c->id = NULL;
+    c->degree = degree;
 
     if (idOpenParen < idCloseParen) {
@@ -171 +176 @@
         the type and id of the third component are both blank.
         for the above example paths, the id field of the first
-        components, the index component, is NULL.
+        components, the input component, is NULL.
         i don't think there is a way to get a NULL type right now.
     */
@@ -215 +220 @@
     int idCloseParen = -1;
     componentStruct *c = NULL;
+    size_t degree = 1;
+    char *newEnd = NULL;
 
     Rp_Chain *compList = Rp_ChainCreate();
@@ -227 +234 @@
         } else if (p[end] == ')') {
             idCloseParen = end;
+        } else if ( (idOpenParen <= idCloseParen) &&
+                    (end != 0) &&
+                    (p[end] >= '0') &&
+                    (p[end] <= '9') ) {
+            degree = (size_t) strtod(p+end, &newEnd);
+            if (degree == 0) {
+                // interpret degree of 0 same as degree of 1
+                degree = 1;
+            }
+            // check if we consumed the _ifs
+            if (*(newEnd-1) == _ifs) {
+                newEnd -= 2;
+            }
+            end += newEnd - (p + end);
         } else if (p[end] == _ifs) {
-            c = __createComponent(p,start,end,idOpenParen,idCloseParen);
+            c = __createComponent(p,start,end,idOpenParen,idCloseParen,degree);
             if (c != NULL) {
                 Rp_ChainAppend(compList,c);
@@ -240 +261 @@
     }
 
-    c = __createComponent(p,start,end,idOpenParen,idCloseParen);
+    c = __createComponent(p,start,end,idOpenParen,idCloseParen,degree);
     if (c != NULL) {
         Rp_ChainAppend(compList,c);
@@ -335 +356 @@
 }
 
+bool
+Path::eof ()
+{
+    return (_currLink == NULL);
+}
+
+Path&
+Path::first ()
+{
+    _currLink = Rp_ChainFirstLink(_pathList);
+    return *this;
+}
+
+Path&
+Path::prev ()
+{
+    if (_currLink) {
+        _currLink = Rp_ChainPrevLink(_currLink);
+    }
+    return *this;
+}
+
+Path&
+Path::next ()
+{
+    if (_currLink) {
+        _currLink = Rp_ChainNextLink(_currLink);
+    }
+    return *this;
+}
+
+Path&
+Path::last ()
+{
+    _currLink = Rp_ChainLastLink(_pathList);
+    return *this;
+}
+
+size_t
+Path::count ()
+{
+    return Rp_ChainGetLength(_pathList);
+}
+
 const char *
 Path::component(void)
 {
     Rp_ChainLink *l = NULL;
-    size_t len = 0;
-
+
+    /*
     tmpBuf.clear();
 
@@ -348 +413 @@
     }
 
-    l = Rp_ChainLastLink(_pathList);
+    l = _currLink;
 
     if (l == NULL) {
@@ -363 +428 @@
 
     if (c->type != NULL) {
-        len = strlen(c->type);
-        if (len > 0) {
-            tmpBuf.append(c->type,len);
-        }
+        tmpBuf.appendf("%s",c->type);
+    }
+
+    if (c->degree != 1) {
+        tmpBuf.appendf("%zu",c->degree);
     }
 
     if (c->id != NULL) {
-        tmpBuf.append("(",1);
-        len = strlen(c->id);
-        if (len > 0) {
-            tmpBuf.append(c->id,len);
-        }
-        tmpBuf.append(")",1);
-    }
-
+        tmpBuf.appendf("(%s)",c->id);
+    }
+
+    // incase none of the above if statements are hit.
+    tmpBuf.append("\0",1);
+
+    return tmpBuf.bytes();
+    */
+
+
+    if (_pathList == NULL) {
+        return NULL;
+    }
+
+    l = _currLink;
+
+    if (l == NULL) {
+        return NULL;
+    }
+
+    componentStruct *c = (componentStruct *) Rp_ChainGetValue(l);
+
+    if (c == NULL) {
+        return NULL;
+    }
+
+    tmpBuf.clear();
+
+    if (c->type != NULL) {
+        tmpBuf.appendf("%s",c->type);
+    }
+
+    if (c->degree != 1) {
+        tmpBuf.appendf("%zu",c->degree);
+    }
+
+    if (c->id != NULL) {
+        tmpBuf.appendf("(%s)",c->id);
+    }
+
+    // incase none of the above if statements are hit.
     tmpBuf.append("\0",1);
 
@@ -426 +525 @@
     Rp_ChainDestroy(addList);
 
-    // remove the last component from the current path
-    l = Rp_ChainLastLink(_pathList);
+    // swap the current component from the current path
+    // with the component from the provided path.
+    l = _currLink;
 
     if (l != NULL) {
         componentStruct *last = (componentStruct *) Rp_ChainGetValue(l);
         delete last;
-        Rp_ChainDeleteLink(_pathList,l);
-    }
-
-    // append the new component onto the current path
-    Rp_ChainAppend(_pathList,aLcomp);
+        Rp_ChainSetValue(l,aLcomp);
+    } else {
+        // add a new component as a link
+        // point _currLink to the new component
+        _currLink = Rp_ChainAppend(_pathList,aLcomp);
+    }
 
     __updateBuffer();
@@ -448 +549 @@
     Rp_ChainLink *l = NULL;
 
+    /*
     tmpBuf.clear();
 
@@ -455 +557 @@
     }
 
-    l = Rp_ChainLastLink(_pathList);
+    l = _currLink;
 
     if (l == NULL) {
@@ -476 +578 @@
 
     return tmpBuf.bytes();
+    */
+
+    if (_pathList == NULL) {
+        return NULL;
+    }
+
+    l = _currLink;
+
+    if (l == NULL) {
+        return NULL;
+    }
+
+    componentStruct *c = (componentStruct *) Rp_ChainGetValue(l);
+
+    if (c == NULL) {
+        return NULL;
+    }
+
+    return c->id;
 }
 
@@ -490 +611 @@
     componentStruct *last = NULL;
 
-    // update the last component from the current path
-    l = Rp_ChainLastLink(_pathList);
+    // update the current component from the current path
+    l = _currLink;
 
     if (l != NULL) {
@@ -499 +620 @@
         // append the new component onto the current path
         last = new componentStruct;
-        Rp_ChainAppend(_pathList,last);
+        _currLink = Rp_ChainAppend(_pathList,last);
         tmp = new char[1];
         *tmp = '\0';
@@ -520 +641 @@
     Rp_ChainLink *l = NULL;
 
+    /*
     tmpBuf.clear();
 
@@ -527 +649 @@
     }
 
-    l = Rp_ChainLastLink(_pathList);
+    l = _currLink;
 
     if (l == NULL) {
@@ -548 +670 @@
 
     return tmpBuf.bytes();
+    */
+
+    if (_pathList == NULL) {
+        return NULL;
+    }
+
+    l = _currLink;
+
+    if (l == NULL) {
+        return NULL;
+    }
+
+    componentStruct *c = (componentStruct *) Rp_ChainGetValue(l);
+
+    if (c == NULL) {
+        return NULL;
+    }
+
+    return c->type;
 }
 
@@ -563 +704 @@
 
     // update the last component from the current path
-    l = Rp_ChainLastLink(_pathList);
+    l = _currLink;
 
     if (l != NULL) {
@@ -571 +712 @@
         // append the new component onto the current path
         last = new componentStruct;
-        Rp_ChainAppend(_pathList,last);
+        _currLink = Rp_ChainAppend(_pathList,last);
         last->id = NULL;
     }
@@ -593 +734 @@
     tmpBuf.clear();
 
-    last = Rp_ChainLastLink(_pathList);
+    last = _currLink;
     l = Rp_ChainFirstLink(_pathList);
     while (l != last) {
@@ -685 +826 @@
 }
 
+size_t
+Path::degree()
+{
+    Rp_ChainLink *l = NULL;
+
+    l = _currLink;
+
+    if (l == NULL) {
+        return 0;
+    }
+
+    componentStruct *c = (componentStruct *) Rp_ChainGetValue(l);
+
+    if (c == NULL) {
+        return 0;
+    }
+
+    return c->degree;
+}
+
+void
+Path::degree(size_t d)
+{
+    if (d == 0) {
+        d = 1;
+    }
+
+    Rp_ChainLink *l = NULL;
+    componentStruct *last = NULL;
+
+    // update the current component from the current path
+    l = _currLink;
+
+    if (l != NULL) {
+        last = (componentStruct *) Rp_ChainGetValue(l);
+    } else {
+        // append the new component onto the current path
+        last = new componentStruct;
+        _currLink = Rp_ChainAppend(_pathList,last);
+    }
+
+    // adjust the degree field
+    last->degree = d;
+
+    __updateBuffer();
+
+    return;
+}
+
 const char *
 Path::path(void)
@@ -696 +886 @@
     if (p != NULL) {
         _pathList = __parse(p);
+        _currLink = Rp_ChainLastLink(_pathList);
         __updateBuffer();
     }