Changeset 7398

Timestamp:

02/21/07 21:47:04 (23 months ago)

Author:

peller

Message:

Fix handling of places flag on regexp creation. References #2475

Location:

trunk/src

Files:

• number.js (modified) (3 diffs)
• regexp.js (modified) (1 diff)

trunk/src/number.js

@@ -204 +204 @@
                                 exponent: false};
                         var parts = format.split('.');
-                        if(parts.length == 1){parts.fractional = false;}
+                        var places = options.places;
+                        if(parts.length == 1 || places === 0){flags.fractional = false;}
                         else{
-                                var places = options.places;
                                 if(typeof places == "undefined"){ places = parts[1].lastIndexOf('0')+1; }
-                                if(places){parts.fractional = true;} // required fraction
+                                if(places){flags.fractional = true;} // required fraction
+                                if(!options.places && (places < parts[1].length)){ places += "," + parts[1].length; }
                                 flags.places = places;
-                                if(places < parts[1].length){ flags.places += "," + parts[1].length; }
                         }
                         var groups = parts[0].split(',');
@@ -224 +224 @@
 
         if(!options.strict){
-                // TODO: handle .### with no leading integer?
+                //TODO: handle .### with no leading integer as a strict option only?
                 //TODO: !strict: make currency symbol too
         }
@@ -260 +260 @@
                 return NaN; //NaN
         }
-        var numberExpression = results[1];
-        if(typeof numberExpression == 'undefined'){
+        var absoluteMatch = results[1];
+        if(typeof absoluteMatch == 'undefined'){
                 // matched the negative pattern
                 var negative = true;
-                numberExpression = results[2];
-        }
-        numberExpression = numberExpression.replace(group, "", "g").replace(decimal, ".");
-        value = Number(numberExpression);
+                absoluteMatch = results[2];
+        }
+        absoluteMatch = absoluteMatch.replace(group, "", "g").replace(decimal, ".");
+        value = Number(absoluteMatch);
 
         if(!isNaN(value)){

trunk/src/regexp.js

@@ -332 +332 @@
 
         // real number RE
-        return "(?:(?:"+ integerRE + decimalRE + ")|(?:" + decimalRE + "))" + exponentRE; // String
+        var realRE = integerRE + decimalRE;
+        // allow for decimals without integers, e.g. .25
+        if(decimalRE){realRE = "(?:(?:"+ realRE + ")|(?:" + decimalRE + "))";}
+        return realRE + exponentRE; // String
 }