diff --git a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/_KDocLexer.java b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/_KDocLexer.java index d1858a3124f..260b7ec5d8e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/_KDocLexer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/_KDocLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 11/27/15 4:27 PM */ +/* The following code was generated by JFlex 1.4.3 on 11/30/15 6:43 PM */ package org.jetbrains.kotlin.kdoc.lexer; @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.kdoc.parser.KDocKnownTag; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 11/27/15 4:27 PM from the specification file + * on 11/30/15 6:43 PM from the specification file * /Users/abreslav/work/kotlin/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDoc.flex */ class _KDocLexer implements FlexLexer { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex b/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex index 81ad34e5a2b..d3b3c8513b6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex +++ b/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex @@ -246,6 +246,7 @@ LONG_TEMPLATE_ENTRY_START=\$\{ "throw" { return KtTokens.THROW_KEYWORD ;} "false" { return KtTokens.FALSE_KEYWORD ;} "super" { return KtTokens.SUPER_KEYWORD ;} +"yield" { return KtTokens.YIELD_KEYWORD ;} "when" { return KtTokens.WHEN_KEYWORD ;} "true" { return KtTokens.TRUE_KEYWORD ;} "this" { return KtTokens.THIS_KEYWORD ;} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java b/compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java index 5901f46931d..fd78bd4f6aa 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java @@ -77,6 +77,9 @@ public interface KtTokens { KtKeywordToken WHEN_KEYWORD = KtKeywordToken.keyword("when"); KtKeywordToken INTERFACE_KEYWORD = KtKeywordToken.keyword("interface"); + // Reserved for future use: + KtKeywordToken YIELD_KEYWORD = KtKeywordToken.keyword("yield"); + KtToken AS_SAFE = KtKeywordToken.keyword("AS_SAFE");//new KtToken("as?"); KtToken IDENTIFIER = new KtToken("IDENTIFIER"); @@ -188,7 +191,8 @@ public interface KtTokens { TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD, IN_KEYWORD, THROW_KEYWORD, RETURN_KEYWORD, BREAK_KEYWORD, CONTINUE_KEYWORD, OBJECT_KEYWORD, IF_KEYWORD, ELSE_KEYWORD, WHILE_KEYWORD, DO_KEYWORD, TRY_KEYWORD, WHEN_KEYWORD, - NOT_IN, NOT_IS, AS_SAFE + NOT_IN, NOT_IS, AS_SAFE, + YIELD_KEYWORD ); TokenSet SOFT_KEYWORDS = TokenSet.create(FILE_KEYWORD, IMPORT_KEYWORD, WHERE_KEYWORD, BY_KEYWORD, GET_KEYWORD, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/lexer/_JetLexer.java b/compiler/frontend/src/org/jetbrains/kotlin/lexer/_JetLexer.java index 0c5465e7794..4215f328fb5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/lexer/_JetLexer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/lexer/_JetLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 11/27/15 4:27 PM */ +/* The following code was generated by JFlex 1.4.3 on 11/30/15 6:43 PM */ package org.jetbrains.kotlin.lexer; @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.lexer.KtTokens; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 11/27/15 4:27 PM from the specification file + * on 11/30/15 6:43 PM from the specification file * /Users/abreslav/work/kotlin/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex */ class _JetLexer implements FlexLexer { @@ -49,8 +49,8 @@ class _JetLexer implements FlexLexer { "\1\20\1\11\1\14\11\1\1\70\1\75\1\63\1\60\1\64\1\61"+ "\1\77\1\2\1\16\2\2\1\22\1\21\5\4\1\17\13\4\1\15"+ "\2\4\1\71\1\25\1\72\1\0\1\4\1\6\1\42\1\53\1\47"+ - "\1\57\1\41\1\46\1\52\1\32\1\33\1\54\1\51\1\43\1\4"+ - "\1\44\1\50\1\40\1\4\1\45\1\34\1\31\1\26\1\56\1\55"+ + "\1\56\1\41\1\46\1\52\1\32\1\33\1\54\1\51\1\43\1\4"+ + "\1\44\1\50\1\40\1\4\1\45\1\34\1\31\1\26\1\57\1\55"+ "\1\15\1\37\1\4\1\30\1\66\1\35\54\0\1\4\12\0\1\4"+ "\4\0\1\4\5\0\27\4\1\0\37\4\1\0\u01ca\4\4\0\14\4"+ "\16\0\5\4\7\0\1\4\1\0\1\4\201\0\5\4\1\0\2\4"+ @@ -144,27 +144,27 @@ class _JetLexer implements FlexLexer { private static final String ZZ_ACTION_PACKED_0 = "\6\0\1\1\1\2\1\3\1\4\2\1\1\5\1\6"+ "\1\7\1\2\1\10\1\11\1\12\1\13\1\14\3\3"+ - "\1\15\1\16\14\3\1\17\1\20\1\21\1\22\1\23"+ + "\1\15\1\16\15\3\1\17\1\20\1\21\1\22\1\23"+ "\2\1\1\24\1\25\1\26\1\27\1\30\1\31\1\32"+ "\1\33\1\34\1\35\1\36\1\35\1\1\1\37\2\35"+ "\1\40\1\1\1\40\3\41\1\42\1\43\1\2\1\0"+ "\2\44\1\0\1\45\1\0\1\46\1\47\1\50\1\51"+ "\1\0\1\52\1\0\2\2\1\44\1\53\1\54\1\55"+ "\1\56\2\12\1\0\3\3\1\57\1\60\1\61\1\3"+ - "\1\62\2\3\1\63\13\3\1\64\1\65\1\66\1\67"+ - "\1\70\1\71\1\72\1\73\1\74\1\75\1\76\1\77"+ - "\1\100\1\0\1\101\2\102\2\0\1\40\1\103\1\104"+ - "\1\0\1\105\1\44\1\3\1\0\1\106\1\107\1\110"+ - "\1\111\1\0\1\112\1\113\4\3\1\114\4\3\1\115"+ - "\2\3\1\116\1\3\1\117\6\3\1\120\1\121\1\122"+ - "\2\0\1\123\2\40\1\45\1\124\1\125\1\126\2\3"+ - "\1\127\3\3\1\130\1\131\7\3\1\132\1\100\1\0"+ - "\1\133\1\134\2\3\1\135\2\3\1\136\1\137\2\3"+ - "\1\140\1\141\1\0\3\3\1\142\1\3\1\143\2\3"+ - "\1\144\3\3\1\145\1\146\1\147"; + "\1\62\3\3\1\63\12\3\1\64\1\3\1\65\1\66"+ + "\1\67\1\70\1\71\1\72\1\73\1\74\1\75\1\76"+ + "\1\77\1\100\1\0\1\101\2\102\2\0\1\40\1\103"+ + "\1\104\1\0\1\105\1\44\1\3\1\0\1\106\1\107"+ + "\1\110\1\111\1\0\1\112\1\113\4\3\1\114\5\3"+ + "\1\115\2\3\1\116\1\3\1\117\6\3\1\120\1\121"+ + "\1\122\2\0\1\123\2\40\1\45\1\124\1\125\1\126"+ + "\2\3\1\127\4\3\1\130\1\131\7\3\1\132\1\100"+ + "\1\0\1\133\1\134\2\3\1\135\1\136\2\3\1\137"+ + "\1\140\2\3\1\141\1\142\1\0\3\3\1\143\1\3"+ + "\1\144\2\3\1\145\3\3\1\146\1\147\1\150"; private static int [] zzUnpackAction() { - int [] result = new int[229]; + int [] result = new int[234]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -193,34 +193,35 @@ class _JetLexer implements FlexLexer { "\0\u0200\0\u0240\0\u0280\0\u02c0\0\u0300\0\u0340\0\u0380\0\u03c0"+ "\0\u0400\0\u0440\0\u0480\0\u04c0\0\u0180\0\u0500\0\u0540\0\u0580"+ "\0\u0180\0\u05c0\0\u0600\0\u0640\0\u0680\0\u06c0\0\u0700\0\u0740"+ - "\0\u0780\0\u07c0\0\u0800\0\u0840\0\u0880\0\u08c0\0\u0900\0\u0180"+ - "\0\u0940\0\u0980\0\u09c0\0\u0a00\0\u0a40\0\u0a80\0\u0ac0\0\u0180"+ - "\0\u0180\0\u0180\0\u0180\0\u0b00\0\u0180\0\u0180\0\u0b40\0\u0180"+ - "\0\u0b80\0\u0bc0\0\u0180\0\u0180\0\u0c00\0\u0c40\0\u0c80\0\u0cc0"+ - "\0\u0180\0\u0d00\0\u0d40\0\u0180\0\u0180\0\u0d80\0\u0dc0\0\u0180"+ - "\0\u0e00\0\u0e40\0\u0e80\0\u0ec0\0\u0f00\0\u0f40\0\u0180\0\u0f80"+ - "\0\u0fc0\0\u1000\0\u1040\0\u1080\0\u10c0\0\u1100\0\u1140\0\u0180"+ - "\0\u0180\0\u0180\0\u0180\0\u1180\0\u11c0\0\u1200\0\u1240\0\u1280"+ - "\0\u0200\0\u12c0\0\u0200\0\u1300\0\u0180\0\u1340\0\u1380\0\u13c0"+ + "\0\u0780\0\u07c0\0\u0800\0\u0840\0\u0880\0\u08c0\0\u0900\0\u0940"+ + "\0\u0180\0\u0980\0\u09c0\0\u0a00\0\u0a40\0\u0a80\0\u0ac0\0\u0b00"+ + "\0\u0180\0\u0180\0\u0180\0\u0180\0\u0b40\0\u0180\0\u0180\0\u0b80"+ + "\0\u0180\0\u0bc0\0\u0c00\0\u0180\0\u0180\0\u0c40\0\u0c80\0\u0cc0"+ + "\0\u0d00\0\u0180\0\u0d40\0\u0d80\0\u0180\0\u0180\0\u0dc0\0\u0e00"+ + "\0\u0180\0\u0e40\0\u0e80\0\u0ec0\0\u0f00\0\u0f40\0\u0f80\0\u0180"+ + "\0\u0fc0\0\u1000\0\u1040\0\u1080\0\u10c0\0\u1100\0\u1140\0\u1180"+ + "\0\u0180\0\u0180\0\u0180\0\u0180\0\u11c0\0\u1200\0\u1240\0\u1280"+ + "\0\u12c0\0\u0200\0\u1300\0\u0200\0\u1340\0\u0180\0\u1380\0\u13c0"+ "\0\u1400\0\u1440\0\u1480\0\u14c0\0\u1500\0\u1540\0\u1580\0\u15c0"+ - "\0\u1600\0\u1640\0\u1680\0\u0200\0\u16c0\0\u0180\0\u0180\0\u0180"+ - "\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u1700"+ - "\0\u1740\0\u0180\0\u0180\0\u1780\0\u17c0\0\u1800\0\u1840\0\u0180"+ - "\0\u0180\0\u1880\0\u0180\0\u18c0\0\u0180\0\u1900\0\u1940\0\u1980"+ - "\0\u1980\0\u0180\0\u19c0\0\u0180\0\u0180\0\u1a00\0\u1a40\0\u1a80"+ - "\0\u1ac0\0\u0200\0\u1b00\0\u1b40\0\u1b80\0\u1bc0\0\u0180\0\u1c00"+ - "\0\u1c40\0\u0200\0\u1c80\0\u0200\0\u1cc0\0\u1d00\0\u1d40\0\u1d80"+ - "\0\u1dc0\0\u1e00\0\u0200\0\u0200\0\u0180\0\u1e40\0\u1e80\0\u17c0"+ - "\0\u0180\0\u1ec0\0\u0180\0\u0180\0\u0180\0\u0200\0\u1f00\0\u1f40"+ - "\0\u0200\0\u1f80\0\u1fc0\0\u2000\0\u0200\0\u0200\0\u2040\0\u2080"+ - "\0\u20c0\0\u2100\0\u2140\0\u2180\0\u21c0\0\u0200\0\u0180\0\u2200"+ - "\0\u0c40\0\u0200\0\u2240\0\u2280\0\u0200\0\u22c0\0\u2300\0\u0200"+ - "\0\u0200\0\u2340\0\u2380\0\u0200\0\u0200\0\u23c0\0\u2400\0\u2440"+ - "\0\u2480\0\u0200\0\u24c0\0\u0200\0\u2500\0\u2540\0\u0200\0\u2580"+ - "\0\u25c0\0\u2600\0\u0200\0\u0200\0\u0200"; + "\0\u1600\0\u1640\0\u1680\0\u16c0\0\u0200\0\u1700\0\u1740\0\u0180"+ + "\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180"+ + "\0\u0180\0\u1780\0\u17c0\0\u0180\0\u0180\0\u1800\0\u1840\0\u1880"+ + "\0\u18c0\0\u0180\0\u0180\0\u1900\0\u0180\0\u1940\0\u0180\0\u1980"+ + "\0\u19c0\0\u1a00\0\u1a00\0\u0180\0\u1a40\0\u0180\0\u0180\0\u1a80"+ + "\0\u1ac0\0\u1b00\0\u1b40\0\u0200\0\u1b80\0\u1bc0\0\u1c00\0\u1c40"+ + "\0\u1c80\0\u0180\0\u1cc0\0\u1d00\0\u0200\0\u1d40\0\u0200\0\u1d80"+ + "\0\u1dc0\0\u1e00\0\u1e40\0\u1e80\0\u1ec0\0\u0200\0\u0200\0\u0180"+ + "\0\u1f00\0\u1f40\0\u1840\0\u0180\0\u1f80\0\u0180\0\u0180\0\u0180"+ + "\0\u0200\0\u1fc0\0\u2000\0\u0200\0\u2040\0\u2080\0\u20c0\0\u2100"+ + "\0\u0200\0\u0200\0\u2140\0\u2180\0\u21c0\0\u2200\0\u2240\0\u2280"+ + "\0\u22c0\0\u0200\0\u0180\0\u2300\0\u0c80\0\u0200\0\u2340\0\u2380"+ + "\0\u0200\0\u0200\0\u23c0\0\u2400\0\u0200\0\u0200\0\u2440\0\u2480"+ + "\0\u0200\0\u0200\0\u24c0\0\u2500\0\u2540\0\u2580\0\u0200\0\u25c0"+ + "\0\u0200\0\u2600\0\u2640\0\u0200\0\u2680\0\u26c0\0\u2700\0\u0200"+ + "\0\u0200\0\u0200"; private static int [] zzUnpackRowMap() { - int [] result = new int[229]; + int [] result = new int[234]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -246,242 +247,250 @@ class _JetLexer implements FlexLexer { "\1\7\1\10\1\11\1\12\1\11\1\7\1\13\1\12"+ "\1\14\1\15\1\16\1\17\1\20\3\11\1\21\2\11"+ "\1\22\1\23\1\7\1\11\1\24\1\25\1\26\1\11"+ - "\1\27\1\30\1\31\1\32\1\11\1\33\1\34\1\35"+ - "\1\11\1\36\1\37\1\40\1\41\1\42\2\11\1\43"+ - "\1\11\1\44\1\45\1\46\1\47\1\50\1\51\1\52"+ - "\1\53\1\54\1\55\1\56\1\57\1\60\1\61\1\62"+ - "\1\63\1\64\1\65\1\66\7\67\1\70\1\71\14\67"+ - "\1\72\1\67\1\73\57\67\1\74\1\71\14\67\1\74"+ - "\1\67\1\75\50\67\2\7\1\76\1\7\1\76\1\7"+ - "\1\77\1\0\5\7\3\76\1\7\2\76\3\7\1\76"+ - "\2\7\1\100\3\76\2\7\21\76\20\7\11\101\1\102"+ - "\24\101\1\103\41\101\1\7\1\10\1\11\1\12\1\11"+ + "\1\27\1\30\1\31\1\32\1\33\1\34\1\35\1\36"+ + "\1\11\1\37\1\40\1\41\1\42\1\43\2\11\1\44"+ + "\1\11\1\45\1\46\1\47\1\50\1\51\1\52\1\53"+ + "\1\54\1\55\1\56\1\57\1\60\1\61\1\62\1\63"+ + "\1\64\1\65\1\66\1\67\7\70\1\71\1\72\14\70"+ + "\1\73\1\70\1\74\57\70\1\75\1\72\14\70\1\75"+ + "\1\70\1\76\50\70\2\7\1\77\1\7\1\77\1\7"+ + "\1\100\1\0\5\7\3\77\1\7\2\77\3\7\1\77"+ + "\2\7\1\101\3\77\2\7\21\77\20\7\11\102\1\103"+ + "\24\102\1\104\41\102\1\7\1\10\1\11\1\12\1\11"+ "\1\7\1\13\1\12\1\14\1\15\1\16\1\17\1\20"+ "\3\11\1\21\2\11\1\22\1\23\1\7\1\11\1\24"+ - "\1\104\1\26\1\11\1\27\1\30\1\105\1\32\1\11"+ - "\1\33\1\34\1\35\1\11\1\36\1\37\1\40\1\41"+ - "\1\42\2\11\1\43\1\11\1\44\1\45\1\46\1\47"+ - "\1\50\1\51\1\52\1\53\1\54\1\55\1\56\1\57"+ - "\1\60\1\61\1\62\1\63\1\64\1\65\1\66\101\0"+ - "\1\10\12\0\1\10\2\0\1\106\1\107\1\110\1\111"+ - "\16\0\1\111\1\0\1\106\2\0\1\110\32\0\2\11"+ + "\1\105\1\26\1\11\1\27\1\30\1\106\1\32\1\33"+ + "\1\34\1\35\1\36\1\11\1\37\1\40\1\41\1\42"+ + "\1\43\2\11\1\44\1\11\1\45\1\46\1\47\1\50"+ + "\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1\60"+ + "\1\61\1\62\1\63\1\64\1\65\1\66\1\67\101\0"+ + "\1\10\12\0\1\10\2\0\1\107\1\110\1\111\1\112"+ + "\16\0\1\112\1\0\1\107\2\0\1\111\32\0\2\11"+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ "\2\0\4\11\2\0\21\11\23\0\1\12\3\0\1\12"+ - "\70\0\6\112\2\0\70\112\2\0\1\113\1\0\1\113"+ - "\1\0\1\114\6\0\3\113\1\0\2\113\3\0\1\113"+ - "\2\0\4\113\2\0\21\113\31\0\1\115\24\0\1\116"+ - "\21\0\1\117\32\0\1\120\117\0\1\121\24\0\1\122"+ - "\20\0\1\123\12\0\1\123\1\124\1\125\1\106\1\107"+ - "\1\110\1\111\16\0\1\111\1\0\1\106\2\0\1\110"+ - "\4\0\1\125\25\0\1\126\12\0\1\126\3\0\1\127"+ - "\102\0\1\130\34\0\1\131\3\0\1\132\13\0\7\23"+ - "\1\0\14\23\1\133\1\134\52\23\27\0\1\135\51\0"+ + "\70\0\6\113\2\0\70\113\2\0\1\114\1\0\1\114"+ + "\1\0\1\115\6\0\3\114\1\0\2\114\3\0\1\114"+ + "\2\0\4\114\2\0\21\114\31\0\1\116\24\0\1\117"+ + "\21\0\1\120\32\0\1\121\117\0\1\122\24\0\1\123"+ + "\20\0\1\124\12\0\1\124\1\125\1\126\1\107\1\110"+ + "\1\111\1\112\16\0\1\112\1\0\1\107\2\0\1\111"+ + "\4\0\1\126\25\0\1\127\12\0\1\127\3\0\1\130"+ + "\102\0\1\131\34\0\1\132\3\0\1\133\13\0\7\23"+ + "\1\0\14\23\1\134\1\135\52\23\27\0\1\136\51\0"+ "\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+ - "\1\11\2\0\1\11\1\136\2\11\2\0\1\137\5\11"+ - "\1\140\12\11\21\0\2\11\1\0\2\11\6\0\4\11"+ - "\1\0\2\11\3\0\1\11\2\0\3\11\1\141\2\0"+ - "\5\11\1\142\1\11\1\143\11\11\21\0\2\11\1\0"+ - "\2\11\6\0\4\11\1\0\2\11\3\0\1\144\2\0"+ - "\4\11\2\0\21\11\100\0\1\145\20\0\2\11\1\0"+ + "\1\11\2\0\1\11\1\137\2\11\2\0\1\140\5\11"+ + "\1\141\12\11\21\0\2\11\1\0\2\11\6\0\4\11"+ + "\1\0\2\11\3\0\1\11\2\0\3\11\1\142\2\0"+ + "\5\11\1\143\1\11\1\144\11\11\21\0\2\11\1\0"+ + "\2\11\6\0\4\11\1\0\2\11\3\0\1\145\2\0"+ + "\4\11\2\0\21\11\100\0\1\146\20\0\2\11\1\0"+ "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\3\11\1\146\15\11\21\0\2\11\1\0"+ + "\2\11\1\147\1\11\2\0\21\11\21\0\2\11\1\0"+ "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\4\11\1\147\14\11\21\0\2\11\1\0"+ + "\4\11\2\0\3\11\1\150\15\11\21\0\2\11\1\0"+ "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\3\11\1\150\2\0\21\11\21\0\2\11\1\0\2\11"+ - "\6\0\4\11\1\0\2\11\3\0\1\151\2\0\4\11"+ + "\4\11\2\0\4\11\1\151\14\11\21\0\2\11\1\0"+ + "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ + "\3\11\1\152\2\0\21\11\21\0\2\11\1\0\2\11"+ + "\6\0\4\11\1\0\2\11\3\0\1\153\2\0\4\11"+ "\2\0\21\11\21\0\2\11\1\0\2\11\6\0\4\11"+ "\1\0\2\11\3\0\1\11\2\0\4\11\2\0\2\11"+ - "\1\152\16\11\21\0\2\11\1\0\2\11\6\0\4\11"+ - "\1\0\2\11\3\0\1\153\2\0\4\11\2\0\3\11"+ - "\1\154\5\11\1\155\7\11\21\0\2\11\1\0\2\11"+ + "\1\154\16\11\21\0\2\11\1\0\2\11\6\0\4\11"+ + "\1\0\2\11\3\0\1\155\2\0\4\11\2\0\3\11"+ + "\1\156\5\11\1\157\7\11\21\0\2\11\1\0\2\11"+ "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+ - "\2\0\4\11\1\156\4\11\1\157\7\11\21\0\2\11"+ + "\2\0\4\11\1\160\4\11\1\161\7\11\21\0\2\11"+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\4\11\2\0\14\11\1\160\4\11\21\0\2\11"+ + "\2\0\4\11\2\0\14\11\1\162\4\11\21\0\2\11"+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\4\11\2\0\6\11\1\161\12\11\21\0\2\11"+ + "\2\0\4\11\2\0\6\11\1\163\12\11\21\0\2\11"+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\1\11\1\162\2\11\2\0\21\11\21\0\2\11"+ + "\2\0\1\11\1\164\2\11\2\0\21\11\21\0\2\11"+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\4\11\2\0\3\11\1\163\15\11\21\0\2\11"+ + "\2\0\4\11\2\0\11\11\1\165\7\11\21\0\2\11"+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\4\11\2\0\11\11\1\164\7\11\100\0\1\165"+ - "\3\0\1\166\73\0\1\167\1\0\1\170\75\0\1\171"+ - "\77\0\1\172\104\0\1\173\100\0\1\174\71\0\1\175"+ - "\107\0\1\176\104\0\1\177\2\0\7\67\2\0\14\67"+ - "\1\0\1\67\1\0\50\67\2\0\1\200\1\0\1\200"+ - "\1\0\1\201\6\0\3\200\1\0\2\200\3\0\1\200"+ - "\1\0\1\202\4\200\2\0\21\200\20\0\7\203\1\0"+ - "\16\203\1\204\51\203\27\0\1\205\51\0\2\76\1\0"+ - "\2\76\6\0\4\76\1\0\2\76\3\0\1\76\2\0"+ - "\4\76\2\0\21\76\20\0\6\206\2\0\70\206\1\0"+ - "\2\76\1\0\2\76\6\0\4\76\1\0\2\76\3\0"+ - "\1\76\2\0\1\76\1\207\2\76\2\0\21\76\56\0"+ - "\1\210\52\0\1\211\106\0\1\212\60\0\1\126\12\0"+ - "\1\126\3\0\1\213\60\0\1\214\12\0\1\214\4\0"+ - "\1\110\1\0\1\214\22\0\1\110\13\0\1\214\15\0"+ - "\6\112\1\215\1\0\70\112\1\0\2\113\1\0\2\113"+ - "\6\0\4\113\1\0\2\113\3\0\1\113\2\0\4\113"+ - "\2\0\21\113\20\0\6\216\2\0\70\216\7\115\1\0"+ - "\70\115\36\0\1\217\41\0\7\120\1\0\70\120\34\0"+ - "\1\220\7\0\1\221\113\0\1\222\20\0\1\123\12\0"+ - "\1\123\3\0\1\223\1\110\1\111\16\0\1\111\4\0"+ - "\1\110\32\0\2\124\11\0\1\124\1\0\1\124\1\106"+ - "\1\212\2\124\16\0\2\124\1\106\2\0\2\124\3\0"+ - "\1\124\3\0\1\124\21\0\1\125\12\0\1\125\2\0"+ - "\1\106\1\212\22\0\1\106\35\0\1\126\12\0\1\126"+ - "\4\0\1\110\1\111\16\0\1\111\4\0\1\110\51\0"+ - "\1\224\57\0\7\23\1\0\70\23\27\0\1\225\51\0"+ + "\2\0\4\11\2\0\3\11\1\166\15\11\100\0\1\167"+ + "\3\0\1\170\73\0\1\171\1\0\1\172\75\0\1\173"+ + "\77\0\1\174\104\0\1\175\100\0\1\176\71\0\1\177"+ + "\107\0\1\200\104\0\1\201\2\0\7\70\2\0\14\70"+ + "\1\0\1\70\1\0\50\70\2\0\1\202\1\0\1\202"+ + "\1\0\1\203\6\0\3\202\1\0\2\202\3\0\1\202"+ + "\1\0\1\204\4\202\2\0\21\202\20\0\7\205\1\0"+ + "\16\205\1\206\51\205\27\0\1\207\51\0\2\77\1\0"+ + "\2\77\6\0\4\77\1\0\2\77\3\0\1\77\2\0"+ + "\4\77\2\0\21\77\20\0\6\210\2\0\70\210\1\0"+ + "\2\77\1\0\2\77\6\0\4\77\1\0\2\77\3\0"+ + "\1\77\2\0\1\77\1\211\2\77\2\0\21\77\56\0"+ + "\1\212\52\0\1\213\106\0\1\214\60\0\1\127\12\0"+ + "\1\127\3\0\1\215\60\0\1\216\12\0\1\216\4\0"+ + "\1\111\1\0\1\216\22\0\1\111\13\0\1\216\15\0"+ + "\6\113\1\217\1\0\70\113\1\0\2\114\1\0\2\114"+ + "\6\0\4\114\1\0\2\114\3\0\1\114\2\0\4\114"+ + "\2\0\21\114\20\0\6\220\2\0\70\220\7\116\1\0"+ + "\70\116\36\0\1\221\41\0\7\121\1\0\70\121\34\0"+ + "\1\222\7\0\1\223\113\0\1\224\20\0\1\124\12\0"+ + "\1\124\3\0\1\225\1\111\1\112\16\0\1\112\4\0"+ + "\1\111\32\0\2\125\11\0\1\125\1\0\1\125\1\107"+ + "\1\214\2\125\16\0\2\125\1\107\2\0\2\125\3\0"+ + "\1\125\2\0\1\125\22\0\1\126\12\0\1\126\2\0"+ + "\1\107\1\214\22\0\1\107\35\0\1\127\12\0\1\127"+ + "\4\0\1\111\1\112\16\0\1\112\4\0\1\111\51\0"+ + "\1\226\57\0\7\23\1\0\70\23\27\0\1\227\51\0"+ "\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+ - "\1\11\2\0\2\11\1\226\1\11\2\0\6\11\1\227"+ + "\1\11\2\0\2\11\1\230\1\11\2\0\6\11\1\231"+ "\12\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+ - "\2\11\3\0\1\11\2\0\4\11\2\0\1\11\1\230"+ + "\2\11\3\0\1\11\2\0\4\11\2\0\1\11\1\232"+ "\17\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+ - "\2\11\3\0\1\231\2\0\4\11\2\0\1\232\20\11"+ + "\2\11\3\0\1\233\2\0\4\11\2\0\1\234\20\11"+ "\21\0\2\11\1\0\2\11\6\0\4\11\1\0\2\11"+ - "\3\0\1\11\2\0\1\233\3\11\2\0\21\11\21\0"+ + "\3\0\1\11\2\0\1\235\3\11\2\0\21\11\21\0"+ "\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+ - "\1\11\2\0\4\11\2\0\1\11\1\234\17\11\21\0"+ + "\1\11\2\0\4\11\2\0\1\11\1\236\17\11\21\0"+ "\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+ - "\1\11\2\0\4\11\2\0\10\11\1\235\10\11\21\0"+ + "\1\11\2\0\4\11\2\0\2\11\1\237\16\11\21\0"+ "\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+ - "\1\11\2\0\3\11\1\236\2\0\21\11\21\0\2\11"+ - "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\4\11\2\0\21\11\1\0\1\237\17\0\2\11"+ - "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\4\11\2\0\4\11\1\240\14\11\21\0\2\11"+ - "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\1\241\3\11\2\0\21\11\21\0\2\11\1\0"+ - "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\5\11\1\242\13\11\21\0\2\11\1\0"+ - "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\4\11\1\243\14\11\21\0\2\11\1\0"+ - "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\6\11\1\244\12\11\21\0\2\11\1\0"+ - "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\3\11\1\245\15\11\21\0\2\11\1\0"+ - "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\5\11\1\246\13\11\21\0\2\11\1\0"+ - "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\15\11\1\247\3\11\21\0\2\11\1\0"+ - "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\2\11\1\250\16\11\21\0\2\11\1\0"+ - "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\2\11\1\251\1\11\2\0\2\11\1\252\16\11\21\0"+ + "\1\11\2\0\4\11\2\0\10\11\1\240\10\11\21\0"+ "\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+ - "\1\11\2\0\4\11\2\0\4\11\1\253\1\11\1\254"+ - "\12\11\100\0\1\255\20\0\2\200\1\0\2\200\6\0"+ - "\4\200\1\0\2\200\3\0\1\200\2\0\4\200\2\0"+ - "\21\200\20\0\6\256\2\0\70\256\1\0\2\257\11\0"+ - "\1\257\1\0\1\257\2\0\2\257\16\0\2\257\3\0"+ - "\2\257\3\0\1\257\3\0\1\257\47\0\1\260\50\0"+ - "\6\206\1\261\1\0\70\206\1\0\2\76\1\0\2\76"+ - "\6\0\4\76\1\0\2\76\3\0\1\76\2\0\2\76"+ - "\1\262\1\76\2\0\21\76\40\0\1\213\60\0\1\214"+ - "\12\0\1\214\4\0\1\110\24\0\1\110\31\0\6\216"+ - "\1\263\1\0\70\216\11\0\1\264\67\0\2\265\1\0"+ - "\2\265\6\0\4\265\1\0\2\265\3\0\1\265\2\0"+ - "\4\265\2\0\21\265\21\0\1\126\12\0\1\126\64\0"+ + "\1\11\2\0\3\11\1\241\2\0\21\11\21\0\2\11"+ + "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ + "\2\0\4\11\2\0\21\11\1\0\1\242\17\0\2\11"+ + "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ + "\2\0\4\11\2\0\4\11\1\243\14\11\21\0\2\11"+ + "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ + "\2\0\1\244\3\11\2\0\21\11\21\0\2\11\1\0"+ + "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ + "\4\11\2\0\5\11\1\245\13\11\21\0\2\11\1\0"+ + "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ + "\4\11\2\0\4\11\1\246\14\11\21\0\2\11\1\0"+ + "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ + "\4\11\2\0\6\11\1\247\12\11\21\0\2\11\1\0"+ + "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ + "\4\11\2\0\3\11\1\250\15\11\21\0\2\11\1\0"+ + "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ + "\4\11\2\0\5\11\1\251\13\11\21\0\2\11\1\0"+ + "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ + "\4\11\2\0\15\11\1\252\3\11\21\0\2\11\1\0"+ + "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ + "\4\11\2\0\2\11\1\253\16\11\21\0\2\11\1\0"+ + "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ + "\2\11\1\254\1\11\2\0\2\11\1\255\16\11\21\0"+ "\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+ - "\1\11\2\0\3\11\1\266\2\0\21\11\21\0\2\11"+ + "\1\11\2\0\4\11\2\0\4\11\1\256\1\11\1\257"+ + "\12\11\100\0\1\260\20\0\2\202\1\0\2\202\6\0"+ + "\4\202\1\0\2\202\3\0\1\202\2\0\4\202\2\0"+ + "\21\202\20\0\6\261\2\0\70\261\1\0\2\262\11\0"+ + "\1\262\1\0\1\262\2\0\2\262\16\0\2\262\3\0"+ + "\2\262\3\0\1\262\2\0\1\262\50\0\1\263\50\0"+ + "\6\210\1\264\1\0\70\210\1\0\2\77\1\0\2\77"+ + "\6\0\4\77\1\0\2\77\3\0\1\77\2\0\2\77"+ + "\1\265\1\77\2\0\21\77\40\0\1\215\60\0\1\216"+ + "\12\0\1\216\4\0\1\111\24\0\1\111\31\0\6\220"+ + "\1\266\1\0\70\220\11\0\1\267\67\0\2\270\1\0"+ + "\2\270\6\0\4\270\1\0\2\270\3\0\1\270\2\0"+ + "\4\270\2\0\21\270\21\0\1\127\12\0\1\127\64\0"+ + "\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+ + "\1\11\2\0\3\11\1\271\2\0\21\11\21\0\2\11"+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\4\11\2\0\11\11\1\267\7\11\21\0\2\11"+ - "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\4\11\2\0\2\11\1\270\16\11\21\0\2\11"+ - "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\4\11\2\0\2\11\1\271\16\11\21\0\2\11"+ - "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\4\11\2\0\2\11\1\272\16\11\21\0\2\11"+ + "\2\0\4\11\2\0\11\11\1\272\7\11\21\0\2\11"+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ "\2\0\4\11\2\0\2\11\1\273\16\11\21\0\2\11"+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\4\11\2\0\12\11\1\274\6\11\21\0\2\11"+ + "\2\0\4\11\2\0\2\11\1\274\16\11\21\0\2\11"+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ "\2\0\4\11\2\0\2\11\1\275\16\11\21\0\2\11"+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ - "\2\0\4\11\2\0\4\11\1\276\14\11\21\0\2\11"+ - "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\277"+ + "\2\0\4\11\2\0\2\11\1\276\16\11\21\0\2\11"+ + "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ + "\2\0\4\11\2\0\4\11\1\277\14\11\21\0\2\11"+ + "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ + "\2\0\4\11\2\0\12\11\1\300\6\11\21\0\2\11"+ + "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ + "\2\0\4\11\2\0\2\11\1\301\16\11\21\0\2\11"+ + "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+ + "\2\0\4\11\2\0\4\11\1\302\14\11\21\0\2\11"+ + "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\303"+ "\2\0\4\11\2\0\21\11\21\0\2\11\1\0\2\11"+ "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\3\11"+ - "\1\300\2\0\21\11\21\0\2\11\1\0\2\11\6\0"+ - "\4\11\1\0\2\11\3\0\1\11\2\0\3\11\1\301"+ + "\1\304\2\0\21\11\21\0\2\11\1\0\2\11\6\0"+ + "\4\11\1\0\2\11\3\0\1\11\2\0\3\11\1\305"+ "\2\0\21\11\21\0\2\11\1\0\2\11\6\0\4\11"+ - "\1\0\2\11\3\0\1\11\2\0\1\302\3\11\2\0"+ + "\1\0\2\11\3\0\1\11\2\0\1\306\3\11\2\0"+ "\21\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+ - "\2\11\3\0\1\11\2\0\4\11\2\0\2\11\1\303"+ + "\2\11\3\0\1\11\2\0\4\11\2\0\2\11\1\307"+ "\16\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+ - "\2\11\3\0\1\11\2\0\4\11\2\0\3\11\1\304"+ + "\2\11\3\0\1\11\2\0\4\11\2\0\3\11\1\310"+ "\15\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+ - "\2\11\3\0\1\11\2\0\4\11\2\0\4\11\1\305"+ + "\2\11\3\0\1\11\2\0\4\11\2\0\4\11\1\311"+ "\14\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+ - "\2\11\3\0\1\11\2\0\4\11\2\0\5\11\1\306"+ - "\13\11\20\0\6\256\1\307\1\0\70\256\1\0\2\310"+ - "\11\0\1\310\1\0\1\310\2\0\2\310\16\0\2\310"+ - "\3\0\2\310\3\0\1\310\3\0\1\310\21\0\2\76"+ - "\1\0\2\76\6\0\4\76\1\0\2\76\3\0\1\76"+ - "\2\0\3\76\1\311\2\0\21\76\21\0\2\11\1\0"+ + "\2\11\3\0\1\11\2\0\4\11\2\0\5\11\1\312"+ + "\13\11\20\0\6\261\1\313\1\0\70\261\1\0\2\314"+ + "\11\0\1\314\1\0\1\314\2\0\2\314\16\0\2\314"+ + "\3\0\2\314\3\0\1\314\2\0\1\314\22\0\2\77"+ + "\1\0\2\77\6\0\4\77\1\0\2\77\3\0\1\77"+ + "\2\0\3\77\1\315\2\0\21\77\21\0\2\11\1\0"+ "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\16\11\1\312\2\11\21\0\2\11\1\0"+ + "\4\11\2\0\16\11\1\316\2\11\21\0\2\11\1\0"+ "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\3\11\1\313\15\11\21\0\2\11\1\0"+ + "\4\11\2\0\3\11\1\317\15\11\21\0\2\11\1\0"+ "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\6\11\1\314\12\11\21\0\2\11\1\0"+ + "\4\11\2\0\6\11\1\320\12\11\21\0\2\11\1\0"+ "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\6\11\1\315\12\11\21\0\2\11\1\0"+ + "\4\11\2\0\6\11\1\321\12\11\21\0\2\11\1\0"+ "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\3\11\1\316\15\11\21\0\2\11\1\0"+ + "\4\11\2\0\17\11\1\322\1\11\21\0\2\11\1\0"+ "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\6\11\1\317\12\11\21\0\2\11\1\0"+ + "\4\11\2\0\3\11\1\323\15\11\21\0\2\11\1\0"+ "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\4\11\2\0\2\11\1\320\16\11\21\0\2\11\1\0"+ + "\4\11\2\0\6\11\1\324\12\11\21\0\2\11\1\0"+ "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ - "\3\11\1\321\2\0\21\11\21\0\2\11\1\0\2\11"+ + "\4\11\2\0\2\11\1\325\16\11\21\0\2\11\1\0"+ + "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+ + "\3\11\1\326\2\0\21\11\21\0\2\11\1\0\2\11"+ "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\2\11"+ - "\1\322\1\11\2\0\21\11\21\0\2\11\1\0\2\11"+ + "\1\327\1\11\2\0\21\11\21\0\2\11\1\0\2\11"+ "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+ - "\2\0\10\11\1\323\10\11\21\0\2\11\1\0\2\11"+ + "\2\0\10\11\1\330\10\11\21\0\2\11\1\0\2\11"+ "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+ - "\2\0\12\11\1\324\6\11\21\0\2\11\1\0\2\11"+ + "\2\0\12\11\1\331\6\11\21\0\2\11\1\0\2\11"+ "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+ - "\2\0\2\11\1\325\16\11\21\0\2\326\11\0\1\326"+ - "\1\0\1\326\2\0\2\326\16\0\2\326\3\0\2\326"+ - "\3\0\1\326\3\0\1\326\21\0\2\11\1\0\2\11"+ + "\2\0\2\11\1\332\16\11\21\0\2\333\11\0\1\333"+ + "\1\0\1\333\2\0\2\333\16\0\2\333\3\0\2\333"+ + "\3\0\1\333\2\0\1\333\22\0\2\11\1\0\2\11"+ "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+ - "\2\0\4\11\1\327\14\11\21\0\2\11\1\0\2\11"+ + "\2\0\4\11\1\334\14\11\21\0\2\11\1\0\2\11"+ "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+ - "\2\0\7\11\1\330\11\11\21\0\2\11\1\0\2\11"+ + "\2\0\7\11\1\335\11\11\21\0\2\11\1\0\2\11"+ "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+ - "\2\0\13\11\1\331\5\11\21\0\2\11\1\0\2\11"+ + "\2\0\13\11\1\336\5\11\21\0\2\11\1\0\2\11"+ "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+ - "\2\0\5\11\1\332\13\11\21\0\2\11\1\0\2\11"+ + "\2\0\5\11\1\337\13\11\21\0\2\11\1\0\2\11"+ "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+ - "\2\0\5\11\1\333\13\11\21\0\2\11\1\0\2\11"+ - "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\1\334"+ - "\3\11\2\0\21\11\21\0\2\203\11\0\1\203\1\0"+ - "\1\203\2\0\2\203\16\0\2\203\3\0\2\203\3\0"+ - "\1\203\3\0\1\203\21\0\2\11\1\0\2\11\6\0"+ - "\4\11\1\0\2\11\3\0\1\11\2\0\2\11\1\335"+ + "\2\0\5\11\1\340\13\11\21\0\2\11\1\0\2\11"+ + "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\1\341"+ + "\3\11\2\0\21\11\21\0\2\205\11\0\1\205\1\0"+ + "\1\205\2\0\2\205\16\0\2\205\3\0\2\205\3\0"+ + "\1\205\2\0\1\205\22\0\2\11\1\0\2\11\6\0"+ + "\4\11\1\0\2\11\3\0\1\11\2\0\2\11\1\342"+ "\1\11\2\0\21\11\21\0\2\11\1\0\2\11\6\0"+ "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\2\0"+ - "\3\11\1\336\15\11\21\0\2\11\1\0\2\11\6\0"+ + "\3\11\1\343\15\11\21\0\2\11\1\0\2\11\6\0"+ "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\2\0"+ - "\2\11\1\337\16\11\21\0\2\11\1\0\2\11\6\0"+ - "\4\11\1\0\2\11\3\0\1\340\2\0\4\11\2\0"+ + "\2\11\1\344\16\11\21\0\2\11\1\0\2\11\6\0"+ + "\4\11\1\0\2\11\3\0\1\345\2\0\4\11\2\0"+ "\21\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+ - "\2\11\3\0\1\11\2\0\4\11\2\0\3\11\1\341"+ + "\2\11\3\0\1\11\2\0\4\11\2\0\3\11\1\346"+ "\15\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+ - "\2\11\3\0\1\11\2\0\4\11\2\0\10\11\1\342"+ + "\2\11\3\0\1\11\2\0\4\11\2\0\10\11\1\347"+ "\10\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+ - "\2\11\3\0\1\11\2\0\4\11\2\0\2\11\1\343"+ + "\2\11\3\0\1\11\2\0\4\11\2\0\2\11\1\350"+ "\16\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+ - "\2\11\3\0\1\11\2\0\3\11\1\344\2\0\21\11"+ + "\2\11\3\0\1\11\2\0\3\11\1\351\2\0\21\11"+ "\21\0\2\11\1\0\2\11\6\0\4\11\1\0\2\11"+ - "\3\0\1\11\2\0\4\11\2\0\2\11\1\345\16\11"+ + "\3\0\1\11\2\0\4\11\2\0\2\11\1\352\16\11"+ "\20\0"; private static int [] zzUnpackTrans() { - int [] result = new int[9792]; + int [] result = new int[10048]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -522,18 +531,18 @@ class _JetLexer implements FlexLexer { private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\6\0\1\11\15\1\1\11\3\1\1\11\16\1\1\11"+ + "\6\0\1\11\15\1\1\11\3\1\1\11\17\1\1\11"+ "\7\1\4\11\1\1\2\11\1\1\1\11\2\1\2\11"+ "\4\1\1\11\2\1\2\11\1\1\1\0\1\11\1\1"+ "\1\0\1\1\1\0\2\1\1\11\1\1\1\0\1\1"+ - "\1\0\4\1\4\11\1\1\1\0\7\1\1\11\20\1"+ + "\1\0\4\1\4\11\1\1\1\0\7\1\1\11\21\1"+ "\12\11\1\1\1\0\2\11\1\1\2\0\1\1\2\11"+ "\1\0\1\11\1\1\1\11\1\0\3\1\1\11\1\0"+ - "\2\11\11\1\1\11\15\1\1\11\2\0\1\1\1\11"+ - "\1\1\3\11\21\1\1\11\1\0\15\1\1\0\17\1"; + "\2\11\12\1\1\11\15\1\1\11\2\0\1\1\1\11"+ + "\1\1\3\11\22\1\1\11\1\0\16\1\1\0\17\1"; private static int [] zzUnpackAttribute() { - int [] result = new int[229]; + int [] result = new int[234]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; @@ -883,167 +892,167 @@ class _JetLexer implements FlexLexer { case 22: { return KtTokens.LBRACKET ; } - case 104: break; + case 105: break; case 78: { return KtTokens.FUN_KEYWORD ; } - case 105: break; + case 106: break; case 48: { return KtTokens.IN_KEYWORD ; } - case 106: break; + case 107: break; case 58: { return KtTokens.GTEQ ; } - case 107: break; + case 108: break; case 87: { return KtTokens.TRUE_KEYWORD ; } - case 108: break; + case 109: break; case 13: { return KtTokens.RBRACE ; } - case 109: break; + case 110: break; case 10: { return KtTokens.CHARACTER_LITERAL; } - case 110: break; + case 111: break; case 7: { return KtTokens.EXCL ; } - case 111: break; + case 112: break; case 80: { return KtTokens.VAL_KEYWORD ; } - case 112: break; + case 113: break; case 42: { return KtTokens.EXCLEQ ; } - case 113: break; + case 114: break; case 45: { return KtTokens.MINUSEQ ; } - case 114: break; + case 115: break; case 36: { return KtTokens.FLOAT_LITERAL; } - case 115: break; + case 116: break; case 51: { return KtTokens.AS_KEYWORD ; } - case 116: break; + case 117: break; case 90: { return KtTokens.WHEN_KEYWORD ; } - case 117: break; + case 118: break; case 16: { return KtTokens.QUEST ; } - case 118: break; - case 94: + case 119: break; + case 95: { return KtTokens.FALSE_KEYWORD ; } - case 119: break; + case 120: break; case 34: { lBraceCount++; return KtTokens.LBRACE; } - case 120: break; + case 121: break; case 44: { return KtTokens.MINUSMINUS; } - case 121: break; + case 122: break; case 66: { return KtTokens.ESCAPE_SEQUENCE; } - case 122: break; + case 123: break; case 5: { return KtTokens.DIV ; } - case 123: break; + case 124: break; case 79: { return KtTokens.FOR_KEYWORD ; } - case 124: break; + case 125: break; case 30: { popState(); yypushback(1); return KtTokens.DANGLING_NEWLINE; } - case 125: break; + case 126: break; case 52: { return KtTokens.DO_KEYWORD ; } - case 126: break; - case 101: + case 127: break; + case 102: { return KtTokens.CONTINUE_KEYWORD ; } - case 127: break; - case 103: + case 128: break; + case 104: { return KtTokens.INTERFACE_KEYWORD ; } - case 128: break; + case 129: break; case 75: { pushState(RAW_STRING); return KtTokens.OPEN_QUOTE; } - case 129: break; + case 130: break; case 4: { return KtTokens.WHITE_SPACE; } - case 130: break; - case 96: + case 131: break; + case 97: { return KtTokens.BREAK_KEYWORD ; } - case 131: break; + case 132: break; case 85: { yypushback(3); return KtTokens.EXCL; } - case 132: break; + case 133: break; case 60: { return KtTokens.OROR ; } - case 133: break; + case 134: break; case 20: { return KtTokens.PERC ; } - case 134: break; + case 135: break; case 73: { return KtTokens.EXCLEQEQEQ; } - case 135: break; + case 136: break; case 61: { return KtTokens.PERCEQ ; } - case 136: break; + case 137: break; case 43: { return KtTokens.RANGE ; } - case 137: break; + case 138: break; case 54: { return KtTokens.DOUBLE_ARROW; } - case 138: break; + case 139: break; case 38: { return KtTokens.EOL_COMMENT; } - case 139: break; + case 140: break; case 31: { popState(); return KtTokens.CLOSING_QUOTE; } - case 140: break; + case 141: break; case 14: { return KtTokens.MUL ; } - case 141: break; + case 142: break; case 23: { return KtTokens.RBRACKET ; } - case 142: break; + case 143: break; case 56: { return KtTokens.PLUSPLUS ; } - case 143: break; - case 99: + case 144: break; + case 100: { return KtTokens.OBJECT_KEYWORD ; } - case 144: break; + case 145: break; case 68: { if (commentDepth > 0) { commentDepth--; @@ -1055,93 +1064,97 @@ class _JetLexer implements FlexLexer { return commentStateToTokenType(state); } } - case 145: break; + case 146: break; case 8: { return KtTokens.DOT ; } - case 146: break; + case 147: break; case 26: { return KtTokens.SEMICOLON ; } - case 147: break; + case 148: break; + case 94: + { return KtTokens.YIELD_KEYWORD ; + } + case 149: break; case 69: { yypushback(2); return KtTokens.INTEGER_LITERAL; } - case 148: break; + case 150: break; case 32: { popState(); return KtTokens.IDENTIFIER; } - case 149: break; + case 151: break; case 81: { return KtTokens.VAR_KEYWORD ; } - case 150: break; - case 102: + case 152: break; + case 103: { return KtTokens.TYPE_ALIAS_KEYWORD ; } - case 151: break; - case 98: + case 153: break; + case 99: { return KtTokens.RETURN_KEYWORD ; } - case 152: break; + case 154: break; case 37: { return KtTokens.FIELD_IDENTIFIER; } - case 153: break; + case 155: break; case 15: { return KtTokens.EQ ; } - case 154: break; + case 156: break; case 28: { return KtTokens.AT ; } - case 155: break; + case 157: break; case 76: { return KtTokens.TRY_KEYWORD ; } - case 156: break; + case 158: break; case 24: { return KtTokens.LPAR ; } - case 157: break; + case 159: break; case 9: { return KtTokens.MINUS ; } - case 158: break; + case 160: break; case 70: { pushState(DOC_COMMENT); commentDepth = 0; commentStart = getTokenStart(); } - case 159: break; + case 161: break; case 86: { return KtTokens.THIS_KEYWORD ; } - case 160: break; + case 162: break; case 1: { return TokenType.BAD_CHARACTER; } - case 161: break; - case 97: + case 163: break; + case 98: { return KtTokens.WHILE_KEYWORD ; } - case 162: break; + case 164: break; case 40: { return KtTokens.DIVEQ ; } - case 163: break; - case 95: + case 165: break; + case 96: { return KtTokens.CLASS_KEYWORD ; } - case 164: break; + case 166: break; case 53: { return KtTokens.EQEQ ; } - case 165: break; + case 167: break; case 82: { return KtTokens.EQEQEQ ; } - case 166: break; + case 168: break; case 83: { int length = yytext().length(); if (length <= 3) { // closing """ @@ -1153,121 +1166,121 @@ class _JetLexer implements FlexLexer { return KtTokens.REGULAR_STRING_PART; } } - case 167: break; + case 169: break; case 50: { return KtTokens.MULTEQ ; } - case 168: break; + case 170: break; case 65: { pushState(LONG_TEMPLATE_ENTRY); return KtTokens.LONG_TEMPLATE_ENTRY_START; } - case 169: break; + case 171: break; case 12: { return KtTokens.LBRACE ; } - case 170: break; + case 172: break; case 39: { pushState(BLOCK_COMMENT); commentDepth = 0; commentStart = getTokenStart(); } - case 171: break; + case 173: break; case 92: { return KtTokens.THROW_KEYWORD ; } - case 172: break; + case 174: break; case 93: { return KtTokens.SUPER_KEYWORD ; } - case 173: break; + case 175: break; case 62: { return KtTokens.COLONCOLON; } - case 174: break; + case 176: break; case 72: { return KtTokens.NOT_IN; } - case 175: break; + case 177: break; case 63: { return KtTokens.DOUBLE_SEMICOLON; } - case 176: break; + case 178: break; case 6: { return KtTokens.HASH ; } - case 177: break; + case 179: break; case 3: { return KtTokens.IDENTIFIER; } - case 178: break; + case 180: break; case 2: { return KtTokens.INTEGER_LITERAL; } - case 179: break; + case 181: break; case 88: { return KtTokens.ELSE_KEYWORD ; } - case 180: break; + case 182: break; case 11: { pushState(STRING); return KtTokens.OPEN_QUOTE; } - case 181: break; - case 100: + case 183: break; + case 101: { return KtTokens.PACKAGE_KEYWORD ; } - case 182: break; + case 184: break; case 49: { return KtTokens.IF_KEYWORD ; } - case 183: break; + case 185: break; case 18: { return KtTokens.LT ; } - case 184: break; + case 186: break; case 17: { return KtTokens.PLUS ; } - case 185: break; + case 187: break; case 55: { return KtTokens.PLUSEQ ; } - case 186: break; + case 188: break; case 74: { return KtTokens.RESERVED ; } - case 187: break; + case 189: break; case 67: { commentDepth++; } - case 188: break; + case 190: break; case 27: { return KtTokens.COMMA ; } - case 189: break; + case 191: break; case 19: { return KtTokens.GT ; } - case 190: break; + case 192: break; case 77: { return KtTokens.AS_SAFE; } - case 191: break; + case 193: break; case 25: { return KtTokens.RPAR ; } - case 192: break; + case 194: break; case 71: { return KtTokens.NOT_IS; } - case 193: break; + case 195: break; case 89: { return KtTokens.NULL_KEYWORD ; } - case 194: break; + case 196: break; case 59: { return KtTokens.ANDAND ; } - case 195: break; + case 197: break; case 35: { if (lBraceCount == 0) { popState(); @@ -1276,11 +1289,11 @@ class _JetLexer implements FlexLexer { lBraceCount--; return KtTokens.RBRACE; } - case 196: break; + case 198: break; case 84: { return KtTokens.BLOCK_COMMENT; } - case 197: break; + case 199: break; case 41: { if (zzCurrentPos == 0) { return KtTokens.SHEBANG_COMMENT; @@ -1290,41 +1303,41 @@ class _JetLexer implements FlexLexer { return KtTokens.HASH; } } - case 198: break; + case 200: break; case 29: { return KtTokens.REGULAR_STRING_PART; } - case 199: break; + case 201: break; case 47: { return KtTokens.IS_KEYWORD ; } - case 200: break; + case 202: break; case 91: { popState(); return KtTokens.THIS_KEYWORD; } - case 201: break; + case 203: break; case 21: { return KtTokens.COLON ; } - case 202: break; + case 204: break; case 57: { return KtTokens.LTEQ ; } - case 203: break; + case 205: break; case 33: { } - case 204: break; + case 206: break; case 64: { pushState(SHORT_TEMPLATE_ENTRY); yypushback(yylength() - 1); return KtTokens.SHORT_TEMPLATE_ENTRY_START; } - case 205: break; + case 207: break; case 46: { return KtTokens.ARROW ; } - case 206: break; + case 208: break; default: if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { zzAtEOF = true; @@ -1336,14 +1349,14 @@ class _JetLexer implements FlexLexer { zzStartRead = commentStart; return commentStateToTokenType(state); } - case 230: break; + case 235: break; case DOC_COMMENT: { int state = yystate(); popState(); zzStartRead = commentStart; return commentStateToTokenType(state); } - case 231: break; + case 236: break; default: return null; } diff --git a/compiler/testData/psi/Reserved.kt b/compiler/testData/psi/Reserved.kt new file mode 100644 index 00000000000..02f0d10671e --- /dev/null +++ b/compiler/testData/psi/Reserved.kt @@ -0,0 +1,5 @@ +fun yield() {} + +fun test() { + yield +} \ No newline at end of file diff --git a/compiler/testData/psi/Reserved.txt b/compiler/testData/psi/Reserved.txt new file mode 100644 index 00000000000..82c2c5fe64c --- /dev/null +++ b/compiler/testData/psi/Reserved.txt @@ -0,0 +1,33 @@ +JetFile: Reserved.kt + PACKAGE_DIRECTIVE + + IMPORT_LIST + + FUN + PsiElement(fun)('fun') + PsiWhiteSpace(' ') + PsiErrorElement:Expecting function name or receiver type + PsiElement(yield)('yield') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + BLOCK + PsiElement(LBRACE)('{') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n\n') + FUN + PsiElement(fun)('fun') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('test') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + BLOCK + PsiElement(LBRACE)('{') + PsiWhiteSpace('\n ') + PsiErrorElement:Expecting an element + PsiElement(yield)('yield') + PsiWhiteSpace('\n') + PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java index 4baead2d7e9..883cb913926 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java @@ -637,6 +637,12 @@ public class ParsingTestGenerated extends AbstractParsingTest { doParsingTest(fileName); } + @TestMetadata("Reserved.kt") + public void testReserved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Reserved.kt"); + doParsingTest(fileName); + } + @TestMetadata("RootPackage.kt") public void testRootPackage() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/RootPackage.kt"); diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java index dd5c893a369..0ff6e133b73 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java @@ -51,6 +51,7 @@ public class KeywordStringsGenerated { "while", "do", "when", - "interface" + "interface", + "yield" )); } diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt index 5dbb257f32c..d74f4a8cfa5 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt @@ -320,7 +320,8 @@ class TestDataBuilder() { error("The file '$fileName' unexpectedly exists when create test data from scratch.") } } else if (!isCreatingFromScratch) { - error("Unexpected new testdata file: '$fileName'. It may cause for example because of bug in stdlib.") + error("Unexpected new testdata file: '$fileName'. It may cause for example because of bug in stdlib.\n" + + "If a new keyword has been added, delete SHOULD_BE_ESCAPED.txt and SHOULD_NOT_BE_ESCAPED.txt") } GeneratorsFileUtil.writeFileIfContentChanged(testDataFile, out, false) diff --git a/j2k/testData/fileOrElement/identifier/keywords.java b/j2k/testData/fileOrElement/identifier/keywords.java index b2c71995cdf..735b57e6230 100644 --- a/j2k/testData/fileOrElement/identifier/keywords.java +++ b/j2k/testData/fileOrElement/identifier/keywords.java @@ -1,2 +1,2 @@ //statement -int as, type, val, var, fun, is, in, object, when; \ No newline at end of file +int as, type, val, var, fun, is, in, object, when, yield; \ No newline at end of file diff --git a/j2k/testData/fileOrElement/identifier/keywords.kt b/j2k/testData/fileOrElement/identifier/keywords.kt index 7d924af8a27..df61385ba3b 100644 --- a/j2k/testData/fileOrElement/identifier/keywords.kt +++ b/j2k/testData/fileOrElement/identifier/keywords.kt @@ -6,4 +6,5 @@ val `fun`: Int val `is`: Int val `in`: Int val `object`: Int -val `when`: Int \ No newline at end of file +val `when`: Int +val `yield`: Int \ No newline at end of file diff --git a/j2k/testData/fileOrElement/importStatement/importWithKeywords.java b/j2k/testData/fileOrElement/importStatement/importWithKeywords.java index b7b0c0ff8cb..35a346fab6b 100644 --- a/j2k/testData/fileOrElement/importStatement/importWithKeywords.java +++ b/j2k/testData/fileOrElement/importStatement/importWithKeywords.java @@ -1,6 +1,6 @@ //file package test; -import as.type.val.var.fun.is.in.object.when; +import as.type.val.var.fun.is.in.object.when.yield; class Test {} \ No newline at end of file diff --git a/j2k/testData/fileOrElement/importStatement/importWithKeywords.kt b/j2k/testData/fileOrElement/importStatement/importWithKeywords.kt index 2720249e739..e65a09dfe8d 100644 --- a/j2k/testData/fileOrElement/importStatement/importWithKeywords.kt +++ b/j2k/testData/fileOrElement/importStatement/importWithKeywords.kt @@ -1,6 +1,6 @@ // ERROR: Unresolved reference: `as` package test -import `as`.type.`val`.`var`.`fun`.`is`.`in`.`object`.`when` +import `as`.type.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`yield` internal class Test \ No newline at end of file diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java index da490e805a4..2dd9d774749 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java @@ -35,21 +35,9 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/reservedWords/cases"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("dataClassValBreak.kt") - public void testDataClassValBreak() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValBreak.kt"); - doTest(fileName); - } - - @TestMetadata("dataClassValClass.kt") - public void testDataClassValClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValClass.kt"); - doTest(fileName); - } - - @TestMetadata("dataClassValUndefined.kt") - public void testDataClassValUndefined() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValUndefined.kt"); + @TestMetadata("dataClassValVar.kt") + public void testDataClassValVar() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValVar.kt"); doTest(fileName); } @@ -59,21 +47,33 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("dataClassVarContinue.kt") - public void testDataClassVarContinue() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarContinue.kt"); + @TestMetadata("dataClassValWhile.kt") + public void testDataClassValWhile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValWhile.kt"); doTest(fileName); } - @TestMetadata("dataClassVarDo.kt") - public void testDataClassVarDo() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarDo.kt"); + @TestMetadata("dataClassValWith.kt") + public void testDataClassValWith() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValWith.kt"); doTest(fileName); } - @TestMetadata("dataClassVarWith.kt") - public void testDataClassVarWith() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarWith.kt"); + @TestMetadata("dataClassVarBreak.kt") + public void testDataClassVarBreak() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarBreak.kt"); + doTest(fileName); + } + + @TestMetadata("dataClassVarInfinity.kt") + public void testDataClassVarInfinity() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarInfinity.kt"); + doTest(fileName); + } + + @TestMetadata("dataClassVarKotlin.kt") + public void testDataClassVarKotlin() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarKotlin.kt"); doTest(fileName); } @@ -83,267 +83,267 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("delegatedFunCatch.kt") - public void testDelegatedFunCatch() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunCatch.kt"); + @TestMetadata("delegatedFunDebugger.kt") + public void testDelegatedFunDebugger() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunDebugger.kt"); doTest(fileName); } - @TestMetadata("delegatedFunConst.kt") - public void testDelegatedFunConst() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunConst.kt"); + @TestMetadata("delegatedFunDefault.kt") + public void testDelegatedFunDefault() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunDefault.kt"); doTest(fileName); } - @TestMetadata("delegatedFunNull.kt") - public void testDelegatedFunNull() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunNull.kt"); + @TestMetadata("delegatedFunIf.kt") + public void testDelegatedFunIf() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunIf.kt"); doTest(fileName); } - @TestMetadata("delegatedFunPackage.kt") - public void testDelegatedFunPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunPackage.kt"); + @TestMetadata("delegatedFunIn.kt") + public void testDelegatedFunIn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunIn.kt"); doTest(fileName); } - @TestMetadata("delegatedFunParamDebugger.kt") - public void testDelegatedFunParamDebugger() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamDebugger.kt"); + @TestMetadata("delegatedFunParamDelete.kt") + public void testDelegatedFunParamDelete() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamDelete.kt"); doTest(fileName); } - @TestMetadata("delegatedFunParamDefault.kt") - public void testDelegatedFunParamDefault() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamDefault.kt"); + @TestMetadata("delegatedFunParamEnum.kt") + public void testDelegatedFunParamEnum() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamEnum.kt"); doTest(fileName); } - @TestMetadata("delegatedFunParamReturn.kt") - public void testDelegatedFunParamReturn() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamReturn.kt"); + @TestMetadata("delegatedFunParamInterface.kt") + public void testDelegatedFunParamInterface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamInterface.kt"); doTest(fileName); } - @TestMetadata("delegatedFunParamSuper.kt") - public void testDelegatedFunParamSuper() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamSuper.kt"); + @TestMetadata("delegatedFunParamNull.kt") + public void testDelegatedFunParamNull() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamNull.kt"); doTest(fileName); } - @TestMetadata("delegatedLabelDelete.kt") - public void testDelegatedLabelDelete() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelDelete.kt"); + @TestMetadata("delegatedLabelEval.kt") + public void testDelegatedLabelEval() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelEval.kt"); doTest(fileName); } - @TestMetadata("delegatedLabelEnum.kt") - public void testDelegatedLabelEnum() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelEnum.kt"); + @TestMetadata("delegatedLabelExport.kt") + public void testDelegatedLabelExport() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelExport.kt"); doTest(fileName); } - @TestMetadata("delegatedLabelThis.kt") - public void testDelegatedLabelThis() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelThis.kt"); + @TestMetadata("delegatedLabelPackage.kt") + public void testDelegatedLabelPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelPackage.kt"); doTest(fileName); } - @TestMetadata("delegatedLabelThrow.kt") - public void testDelegatedLabelThrow() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelThrow.kt"); + @TestMetadata("delegatedLabelReturn.kt") + public void testDelegatedLabelReturn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelReturn.kt"); doTest(fileName); } - @TestMetadata("delegatedValArguments.kt") - public void testDelegatedValArguments() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValArguments.kt"); + @TestMetadata("delegatedValAwait.kt") + public void testDelegatedValAwait() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValAwait.kt"); doTest(fileName); } - @TestMetadata("delegatedValFor.kt") - public void testDelegatedValFor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValFor.kt"); + @TestMetadata("delegatedValCase.kt") + public void testDelegatedValCase() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValCase.kt"); doTest(fileName); } - @TestMetadata("delegatedValIf.kt") - public void testDelegatedValIf() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValIf.kt"); + @TestMetadata("delegatedValDo.kt") + public void testDelegatedValDo() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValDo.kt"); doTest(fileName); } - @TestMetadata("delegatedValNaN.kt") - public void testDelegatedValNaN() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValNaN.kt"); + @TestMetadata("delegatedValElse.kt") + public void testDelegatedValElse() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValElse.kt"); doTest(fileName); } - @TestMetadata("delegatedVarAwait.kt") - public void testDelegatedVarAwait() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarAwait.kt"); + @TestMetadata("delegatedVarCatch.kt") + public void testDelegatedVarCatch() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarCatch.kt"); doTest(fileName); } - @TestMetadata("delegatedVarCase.kt") - public void testDelegatedVarCase() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarCase.kt"); + @TestMetadata("delegatedVarConst.kt") + public void testDelegatedVarConst() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarConst.kt"); doTest(fileName); } - @TestMetadata("delegatedVarIn.kt") - public void testDelegatedVarIn() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarIn.kt"); + @TestMetadata("delegatedVarFalse.kt") + public void testDelegatedVarFalse() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarFalse.kt"); doTest(fileName); } - @TestMetadata("delegatedVarInterface.kt") - public void testDelegatedVarInterface() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarInterface.kt"); + @TestMetadata("delegatedVarFor.kt") + public void testDelegatedVarFor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarFor.kt"); doTest(fileName); } - @TestMetadata("enumEntryFor.kt") - public void testEnumEntryFor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryFor.kt"); + @TestMetadata("enumEntryContinue.kt") + public void testEnumEntryContinue() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryContinue.kt"); doTest(fileName); } - @TestMetadata("enumEntryIf.kt") - public void testEnumEntryIf() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryIf.kt"); + @TestMetadata("enumEntryDo.kt") + public void testEnumEntryDo() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryDo.kt"); doTest(fileName); } - @TestMetadata("enumEntryPrivate.kt") - public void testEnumEntryPrivate() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryPrivate.kt"); + @TestMetadata("enumEntryPublic.kt") + public void testEnumEntryPublic() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryPublic.kt"); doTest(fileName); } - @TestMetadata("enumEntryProtected.kt") - public void testEnumEntryProtected() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryProtected.kt"); + @TestMetadata("enumEntryStatic.kt") + public void testEnumEntryStatic() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryStatic.kt"); doTest(fileName); } - @TestMetadata("enumFunBreak.kt") - public void testEnumFunBreak() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunBreak.kt"); + @TestMetadata("enumFunImport.kt") + public void testEnumFunImport() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunImport.kt"); doTest(fileName); } - @TestMetadata("enumFunClass.kt") - public void testEnumFunClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunClass.kt"); + @TestMetadata("enumFunInstanceof.kt") + public void testEnumFunInstanceof() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt"); doTest(fileName); } - @TestMetadata("enumFunFunction.kt") - public void testEnumFunFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunFunction.kt"); + @TestMetadata("enumFunParamLet.kt") + public void testEnumFunParamLet() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt"); doTest(fileName); } - @TestMetadata("enumFunImplements.kt") - public void testEnumFunImplements() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunImplements.kt"); + @TestMetadata("enumFunParamNew.kt") + public void testEnumFunParamNew() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt"); doTest(fileName); } - @TestMetadata("enumFunParamContinue.kt") - public void testEnumFunParamContinue() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamContinue.kt"); + @TestMetadata("enumFunParamWhile.kt") + public void testEnumFunParamWhile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamWhile.kt"); doTest(fileName); } - @TestMetadata("enumFunParamDo.kt") - public void testEnumFunParamDo() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamDo.kt"); + @TestMetadata("enumFunParamYield.kt") + public void testEnumFunParamYield() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamYield.kt"); doTest(fileName); } - @TestMetadata("enumFunParamImport.kt") - public void testEnumFunParamImport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamImport.kt"); + @TestMetadata("enumFunTry.kt") + public void testEnumFunTry() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunTry.kt"); doTest(fileName); } - @TestMetadata("enumFunParamInstanceof.kt") - public void testEnumFunParamInstanceof() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamInstanceof.kt"); + @TestMetadata("enumFunVar.kt") + public void testEnumFunVar() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunVar.kt"); doTest(fileName); } - @TestMetadata("enumLabelElse.kt") - public void testEnumLabelElse() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelElse.kt"); + @TestMetadata("enumLabelBreak.kt") + public void testEnumLabelBreak() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelBreak.kt"); doTest(fileName); } - @TestMetadata("enumLabelFalse.kt") - public void testEnumLabelFalse() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelFalse.kt"); + @TestMetadata("enumLabelClass.kt") + public void testEnumLabelClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelClass.kt"); doTest(fileName); } - @TestMetadata("enumLabelLet.kt") - public void testEnumLabelLet() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelLet.kt"); + @TestMetadata("enumLabelPrivate.kt") + public void testEnumLabelPrivate() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt"); doTest(fileName); } - @TestMetadata("enumLabelNew.kt") - public void testEnumLabelNew() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelNew.kt"); + @TestMetadata("enumLabelProtected.kt") + public void testEnumLabelProtected() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt"); doTest(fileName); } - @TestMetadata("enumValEval.kt") - public void testEnumValEval() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValEval.kt"); + @TestMetadata("enumValExtends.kt") + public void testEnumValExtends() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValExtends.kt"); doTest(fileName); } - @TestMetadata("enumValExport.kt") - public void testEnumValExport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValExport.kt"); + @TestMetadata("enumValFinally.kt") + public void testEnumValFinally() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValFinally.kt"); doTest(fileName); } - @TestMetadata("enumValTrue.kt") - public void testEnumValTrue() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValTrue.kt"); + @TestMetadata("enumValSuper.kt") + public void testEnumValSuper() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValSuper.kt"); doTest(fileName); } - @TestMetadata("enumValTry.kt") - public void testEnumValTry() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValTry.kt"); + @TestMetadata("enumValThis.kt") + public void testEnumValThis() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValThis.kt"); doTest(fileName); } - @TestMetadata("enumVarExtends.kt") - public void testEnumVarExtends() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarExtends.kt"); + @TestMetadata("enumVarFunction.kt") + public void testEnumVarFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarFunction.kt"); doTest(fileName); } - @TestMetadata("enumVarFinally.kt") - public void testEnumVarFinally() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarFinally.kt"); + @TestMetadata("enumVarImplements.kt") + public void testEnumVarImplements() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarImplements.kt"); doTest(fileName); } - @TestMetadata("enumVarVar.kt") - public void testEnumVarVar() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarVar.kt"); + @TestMetadata("enumVarThrow.kt") + public void testEnumVarThrow() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarThrow.kt"); doTest(fileName); } - @TestMetadata("enumVarWhile.kt") - public void testEnumVarWhile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarWhile.kt"); + @TestMetadata("enumVarTrue.kt") + public void testEnumVarTrue() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarTrue.kt"); doTest(fileName); } @@ -353,15 +353,9 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassFunNaN.kt") - public void testInsideClassFunNaN() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunNaN.kt"); - doTest(fileName); - } - - @TestMetadata("insideClassFunParamAwait.kt") - public void testInsideClassFunParamAwait() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamAwait.kt"); + @TestMetadata("insideClassFunAwait.kt") + public void testInsideClassFunAwait() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunAwait.kt"); doTest(fileName); } @@ -371,15 +365,27 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } + @TestMetadata("insideClassFunParamCatch.kt") + public void testInsideClassFunParamCatch() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamCatch.kt"); + doTest(fileName); + } + + @TestMetadata("insideClassFunParamThrow.kt") + public void testInsideClassFunParamThrow() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamThrow.kt"); + doTest(fileName); + } + @TestMetadata("insideClassFunParamTrue.kt") public void testInsideClassFunParamTrue() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamTrue.kt"); doTest(fileName); } - @TestMetadata("insideClassFunParamTry.kt") - public void testInsideClassFunParamTry() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamTry.kt"); + @TestMetadata("insideClassFunSuper.kt") + public void testInsideClassFunSuper() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunSuper.kt"); doTest(fileName); } @@ -389,45 +395,39 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassFunThrow.kt") - public void testInsideClassFunThrow() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunThrow.kt"); - doTest(fileName); - } - - @TestMetadata("insideClassLabelCatch.kt") - public void testInsideClassLabelCatch() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelCatch.kt"); - doTest(fileName); - } - @TestMetadata("insideClassLabelConst.kt") public void testInsideClassLabelConst() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelConst.kt"); doTest(fileName); } + @TestMetadata("insideClassLabelDebugger.kt") + public void testInsideClassLabelDebugger() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelDebugger.kt"); + doTest(fileName); + } + + @TestMetadata("insideClassLabelTry.kt") + public void testInsideClassLabelTry() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelTry.kt"); + doTest(fileName); + } + @TestMetadata("insideClassLabelVar.kt") public void testInsideClassLabelVar() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelVar.kt"); doTest(fileName); } - @TestMetadata("insideClassLabelWhile.kt") - public void testInsideClassLabelWhile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelWhile.kt"); + @TestMetadata("insideClassObjectFunContinue.kt") + public void testInsideClassObjectFunContinue() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunContinue.kt"); doTest(fileName); } - @TestMetadata("insideClassObjectFunElse.kt") - public void testInsideClassObjectFunElse() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunElse.kt"); - doTest(fileName); - } - - @TestMetadata("insideClassObjectFunEval.kt") - public void testInsideClassObjectFunEval() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt"); + @TestMetadata("insideClassObjectFunDo.kt") + public void testInsideClassObjectFunDo() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunDo.kt"); doTest(fileName); } @@ -437,15 +437,21 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassObjectFunFalse.kt") - public void testInsideClassObjectFunFalse() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunFalse.kt"); + @TestMetadata("insideClassObjectFunExtends.kt") + public void testInsideClassObjectFunExtends() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunExtends.kt"); doTest(fileName); } - @TestMetadata("insideClassObjectFunParamExtends.kt") - public void testInsideClassObjectFunParamExtends() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExtends.kt"); + @TestMetadata("insideClassObjectFunParamElse.kt") + public void testInsideClassObjectFunParamElse() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamElse.kt"); + doTest(fileName); + } + + @TestMetadata("insideClassObjectFunParamFalse.kt") + public void testInsideClassObjectFunParamFalse() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFalse.kt"); doTest(fileName); } @@ -455,21 +461,21 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassObjectFunParamFor.kt") - public void testInsideClassObjectFunParamFor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFor.kt"); + @TestMetadata("insideClassObjectFunParamFunction.kt") + public void testInsideClassObjectFunParamFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFunction.kt"); doTest(fileName); } - @TestMetadata("insideClassObjectFunParamIf.kt") - public void testInsideClassObjectFunParamIf() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamIf.kt"); + @TestMetadata("insideClassObjectLabelFor.kt") + public void testInsideClassObjectLabelFor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFor.kt"); doTest(fileName); } - @TestMetadata("insideClassObjectLabelFunction.kt") - public void testInsideClassObjectLabelFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFunction.kt"); + @TestMetadata("insideClassObjectLabelIf.kt") + public void testInsideClassObjectLabelIf() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIf.kt"); doTest(fileName); } @@ -479,33 +485,9 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassObjectLabelIn.kt") - public void testInsideClassObjectLabelIn() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIn.kt"); - doTest(fileName); - } - - @TestMetadata("insideClassObjectLabelInterface.kt") - public void testInsideClassObjectLabelInterface() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInterface.kt"); - doTest(fileName); - } - - @TestMetadata("insideClassObjectValBreak.kt") - public void testInsideClassObjectValBreak() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValBreak.kt"); - doTest(fileName); - } - - @TestMetadata("insideClassObjectValClass.kt") - public void testInsideClassObjectValClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValClass.kt"); - doTest(fileName); - } - - @TestMetadata("insideClassObjectValDebugger.kt") - public void testInsideClassObjectValDebugger() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValDebugger.kt"); + @TestMetadata("insideClassObjectLabelImport.kt") + public void testInsideClassObjectLabelImport() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImport.kt"); doTest(fileName); } @@ -515,21 +497,33 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassObjectVarContinue.kt") - public void testInsideClassObjectVarContinue() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarContinue.kt"); + @TestMetadata("insideClassObjectValDelete.kt") + public void testInsideClassObjectValDelete() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValDelete.kt"); doTest(fileName); } - @TestMetadata("insideClassObjectVarDelete.kt") - public void testInsideClassObjectVarDelete() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarDelete.kt"); + @TestMetadata("insideClassObjectValWhile.kt") + public void testInsideClassObjectValWhile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValWhile.kt"); doTest(fileName); } - @TestMetadata("insideClassObjectVarDo.kt") - public void testInsideClassObjectVarDo() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarDo.kt"); + @TestMetadata("insideClassObjectValYield.kt") + public void testInsideClassObjectValYield() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValYield.kt"); + doTest(fileName); + } + + @TestMetadata("insideClassObjectVarBreak.kt") + public void testInsideClassObjectVarBreak() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarBreak.kt"); + doTest(fileName); + } + + @TestMetadata("insideClassObjectVarClass.kt") + public void testInsideClassObjectVarClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarClass.kt"); doTest(fileName); } @@ -539,15 +533,27 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassValNull.kt") - public void testInsideClassValNull() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValNull.kt"); + @TestMetadata("insideClassObjectVarEval.kt") + public void testInsideClassObjectVarEval() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarEval.kt"); doTest(fileName); } - @TestMetadata("insideClassValPackage.kt") - public void testInsideClassValPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValPackage.kt"); + @TestMetadata("insideClassValInfinity.kt") + public void testInsideClassValInfinity() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValInfinity.kt"); + doTest(fileName); + } + + @TestMetadata("insideClassValInterface.kt") + public void testInsideClassValInterface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValInterface.kt"); + doTest(fileName); + } + + @TestMetadata("insideClassValNull.kt") + public void testInsideClassValNull() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValNull.kt"); doTest(fileName); } @@ -557,63 +563,51 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassValYield.kt") - public void testInsideClassValYield() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValYield.kt"); - doTest(fileName); - } - - @TestMetadata("insideClassVarInfinity.kt") - public void testInsideClassVarInfinity() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarInfinity.kt"); - doTest(fileName); - } - @TestMetadata("insideClassVarKotlin.kt") public void testInsideClassVarKotlin() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarKotlin.kt"); doTest(fileName); } + @TestMetadata("insideClassVarNaN.kt") + public void testInsideClassVarNaN() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarNaN.kt"); + doTest(fileName); + } + + @TestMetadata("insideClassVarPackage.kt") + public void testInsideClassVarPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarPackage.kt"); + doTest(fileName); + } + @TestMetadata("insideClassVarReturn.kt") public void testInsideClassVarReturn() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarReturn.kt"); doTest(fileName); } - @TestMetadata("insideClassVarSuper.kt") - public void testInsideClassVarSuper() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarSuper.kt"); - doTest(fileName); - } - - @TestMetadata("insideObjectFunParamPublic.kt") - public void testInsideObjectFunParamPublic() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamPublic.kt"); - doTest(fileName); - } - @TestMetadata("insideObjectFunParamStatic.kt") public void testInsideObjectFunParamStatic() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamStatic.kt"); doTest(fileName); } - @TestMetadata("insideObjectFunParamTrue.kt") - public void testInsideObjectFunParamTrue() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamTrue.kt"); + @TestMetadata("insideObjectFunParamSwitch.kt") + public void testInsideObjectFunParamSwitch() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamSwitch.kt"); doTest(fileName); } - @TestMetadata("insideObjectFunParamTry.kt") - public void testInsideObjectFunParamTry() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamTry.kt"); + @TestMetadata("insideObjectFunParamThis.kt") + public void testInsideObjectFunParamThis() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamThis.kt"); doTest(fileName); } - @TestMetadata("insideObjectFunPrivate.kt") - public void testInsideObjectFunPrivate() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunPrivate.kt"); + @TestMetadata("insideObjectFunParamThrow.kt") + public void testInsideObjectFunParamThrow() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamThrow.kt"); doTest(fileName); } @@ -623,21 +617,33 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideObjectFunThis.kt") - public void testInsideObjectFunThis() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunThis.kt"); + @TestMetadata("insideObjectFunPublic.kt") + public void testInsideObjectFunPublic() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunPublic.kt"); doTest(fileName); } - @TestMetadata("insideObjectFunThrow.kt") - public void testInsideObjectFunThrow() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunThrow.kt"); + @TestMetadata("insideObjectFunReturn.kt") + public void testInsideObjectFunReturn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunReturn.kt"); doTest(fileName); } - @TestMetadata("insideObjectLabelSwitch.kt") - public void testInsideObjectLabelSwitch() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelSwitch.kt"); + @TestMetadata("insideObjectFunSuper.kt") + public void testInsideObjectFunSuper() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunSuper.kt"); + doTest(fileName); + } + + @TestMetadata("insideObjectLabelTrue.kt") + public void testInsideObjectLabelTrue() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelTrue.kt"); + doTest(fileName); + } + + @TestMetadata("insideObjectLabelTry.kt") + public void testInsideObjectLabelTry() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelTry.kt"); doTest(fileName); } @@ -647,21 +653,15 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideObjectLabelVar.kt") - public void testInsideObjectLabelVar() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelVar.kt"); + @TestMetadata("insideObjectLabelUndefined.kt") + public void testInsideObjectLabelUndefined() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelUndefined.kt"); doTest(fileName); } - @TestMetadata("insideObjectLabelWhile.kt") - public void testInsideObjectLabelWhile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelWhile.kt"); - doTest(fileName); - } - - @TestMetadata("insideObjectValImport.kt") - public void testInsideObjectValImport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValImport.kt"); + @TestMetadata("insideObjectValIn.kt") + public void testInsideObjectValIn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValIn.kt"); doTest(fileName); } @@ -671,21 +671,15 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideObjectValNull.kt") - public void testInsideObjectValNull() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValNull.kt"); + @TestMetadata("insideObjectValInterface.kt") + public void testInsideObjectValInterface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValInterface.kt"); doTest(fileName); } - @TestMetadata("insideObjectValPackage.kt") - public void testInsideObjectValPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValPackage.kt"); - doTest(fileName); - } - - @TestMetadata("insideObjectVarLet.kt") - public void testInsideObjectVarLet() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarLet.kt"); + @TestMetadata("insideObjectValLet.kt") + public void testInsideObjectValLet() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValLet.kt"); doTest(fileName); } @@ -695,15 +689,27 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideObjectVarReturn.kt") - public void testInsideObjectVarReturn() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarReturn.kt"); + @TestMetadata("insideObjectVarNull.kt") + public void testInsideObjectVarNull() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarNull.kt"); doTest(fileName); } - @TestMetadata("insideObjectVarSuper.kt") - public void testInsideObjectVarSuper() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarSuper.kt"); + @TestMetadata("insideObjectVarPackage.kt") + public void testInsideObjectVarPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarPackage.kt"); + doTest(fileName); + } + + @TestMetadata("insideObjectVarPrivate.kt") + public void testInsideObjectVarPrivate() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarPrivate.kt"); + doTest(fileName); + } + + @TestMetadata("localCatchIf.kt") + public void testLocalCatchIf() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchIf.kt"); doTest(fileName); } @@ -713,12 +719,6 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("localCatchInterface.kt") - public void testLocalCatchInterface() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchInterface.kt"); - doTest(fileName); - } - @TestMetadata("localCatchUndefined.kt") public void testLocalCatchUndefined() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchUndefined.kt"); @@ -731,15 +731,21 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } + @TestMetadata("localFunClass.kt") + public void testLocalFunClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunClass.kt"); + doTest(fileName); + } + @TestMetadata("localFunContinue.kt") public void testLocalFunContinue() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunContinue.kt"); doTest(fileName); } - @TestMetadata("localFunDo.kt") - public void testLocalFunDo() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunDo.kt"); + @TestMetadata("localFunParamDo.kt") + public void testLocalFunParamDo() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamDo.kt"); doTest(fileName); } @@ -749,12 +755,6 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("localFunParamFalse.kt") - public void testLocalFunParamFalse() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamFalse.kt"); - doTest(fileName); - } - @TestMetadata("localFunParamPublic.kt") public void testLocalFunParamPublic() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamPublic.kt"); @@ -779,15 +779,15 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("localLabelFor.kt") - public void testLocalLabelFor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelFor.kt"); + @TestMetadata("localLabelFalse.kt") + public void testLocalLabelFalse() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelFalse.kt"); doTest(fileName); } - @TestMetadata("localLabelIf.kt") - public void testLocalLabelIf() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelIf.kt"); + @TestMetadata("localLabelFor.kt") + public void testLocalLabelFor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelFor.kt"); doTest(fileName); } @@ -833,12 +833,6 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("localVarClass.kt") - public void testLocalVarClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarClass.kt"); - doTest(fileName); - } - @TestMetadata("localVarLet.kt") public void testLocalVarLet() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarLet.kt"); @@ -851,6 +845,12 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } + @TestMetadata("localVarYield.kt") + public void testLocalVarYield() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarYield.kt"); + doTest(fileName); + } + @TestMetadata("toplevelClassDelete.kt") public void testToplevelClassDelete() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelClassDelete.kt"); diff --git a/js/js.translator/testData/reservedWords/cases/SHOULD_BE_ESCAPED.txt b/js/js.translator/testData/reservedWords/cases/SHOULD_BE_ESCAPED.txt index c0506b1b927..803924afd0c 100644 --- a/js/js.translator/testData/reservedWords/cases/SHOULD_BE_ESCAPED.txt +++ b/js/js.translator/testData/reservedWords/cases/SHOULD_BE_ESCAPED.txt @@ -18,4 +18,5 @@ throw true try var -while \ No newline at end of file +while +yield \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/SHOULD_NOT_BE_ESCAPED.txt b/js/js.translator/testData/reservedWords/cases/SHOULD_NOT_BE_ESCAPED.txt index 90678c9f7e8..6a0b3f85313 100644 --- a/js/js.translator/testData/reservedWords/cases/SHOULD_NOT_BE_ESCAPED.txt +++ b/js/js.translator/testData/reservedWords/cases/SHOULD_NOT_BE_ESCAPED.txt @@ -29,5 +29,4 @@ switch typeof undefined void -with -yield \ No newline at end of file +with \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValUndefined.kt b/js/js.translator/testData/reservedWords/cases/dataClassValUndefined.kt deleted file mode 100644 index 014d0159302..00000000000 --- a/js/js.translator/testData/reservedWords/cases/dataClassValUndefined.kt +++ /dev/null @@ -1,15 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -data class DataClass(val undefined: String) { - init { - testNotRenamed("undefined", { undefined }) - } -} - -fun box(): String { - DataClass("123") - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumVarVar.kt b/js/js.translator/testData/reservedWords/cases/dataClassValVar.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/enumVarVar.kt rename to js/js.translator/testData/reservedWords/cases/dataClassValVar.kt index db9bab6411b..f402b94320a 100644 --- a/js/js.translator/testData/reservedWords/cases/enumVarVar.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassValVar.kt @@ -2,17 +2,14 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -enum class Foo { - BAR; - var `var`: Int = 0 - - fun test() { +data class DataClass(val `var`: String) { + init { testNotRenamed("var", { `var` }) } } fun box(): String { - Foo.BAR.test() + DataClass("123") return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumVarWhile.kt b/js/js.translator/testData/reservedWords/cases/dataClassValWhile.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/enumVarWhile.kt rename to js/js.translator/testData/reservedWords/cases/dataClassValWhile.kt index 5bf8998ff62..d0377034c8e 100644 --- a/js/js.translator/testData/reservedWords/cases/enumVarWhile.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassValWhile.kt @@ -2,17 +2,14 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -enum class Foo { - BAR; - var `while`: Int = 0 - - fun test() { +data class DataClass(val `while`: String) { + init { testNotRenamed("while", { `while` }) } } fun box(): String { - Foo.BAR.test() + DataClass("123") return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarWith.kt b/js/js.translator/testData/reservedWords/cases/dataClassValWith.kt similarity index 84% rename from js/js.translator/testData/reservedWords/cases/dataClassVarWith.kt rename to js/js.translator/testData/reservedWords/cases/dataClassValWith.kt index 02640932580..7f642e2eae6 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassVarWith.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassValWith.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -data class DataClass(var with: String) { +data class DataClass(val with: String) { init { testNotRenamed("with", { with }) } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValBreak.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarBreak.kt similarity index 84% rename from js/js.translator/testData/reservedWords/cases/dataClassValBreak.kt rename to js/js.translator/testData/reservedWords/cases/dataClassVarBreak.kt index 17126bab340..422b6616b15 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassValBreak.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassVarBreak.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -data class DataClass(val `break`: String) { +data class DataClass(var `break`: String) { init { testNotRenamed("break", { `break` }) } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarContinue.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarContinue.kt deleted file mode 100644 index 689a7b6e9c1..00000000000 --- a/js/js.translator/testData/reservedWords/cases/dataClassVarContinue.kt +++ /dev/null @@ -1,15 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -data class DataClass(var `continue`: String) { - init { - testNotRenamed("continue", { `continue` }) - } -} - -fun box(): String { - DataClass("123") - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValClass.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarInfinity.kt similarity index 66% rename from js/js.translator/testData/reservedWords/cases/dataClassValClass.kt rename to js/js.translator/testData/reservedWords/cases/dataClassVarInfinity.kt index 7b81ab59844..23da1e006fc 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassValClass.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassVarInfinity.kt @@ -2,9 +2,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -data class DataClass(val `class`: String) { +data class DataClass(var Infinity: String) { init { - testNotRenamed("class", { `class` }) + testNotRenamed("Infinity", { Infinity }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarDo.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarKotlin.kt similarity index 67% rename from js/js.translator/testData/reservedWords/cases/dataClassVarDo.kt rename to js/js.translator/testData/reservedWords/cases/dataClassVarKotlin.kt index 94e3043d2bc..a73fff589ff 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassVarDo.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassVarKotlin.kt @@ -2,9 +2,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -data class DataClass(var `do`: String) { +data class DataClass(var Kotlin: String) { init { - testNotRenamed("do", { `do` }) + testNotRenamed("Kotlin", { Kotlin }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarYield.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarYield.kt index c30a59fbf19..263ac2f2b4e 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassVarYield.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassVarYield.kt @@ -2,9 +2,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -data class DataClass(var yield: String) { +data class DataClass(var `yield`: String) { init { - testNotRenamed("yield", { yield }) + testNotRenamed("yield", { `yield` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunNull.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunDebugger.kt similarity index 72% rename from js/js.translator/testData/reservedWords/cases/delegatedFunNull.kt rename to js/js.translator/testData/reservedWords/cases/delegatedFunDebugger.kt index e666fe97747..b484bd5cd60 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunNull.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunDebugger.kt @@ -3,16 +3,16 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - fun `null`() + fun debugger() } class TraitImpl : Trait { - override fun `null`() { `null`() } + override fun debugger() { debugger() } } class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("null", { `null`() }) + testNotRenamed("debugger", { debugger() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunConst.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunDefault.kt similarity index 72% rename from js/js.translator/testData/reservedWords/cases/delegatedFunConst.kt rename to js/js.translator/testData/reservedWords/cases/delegatedFunDefault.kt index eddd4bf67cc..a4567d90145 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunConst.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunDefault.kt @@ -3,16 +3,16 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - fun const() + fun default() } class TraitImpl : Trait { - override fun const() { const() } + override fun default() { default() } } class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("const", { const() }) + testNotRenamed("default", { default() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValNaN.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunIf.kt similarity index 76% rename from js/js.translator/testData/reservedWords/cases/delegatedValNaN.kt rename to js/js.translator/testData/reservedWords/cases/delegatedFunIf.kt index 448de2d7e61..f1bf64b0019 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedValNaN.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunIf.kt @@ -3,16 +3,16 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - val NaN: Int + fun `if`() } class TraitImpl : Trait { - override val NaN: Int = 0 + override fun `if`() { `if`() } } class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("NaN", { NaN }) + testNotRenamed("if", { `if`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarIn.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunIn.kt similarity index 76% rename from js/js.translator/testData/reservedWords/cases/delegatedVarIn.kt rename to js/js.translator/testData/reservedWords/cases/delegatedFunIn.kt index 401473cbab5..fc7e8ee36aa 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedVarIn.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunIn.kt @@ -3,16 +3,16 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - var `in`: Int + fun `in`() } class TraitImpl : Trait { - override var `in`: Int = 0 + override fun `in`() { `in`() } } class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("in", { `in` }) + testNotRenamed("in", { `in`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunPackage.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunPackage.kt deleted file mode 100644 index 2acca2a76f5..00000000000 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunPackage.kt +++ /dev/null @@ -1,23 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -interface Trait { - fun `package`() -} - -class TraitImpl : Trait { - override fun `package`() { `package`() } -} - -class TestDelegate : Trait by TraitImpl() { - fun test() { - testNotRenamed("package", { `package`() }) - } -} - -fun box(): String { - TestDelegate().test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunParamSuper.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunParamDelete.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/delegatedFunParamSuper.kt rename to js/js.translator/testData/reservedWords/cases/delegatedFunParamDelete.kt index 454aa0f3453..c820a1b2763 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunParamSuper.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunParamDelete.kt @@ -3,13 +3,13 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - fun foo(`super`: String) + fun foo(delete: String) } class TraitImpl : Trait { - override fun foo(`super`: String) { - assertEquals("123", `super`) - testRenamed("super", { `super` }) + override fun foo(delete: String) { + assertEquals("123", delete) + testRenamed("delete", { delete }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunParamDefault.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunParamEnum.kt similarity index 68% rename from js/js.translator/testData/reservedWords/cases/delegatedFunParamDefault.kt rename to js/js.translator/testData/reservedWords/cases/delegatedFunParamEnum.kt index 0ee00c0cec5..0e168a885b2 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunParamDefault.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunParamEnum.kt @@ -3,13 +3,13 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - fun foo(default: String) + fun foo(enum: String) } class TraitImpl : Trait { - override fun foo(default: String) { - assertEquals("123", default) - testRenamed("default", { default }) + override fun foo(enum: String) { + assertEquals("123", enum) + testRenamed("enum", { enum }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunParamDebugger.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunParamInterface.kt similarity index 66% rename from js/js.translator/testData/reservedWords/cases/delegatedFunParamDebugger.kt rename to js/js.translator/testData/reservedWords/cases/delegatedFunParamInterface.kt index db7b0238adf..3f3c69693d4 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunParamDebugger.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunParamInterface.kt @@ -3,13 +3,13 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - fun foo(debugger: String) + fun foo(`interface`: String) } class TraitImpl : Trait { - override fun foo(debugger: String) { - assertEquals("123", debugger) - testRenamed("debugger", { debugger }) + override fun foo(`interface`: String) { + assertEquals("123", `interface`) + testRenamed("interface", { `interface` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunParamReturn.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunParamNull.kt similarity index 68% rename from js/js.translator/testData/reservedWords/cases/delegatedFunParamReturn.kt rename to js/js.translator/testData/reservedWords/cases/delegatedFunParamNull.kt index 012081be964..033cf91f32c 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunParamReturn.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunParamNull.kt @@ -3,13 +3,13 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - fun foo(`return`: String) + fun foo(`null`: String) } class TraitImpl : Trait { - override fun foo(`return`: String) { - assertEquals("123", `return`) - testRenamed("return", { `return` }) + override fun foo(`null`: String) { + assertEquals("123", `null`) + testRenamed("null", { `null` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedLabelEnum.kt b/js/js.translator/testData/reservedWords/cases/delegatedLabelEval.kt similarity index 85% rename from js/js.translator/testData/reservedWords/cases/delegatedLabelEnum.kt rename to js/js.translator/testData/reservedWords/cases/delegatedLabelEval.kt index 49278a272a5..92fec6c006b 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedLabelEnum.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedLabelEval.kt @@ -12,7 +12,7 @@ class TraitImpl : Trait { class TestDelegate : Trait by TraitImpl() { fun test() { - testRenamed("enum", { enum@ while (false) {} }) + testRenamed("eval", { eval@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedLabelThis.kt b/js/js.translator/testData/reservedWords/cases/delegatedLabelExport.kt similarity index 84% rename from js/js.translator/testData/reservedWords/cases/delegatedLabelThis.kt rename to js/js.translator/testData/reservedWords/cases/delegatedLabelExport.kt index 464868ddba2..4da2d38642d 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedLabelThis.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedLabelExport.kt @@ -12,7 +12,7 @@ class TraitImpl : Trait { class TestDelegate : Trait by TraitImpl() { fun test() { - testRenamed("this", { `this`@ while (false) {} }) + testRenamed("export", { export@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedLabelDelete.kt b/js/js.translator/testData/reservedWords/cases/delegatedLabelPackage.kt similarity index 83% rename from js/js.translator/testData/reservedWords/cases/delegatedLabelDelete.kt rename to js/js.translator/testData/reservedWords/cases/delegatedLabelPackage.kt index 7afceafaab4..cf17d2da6c1 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedLabelDelete.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedLabelPackage.kt @@ -12,7 +12,7 @@ class TraitImpl : Trait { class TestDelegate : Trait by TraitImpl() { fun test() { - testRenamed("delete", { delete@ while (false) {} }) + testRenamed("package", { `package`@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedLabelThrow.kt b/js/js.translator/testData/reservedWords/cases/delegatedLabelReturn.kt similarity index 84% rename from js/js.translator/testData/reservedWords/cases/delegatedLabelThrow.kt rename to js/js.translator/testData/reservedWords/cases/delegatedLabelReturn.kt index f84333da4ce..69c3b606683 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedLabelThrow.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedLabelReturn.kt @@ -12,7 +12,7 @@ class TraitImpl : Trait { class TestDelegate : Trait by TraitImpl() { fun test() { - testRenamed("throw", { `throw`@ while (false) {} }) + testRenamed("return", { `return`@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValArguments.kt b/js/js.translator/testData/reservedWords/cases/delegatedValArguments.kt deleted file mode 100644 index 4a943382b5c..00000000000 --- a/js/js.translator/testData/reservedWords/cases/delegatedValArguments.kt +++ /dev/null @@ -1,23 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -interface Trait { - val arguments: Int -} - -class TraitImpl : Trait { - override val arguments: Int = 0 -} - -class TestDelegate : Trait by TraitImpl() { - fun test() { - testNotRenamed("arguments", { arguments }) - } -} - -fun box(): String { - TestDelegate().test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarAwait.kt b/js/js.translator/testData/reservedWords/cases/delegatedValAwait.kt similarity index 86% rename from js/js.translator/testData/reservedWords/cases/delegatedVarAwait.kt rename to js/js.translator/testData/reservedWords/cases/delegatedValAwait.kt index f6a334d2837..1cd04171411 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedVarAwait.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedValAwait.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - var await: Int + val await: Int } class TraitImpl : Trait { - override var await: Int = 0 + override val await: Int = 0 } class TestDelegate : Trait by TraitImpl() { diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarCase.kt b/js/js.translator/testData/reservedWords/cases/delegatedValCase.kt similarity index 87% rename from js/js.translator/testData/reservedWords/cases/delegatedVarCase.kt rename to js/js.translator/testData/reservedWords/cases/delegatedValCase.kt index 2bb703b9a72..e75477dd42b 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedVarCase.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedValCase.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - var case: Int + val case: Int } class TraitImpl : Trait { - override var case: Int = 0 + override val case: Int = 0 } class TestDelegate : Trait by TraitImpl() { diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValIf.kt b/js/js.translator/testData/reservedWords/cases/delegatedValDo.kt similarity index 76% rename from js/js.translator/testData/reservedWords/cases/delegatedValIf.kt rename to js/js.translator/testData/reservedWords/cases/delegatedValDo.kt index cef9afaaf3a..077ba008983 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedValIf.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedValDo.kt @@ -3,16 +3,16 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - val `if`: Int + val `do`: Int } class TraitImpl : Trait { - override val `if`: Int = 0 + override val `do`: Int = 0 } class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("if", { `if` }) + testNotRenamed("do", { `do` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValElse.kt b/js/js.translator/testData/reservedWords/cases/delegatedValElse.kt new file mode 100644 index 00000000000..a7dc69ad23a --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/delegatedValElse.kt @@ -0,0 +1,23 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +interface Trait { + val `else`: Int +} + +class TraitImpl : Trait { + override val `else`: Int = 0 +} + +class TestDelegate : Trait by TraitImpl() { + fun test() { + testNotRenamed("else", { `else` }) + } +} + +fun box(): String { + TestDelegate().test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarCatch.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarCatch.kt new file mode 100644 index 00000000000..1bb4e6c1020 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/delegatedVarCatch.kt @@ -0,0 +1,23 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +interface Trait { + var catch: Int +} + +class TraitImpl : Trait { + override var catch: Int = 0 +} + +class TestDelegate : Trait by TraitImpl() { + fun test() { + testNotRenamed("catch", { catch }) + } +} + +fun box(): String { + TestDelegate().test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarConst.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarConst.kt new file mode 100644 index 00000000000..469b16b71d2 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/delegatedVarConst.kt @@ -0,0 +1,23 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +interface Trait { + var const: Int +} + +class TraitImpl : Trait { + override var const: Int = 0 +} + +class TestDelegate : Trait by TraitImpl() { + fun test() { + testNotRenamed("const", { const }) + } +} + +fun box(): String { + TestDelegate().test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunCatch.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarFalse.kt similarity index 74% rename from js/js.translator/testData/reservedWords/cases/delegatedFunCatch.kt rename to js/js.translator/testData/reservedWords/cases/delegatedVarFalse.kt index 824ed8e2543..dbfbba316bd 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunCatch.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedVarFalse.kt @@ -3,16 +3,16 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - fun catch() + var `false`: Int } class TraitImpl : Trait { - override fun catch() { catch() } + override var `false`: Int = 0 } class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("catch", { catch() }) + testNotRenamed("false", { `false` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValFor.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarFor.kt similarity index 86% rename from js/js.translator/testData/reservedWords/cases/delegatedValFor.kt rename to js/js.translator/testData/reservedWords/cases/delegatedVarFor.kt index 5120fd64e2f..d30746aa852 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedValFor.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedVarFor.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - val `for`: Int + var `for`: Int } class TraitImpl : Trait { - override val `for`: Int = 0 + override var `for`: Int = 0 } class TestDelegate : Trait by TraitImpl() { diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarInterface.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarInterface.kt deleted file mode 100644 index f6cc53ddfb2..00000000000 --- a/js/js.translator/testData/reservedWords/cases/delegatedVarInterface.kt +++ /dev/null @@ -1,23 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -interface Trait { - var `interface`: Int -} - -class TraitImpl : Trait { - override var `interface`: Int = 0 -} - -class TestDelegate : Trait by TraitImpl() { - fun test() { - testNotRenamed("interface", { `interface` }) - } -} - -fun box(): String { - TestDelegate().test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumEntryProtected.kt b/js/js.translator/testData/reservedWords/cases/enumEntryContinue.kt similarity index 70% rename from js/js.translator/testData/reservedWords/cases/enumEntryProtected.kt rename to js/js.translator/testData/reservedWords/cases/enumEntryContinue.kt index d3994a55e98..a6881b51875 100644 --- a/js/js.translator/testData/reservedWords/cases/enumEntryProtected.kt +++ b/js/js.translator/testData/reservedWords/cases/enumEntryContinue.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - `protected` + `continue` } fun box(): String { - testNotRenamed("protected", { Foo.`protected` }) + testNotRenamed("continue", { Foo.`continue` }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumEntryIf.kt b/js/js.translator/testData/reservedWords/cases/enumEntryDo.kt similarity index 77% rename from js/js.translator/testData/reservedWords/cases/enumEntryIf.kt rename to js/js.translator/testData/reservedWords/cases/enumEntryDo.kt index 8c409fd9574..a593141c31b 100644 --- a/js/js.translator/testData/reservedWords/cases/enumEntryIf.kt +++ b/js/js.translator/testData/reservedWords/cases/enumEntryDo.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - `if` + `do` } fun box(): String { - testNotRenamed("if", { Foo.`if` }) + testNotRenamed("do", { Foo.`do` }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumEntryPrivate.kt b/js/js.translator/testData/reservedWords/cases/enumEntryPublic.kt similarity index 72% rename from js/js.translator/testData/reservedWords/cases/enumEntryPrivate.kt rename to js/js.translator/testData/reservedWords/cases/enumEntryPublic.kt index 61070806729..951d6ae0b2f 100644 --- a/js/js.translator/testData/reservedWords/cases/enumEntryPrivate.kt +++ b/js/js.translator/testData/reservedWords/cases/enumEntryPublic.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - `private` + `public` } fun box(): String { - testNotRenamed("private", { Foo.`private` }) + testNotRenamed("public", { Foo.`public` }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumEntryFor.kt b/js/js.translator/testData/reservedWords/cases/enumEntryStatic.kt similarity index 74% rename from js/js.translator/testData/reservedWords/cases/enumEntryFor.kt rename to js/js.translator/testData/reservedWords/cases/enumEntryStatic.kt index 83fbbab60e0..6c4453b83b2 100644 --- a/js/js.translator/testData/reservedWords/cases/enumEntryFor.kt +++ b/js/js.translator/testData/reservedWords/cases/enumEntryStatic.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - `for` + static } fun box(): String { - testNotRenamed("for", { Foo.`for` }) + testNotRenamed("static", { Foo.static }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumFunFunction.kt b/js/js.translator/testData/reservedWords/cases/enumFunFunction.kt deleted file mode 100644 index cf9169977cf..00000000000 --- a/js/js.translator/testData/reservedWords/cases/enumFunFunction.kt +++ /dev/null @@ -1,18 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -enum class Foo { - BAR; - fun function() { function() } - - fun test() { - testNotRenamed("function", { function() }) - } -} - -fun box(): String { - Foo.BAR.test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumFunImplements.kt b/js/js.translator/testData/reservedWords/cases/enumFunImplements.kt deleted file mode 100644 index 9652b6bcf86..00000000000 --- a/js/js.translator/testData/reservedWords/cases/enumFunImplements.kt +++ /dev/null @@ -1,18 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -enum class Foo { - BAR; - fun implements() { implements() } - - fun test() { - testNotRenamed("implements", { implements() }) - } -} - -fun box(): String { - Foo.BAR.test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumFunImport.kt b/js/js.translator/testData/reservedWords/cases/enumFunImport.kt new file mode 100644 index 00000000000..ceebb4a8c31 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/enumFunImport.kt @@ -0,0 +1,18 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +enum class Foo { + BAR; + fun import() { import() } + + fun test() { + testNotRenamed("import", { import() }) + } +} + +fun box(): String { + Foo.BAR.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumFunClass.kt b/js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt similarity index 70% rename from js/js.translator/testData/reservedWords/cases/enumFunClass.kt rename to js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt index a8c5bb6f94b..309a1f7ae6c 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunClass.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt @@ -4,10 +4,10 @@ package foo enum class Foo { BAR; - fun `class`() { `class`() } + fun instanceof() { instanceof() } fun test() { - testNotRenamed("class", { `class`() }) + testNotRenamed("instanceof", { instanceof() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamDo.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt similarity index 72% rename from js/js.translator/testData/reservedWords/cases/enumFunParamDo.kt rename to js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt index 6a8ee3112e6..7c1351c1f65 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunParamDo.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt @@ -4,9 +4,9 @@ package foo enum class Foo { BAR; - fun foo(`do`: String) { - assertEquals("123", `do`) - testRenamed("do", { `do` }) + fun foo(let: String) { + assertEquals("123", let) + testRenamed("let", { let }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamImport.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt similarity index 70% rename from js/js.translator/testData/reservedWords/cases/enumFunParamImport.kt rename to js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt index 7180557bebb..8a011e62d69 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunParamImport.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt @@ -4,9 +4,9 @@ package foo enum class Foo { BAR; - fun foo(import: String) { - assertEquals("123", import) - testRenamed("import", { import }) + fun foo(new: String) { + assertEquals("123", new) + testRenamed("new", { new }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamContinue.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamWhile.kt similarity index 67% rename from js/js.translator/testData/reservedWords/cases/enumFunParamContinue.kt rename to js/js.translator/testData/reservedWords/cases/enumFunParamWhile.kt index 6d1b7e2c297..f4abf35a877 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunParamContinue.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunParamWhile.kt @@ -4,9 +4,9 @@ package foo enum class Foo { BAR; - fun foo(`continue`: String) { - assertEquals("123", `continue`) - testRenamed("continue", { `continue` }) + fun foo(`while`: String) { + assertEquals("123", `while`) + testRenamed("while", { `while` }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamInstanceof.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamYield.kt similarity index 67% rename from js/js.translator/testData/reservedWords/cases/enumFunParamInstanceof.kt rename to js/js.translator/testData/reservedWords/cases/enumFunParamYield.kt index d0b7fba8e7d..929a8f571a8 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunParamInstanceof.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunParamYield.kt @@ -4,9 +4,9 @@ package foo enum class Foo { BAR; - fun foo(instanceof: String) { - assertEquals("123", instanceof) - testRenamed("instanceof", { instanceof }) + fun foo(`yield`: String) { + assertEquals("123", `yield`) + testRenamed("yield", { `yield` }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumFunTry.kt b/js/js.translator/testData/reservedWords/cases/enumFunTry.kt new file mode 100644 index 00000000000..1e7f201a027 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/enumFunTry.kt @@ -0,0 +1,18 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +enum class Foo { + BAR; + fun `try`() { `try`() } + + fun test() { + testNotRenamed("try", { `try`() }) + } +} + +fun box(): String { + Foo.BAR.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumFunVar.kt b/js/js.translator/testData/reservedWords/cases/enumFunVar.kt new file mode 100644 index 00000000000..9f493debec5 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/enumFunVar.kt @@ -0,0 +1,18 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +enum class Foo { + BAR; + fun `var`() { `var`() } + + fun test() { + testNotRenamed("var", { `var`() }) + } +} + +fun box(): String { + Foo.BAR.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelLet.kt b/js/js.translator/testData/reservedWords/cases/enumLabelBreak.kt similarity index 79% rename from js/js.translator/testData/reservedWords/cases/enumLabelLet.kt rename to js/js.translator/testData/reservedWords/cases/enumLabelBreak.kt index 876c4aeff3c..e1aec6d8345 100644 --- a/js/js.translator/testData/reservedWords/cases/enumLabelLet.kt +++ b/js/js.translator/testData/reservedWords/cases/enumLabelBreak.kt @@ -7,7 +7,7 @@ enum class Foo { val t: Int = 0 fun test() { - testRenamed("let", { let@ while (false) {} }) + testRenamed("break", { `break`@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelNew.kt b/js/js.translator/testData/reservedWords/cases/enumLabelClass.kt similarity index 79% rename from js/js.translator/testData/reservedWords/cases/enumLabelNew.kt rename to js/js.translator/testData/reservedWords/cases/enumLabelClass.kt index 193635fe148..a1dfc6559ad 100644 --- a/js/js.translator/testData/reservedWords/cases/enumLabelNew.kt +++ b/js/js.translator/testData/reservedWords/cases/enumLabelClass.kt @@ -7,7 +7,7 @@ enum class Foo { val t: Int = 0 fun test() { - testRenamed("new", { new@ while (false) {} }) + testRenamed("class", { `class`@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelFalse.kt b/js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt similarity index 79% rename from js/js.translator/testData/reservedWords/cases/enumLabelFalse.kt rename to js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt index 6d2b1e85fc8..f1099348369 100644 --- a/js/js.translator/testData/reservedWords/cases/enumLabelFalse.kt +++ b/js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt @@ -7,7 +7,7 @@ enum class Foo { val t: Int = 0 fun test() { - testRenamed("false", { `false`@ while (false) {} }) + testRenamed("private", { private@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelElse.kt b/js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt similarity index 78% rename from js/js.translator/testData/reservedWords/cases/enumLabelElse.kt rename to js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt index 4739bba20a0..9c89ac68fc0 100644 --- a/js/js.translator/testData/reservedWords/cases/enumLabelElse.kt +++ b/js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt @@ -7,7 +7,7 @@ enum class Foo { val t: Int = 0 fun test() { - testRenamed("else", { `else`@ while (false) {} }) + testRenamed("protected", { protected@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumVarExtends.kt b/js/js.translator/testData/reservedWords/cases/enumValExtends.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/enumVarExtends.kt rename to js/js.translator/testData/reservedWords/cases/enumValExtends.kt index 64280d16b21..c140034ec4c 100644 --- a/js/js.translator/testData/reservedWords/cases/enumVarExtends.kt +++ b/js/js.translator/testData/reservedWords/cases/enumValExtends.kt @@ -4,7 +4,7 @@ package foo enum class Foo { BAR; - var extends: Int = 0 + val extends: Int = 0 fun test() { testNotRenamed("extends", { extends }) diff --git a/js/js.translator/testData/reservedWords/cases/enumVarFinally.kt b/js/js.translator/testData/reservedWords/cases/enumValFinally.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/enumVarFinally.kt rename to js/js.translator/testData/reservedWords/cases/enumValFinally.kt index d12d319d8df..f46b8045d09 100644 --- a/js/js.translator/testData/reservedWords/cases/enumVarFinally.kt +++ b/js/js.translator/testData/reservedWords/cases/enumValFinally.kt @@ -4,7 +4,7 @@ package foo enum class Foo { BAR; - var finally: Int = 0 + val finally: Int = 0 fun test() { testNotRenamed("finally", { finally }) diff --git a/js/js.translator/testData/reservedWords/cases/enumValEval.kt b/js/js.translator/testData/reservedWords/cases/enumValSuper.kt similarity index 75% rename from js/js.translator/testData/reservedWords/cases/enumValEval.kt rename to js/js.translator/testData/reservedWords/cases/enumValSuper.kt index c2dc5a740a4..5d8caad9e03 100644 --- a/js/js.translator/testData/reservedWords/cases/enumValEval.kt +++ b/js/js.translator/testData/reservedWords/cases/enumValSuper.kt @@ -4,10 +4,10 @@ package foo enum class Foo { BAR; - val eval: Int = 0 + val `super`: Int = 0 fun test() { - testNotRenamed("eval", { eval }) + testNotRenamed("super", { `super` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumValTry.kt b/js/js.translator/testData/reservedWords/cases/enumValThis.kt similarity index 76% rename from js/js.translator/testData/reservedWords/cases/enumValTry.kt rename to js/js.translator/testData/reservedWords/cases/enumValThis.kt index d52cafcb96f..1c8f1cb09cd 100644 --- a/js/js.translator/testData/reservedWords/cases/enumValTry.kt +++ b/js/js.translator/testData/reservedWords/cases/enumValThis.kt @@ -4,10 +4,10 @@ package foo enum class Foo { BAR; - val `try`: Int = 0 + val `this`: Int = 0 fun test() { - testNotRenamed("try", { `try` }) + testNotRenamed("this", { `this` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumVarFunction.kt b/js/js.translator/testData/reservedWords/cases/enumVarFunction.kt new file mode 100644 index 00000000000..b9c710d5529 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/enumVarFunction.kt @@ -0,0 +1,18 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +enum class Foo { + BAR; + var function: Int = 0 + + fun test() { + testNotRenamed("function", { function }) + } +} + +fun box(): String { + Foo.BAR.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumFunBreak.kt b/js/js.translator/testData/reservedWords/cases/enumVarImplements.kt similarity index 72% rename from js/js.translator/testData/reservedWords/cases/enumFunBreak.kt rename to js/js.translator/testData/reservedWords/cases/enumVarImplements.kt index 095145bf7d2..b33e6926c14 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunBreak.kt +++ b/js/js.translator/testData/reservedWords/cases/enumVarImplements.kt @@ -4,10 +4,10 @@ package foo enum class Foo { BAR; - fun `break`() { `break`() } + var implements: Int = 0 fun test() { - testNotRenamed("break", { `break`() }) + testNotRenamed("implements", { implements }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumValExport.kt b/js/js.translator/testData/reservedWords/cases/enumVarThrow.kt similarity index 75% rename from js/js.translator/testData/reservedWords/cases/enumValExport.kt rename to js/js.translator/testData/reservedWords/cases/enumVarThrow.kt index 9fb662683f4..f7eee0afda7 100644 --- a/js/js.translator/testData/reservedWords/cases/enumValExport.kt +++ b/js/js.translator/testData/reservedWords/cases/enumVarThrow.kt @@ -4,10 +4,10 @@ package foo enum class Foo { BAR; - val export: Int = 0 + var `throw`: Int = 0 fun test() { - testNotRenamed("export", { export }) + testNotRenamed("throw", { `throw` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumValTrue.kt b/js/js.translator/testData/reservedWords/cases/enumVarTrue.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/enumValTrue.kt rename to js/js.translator/testData/reservedWords/cases/enumVarTrue.kt index ba1e455668c..c227d249402 100644 --- a/js/js.translator/testData/reservedWords/cases/enumValTrue.kt +++ b/js/js.translator/testData/reservedWords/cases/enumVarTrue.kt @@ -4,7 +4,7 @@ package foo enum class Foo { BAR; - val `true`: Int = 0 + var `true`: Int = 0 fun test() { testNotRenamed("true", { `true` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassVarSuper.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunAwait.kt similarity index 74% rename from js/js.translator/testData/reservedWords/cases/insideClassVarSuper.kt rename to js/js.translator/testData/reservedWords/cases/insideClassFunAwait.kt index 0451fb3812c..569f0d44ec4 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassVarSuper.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassFunAwait.kt @@ -3,10 +3,10 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - var `super`: Int = 0 + fun await() { await() } fun test() { - testNotRenamed("super", { `super` }) + testNotRenamed("await", { await() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunParamAwait.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunParamCatch.kt similarity index 70% rename from js/js.translator/testData/reservedWords/cases/insideClassFunParamAwait.kt rename to js/js.translator/testData/reservedWords/cases/insideClassFunParamCatch.kt index e644e041a8c..5cb8d43853d 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassFunParamAwait.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassFunParamCatch.kt @@ -3,9 +3,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - fun foo(await: String) { - assertEquals("123", await) - testRenamed("await", { await }) + fun foo(catch: String) { + assertEquals("123", catch) + testRenamed("catch", { catch }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunParamTry.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunParamThrow.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/insideClassFunParamTry.kt rename to js/js.translator/testData/reservedWords/cases/insideClassFunParamThrow.kt index 271b38dc759..88d42bff863 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassFunParamTry.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassFunParamThrow.kt @@ -3,9 +3,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - fun foo(`try`: String) { - assertEquals("123", `try`) - testRenamed("try", { `try` }) + fun foo(`throw`: String) { + assertEquals("123", `throw`) + testRenamed("throw", { `throw` }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunThrow.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunSuper.kt similarity index 72% rename from js/js.translator/testData/reservedWords/cases/insideClassFunThrow.kt rename to js/js.translator/testData/reservedWords/cases/insideClassFunSuper.kt index 47ffa232244..5479c11d0c6 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassFunThrow.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassFunSuper.kt @@ -3,10 +3,10 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - fun `throw`() { `throw`() } + fun `super`() { `super`() } fun test() { - testNotRenamed("throw", { `throw`() }) + testNotRenamed("super", { `super`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassLabelWhile.kt b/js/js.translator/testData/reservedWords/cases/insideClassLabelDebugger.kt similarity index 78% rename from js/js.translator/testData/reservedWords/cases/insideClassLabelWhile.kt rename to js/js.translator/testData/reservedWords/cases/insideClassLabelDebugger.kt index 81eb94149c4..a24ea8d8cbc 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassLabelWhile.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassLabelDebugger.kt @@ -6,7 +6,7 @@ class TestClass { val t: Int = 0 fun test() { - testRenamed("while", { `while`@ while (false) {} }) + testRenamed("debugger", { debugger@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassLabelCatch.kt b/js/js.translator/testData/reservedWords/cases/insideClassLabelTry.kt similarity index 80% rename from js/js.translator/testData/reservedWords/cases/insideClassLabelCatch.kt rename to js/js.translator/testData/reservedWords/cases/insideClassLabelTry.kt index 11124b5ff40..07c9b54391a 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassLabelCatch.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassLabelTry.kt @@ -6,7 +6,7 @@ class TestClass { val t: Int = 0 fun test() { - testRenamed("catch", { catch@ while (false) {} }) + testRenamed("try", { `try`@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFalse.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunContinue.kt similarity index 71% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunFalse.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunContinue.kt index d7f4947492f..1e62cea6422 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFalse.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunContinue.kt @@ -4,10 +4,10 @@ package foo class TestClass { companion object { - fun `false`() { `false`() } + fun `continue`() { `continue`() } fun test() { - testNotRenamed("false", { `false`() }) + testNotRenamed("continue", { `continue`() }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunDo.kt similarity index 76% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunDo.kt index 0a39eca32e2..8af680af5ef 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunDo.kt @@ -4,10 +4,10 @@ package foo class TestClass { companion object { - fun eval() { eval() } + fun `do`() { `do`() } fun test() { - testNotRenamed("eval", { eval() }) + testNotRenamed("do", { `do`() }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunElse.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunExtends.kt similarity index 73% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunElse.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunExtends.kt index c86f07627c3..b9d71e21a8d 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunElse.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunExtends.kt @@ -4,10 +4,10 @@ package foo class TestClass { companion object { - fun `else`() { `else`() } + fun extends() { extends() } fun test() { - testNotRenamed("else", { `else`() }) + testNotRenamed("extends", { extends() }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFor.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamElse.kt similarity index 72% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFor.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamElse.kt index 30ebab7d92c..95871050277 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFor.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamElse.kt @@ -4,9 +4,9 @@ package foo class TestClass { companion object { - fun foo(`for`: String) { - assertEquals("123", `for`) - testRenamed("for", { `for` }) + fun foo(`else`: String) { + assertEquals("123", `else`) + testRenamed("else", { `else` }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamIf.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFalse.kt similarity index 72% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamIf.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFalse.kt index 41e7101d0ed..eff1ae92329 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamIf.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFalse.kt @@ -4,9 +4,9 @@ package foo class TestClass { companion object { - fun foo(`if`: String) { - assertEquals("123", `if`) - testRenamed("if", { `if` }) + fun foo(`false`: String) { + assertEquals("123", `false`) + testRenamed("false", { `false` }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExtends.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFunction.kt similarity index 70% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExtends.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFunction.kt index b8a5ee9b743..6cb1a32c879 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExtends.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFunction.kt @@ -4,9 +4,9 @@ package foo class TestClass { companion object { - fun foo(extends: String) { - assertEquals("123", extends) - testRenamed("extends", { extends }) + fun foo(function: String) { + assertEquals("123", function) + testRenamed("function", { function }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFunction.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFor.kt similarity index 79% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFunction.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFor.kt index b65d91d2116..05291b6e0b4 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFunction.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFor.kt @@ -7,7 +7,7 @@ class TestClass { val t: Int = 0 fun test() { - testRenamed("function", { function@ while (false) {} }) + testRenamed("for", { `for`@ while (false) {} }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIn.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIf.kt similarity index 82% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIn.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIf.kt index e575a4b1a0a..c67c100a9c7 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIn.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIf.kt @@ -7,7 +7,7 @@ class TestClass { val t: Int = 0 fun test() { - testRenamed("in", { `in`@ while (false) {} }) + testRenamed("if", { `if`@ while (false) {} }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInterface.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImport.kt similarity index 79% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInterface.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImport.kt index 98c4501f6d3..6e4b058c1c0 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInterface.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImport.kt @@ -7,7 +7,7 @@ class TestClass { val t: Int = 0 fun test() { - testRenamed("interface", { `interface`@ while (false) {} }) + testRenamed("import", { import@ while (false) {} }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValDebugger.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectValDebugger.kt deleted file mode 100644 index 26704f44944..00000000000 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectValDebugger.kt +++ /dev/null @@ -1,19 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -class TestClass { - companion object { - val debugger: Int = 0 - - fun test() { - testNotRenamed("debugger", { debugger }) - } - } -} - -fun box(): String { - TestClass.test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarDelete.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectValDelete.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectVarDelete.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectValDelete.kt index b79c9ddcfa5..d23924c8d2e 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarDelete.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectValDelete.kt @@ -4,7 +4,7 @@ package foo class TestClass { companion object { - var delete: Int = 0 + val delete: Int = 0 fun test() { testNotRenamed("delete", { delete }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValWhile.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectValWhile.kt new file mode 100644 index 00000000000..200055781ba --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectValWhile.kt @@ -0,0 +1,19 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +class TestClass { + companion object { + val `while`: Int = 0 + + fun test() { + testNotRenamed("while", { `while` }) + } + } +} + +fun box(): String { + TestClass.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValYield.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectValYield.kt new file mode 100644 index 00000000000..eb5eed960bf --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectValYield.kt @@ -0,0 +1,19 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +class TestClass { + companion object { + val `yield`: Int = 0 + + fun test() { + testNotRenamed("yield", { `yield` }) + } + } +} + +fun box(): String { + TestClass.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValBreak.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarBreak.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectValBreak.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectVarBreak.kt index 25904dab863..1530c652230 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectValBreak.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarBreak.kt @@ -4,7 +4,7 @@ package foo class TestClass { companion object { - val `break`: Int = 0 + var `break`: Int = 0 fun test() { testNotRenamed("break", { `break` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValClass.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarClass.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectValClass.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectVarClass.kt index ddc28292a7d..d9e49b844c6 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectValClass.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarClass.kt @@ -4,7 +4,7 @@ package foo class TestClass { companion object { - val `class`: Int = 0 + var `class`: Int = 0 fun test() { testNotRenamed("class", { `class` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarContinue.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarContinue.kt deleted file mode 100644 index d26ca273793..00000000000 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarContinue.kt +++ /dev/null @@ -1,19 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -class TestClass { - companion object { - var `continue`: Int = 0 - - fun test() { - testNotRenamed("continue", { `continue` }) - } - } -} - -fun box(): String { - TestClass.test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarDo.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarEval.kt similarity index 77% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectVarDo.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectVarEval.kt index 3d01251db14..68b8dc96059 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarDo.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarEval.kt @@ -4,10 +4,10 @@ package foo class TestClass { companion object { - var `do`: Int = 0 + var eval: Int = 0 fun test() { - testNotRenamed("do", { `do` }) + testNotRenamed("eval", { eval }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassVarInfinity.kt b/js/js.translator/testData/reservedWords/cases/insideClassValInfinity.kt similarity index 90% rename from js/js.translator/testData/reservedWords/cases/insideClassVarInfinity.kt rename to js/js.translator/testData/reservedWords/cases/insideClassValInfinity.kt index 312fbdce8df..690f9fd51f3 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassVarInfinity.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassValInfinity.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - var Infinity: Int = 0 + val Infinity: Int = 0 fun test() { testNotRenamed("Infinity", { Infinity }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassValInterface.kt b/js/js.translator/testData/reservedWords/cases/insideClassValInterface.kt new file mode 100644 index 00000000000..10ff41bc4e3 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/insideClassValInterface.kt @@ -0,0 +1,17 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +class TestClass { + val `interface`: Int = 0 + + fun test() { + testNotRenamed("interface", { `interface` }) + } +} + +fun box(): String { + TestClass().test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassValYield.kt b/js/js.translator/testData/reservedWords/cases/insideClassValYield.kt deleted file mode 100644 index 0b071cd9d58..00000000000 --- a/js/js.translator/testData/reservedWords/cases/insideClassValYield.kt +++ /dev/null @@ -1,17 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -class TestClass { - val yield: Int = 0 - - fun test() { - testNotRenamed("yield", { yield }) - } -} - -fun box(): String { - TestClass().test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunNaN.kt b/js/js.translator/testData/reservedWords/cases/insideClassVarNaN.kt similarity index 76% rename from js/js.translator/testData/reservedWords/cases/insideClassFunNaN.kt rename to js/js.translator/testData/reservedWords/cases/insideClassVarNaN.kt index c7fdaf170e6..70d69f10b74 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassFunNaN.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassVarNaN.kt @@ -3,10 +3,10 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - fun NaN() { NaN() } + var NaN: Int = 0 fun test() { - testNotRenamed("NaN", { NaN() }) + testNotRenamed("NaN", { NaN }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassValPackage.kt b/js/js.translator/testData/reservedWords/cases/insideClassVarPackage.kt similarity index 90% rename from js/js.translator/testData/reservedWords/cases/insideClassValPackage.kt rename to js/js.translator/testData/reservedWords/cases/insideClassVarPackage.kt index 56318627ba4..8fc56bc984b 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassValPackage.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassVarPackage.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - val `package`: Int = 0 + var `package`: Int = 0 fun test() { testNotRenamed("package", { `package` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamTry.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamSwitch.kt similarity index 70% rename from js/js.translator/testData/reservedWords/cases/insideObjectFunParamTry.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectFunParamSwitch.kt index 9cdc8cb8f9c..9d99ce4a578 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamTry.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamSwitch.kt @@ -3,9 +3,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - fun foo(`try`: String) { - assertEquals("123", `try`) - testRenamed("try", { `try` }) + fun foo(switch: String) { + assertEquals("123", switch) + testRenamed("switch", { switch }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamTrue.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamThis.kt similarity index 70% rename from js/js.translator/testData/reservedWords/cases/insideObjectFunParamTrue.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectFunParamThis.kt index d7ef7d8b8a1..0b3dbd2ab79 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamTrue.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamThis.kt @@ -3,9 +3,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - fun foo(`true`: String) { - assertEquals("123", `true`) - testRenamed("true", { `true` }) + fun foo(`this`: String) { + assertEquals("123", `this`) + testRenamed("this", { `this` }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamPublic.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamThrow.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/insideObjectFunParamPublic.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectFunParamThrow.kt index 77de44b5d35..889a9be641b 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamPublic.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamThrow.kt @@ -3,9 +3,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - fun foo(public: String) { - assertEquals("123", public) - testRenamed("public", { public }) + fun foo(`throw`: String) { + assertEquals("123", `throw`) + testRenamed("throw", { `throw` }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunThis.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunPublic.kt similarity index 73% rename from js/js.translator/testData/reservedWords/cases/insideObjectFunThis.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectFunPublic.kt index 7186f802307..e67db8bc791 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunThis.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunPublic.kt @@ -3,10 +3,10 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - fun `this`() { `this`() } + fun public() { public() } fun test() { - testNotRenamed("this", { `this`() }) + testNotRenamed("public", { public() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunReturn.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunReturn.kt new file mode 100644 index 00000000000..9c8cc674dd4 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunReturn.kt @@ -0,0 +1,17 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +object TestObject { + fun `return`() { `return`() } + + fun test() { + testNotRenamed("return", { `return`() }) + } +} + +fun box(): String { + TestObject.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunThrow.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunSuper.kt similarity index 73% rename from js/js.translator/testData/reservedWords/cases/insideObjectFunThrow.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectFunSuper.kt index 7c2b40d88ce..d42af11e255 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunThrow.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunSuper.kt @@ -3,10 +3,10 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - fun `throw`() { `throw`() } + fun `super`() { `super`() } fun test() { - testNotRenamed("throw", { `throw`() }) + testNotRenamed("super", { `super`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectLabelWhile.kt b/js/js.translator/testData/reservedWords/cases/insideObjectLabelTrue.kt similarity index 79% rename from js/js.translator/testData/reservedWords/cases/insideObjectLabelWhile.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectLabelTrue.kt index f9012dbab14..45e5debe7e2 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectLabelWhile.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectLabelTrue.kt @@ -6,7 +6,7 @@ object TestObject { val t: Int = 0 fun test() { - testRenamed("while", { `while`@ while (false) {} }) + testRenamed("true", { `true`@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectLabelVar.kt b/js/js.translator/testData/reservedWords/cases/insideObjectLabelTry.kt similarity index 80% rename from js/js.translator/testData/reservedWords/cases/insideObjectLabelVar.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectLabelTry.kt index be6a3dbebde..dac122e3026 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectLabelVar.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectLabelTry.kt @@ -6,7 +6,7 @@ object TestObject { val t: Int = 0 fun test() { - testRenamed("var", { `var`@ while (false) {} }) + testRenamed("try", { `try`@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectLabelSwitch.kt b/js/js.translator/testData/reservedWords/cases/insideObjectLabelUndefined.kt similarity index 77% rename from js/js.translator/testData/reservedWords/cases/insideObjectLabelSwitch.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectLabelUndefined.kt index 23f7ebed563..690bb4e2eb7 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectLabelSwitch.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectLabelUndefined.kt @@ -6,7 +6,7 @@ object TestObject { val t: Int = 0 fun test() { - testRenamed("switch", { switch@ while (false) {} }) + testRenamed("undefined", { undefined@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectValImport.kt b/js/js.translator/testData/reservedWords/cases/insideObjectValIn.kt similarity index 75% rename from js/js.translator/testData/reservedWords/cases/insideObjectValImport.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectValIn.kt index 9eedca715ba..81d35823d23 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectValImport.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectValIn.kt @@ -3,10 +3,10 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - val import: Int = 0 + val `in`: Int = 0 fun test() { - testNotRenamed("import", { import }) + testNotRenamed("in", { `in` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunPrivate.kt b/js/js.translator/testData/reservedWords/cases/insideObjectValInterface.kt similarity index 72% rename from js/js.translator/testData/reservedWords/cases/insideObjectFunPrivate.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectValInterface.kt index 31ccf9ca5f9..9e4b5452df4 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunPrivate.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectValInterface.kt @@ -3,10 +3,10 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - fun private() { private() } + val `interface`: Int = 0 fun test() { - testNotRenamed("private", { private() }) + testNotRenamed("interface", { `interface` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectVarLet.kt b/js/js.translator/testData/reservedWords/cases/insideObjectValLet.kt similarity index 92% rename from js/js.translator/testData/reservedWords/cases/insideObjectVarLet.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectValLet.kt index 237ad15e38f..bf7f5aab8ee 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectVarLet.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectValLet.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - var let: Int = 0 + val let: Int = 0 fun test() { testNotRenamed("let", { let }) diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectValNull.kt b/js/js.translator/testData/reservedWords/cases/insideObjectVarNull.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/insideObjectValNull.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectVarNull.kt index 6e43c94ad72..f1bcb915f36 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectValNull.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectVarNull.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - val `null`: Int = 0 + var `null`: Int = 0 fun test() { testNotRenamed("null", { `null` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectValPackage.kt b/js/js.translator/testData/reservedWords/cases/insideObjectVarPackage.kt similarity index 90% rename from js/js.translator/testData/reservedWords/cases/insideObjectValPackage.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectVarPackage.kt index a4e740ec302..fc7f5bd6076 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectValPackage.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectVarPackage.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - val `package`: Int = 0 + var `package`: Int = 0 fun test() { testNotRenamed("package", { `package` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectVarSuper.kt b/js/js.translator/testData/reservedWords/cases/insideObjectVarPrivate.kt similarity index 74% rename from js/js.translator/testData/reservedWords/cases/insideObjectVarSuper.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectVarPrivate.kt index 4400b7f3fbc..75e063e2bd6 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectVarSuper.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectVarPrivate.kt @@ -3,10 +3,10 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - var `super`: Int = 0 + var private: Int = 0 fun test() { - testNotRenamed("super", { `super` }) + testNotRenamed("private", { private }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectVarReturn.kt b/js/js.translator/testData/reservedWords/cases/insideObjectVarReturn.kt deleted file mode 100644 index c285df4a898..00000000000 --- a/js/js.translator/testData/reservedWords/cases/insideObjectVarReturn.kt +++ /dev/null @@ -1,17 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -object TestObject { - var `return`: Int = 0 - - fun test() { - testNotRenamed("return", { `return` }) - } -} - -fun box(): String { - TestObject.test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/localCatchInterface.kt b/js/js.translator/testData/reservedWords/cases/localCatchIf.kt similarity index 70% rename from js/js.translator/testData/reservedWords/cases/localCatchInterface.kt rename to js/js.translator/testData/reservedWords/cases/localCatchIf.kt index a4ac27635d5..5c276229950 100644 --- a/js/js.translator/testData/reservedWords/cases/localCatchInterface.kt +++ b/js/js.translator/testData/reservedWords/cases/localCatchIf.kt @@ -9,8 +9,8 @@ fun box(): String { try { throw Exception() } - catch(`interface`: Exception) { - testRenamed("interface", { `interface` }) + catch(`if`: Exception) { + testRenamed("if", { `if` }) } return "OK" diff --git a/js/js.translator/testData/reservedWords/cases/localFunDo.kt b/js/js.translator/testData/reservedWords/cases/localFunClass.kt similarity index 66% rename from js/js.translator/testData/reservedWords/cases/localFunDo.kt rename to js/js.translator/testData/reservedWords/cases/localFunClass.kt index a326990d127..66eb91b88e1 100644 --- a/js/js.translator/testData/reservedWords/cases/localFunDo.kt +++ b/js/js.translator/testData/reservedWords/cases/localFunClass.kt @@ -3,9 +3,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! fun box(): String { - fun `do`() { `do`() } + fun `class`() { `class`() } - testRenamed("do", { `do`() }) + testRenamed("class", { `class`() }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/localFunParamFalse.kt b/js/js.translator/testData/reservedWords/cases/localFunParamDo.kt similarity index 61% rename from js/js.translator/testData/reservedWords/cases/localFunParamFalse.kt rename to js/js.translator/testData/reservedWords/cases/localFunParamDo.kt index b837093fb84..6103b5d6777 100644 --- a/js/js.translator/testData/reservedWords/cases/localFunParamFalse.kt +++ b/js/js.translator/testData/reservedWords/cases/localFunParamDo.kt @@ -3,9 +3,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! fun box(): String { - fun foo(`false`: String) { - assertEquals("123", `false`) - testRenamed("false", { `false` }) + fun foo(`do`: String) { + assertEquals("123", `do`) + testRenamed("do", { `do` }) } foo("123") diff --git a/js/js.translator/testData/reservedWords/cases/localLabelIf.kt b/js/js.translator/testData/reservedWords/cases/localLabelFalse.kt similarity index 74% rename from js/js.translator/testData/reservedWords/cases/localLabelIf.kt rename to js/js.translator/testData/reservedWords/cases/localLabelFalse.kt index 4f19cbaac5a..75c2826317e 100644 --- a/js/js.translator/testData/reservedWords/cases/localLabelIf.kt +++ b/js/js.translator/testData/reservedWords/cases/localLabelFalse.kt @@ -5,7 +5,7 @@ package foo fun box(): String { val t: Int = 0 - testRenamed("if", { `if`@ while (false) {} }) + testRenamed("false", { `false`@ while (false) {} }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/localVarClass.kt b/js/js.translator/testData/reservedWords/cases/localVarYield.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/localVarClass.kt rename to js/js.translator/testData/reservedWords/cases/localVarYield.kt index 0ba037904d0..325d12f88ad 100644 --- a/js/js.translator/testData/reservedWords/cases/localVarClass.kt +++ b/js/js.translator/testData/reservedWords/cases/localVarYield.kt @@ -3,9 +3,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! fun box(): String { - var `class`: Int = 0 + var `yield`: Int = 0 - testRenamed("class", { `class` }) + testRenamed("yield", { `yield` }) return "OK" } \ No newline at end of file