Changeset 564

Timestamp:

Jan 15, 2007 1:03:48 AM (17 years ago)

Author:

dkearney

Message:

new path parsing algorithm, this fix should allow us to place floating point numbers in the id portion of a path like this example
input.curve(Vdd=3.5V).component.xy, app-nanocmos or app-sbcnfet can be used as tests for this fix.

File:

• trunk/src/core/RpLibrary.cc (modified) (1 diff)

trunk/src/core/RpLibrary.cc

@@ -57 +57 @@
 
 int
-RpLibrary::_path2list (std::string& path, std::string** list, int listLen) 
+RpLibrary::_path2list (std::string& path, std::string** list, int listLen)
 {
     std::string::size_type pos = 0;
     std::string::size_type start = 0;
+    std::string::size_type end = path.length();
     int index = 0;
     int retVal = 0;
-
-    // listLen should be the highest index + 1
-    for (   pos = path.find(".",NO_CREATE_PATH);
-            (pos != std::string::npos) || (index >= listLen);
-            pos = path.find(".",pos)   )
-    {
-        list[index++] = new std::string(path.substr(start,pos-start));
-        start = ++pos;
+    unsigned int parenDepth = 0;
+
+    for (   pos = 0; (pos < end) && (index < listLen); pos++) {
+        if (path[pos] == '(') {
+            parenDepth++;
+            continue;
+        }
+
+        if (path[pos] == ')') {
+            parenDepth--;
+            continue;
+        }
+
+        if ( (path[pos] == '.') && (parenDepth == 0) ) {
+            list[index] = new std::string(path.substr(start,pos-start));
+            index++;
+            start = pos + 1;
+        }
     }
 
     // add the last path to the list
-    if (index < listLen) {
-        // error checking for path names?
-        // what if you get something like p1.p2. ?
-        list[index] = new std::string(path.substr(start,path.length()-start));
-    }
-
-    retVal = index++;
+    // error checking for path names like p1.p2.
+    if ( (start < end) && (pos == end) ) {
+        list[index] = new std::string(path.substr(start,pos-start));
+    }
+    retVal = index;
+    index++;
 
     // null out the rest of the pointers so we know where to stop free'ing