tyler.durden
/
test262
mirror of https://github.com/tc39/test262.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify alphanum regex in testIntl.js

This commit is contained in:
Ross Kirsling 2020-04-15 16:17:45 -07:00 committed by Rick Waldron
parent 064d3c24e3
commit d57bd9d4bd
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
harness/testIntl.js
View File

@ -272,10 +272,10 @@ function isCanonicalizedStructurallyValidLanguageTag(locale) {
* *
* Spec: https://unicode.org/reports/tr35/#Unicode_locale_identifier * Spec: https://unicode.org/reports/tr35/#Unicode_locale_identifier
*/ */
var alpha = "[a-z]", var alpha = "[A-Za-z]",
digit = "[0-9]", digit = "[0-9]",
alphanum = "(" + alpha + "|" + digit + ")", alphanum = "[A-Za-z0-9]",
variant = "(" + alphanum + "{5,8}|(" + digit + alphanum + "{3}))", variant = "(" + alphanum + "{5,8}|(?:" + digit + alphanum + "{3}))",
region = "(" + alpha + "{2}|" + digit + "{3})", region = "(" + alpha + "{2}|" + digit + "{3})",
script = "(" + alpha + "{4})", script = "(" + alpha + "{4})",
language = "(" + alpha + "{2,3}|" + alpha + "{5,8})", language = "(" + alpha + "{2,3}|" + alpha + "{5,8})",
@ -292,14 +292,14 @@ function isCanonicalizedStructurallyValidLanguageTag(locale) {
extension = "(" + unicode_locale_extensions + "|" + transformed_extensions + "|" + other_extensions + ")", extension = "(" + unicode_locale_extensions + "|" + transformed_extensions + "|" + other_extensions + ")",
locale_id = language + "(-" + script + ")?(-" + region + ")?(-" + variant + ")*(-" + extension + ")*(-" + privateuse + ")?", locale_id = language + "(-" + script + ")?(-" + region + ")?(-" + variant + ")*(-" + extension + ")*(-" + privateuse + ")?",
languageTag = "^(" + locale_id + ")$", languageTag = "^(" + locale_id + ")$",
languageTagRE = new RegExp(languageTag, "i"); languageTagRE = new RegExp(languageTag);
var duplicateSingleton = "-" + singleton + "-(.*-)?\\1(?!" + alphanum + ")", var duplicateSingleton = "-" + singleton + "-(.*-)?\\1(?!" + alphanum + ")",
duplicateSingletonRE = new RegExp(duplicateSingleton, "i"), duplicateSingletonRE = new RegExp(duplicateSingleton),
duplicateVariant = "(" + alphanum + "{2,8}-)+" + variant + "-(" + alphanum + "{2,8}-)*\\3(?!" + alphanum + ")", duplicateVariant = "(" + alphanum + "{2,8}-)+" + variant + "-(" + alphanum + "{2,8}-)*\\2(?!" + alphanum + ")",
duplicateVariantRE = new RegExp(duplicateVariant, "i"); duplicateVariantRE = new RegExp(duplicateVariant);
var transformKeyRE = new RegExp("^" + alpha + digit + "$", "i"); var transformKeyRE = new RegExp("^" + alpha + digit + "$");
/** /**
* Verifies that the given string is a well-formed Unicode BCP 47 Locale Identifier * Verifies that the given string is a well-formed Unicode BCP 47 Locale Identifier