Changeset 2156 for trunk

Timestamp:

Mar 27, 2011, 12:32:55 PM (13 years ago)

Author:

mmc

Message:

Fixed a problem with the number parsing routine. Wasn't getting the
full units for something like "10.2meV", thinking it was just "10.2V".
Working better now for all combinations of spaces, slashes, and multiple
units.

Location:

trunk/lang/tcl/scripts

Files:

• objects/number/number.rp (modified) (1 diff)
• validations/number.tcl (modified) (1 diff)

trunk/lang/tcl/scripts/objects/number/number.rp

@@ -103 +103 @@
 
     import string {val {defunits ""}} {
-puts "IMPORTING: $val (number with units $defunits)"
         if {[regexp {^([-+]?(?:[0-9]+\.|\.)?[0-9]+(?:[eE][-+]?[0-9]+)?)( *(?:[a-zA-Z]+[0-9]*)+(?:\/(?:[a-zA-Z]+[0-9]*)+)*)*$} $val match num units]} {
             set sys [Rappture::Units::System::for $units]

trunk/lang/tcl/scripts/validations/number.tcl

@@ -15 +15 @@
     upvar $numvar num
     upvar $unitsvar units
-    return [regexp {^([-+]?(?:[0-9]+\.|\.)?[0-9]+(?:[eE][-+]?[0-9]+)?)( *(?:[a-zA-Z]+[0-9]*)+(?:\/(?:[a-zA-Z]+[0-9]*)+)*)*$} $str match num units]
+    if {![regexp {^([-+]?(?:[0-9]+\.|\.)?[0-9]+(?:[eE][-+]?[0-9]+)?)( *[a-zA-Z/]?[a-zA-Z0-9/ \t]*)$} $str match num rest]} {
+        return 0
+    }
+    regsub -all {[ \t]+} $rest "" rest  ;# strip out spaces from units
+    if {$rest eq ""} {
+        set units ""
+    } elseif {![regexp {^(/?[a-zA-Z]+[0-9]*)*$} $rest units]} {
+        return 0  ;# units failed to match
+    }
+    return 1;
 }