Changeset 1782 for trunk/src

Timestamp:

Jun 28, 2010, 12:19:11 PM (14 years ago)

Author:

dkearney

Message:

patching units code to ignore whitespace within unit strings. adding test cases to the units test suite. this patch is in regard to nanohub ticket #257716

File:

• trunk/src/core/RpUnits.cc (modified) (3 diffs)

trunk/src/core/RpUnits.cc

@@ -1025 +1025 @@
     const RpUnits* prefix   = NULL;
 
-
     while ( !myInUnits.empty() ) {
 
@@ -1044 +1043 @@
             // type = myInUnits[last] + type;
             // ignore * because we assume everything is multiplied together
+            myInUnits.erase(last);
+            continue;
+        }
+
+        // ignore whitespace characters
+        if (isspace(myInUnits[last])) {
+            // ignore whitespace characters, they represent multiplication
             myInUnits.erase(last);
             continue;
@@ -3288 +3294 @@
         retVal = 1;
     }
-    else {
-    }
 
     outUnits = std::string(endptr);