Skip to content

Commit

Permalink
Number Parser: Remove unnecessary regular expression part
Browse files Browse the repository at this point in the history
Ref #292
Ref #353
  • Loading branch information
rxaviers committed Dec 30, 2016
1 parent 3570240 commit f0effa9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/number/parse-properties.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ return function( pattern, cldr, options ) {
//
// digits_w_1_grouping_separators = regexp(\d{1,3}(,\d{3})+)
//
// digits_w_2_grouping_separators = regexp(\d{1,2}((,\d{2})*(,\d{3}))?)
// digits_w_2_grouping_separators = regexp(\d{1,2}((,\d{2})*(,\d{3})))

// Integer part
numberTokenizer = digitsRe + "+";
Expand All @@ -121,7 +121,7 @@ return function( pattern, cldr, options ) {
if ( secondaryGroupingSize ) {
aux = digitsRe + "{1," + secondaryGroupingSize + "}((" + groupingSeparatorRe +
digitsRe + "{" + secondaryGroupingSize + "})*(" + groupingSeparatorRe +
digitsRe + "{" + primaryGroupingSize + "}))?";
digitsRe + "{" + primaryGroupingSize + "}))";
} else {
aux = digitsRe + "{1," + primaryGroupingSize + "}(" + groupingSeparatorRe +
digitsRe + "{" + primaryGroupingSize + "})+";
Expand Down
2 changes: 1 addition & 1 deletion test/unit/number/parse-properties.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ QUnit.test( "should return number tokenizer", function( assert ) {

assert.deepEqual(
properties( "#,##,##0.##", en )[ 2 ].number,
/^((\d{1,2}((,\d{2})*(,\d{3}))?|\d+))?(\.\d+)?/
/^((\d{1,2}((,\d{2})*(,\d{3}))|\d+))?(\.\d+)?/
);

assert.deepEqual(
Expand Down

0 comments on commit f0effa9

Please sign in to comment.