diff --git a/acorn/src/regexp.js b/acorn/src/regexp.js index d0e66df83..88410116c 100644 --- a/acorn/src/regexp.js +++ b/acorn/src/regexp.js @@ -9,7 +9,7 @@ export class RegExpValidationState { constructor(parser) { this.parser = parser this.validFlags = `gim${parser.options.ecmaVersion >= 6 ? "uy" : ""}${parser.options.ecmaVersion >= 9 ? "s" : ""}` - this.unicodeProperties = UNICODE_PROPERTY_VALUES[parser.options.ecmaVersion >= 11 ? 11 : parser.options.ecmaVersion] + this.unicodeProperties = UNICODE_PROPERTY_VALUES[parser.options.ecmaVersion >= 12 ? 12 : parser.options.ecmaVersion] this.source = "" this.flags = "" this.start = 0 diff --git a/acorn/src/tokenize.js b/acorn/src/tokenize.js index 6c86f5c51..f5b6ec899 100644 --- a/acorn/src/tokenize.js +++ b/acorn/src/tokenize.js @@ -694,6 +694,12 @@ pp.readEscapedChar = function(inTemplate) { return "" case 56: case 57: + if (this.strict) { + this.invalidStringToken( + this.pos - 1, + "Invalid escape sequence" + ) + } if (inTemplate) { const codePos = this.pos - 1 diff --git a/acorn/src/unicode-property-data.js b/acorn/src/unicode-property-data.js index 967ed1a36..6ebc0e75e 100644 --- a/acorn/src/unicode-property-data.js +++ b/acorn/src/unicode-property-data.js @@ -8,10 +8,12 @@ import {wordsRegexp} from "./util.js" const ecma9BinaryProperties = "ASCII ASCII_Hex_Digit AHex Alphabetic Alpha Any Assigned Bidi_Control Bidi_C Bidi_Mirrored Bidi_M Case_Ignorable CI Cased Changes_When_Casefolded CWCF Changes_When_Casemapped CWCM Changes_When_Lowercased CWL Changes_When_NFKC_Casefolded CWKCF Changes_When_Titlecased CWT Changes_When_Uppercased CWU Dash Default_Ignorable_Code_Point DI Deprecated Dep Diacritic Dia Emoji Emoji_Component Emoji_Modifier Emoji_Modifier_Base Emoji_Presentation Extender Ext Grapheme_Base Gr_Base Grapheme_Extend Gr_Ext Hex_Digit Hex IDS_Binary_Operator IDSB IDS_Trinary_Operator IDST ID_Continue IDC ID_Start IDS Ideographic Ideo Join_Control Join_C Logical_Order_Exception LOE Lowercase Lower Math Noncharacter_Code_Point NChar Pattern_Syntax Pat_Syn Pattern_White_Space Pat_WS Quotation_Mark QMark Radical Regional_Indicator RI Sentence_Terminal STerm Soft_Dotted SD Terminal_Punctuation Term Unified_Ideograph UIdeo Uppercase Upper Variation_Selector VS White_Space space XID_Continue XIDC XID_Start XIDS" const ecma10BinaryProperties = ecma9BinaryProperties + " Extended_Pictographic" const ecma11BinaryProperties = ecma10BinaryProperties +const ecma12BinaryProperties = ecma11BinaryProperties + " EBase EComp EMod EPres ExtPict" const unicodeBinaryProperties = { 9: ecma9BinaryProperties, 10: ecma10BinaryProperties, - 11: ecma11BinaryProperties + 11: ecma11BinaryProperties, + 12: ecma12BinaryProperties } // #table-unicode-general-category-values @@ -21,10 +23,12 @@ const unicodeGeneralCategoryValues = "Cased_Letter LC Close_Punctuation Pe Conne const ecma9ScriptValues = "Adlam Adlm Ahom Ahom Anatolian_Hieroglyphs Hluw Arabic Arab Armenian Armn Avestan Avst Balinese Bali Bamum Bamu Bassa_Vah Bass Batak Batk Bengali Beng Bhaiksuki Bhks Bopomofo Bopo Brahmi Brah Braille Brai Buginese Bugi Buhid Buhd Canadian_Aboriginal Cans Carian Cari Caucasian_Albanian Aghb Chakma Cakm Cham Cham Cherokee Cher Common Zyyy Coptic Copt Qaac Cuneiform Xsux Cypriot Cprt Cyrillic Cyrl Deseret Dsrt Devanagari Deva Duployan Dupl Egyptian_Hieroglyphs Egyp Elbasan Elba Ethiopic Ethi Georgian Geor Glagolitic Glag Gothic Goth Grantha Gran Greek Grek Gujarati Gujr Gurmukhi Guru Han Hani Hangul Hang Hanunoo Hano Hatran Hatr Hebrew Hebr Hiragana Hira Imperial_Aramaic Armi Inherited Zinh Qaai Inscriptional_Pahlavi Phli Inscriptional_Parthian Prti Javanese Java Kaithi Kthi Kannada Knda Katakana Kana Kayah_Li Kali Kharoshthi Khar Khmer Khmr Khojki Khoj Khudawadi Sind Lao Laoo Latin Latn Lepcha Lepc Limbu Limb Linear_A Lina Linear_B Linb Lisu Lisu Lycian Lyci Lydian Lydi Mahajani Mahj Malayalam Mlym Mandaic Mand Manichaean Mani Marchen Marc Masaram_Gondi Gonm Meetei_Mayek Mtei Mende_Kikakui Mend Meroitic_Cursive Merc Meroitic_Hieroglyphs Mero Miao Plrd Modi Modi Mongolian Mong Mro Mroo Multani Mult Myanmar Mymr Nabataean Nbat New_Tai_Lue Talu Newa Newa Nko Nkoo Nushu Nshu Ogham Ogam Ol_Chiki Olck Old_Hungarian Hung Old_Italic Ital Old_North_Arabian Narb Old_Permic Perm Old_Persian Xpeo Old_South_Arabian Sarb Old_Turkic Orkh Oriya Orya Osage Osge Osmanya Osma Pahawh_Hmong Hmng Palmyrene Palm Pau_Cin_Hau Pauc Phags_Pa Phag Phoenician Phnx Psalter_Pahlavi Phlp Rejang Rjng Runic Runr Samaritan Samr Saurashtra Saur Sharada Shrd Shavian Shaw Siddham Sidd SignWriting Sgnw Sinhala Sinh Sora_Sompeng Sora Soyombo Soyo Sundanese Sund Syloti_Nagri Sylo Syriac Syrc Tagalog Tglg Tagbanwa Tagb Tai_Le Tale Tai_Tham Lana Tai_Viet Tavt Takri Takr Tamil Taml Tangut Tang Telugu Telu Thaana Thaa Thai Thai Tibetan Tibt Tifinagh Tfng Tirhuta Tirh Ugaritic Ugar Vai Vaii Warang_Citi Wara Yi Yiii Zanabazar_Square Zanb" const ecma10ScriptValues = ecma9ScriptValues + " Dogra Dogr Gunjala_Gondi Gong Hanifi_Rohingya Rohg Makasar Maka Medefaidrin Medf Old_Sogdian Sogo Sogdian Sogd" const ecma11ScriptValues = ecma10ScriptValues + " Elymaic Elym Nandinagari Nand Nyiakeng_Puachue_Hmong Hmnp Wancho Wcho" +const ecma12ScriptValues = ecma11ScriptValues + " Chorasmian Chrs Diak Dives_Akuru Khitan_Small_Script Kits Yezi Yezidi" const unicodeScriptValues = { 9: ecma9ScriptValues, 10: ecma10ScriptValues, - 11: ecma11ScriptValues + 11: ecma11ScriptValues, + 12: ecma12ScriptValues } const data = {} @@ -45,5 +49,6 @@ function buildUnicodeData(ecmaVersion) { buildUnicodeData(9) buildUnicodeData(10) buildUnicodeData(11) +buildUnicodeData(12) export default data diff --git a/bin/run_test262.js b/bin/run_test262.js index ff55bcd19..f2d81e074 100644 --- a/bin/run_test262.js +++ b/bin/run_test262.js @@ -10,11 +10,10 @@ const unsupportedFeatures = [ "class-static-fields-private", "class-static-fields-public", "class-static-methods-private", - "logical-assignment-operators", ]; run( - (content, {sourceType}) => parse(content, {sourceType, ecmaVersion: 12, allowHashBang: true, allowAwaitOutsideFunction: true}), + (content, {sourceType}) => parse(content, {sourceType, ecmaVersion: 12, allowHashBang: true, allowAwaitOutsideFunction: sourceType === "module"}), { testsDirectory: path.dirname(require.resolve("test262/package.json")), skip: test => (test.attrs.features && unsupportedFeatures.some(f => test.attrs.features.includes(f))), diff --git a/bin/test262.whitelist b/bin/test262.whitelist index 725858f89..e69de29bb 100644 --- a/bin/test262.whitelist +++ b/bin/test262.whitelist @@ -1,40 +0,0 @@ -built-ins/RegExp/property-escapes/generated/Emoji_Component.js (default) -built-ins/RegExp/property-escapes/generated/Emoji_Component.js (strict mode) -built-ins/RegExp/property-escapes/generated/Emoji_Modifier.js (default) -built-ins/RegExp/property-escapes/generated/Emoji_Modifier.js (strict mode) -built-ins/RegExp/property-escapes/generated/Emoji_Modifier_Base.js (default) -built-ins/RegExp/property-escapes/generated/Emoji_Modifier_Base.js (strict mode) -built-ins/RegExp/property-escapes/generated/Emoji_Presentation.js (default) -built-ins/RegExp/property-escapes/generated/Emoji_Presentation.js (strict mode) -built-ins/RegExp/property-escapes/generated/Extended_Pictographic.js (default) -built-ins/RegExp/property-escapes/generated/Extended_Pictographic.js (strict mode) -built-ins/RegExp/property-escapes/generated/Script_-_Chorasmian.js (default) -built-ins/RegExp/property-escapes/generated/Script_-_Chorasmian.js (strict mode) -built-ins/RegExp/property-escapes/generated/Script_-_Dives_Akuru.js (default) -built-ins/RegExp/property-escapes/generated/Script_-_Dives_Akuru.js (strict mode) -built-ins/RegExp/property-escapes/generated/Script_-_Khitan_Small_Script.js (default) -built-ins/RegExp/property-escapes/generated/Script_-_Khitan_Small_Script.js (strict mode) -built-ins/RegExp/property-escapes/generated/Script_-_Yezidi.js (default) -built-ins/RegExp/property-escapes/generated/Script_-_Yezidi.js (strict mode) -built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Chorasmian.js (default) -built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Chorasmian.js (strict mode) -built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Dives_Akuru.js (default) -built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Dives_Akuru.js (strict mode) -built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Khitan_Small_Script.js (default) -built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Khitan_Small_Script.js (strict mode) -built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Yezidi.js (default) -built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Yezidi.js (strict mode) - -language/literals/string/legacy-non-octal-escape-sequence-8-strict.js (strict mode) - -language/expressions/await/await-BindingIdentifier-in-global.js (default) -language/expressions/await/await-BindingIdentifier-in-global.js (strict mode) -language/expressions/await/await-in-global.js (default) -language/expressions/await/await-in-global.js (strict mode) -language/expressions/await/await-in-nested-function.js (default) -language/expressions/await/await-in-nested-function.js (strict mode) -language/expressions/await/await-in-nested-generator.js (default) -language/expressions/await/await-in-nested-generator.js (strict mode) - -language/statements/labeled/value-await-non-module.js (default) -language/statements/labeled/value-await-non-module.js (strict mode)