From f0effa980223ca5dc6313644e7497258ca803b7f Mon Sep 17 00:00:00 2001 From: Rafael Xavier de Souza Date: Fri, 30 Dec 2016 17:10:24 -0200 Subject: [PATCH] Number Parser: Remove unnecessary regular expression part Ref #292 Ref #353 --- src/number/parse-properties.js | 4 ++-- test/unit/number/parse-properties.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/number/parse-properties.js b/src/number/parse-properties.js index ad4c9c4be..a2abc5e58 100644 --- a/src/number/parse-properties.js +++ b/src/number/parse-properties.js @@ -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 + "+"; @@ -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 + "})+"; diff --git a/test/unit/number/parse-properties.js b/test/unit/number/parse-properties.js index cb62b54b7..12332404f 100644 --- a/test/unit/number/parse-properties.js +++ b/test/unit/number/parse-properties.js @@ -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(