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 260b7ec5d8e..d8f1bdec4c9 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/30/15 6:43 PM */ +/* The following code was generated by JFlex 1.4.3 on 12/9/15 7:45 PM */ package org.jetbrains.kotlin.kdoc.lexer; @@ -6,15 +6,14 @@ import com.intellij.lexer.FlexLexer; import com.intellij.psi.TokenType; import com.intellij.psi.tree.IElementType; import com.intellij.util.text.CharArrayUtil; -import java.lang.Character; import org.jetbrains.kotlin.kdoc.parser.KDocKnownTag; /** * This class is a scanner generated by * JFlex 1.4.3 - * 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 + * on 12/9/15 7:45 PM from the specification file + * /home/user/projects/kotlin/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDoc.flex */ class _KDocLexer implements FlexLexer { /** initial size of the lookahead buffer */ diff --git a/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex b/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex index d3b3c8513b6..cba8e760814 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex +++ b/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex @@ -247,6 +247,7 @@ LONG_TEMPLATE_ENTRY_START=\$\{ "false" { return KtTokens.FALSE_KEYWORD ;} "super" { return KtTokens.SUPER_KEYWORD ;} "yield" { return KtTokens.YIELD_KEYWORD ;} +"typeof" { return KtTokens.TYPEOF_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 fd78bd4f6aa..c3d9ed91c81 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java @@ -79,6 +79,7 @@ public interface KtTokens { // Reserved for future use: KtKeywordToken YIELD_KEYWORD = KtKeywordToken.keyword("yield"); + KtKeywordToken TYPEOF_KEYWORD = KtKeywordToken.keyword("typeof"); KtToken AS_SAFE = KtKeywordToken.keyword("AS_SAFE");//new KtToken("as?"); @@ -192,7 +193,8 @@ public interface KtTokens { 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, - YIELD_KEYWORD + YIELD_KEYWORD, + TYPEOF_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 4215f328fb5..456022afde9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/lexer/_JetLexer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/lexer/_JetLexer.java @@ -1,21 +1,18 @@ -/* The following code was generated by JFlex 1.4.3 on 11/30/15 6:43 PM */ +/* The following code was generated by JFlex 1.4.3 on 12/9/15 7:45 PM */ package org.jetbrains.kotlin.lexer; -import java.util.*; -import com.intellij.lexer.*; -import com.intellij.psi.*; +import com.intellij.lexer.FlexLexer; +import com.intellij.psi.TokenType; import com.intellij.psi.tree.IElementType; import com.intellij.util.containers.Stack; -import org.jetbrains.kotlin.lexer.KotlinLexerException; -import org.jetbrains.kotlin.lexer.KtTokens; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 11/30/15 6:43 PM from the specification file - * /Users/abreslav/work/kotlin/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex + * on 12/9/15 7:45 PM from the specification file + * /home/user/projects/kotlin/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex */ class _JetLexer implements FlexLexer { /** initial size of the lookahead buffer */ @@ -159,12 +156,13 @@ class _JetLexer implements FlexLexer { "\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"; + "\1\0\1\133\1\134\3\3\1\135\1\136\2\3\1\137"+ + "\1\140\2\3\1\141\1\142\1\0\1\3\1\143\2\3"+ + "\1\144\1\3\1\145\2\3\1\146\3\3\1\147\1\150"+ + "\1\151"; private static int [] zzUnpackAction() { - int [] result = new int[234]; + int [] result = new int[236]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -215,13 +213,13 @@ class _JetLexer implements FlexLexer { "\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"; + "\0\u23c0\0\u0200\0\u0200\0\u2400\0\u2440\0\u0200\0\u0200\0\u2480"+ + "\0\u24c0\0\u0200\0\u0200\0\u2500\0\u2540\0\u0200\0\u2580\0\u25c0"+ + "\0\u0200\0\u2600\0\u0200\0\u2640\0\u2680\0\u0200\0\u26c0\0\u2700"+ + "\0\u2740\0\u0200\0\u0200\0\u0200"; private static int [] zzUnpackRowMap() { - int [] result = new int[234]; + int [] result = new int[236]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -431,66 +429,68 @@ class _JetLexer implements FlexLexer { "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\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\317\15\11\21\0\2\11\1\0"+ + "\4\11\2\0\3\11\1\317\5\11\1\320\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\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\6\11\1\322\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\17\11\1\323\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\3\11\1\324\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\325\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\2\11\1\326\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\327\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\330\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\331\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\332\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\333\16\11\21\0\2\334"+ + "\11\0\1\334\1\0\1\334\2\0\2\334\16\0\2\334"+ + "\3\0\2\334\3\0\1\334\2\0\1\334\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\335\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\336\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\7\11\1\337\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\340\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\341\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\342\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\343\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"+ - "\4\11\2\0\6\11\1\320\12\11\21\0\2\11\1\0"+ + "\2\11\1\344\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\6\11\1\321\12\11\21\0\2\11\1\0"+ + "\4\11\2\0\3\11\1\345\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\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\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\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"+ - "\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\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\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\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\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\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\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\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\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\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\2\0\2\11\1\346\16\11\21\0\2\11\1\0"+ + "\2\11\6\0\4\11\1\0\2\11\3\0\1\347\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\343\15\11\21\0\2\11\1\0\2\11\6\0"+ + "\3\11\1\350\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\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\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\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\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\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\352\16\11"+ - "\20\0"; + "\10\11\1\351\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\352\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\353"+ + "\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\354\16\11\20\0"; private static int [] zzUnpackTrans() { - int [] result = new int[10048]; + int [] result = new int[10112]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -539,10 +539,10 @@ class _JetLexer implements FlexLexer { "\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\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"; + "\1\1\3\11\22\1\1\11\1\0\17\1\1\0\20\1"; private static int [] zzUnpackAttribute() { - int [] result = new int[234]; + int [] result = new int[236]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; @@ -892,167 +892,167 @@ class _JetLexer implements FlexLexer { case 22: { return KtTokens.LBRACKET ; } - case 105: break; + case 106: break; case 78: { return KtTokens.FUN_KEYWORD ; } - case 106: break; + case 107: break; case 48: { return KtTokens.IN_KEYWORD ; } - case 107: break; + case 108: break; case 58: { return KtTokens.GTEQ ; } - case 108: break; + case 109: break; case 87: { return KtTokens.TRUE_KEYWORD ; } - case 109: break; + case 110: break; case 13: { return KtTokens.RBRACE ; } - case 110: break; + case 111: break; case 10: { return KtTokens.CHARACTER_LITERAL; } - case 111: break; + case 112: break; case 7: { return KtTokens.EXCL ; } - case 112: break; + case 113: break; case 80: { return KtTokens.VAL_KEYWORD ; } - case 113: break; + case 114: break; case 42: { return KtTokens.EXCLEQ ; } - case 114: break; + case 115: break; case 45: { return KtTokens.MINUSEQ ; } - case 115: break; + case 116: break; case 36: { return KtTokens.FLOAT_LITERAL; } - case 116: break; + case 117: break; case 51: { return KtTokens.AS_KEYWORD ; } - case 117: break; + case 118: break; case 90: { return KtTokens.WHEN_KEYWORD ; } - case 118: break; + case 119: break; case 16: { return KtTokens.QUEST ; } - case 119: break; + case 120: break; case 95: { return KtTokens.FALSE_KEYWORD ; } - case 120: break; + case 121: break; case 34: { lBraceCount++; return KtTokens.LBRACE; } - case 121: break; + case 122: break; case 44: { return KtTokens.MINUSMINUS; } - case 122: break; + case 123: break; case 66: { return KtTokens.ESCAPE_SEQUENCE; } - case 123: break; + case 124: break; case 5: { return KtTokens.DIV ; } - case 124: break; + case 125: break; case 79: { return KtTokens.FOR_KEYWORD ; } - case 125: break; + case 126: break; case 30: { popState(); yypushback(1); return KtTokens.DANGLING_NEWLINE; } - case 126: break; + case 127: break; case 52: { return KtTokens.DO_KEYWORD ; } - case 127: break; - case 102: + case 128: break; + case 103: { return KtTokens.CONTINUE_KEYWORD ; } - case 128: break; - case 104: + case 129: break; + case 105: { return KtTokens.INTERFACE_KEYWORD ; } - case 129: break; + case 130: break; case 75: { pushState(RAW_STRING); return KtTokens.OPEN_QUOTE; } - case 130: break; + case 131: break; case 4: { return KtTokens.WHITE_SPACE; } - case 131: break; + case 132: break; case 97: { return KtTokens.BREAK_KEYWORD ; } - case 132: break; + case 133: break; case 85: { yypushback(3); return KtTokens.EXCL; } - case 133: break; + case 134: break; case 60: { return KtTokens.OROR ; } - case 134: break; + case 135: break; case 20: { return KtTokens.PERC ; } - case 135: break; + case 136: break; case 73: { return KtTokens.EXCLEQEQEQ; } - case 136: break; + case 137: break; case 61: { return KtTokens.PERCEQ ; } - case 137: break; + case 138: break; case 43: { return KtTokens.RANGE ; } - case 138: break; + case 139: break; case 54: { return KtTokens.DOUBLE_ARROW; } - case 139: break; + case 140: break; case 38: { return KtTokens.EOL_COMMENT; } - case 140: break; + case 141: break; case 31: { popState(); return KtTokens.CLOSING_QUOTE; } - case 141: break; + case 142: break; case 14: { return KtTokens.MUL ; } - case 142: break; + case 143: break; case 23: { return KtTokens.RBRACKET ; } - case 143: break; + case 144: break; case 56: { return KtTokens.PLUSPLUS ; } - case 144: break; - case 100: + case 145: break; + case 101: { return KtTokens.OBJECT_KEYWORD ; } - case 145: break; + case 146: break; case 68: { if (commentDepth > 0) { commentDepth--; @@ -1064,97 +1064,101 @@ class _JetLexer implements FlexLexer { return commentStateToTokenType(state); } } - case 146: break; + case 147: break; case 8: { return KtTokens.DOT ; } - case 147: break; + case 148: break; case 26: { return KtTokens.SEMICOLON ; } - case 148: break; + case 149: break; case 94: { return KtTokens.YIELD_KEYWORD ; } - case 149: break; + case 150: break; case 69: { yypushback(2); return KtTokens.INTEGER_LITERAL; } - case 150: break; + case 151: break; case 32: { popState(); return KtTokens.IDENTIFIER; } - case 151: break; + case 152: break; case 81: { return KtTokens.VAR_KEYWORD ; } - case 152: break; - case 103: + case 153: break; + case 104: { return KtTokens.TYPE_ALIAS_KEYWORD ; } - case 153: break; - case 99: + case 154: break; + case 100: { return KtTokens.RETURN_KEYWORD ; } - case 154: break; + case 155: break; case 37: { return KtTokens.FIELD_IDENTIFIER; } - case 155: break; + case 156: break; case 15: { return KtTokens.EQ ; } - case 156: break; + case 157: break; case 28: { return KtTokens.AT ; } - case 157: break; + case 158: break; case 76: { return KtTokens.TRY_KEYWORD ; } - case 158: break; + case 159: break; case 24: { return KtTokens.LPAR ; } - case 159: break; + case 160: break; case 9: { return KtTokens.MINUS ; } - case 160: break; + case 161: break; case 70: { pushState(DOC_COMMENT); commentDepth = 0; commentStart = getTokenStart(); } - case 161: break; + case 162: break; case 86: { return KtTokens.THIS_KEYWORD ; } - case 162: break; + case 163: break; case 1: { return TokenType.BAD_CHARACTER; } - case 163: break; + case 164: break; case 98: { return KtTokens.WHILE_KEYWORD ; } - case 164: break; + case 165: break; + case 99: + { return KtTokens.TYPEOF_KEYWORD ; + } + case 166: break; case 40: { return KtTokens.DIVEQ ; } - case 165: break; + case 167: break; case 96: { return KtTokens.CLASS_KEYWORD ; } - case 166: break; + case 168: break; case 53: { return KtTokens.EQEQ ; } - case 167: break; + case 169: break; case 82: { return KtTokens.EQEQEQ ; } - case 168: break; + case 170: break; case 83: { int length = yytext().length(); if (length <= 3) { // closing """ @@ -1166,121 +1170,121 @@ class _JetLexer implements FlexLexer { return KtTokens.REGULAR_STRING_PART; } } - case 169: break; + case 171: break; case 50: { return KtTokens.MULTEQ ; } - case 170: break; + case 172: break; case 65: { pushState(LONG_TEMPLATE_ENTRY); return KtTokens.LONG_TEMPLATE_ENTRY_START; } - case 171: break; + case 173: break; case 12: { return KtTokens.LBRACE ; } - case 172: break; + case 174: break; case 39: { pushState(BLOCK_COMMENT); commentDepth = 0; commentStart = getTokenStart(); } - case 173: break; + case 175: break; case 92: { return KtTokens.THROW_KEYWORD ; } - case 174: break; + case 176: break; case 93: { return KtTokens.SUPER_KEYWORD ; } - case 175: break; + case 177: break; case 62: { return KtTokens.COLONCOLON; } - case 176: break; + case 178: break; case 72: { return KtTokens.NOT_IN; } - case 177: break; + case 179: break; case 63: { return KtTokens.DOUBLE_SEMICOLON; } - case 178: break; + case 180: break; case 6: { return KtTokens.HASH ; } - case 179: break; + case 181: break; case 3: { return KtTokens.IDENTIFIER; } - case 180: break; + case 182: break; case 2: { return KtTokens.INTEGER_LITERAL; } - case 181: break; + case 183: break; case 88: { return KtTokens.ELSE_KEYWORD ; } - case 182: break; + case 184: break; case 11: { pushState(STRING); return KtTokens.OPEN_QUOTE; } - case 183: break; - case 101: + case 185: break; + case 102: { return KtTokens.PACKAGE_KEYWORD ; } - case 184: break; + case 186: break; case 49: { return KtTokens.IF_KEYWORD ; } - case 185: break; + case 187: break; case 18: { return KtTokens.LT ; } - case 186: break; + case 188: break; case 17: { return KtTokens.PLUS ; } - case 187: break; + case 189: break; case 55: { return KtTokens.PLUSEQ ; } - case 188: break; + case 190: break; case 74: { return KtTokens.RESERVED ; } - case 189: break; + case 191: break; case 67: { commentDepth++; } - case 190: break; + case 192: break; case 27: { return KtTokens.COMMA ; } - case 191: break; + case 193: break; case 19: { return KtTokens.GT ; } - case 192: break; + case 194: break; case 77: { return KtTokens.AS_SAFE; } - case 193: break; + case 195: break; case 25: { return KtTokens.RPAR ; } - case 194: break; + case 196: break; case 71: { return KtTokens.NOT_IS; } - case 195: break; + case 197: break; case 89: { return KtTokens.NULL_KEYWORD ; } - case 196: break; + case 198: break; case 59: { return KtTokens.ANDAND ; } - case 197: break; + case 199: break; case 35: { if (lBraceCount == 0) { popState(); @@ -1289,11 +1293,11 @@ class _JetLexer implements FlexLexer { lBraceCount--; return KtTokens.RBRACE; } - case 198: break; + case 200: break; case 84: { return KtTokens.BLOCK_COMMENT; } - case 199: break; + case 201: break; case 41: { if (zzCurrentPos == 0) { return KtTokens.SHEBANG_COMMENT; @@ -1303,41 +1307,41 @@ class _JetLexer implements FlexLexer { return KtTokens.HASH; } } - case 200: break; + case 202: break; case 29: { return KtTokens.REGULAR_STRING_PART; } - case 201: break; + case 203: break; case 47: { return KtTokens.IS_KEYWORD ; } - case 202: break; + case 204: break; case 91: { popState(); return KtTokens.THIS_KEYWORD; } - case 203: break; + case 205: break; case 21: { return KtTokens.COLON ; } - case 204: break; + case 206: break; case 57: { return KtTokens.LTEQ ; } - case 205: break; + case 207: break; case 33: { } - case 206: break; + case 208: break; case 64: { pushState(SHORT_TEMPLATE_ENTRY); yypushback(yylength() - 1); return KtTokens.SHORT_TEMPLATE_ENTRY_START; } - case 207: break; + case 209: break; case 46: { return KtTokens.ARROW ; } - case 208: break; + case 210: break; default: if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { zzAtEOF = true; @@ -1349,14 +1353,14 @@ class _JetLexer implements FlexLexer { zzStartRead = commentStart; return commentStateToTokenType(state); } - case 235: break; + case 237: break; case DOC_COMMENT: { int state = yystate(); popState(); zzStartRead = commentStart; return commentStateToTokenType(state); } - case 236: break; + case 238: break; default: return null; } diff --git a/compiler/testData/psi/Reserved.kt b/compiler/testData/psi/Reserved.kt index 02f0d10671e..7e053ba9d1d 100644 --- a/compiler/testData/psi/Reserved.kt +++ b/compiler/testData/psi/Reserved.kt @@ -1,5 +1,7 @@ fun yield() {} +fun typeof() {} fun test() { yield + typeof } \ No newline at end of file diff --git a/compiler/testData/psi/Reserved.txt b/compiler/testData/psi/Reserved.txt index 82c2c5fe64c..0da3830f9c6 100644 --- a/compiler/testData/psi/Reserved.txt +++ b/compiler/testData/psi/Reserved.txt @@ -15,6 +15,19 @@ JetFile: Reserved.kt BLOCK PsiElement(LBRACE)('{') PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + FUN + PsiElement(fun)('fun') + PsiWhiteSpace(' ') + PsiErrorElement:Expecting function name or receiver type + PsiElement(typeof)('typeof') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + BLOCK + PsiElement(LBRACE)('{') + PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') FUN PsiElement(fun)('fun') @@ -29,5 +42,8 @@ JetFile: Reserved.kt PsiWhiteSpace('\n ') PsiErrorElement:Expecting an element PsiElement(yield)('yield') + PsiWhiteSpace('\n ') + PsiErrorElement:Expecting an element + PsiElement(typeof)('typeof') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java index 0ff6e133b73..44c78ffb177 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java @@ -52,6 +52,7 @@ public class KeywordStringsGenerated { "do", "when", "interface", - "yield" + "yield", + "typeof" )); } diff --git a/j2k/testData/fileOrElement/identifier/keywords.java b/j2k/testData/fileOrElement/identifier/keywords.java index 735b57e6230..9e01416b650 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, yield; \ No newline at end of file +int as, type, val, var, fun, is, in, object, when, yield, typeof; \ No newline at end of file diff --git a/j2k/testData/fileOrElement/identifier/keywords.kt b/j2k/testData/fileOrElement/identifier/keywords.kt index df61385ba3b..80a9944ff9d 100644 --- a/j2k/testData/fileOrElement/identifier/keywords.kt +++ b/j2k/testData/fileOrElement/identifier/keywords.kt @@ -7,4 +7,5 @@ val `is`: Int val `in`: Int val `object`: Int val `when`: Int -val `yield`: Int \ No newline at end of file +val `yield`: Int +val `typeof`: Int \ No newline at end of file diff --git a/j2k/testData/fileOrElement/importStatement/importWithKeywords.java b/j2k/testData/fileOrElement/importStatement/importWithKeywords.java index 35a346fab6b..0cd3ea22260 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.yield; +import as.type.val.var.fun.is.in.object.when.yield.typeof; 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 e65a09dfe8d..f9e673f1d4f 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`.`yield` +import `as`.type.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`yield`.`typeof` internal class Test \ No newline at end of file diff --git a/js/js.libraries/src/core/core.kt b/js/js.libraries/src/core/core.kt index 8c94415b3e8..0e642607563 100644 --- a/js/js.libraries/src/core/core.kt +++ b/js/js.libraries/src/core/core.kt @@ -9,9 +9,6 @@ public val noImpl: Nothing @native public fun eval(expr: String): dynamic = noImpl -@native -public fun typeof(a: Any?): String = noImpl - @native public val undefined: Nothing? = noImpl @@ -34,3 +31,8 @@ public fun safeParseDouble(s : String) : Double? = noImpl @native public fun js(code: String): dynamic = noImpl + +/** + * Function corresponding to JavaScript's `typeof` operator + */ +public inline fun jsTypeOf(a: Any?): String = js("typeof a") 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 2dd9d774749..8ef869e8de2 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,321 +35,315 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/reservedWords/cases"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("dataClassValVar.kt") - public void testDataClassValVar() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValVar.kt"); + @TestMetadata("dataClassValInfinity.kt") + public void testDataClassValInfinity() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValInfinity.kt"); doTest(fileName); } - @TestMetadata("dataClassValVoid.kt") - public void testDataClassValVoid() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValVoid.kt"); + @TestMetadata("dataClassValKotlin.kt") + public void testDataClassValKotlin() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValKotlin.kt"); doTest(fileName); } - @TestMetadata("dataClassValWhile.kt") - public void testDataClassValWhile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValWhile.kt"); + @TestMetadata("dataClassValTrue.kt") + public void testDataClassValTrue() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValTrue.kt"); doTest(fileName); } - @TestMetadata("dataClassValWith.kt") - public void testDataClassValWith() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValWith.kt"); + @TestMetadata("dataClassValTry.kt") + public void testDataClassValTry() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValTry.kt"); doTest(fileName); } - @TestMetadata("dataClassVarBreak.kt") - public void testDataClassVarBreak() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarBreak.kt"); + @TestMetadata("dataClassVarArguments.kt") + public void testDataClassVarArguments() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarArguments.kt"); doTest(fileName); } - @TestMetadata("dataClassVarInfinity.kt") - public void testDataClassVarInfinity() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarInfinity.kt"); + @TestMetadata("dataClassVarNaN.kt") + public void testDataClassVarNaN() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarNaN.kt"); doTest(fileName); } - @TestMetadata("dataClassVarKotlin.kt") - public void testDataClassVarKotlin() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarKotlin.kt"); + @TestMetadata("dataClassVarTypeof.kt") + public void testDataClassVarTypeof() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarTypeof.kt"); doTest(fileName); } - @TestMetadata("dataClassVarYield.kt") - public void testDataClassVarYield() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarYield.kt"); + @TestMetadata("dataClassVarVar.kt") + public void testDataClassVarVar() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarVar.kt"); doTest(fileName); } - @TestMetadata("delegatedFunDebugger.kt") - public void testDelegatedFunDebugger() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunDebugger.kt"); + @TestMetadata("delegatedFunDelete.kt") + public void testDelegatedFunDelete() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunDelete.kt"); doTest(fileName); } - @TestMetadata("delegatedFunDefault.kt") - public void testDelegatedFunDefault() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunDefault.kt"); + @TestMetadata("delegatedFunElse.kt") + public void testDelegatedFunElse() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunElse.kt"); doTest(fileName); } - @TestMetadata("delegatedFunIf.kt") - public void testDelegatedFunIf() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunIf.kt"); + @TestMetadata("delegatedFunEnum.kt") + public void testDelegatedFunEnum() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunEnum.kt"); doTest(fileName); } - @TestMetadata("delegatedFunIn.kt") - public void testDelegatedFunIn() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunIn.kt"); + @TestMetadata("delegatedFunFalse.kt") + public void testDelegatedFunFalse() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunFalse.kt"); doTest(fileName); } - @TestMetadata("delegatedFunParamDelete.kt") - public void testDelegatedFunParamDelete() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamDelete.kt"); + @TestMetadata("delegatedFunParamEval.kt") + public void testDelegatedFunParamEval() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamEval.kt"); doTest(fileName); } - @TestMetadata("delegatedFunParamEnum.kt") - public void testDelegatedFunParamEnum() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamEnum.kt"); + @TestMetadata("delegatedFunParamExport.kt") + public void testDelegatedFunParamExport() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamExport.kt"); doTest(fileName); } - @TestMetadata("delegatedFunParamInterface.kt") - public void testDelegatedFunParamInterface() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamInterface.kt"); + @TestMetadata("delegatedFunParamFor.kt") + public void testDelegatedFunParamFor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamFor.kt"); doTest(fileName); } - @TestMetadata("delegatedFunParamNull.kt") - public void testDelegatedFunParamNull() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamNull.kt"); + @TestMetadata("delegatedFunParamIf.kt") + public void testDelegatedFunParamIf() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamIf.kt"); doTest(fileName); } - @TestMetadata("delegatedLabelEval.kt") - public void testDelegatedLabelEval() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelEval.kt"); + @TestMetadata("delegatedLabelExtends.kt") + public void testDelegatedLabelExtends() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelExtends.kt"); doTest(fileName); } - @TestMetadata("delegatedLabelExport.kt") - public void testDelegatedLabelExport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelExport.kt"); + @TestMetadata("delegatedLabelFinally.kt") + public void testDelegatedLabelFinally() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelFinally.kt"); doTest(fileName); } - @TestMetadata("delegatedLabelPackage.kt") - public void testDelegatedLabelPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelPackage.kt"); + @TestMetadata("delegatedLabelIn.kt") + public void testDelegatedLabelIn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelIn.kt"); doTest(fileName); } - @TestMetadata("delegatedLabelReturn.kt") - public void testDelegatedLabelReturn() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelReturn.kt"); + @TestMetadata("delegatedLabelInterface.kt") + public void testDelegatedLabelInterface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelInterface.kt"); doTest(fileName); } - @TestMetadata("delegatedValAwait.kt") - public void testDelegatedValAwait() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValAwait.kt"); + @TestMetadata("delegatedValBreak.kt") + public void testDelegatedValBreak() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValBreak.kt"); doTest(fileName); } - @TestMetadata("delegatedValCase.kt") - public void testDelegatedValCase() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValCase.kt"); + @TestMetadata("delegatedValCatch.kt") + public void testDelegatedValCatch() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValCatch.kt"); doTest(fileName); } - @TestMetadata("delegatedValDo.kt") - public void testDelegatedValDo() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValDo.kt"); + @TestMetadata("delegatedValClass.kt") + public void testDelegatedValClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValClass.kt"); doTest(fileName); } - @TestMetadata("delegatedValElse.kt") - public void testDelegatedValElse() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValElse.kt"); + @TestMetadata("delegatedValConst.kt") + public void testDelegatedValConst() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValConst.kt"); doTest(fileName); } - @TestMetadata("delegatedVarCatch.kt") - public void testDelegatedVarCatch() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarCatch.kt"); + @TestMetadata("delegatedVarContinue.kt") + public void testDelegatedVarContinue() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarContinue.kt"); doTest(fileName); } - @TestMetadata("delegatedVarConst.kt") - public void testDelegatedVarConst() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarConst.kt"); + @TestMetadata("delegatedVarDebugger.kt") + public void testDelegatedVarDebugger() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarDebugger.kt"); doTest(fileName); } - @TestMetadata("delegatedVarFalse.kt") - public void testDelegatedVarFalse() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarFalse.kt"); + @TestMetadata("delegatedVarDefault.kt") + public void testDelegatedVarDefault() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarDefault.kt"); doTest(fileName); } - @TestMetadata("delegatedVarFor.kt") - public void testDelegatedVarFor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarFor.kt"); + @TestMetadata("delegatedVarDo.kt") + public void testDelegatedVarDo() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarDo.kt"); doTest(fileName); } - @TestMetadata("enumEntryContinue.kt") - public void testEnumEntryContinue() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryContinue.kt"); + @TestMetadata("enumEntrySwitch.kt") + public void testEnumEntrySwitch() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntrySwitch.kt"); doTest(fileName); } - @TestMetadata("enumEntryDo.kt") - public void testEnumEntryDo() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryDo.kt"); + @TestMetadata("enumEntryUndefined.kt") + public void testEnumEntryUndefined() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryUndefined.kt"); doTest(fileName); } - @TestMetadata("enumEntryPublic.kt") - public void testEnumEntryPublic() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryPublic.kt"); + @TestMetadata("enumEntryWhile.kt") + public void testEnumEntryWhile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryWhile.kt"); doTest(fileName); } - @TestMetadata("enumEntryStatic.kt") - public void testEnumEntryStatic() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryStatic.kt"); + @TestMetadata("enumEntryYield.kt") + public void testEnumEntryYield() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryYield.kt"); doTest(fileName); } - @TestMetadata("enumFunImport.kt") - public void testEnumFunImport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunImport.kt"); + @TestMetadata("enumFunLet.kt") + public void testEnumFunLet() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunLet.kt"); doTest(fileName); } - @TestMetadata("enumFunInstanceof.kt") - public void testEnumFunInstanceof() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt"); + @TestMetadata("enumFunNew.kt") + public void testEnumFunNew() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunNew.kt"); doTest(fileName); } - @TestMetadata("enumFunParamLet.kt") - public void testEnumFunParamLet() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt"); + @TestMetadata("enumFunParamPrivate.kt") + public void testEnumFunParamPrivate() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamPrivate.kt"); doTest(fileName); } - @TestMetadata("enumFunParamNew.kt") - public void testEnumFunParamNew() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt"); + @TestMetadata("enumFunParamProtected.kt") + public void testEnumFunParamProtected() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamProtected.kt"); doTest(fileName); } - @TestMetadata("enumFunParamWhile.kt") - public void testEnumFunParamWhile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamWhile.kt"); + @TestMetadata("enumFunParamTrue.kt") + public void testEnumFunParamTrue() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamTrue.kt"); doTest(fileName); } - @TestMetadata("enumFunParamYield.kt") - public void testEnumFunParamYield() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamYield.kt"); + @TestMetadata("enumFunParamTry.kt") + public void testEnumFunParamTry() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamTry.kt"); doTest(fileName); } - @TestMetadata("enumFunTry.kt") - public void testEnumFunTry() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunTry.kt"); + @TestMetadata("enumFunThis.kt") + public void testEnumFunThis() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunThis.kt"); doTest(fileName); } - @TestMetadata("enumFunVar.kt") - public void testEnumFunVar() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunVar.kt"); + @TestMetadata("enumFunThrow.kt") + public void testEnumFunThrow() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunThrow.kt"); doTest(fileName); } - @TestMetadata("enumLabelBreak.kt") - public void testEnumLabelBreak() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelBreak.kt"); + @TestMetadata("enumLabelPublic.kt") + public void testEnumLabelPublic() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelPublic.kt"); doTest(fileName); } - @TestMetadata("enumLabelClass.kt") - public void testEnumLabelClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelClass.kt"); + @TestMetadata("enumLabelStatic.kt") + public void testEnumLabelStatic() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelStatic.kt"); doTest(fileName); } - @TestMetadata("enumLabelPrivate.kt") - public void testEnumLabelPrivate() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt"); + @TestMetadata("enumLabelTypeof.kt") + public void testEnumLabelTypeof() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelTypeof.kt"); doTest(fileName); } - @TestMetadata("enumLabelProtected.kt") - public void testEnumLabelProtected() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt"); + @TestMetadata("enumLabelVar.kt") + public void testEnumLabelVar() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelVar.kt"); doTest(fileName); } - @TestMetadata("enumValExtends.kt") - public void testEnumValExtends() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValExtends.kt"); + @TestMetadata("enumValFunction.kt") + public void testEnumValFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValFunction.kt"); doTest(fileName); } - @TestMetadata("enumValFinally.kt") - public void testEnumValFinally() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValFinally.kt"); + @TestMetadata("enumValImplements.kt") + public void testEnumValImplements() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValImplements.kt"); doTest(fileName); } - @TestMetadata("enumValSuper.kt") - public void testEnumValSuper() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValSuper.kt"); + @TestMetadata("enumValNull.kt") + public void testEnumValNull() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValNull.kt"); doTest(fileName); } - @TestMetadata("enumValThis.kt") - public void testEnumValThis() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValThis.kt"); + @TestMetadata("enumValPackage.kt") + public void testEnumValPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValPackage.kt"); doTest(fileName); } - @TestMetadata("enumVarFunction.kt") - public void testEnumVarFunction() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarFunction.kt"); + @TestMetadata("enumVarImport.kt") + public void testEnumVarImport() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarImport.kt"); doTest(fileName); } - @TestMetadata("enumVarImplements.kt") - public void testEnumVarImplements() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarImplements.kt"); + @TestMetadata("enumVarInstanceof.kt") + public void testEnumVarInstanceof() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarInstanceof.kt"); doTest(fileName); } - @TestMetadata("enumVarThrow.kt") - public void testEnumVarThrow() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarThrow.kt"); + @TestMetadata("enumVarReturn.kt") + public void testEnumVarReturn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarReturn.kt"); doTest(fileName); } - @TestMetadata("enumVarTrue.kt") - public void testEnumVarTrue() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarTrue.kt"); - doTest(fileName); - } - - @TestMetadata("insideClassFunArguments.kt") - public void testInsideClassFunArguments() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunArguments.kt"); + @TestMetadata("enumVarSuper.kt") + public void testEnumVarSuper() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarSuper.kt"); doTest(fileName); } @@ -359,9 +353,9 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassFunParamCase.kt") - public void testInsideClassFunParamCase() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamCase.kt"); + @TestMetadata("insideClassFunCase.kt") + public void testInsideClassFunCase() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunCase.kt"); doTest(fileName); } @@ -371,15 +365,27 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } + @TestMetadata("insideClassFunParamConst.kt") + public void testInsideClassFunParamConst() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamConst.kt"); + doTest(fileName); + } + + @TestMetadata("insideClassFunParamThis.kt") + public void testInsideClassFunParamThis() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamThis.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"); + @TestMetadata("insideClassFunReturn.kt") + public void testInsideClassFunReturn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunReturn.kt"); doTest(fileName); } @@ -389,51 +395,39 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassFunThis.kt") - public void testInsideClassFunThis() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunThis.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("insideClassLabelDefault.kt") + public void testInsideClassLabelDefault() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelDefault.kt"); + doTest(fileName); + } + + @TestMetadata("insideClassLabelTrue.kt") + public void testInsideClassLabelTrue() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelTrue.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"); + @TestMetadata("insideClassObjectFunBreak.kt") + public void testInsideClassObjectFunBreak() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunBreak.kt"); doTest(fileName); } - @TestMetadata("insideClassObjectFunContinue.kt") - public void testInsideClassObjectFunContinue() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunContinue.kt"); - doTest(fileName); - } - - @TestMetadata("insideClassObjectFunDo.kt") - public void testInsideClassObjectFunDo() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunDo.kt"); - doTest(fileName); - } - - @TestMetadata("insideClassObjectFunExport.kt") - public void testInsideClassObjectFunExport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunExport.kt"); + @TestMetadata("insideClassObjectFunClass.kt") + public void testInsideClassObjectFunClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunClass.kt"); doTest(fileName); } @@ -443,21 +437,21 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassObjectFunParamElse.kt") - public void testInsideClassObjectFunParamElse() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamElse.kt"); + @TestMetadata("insideClassObjectFunFinally.kt") + public void testInsideClassObjectFunFinally() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunFinally.kt"); doTest(fileName); } - @TestMetadata("insideClassObjectFunParamFalse.kt") - public void testInsideClassObjectFunParamFalse() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFalse.kt"); + @TestMetadata("insideClassObjectFunParamContinue.kt") + public void testInsideClassObjectFunParamContinue() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamContinue.kt"); doTest(fileName); } - @TestMetadata("insideClassObjectFunParamFinally.kt") - public void testInsideClassObjectFunParamFinally() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFinally.kt"); + @TestMetadata("insideClassObjectFunParamDo.kt") + public void testInsideClassObjectFunParamDo() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamDo.kt"); doTest(fileName); } @@ -467,21 +461,21 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassObjectLabelFor.kt") - public void testInsideClassObjectLabelFor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFor.kt"); + @TestMetadata("insideClassObjectFunParamImplements.kt") + public void testInsideClassObjectFunParamImplements() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamImplements.kt"); doTest(fileName); } - @TestMetadata("insideClassObjectLabelIf.kt") - public void testInsideClassObjectLabelIf() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIf.kt"); + @TestMetadata("insideClassObjectLabelElse.kt") + public void testInsideClassObjectLabelElse() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelElse.kt"); doTest(fileName); } - @TestMetadata("insideClassObjectLabelImplements.kt") - public void testInsideClassObjectLabelImplements() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImplements.kt"); + @TestMetadata("insideClassObjectLabelFalse.kt") + public void testInsideClassObjectLabelFalse() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFalse.kt"); doTest(fileName); } @@ -491,9 +485,9 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassObjectValDefault.kt") - public void testInsideClassObjectValDefault() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValDefault.kt"); + @TestMetadata("insideClassObjectLabelInstanceof.kt") + public void testInsideClassObjectLabelInstanceof() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInstanceof.kt"); doTest(fileName); } @@ -503,33 +497,21 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideClassObjectValWhile.kt") - public void testInsideClassObjectValWhile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValWhile.kt"); + @TestMetadata("insideClassObjectValEnum.kt") + public void testInsideClassObjectValEnum() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValEnum.kt"); doTest(fileName); } - @TestMetadata("insideClassObjectValYield.kt") - public void testInsideClassObjectValYield() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValYield.kt"); + @TestMetadata("insideClassObjectValTypeof.kt") + public void testInsideClassObjectValTypeof() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValTypeof.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); - } - - @TestMetadata("insideClassObjectVarEnum.kt") - public void testInsideClassObjectVarEnum() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarEnum.kt"); + @TestMetadata("insideClassObjectValVar.kt") + public void testInsideClassObjectValVar() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValVar.kt"); doTest(fileName); } @@ -539,6 +521,30 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } + @TestMetadata("insideClassObjectVarExport.kt") + public void testInsideClassObjectVarExport() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarExport.kt"); + doTest(fileName); + } + + @TestMetadata("insideClassObjectVarWhile.kt") + public void testInsideClassObjectVarWhile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarWhile.kt"); + doTest(fileName); + } + + @TestMetadata("insideClassObjectVarYield.kt") + public void testInsideClassObjectVarYield() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarYield.kt"); + doTest(fileName); + } + + @TestMetadata("insideClassValIn.kt") + public void testInsideClassValIn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValIn.kt"); + doTest(fileName); + } + @TestMetadata("insideClassValInfinity.kt") public void testInsideClassValInfinity() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValInfinity.kt"); @@ -551,21 +557,15 @@ 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("insideClassValKotlin.kt") + public void testInsideClassValKotlin() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValKotlin.kt"); doTest(fileName); } - @TestMetadata("insideClassValWith.kt") - public void testInsideClassValWith() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValWith.kt"); - doTest(fileName); - } - - @TestMetadata("insideClassVarKotlin.kt") - public void testInsideClassVarKotlin() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarKotlin.kt"); + @TestMetadata("insideClassVarArguments.kt") + public void testInsideClassVarArguments() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarArguments.kt"); doTest(fileName); } @@ -575,21 +575,39 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } + @TestMetadata("insideClassVarNull.kt") + public void testInsideClassVarNull() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarNull.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"); + @TestMetadata("insideObjectFunNull.kt") + public void testInsideObjectFunNull() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunNull.kt"); doTest(fileName); } - @TestMetadata("insideObjectFunParamStatic.kt") - public void testInsideObjectFunParamStatic() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamStatic.kt"); + @TestMetadata("insideObjectFunPackage.kt") + public void testInsideObjectFunPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunPackage.kt"); + doTest(fileName); + } + + @TestMetadata("insideObjectFunParamReturn.kt") + public void testInsideObjectFunParamReturn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamReturn.kt"); + doTest(fileName); + } + + @TestMetadata("insideObjectFunParamSuper.kt") + public void testInsideObjectFunParamSuper() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamSuper.kt"); doTest(fileName); } @@ -599,21 +617,9 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideObjectFunParamThis.kt") - public void testInsideObjectFunParamThis() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamThis.kt"); - doTest(fileName); - } - - @TestMetadata("insideObjectFunParamThrow.kt") - public void testInsideObjectFunParamThrow() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamThrow.kt"); - doTest(fileName); - } - - @TestMetadata("insideObjectFunProtected.kt") - public void testInsideObjectFunProtected() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunProtected.kt"); + @TestMetadata("insideObjectFunParamUndefined.kt") + public void testInsideObjectFunParamUndefined() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamUndefined.kt"); doTest(fileName); } @@ -623,57 +629,45 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideObjectFunReturn.kt") - public void testInsideObjectFunReturn() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunReturn.kt"); + @TestMetadata("insideObjectFunStatic.kt") + public void testInsideObjectFunStatic() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunStatic.kt"); doTest(fileName); } - @TestMetadata("insideObjectFunSuper.kt") - public void testInsideObjectFunSuper() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunSuper.kt"); + @TestMetadata("insideObjectLabelThis.kt") + public void testInsideObjectLabelThis() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelThis.kt"); doTest(fileName); } - @TestMetadata("insideObjectLabelTrue.kt") - public void testInsideObjectLabelTrue() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelTrue.kt"); + @TestMetadata("insideObjectLabelThrow.kt") + public void testInsideObjectLabelThrow() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelThrow.kt"); doTest(fileName); } - @TestMetadata("insideObjectLabelTry.kt") - public void testInsideObjectLabelTry() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelTry.kt"); + @TestMetadata("insideObjectLabelVoid.kt") + public void testInsideObjectLabelVoid() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelVoid.kt"); doTest(fileName); } - @TestMetadata("insideObjectLabelTypeof.kt") - public void testInsideObjectLabelTypeof() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelTypeof.kt"); + @TestMetadata("insideObjectLabelWith.kt") + public void testInsideObjectLabelWith() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelWith.kt"); doTest(fileName); } - @TestMetadata("insideObjectLabelUndefined.kt") - public void testInsideObjectLabelUndefined() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelUndefined.kt"); + @TestMetadata("insideObjectValFor.kt") + public void testInsideObjectValFor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValFor.kt"); doTest(fileName); } - @TestMetadata("insideObjectValIn.kt") - public void testInsideObjectValIn() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValIn.kt"); - doTest(fileName); - } - - @TestMetadata("insideObjectValInstanceof.kt") - public void testInsideObjectValInstanceof() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValInstanceof.kt"); - doTest(fileName); - } - - @TestMetadata("insideObjectValInterface.kt") - public void testInsideObjectValInterface() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValInterface.kt"); + @TestMetadata("insideObjectValIf.kt") + public void testInsideObjectValIf() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValIf.kt"); doTest(fileName); } @@ -683,21 +677,21 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("insideObjectVarNew.kt") - public void testInsideObjectVarNew() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarNew.kt"); + @TestMetadata("insideObjectValNew.kt") + public void testInsideObjectValNew() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValNew.kt"); doTest(fileName); } - @TestMetadata("insideObjectVarNull.kt") - public void testInsideObjectVarNull() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarNull.kt"); + @TestMetadata("insideObjectVarIn.kt") + public void testInsideObjectVarIn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarIn.kt"); doTest(fileName); } - @TestMetadata("insideObjectVarPackage.kt") - public void testInsideObjectVarPackage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarPackage.kt"); + @TestMetadata("insideObjectVarInterface.kt") + public void testInsideObjectVarInterface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarInterface.kt"); doTest(fileName); } @@ -707,39 +701,51 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } + @TestMetadata("insideObjectVarProtected.kt") + public void testInsideObjectVarProtected() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarProtected.kt"); + doTest(fileName); + } + + @TestMetadata("localCatchFor.kt") + public void testLocalCatchFor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchFor.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); } - @TestMetadata("localCatchIn.kt") - public void testLocalCatchIn() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchIn.kt"); - doTest(fileName); - } - - @TestMetadata("localCatchUndefined.kt") - public void testLocalCatchUndefined() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchUndefined.kt"); - doTest(fileName); - } - @TestMetadata("localCatchVoid.kt") public void testLocalCatchVoid() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchVoid.kt"); doTest(fileName); } + @TestMetadata("localCatchWith.kt") + public void testLocalCatchWith() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchWith.kt"); + doTest(fileName); + } + + @TestMetadata("localFunBreak.kt") + public void testLocalFunBreak() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunBreak.kt"); + 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"); + @TestMetadata("localFunParamContinue.kt") + public void testLocalFunParamContinue() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamContinue.kt"); doTest(fileName); } @@ -749,12 +755,6 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("localFunParamElse.kt") - public void testLocalFunParamElse() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamElse.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("localLabelFalse.kt") - public void testLocalLabelFalse() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelFalse.kt"); + @TestMetadata("localLabelElse.kt") + public void testLocalLabelElse() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelElse.kt"); 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); } @@ -797,9 +797,9 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } - @TestMetadata("localLabelTypeof.kt") - public void testLocalLabelTypeof() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelTypeof.kt"); + @TestMetadata("localLabelUndefined.kt") + public void testLocalLabelUndefined() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelUndefined.kt"); doTest(fileName); } @@ -815,24 +815,18 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } + @TestMetadata("localValTypeof.kt") + public void testLocalValTypeof() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localValTypeof.kt"); + doTest(fileName); + } + @TestMetadata("localValVar.kt") public void testLocalValVar() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localValVar.kt"); doTest(fileName); } - @TestMetadata("localValWhile.kt") - public void testLocalValWhile() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localValWhile.kt"); - doTest(fileName); - } - - @TestMetadata("localVarBreak.kt") - public void testLocalVarBreak() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarBreak.kt"); - doTest(fileName); - } - @TestMetadata("localVarLet.kt") public void testLocalVarLet() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarLet.kt"); @@ -845,6 +839,12 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest { doTest(fileName); } + @TestMetadata("localVarWhile.kt") + public void testLocalVarWhile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarWhile.kt"); + doTest(fileName); + } + @TestMetadata("localVarYield.kt") public void testLocalVarYield() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarYield.kt"); diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java index 8048e91ab04..7b1d553f8c9 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java @@ -148,7 +148,7 @@ class JsDataClassGenerator extends DataClassMethodGenerator { JsExpression referenceEqual = JsAstUtils.equality(JsLiteral.THIS, new JsNameRef(paramName)); JsExpression isNotNull = JsAstUtils.inequality(new JsNameRef(paramName), JsLiteral.NULL); - JsExpression otherIsObject = JsAstUtils.typeof(paramName.makeRef(), context.program().getStringLiteral("object")); + JsExpression otherIsObject = JsAstUtils.typeOfIs(paramName.makeRef(), context.program().getStringLiteral("object")); JsExpression prototypeEqual = JsAstUtils.equality(new JsInvocation(new JsNameRef("getPrototypeOf", new JsNameRef("Object")), JsLiteral.THIS), new JsInvocation(new JsNameRef("getPrototypeOf", new JsNameRef("Object")), new JsNameRef(paramName))); diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java index 19888a2b167..38021e082c5 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java @@ -330,7 +330,7 @@ public final class JsAstUtils { } @NotNull - public static JsBinaryOperation typeof(@NotNull JsExpression expression, @NotNull JsStringLiteral string) { + public static JsBinaryOperation typeOfIs(@NotNull JsExpression expression, @NotNull JsStringLiteral string) { return equality(new JsPrefixOperation(JsUnaryOperator.TYPEOF, expression), string); } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/expandIsCalls.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/expandIsCalls.kt index 28173a5d34f..17f515fcab1 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/expandIsCalls.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/expandIsCalls.kt @@ -30,7 +30,7 @@ public fun expandIsCalls(node: JsNode, context: TranslationContext) { val type = callee?.getArguments()?.firstOrNull() val replacement = when (callee?.typeCheck) { - TypeCheck.TYPEOF -> typeof(instance!!, type as JsStringLiteral) + TypeCheck.TYPEOF -> typeOfIs(instance!!, type as JsStringLiteral) TypeCheck.INSTANCEOF -> context.namer().isInstanceOf(instance!!, type!!) else -> null } diff --git a/js/js.translator/testData/native/cases/secondaryConstructor.kt b/js/js.translator/testData/native/cases/secondaryConstructor.kt index 63720361f09..779cada5195 100644 --- a/js/js.translator/testData/native/cases/secondaryConstructor.kt +++ b/js/js.translator/testData/native/cases/secondaryConstructor.kt @@ -12,7 +12,7 @@ class A { fun test(a: A, expectedValue: Any?, expectedTypeOfValue: String) { assertTrue(a is A) assertEquals(expectedValue, a.value) - assertEquals(expectedTypeOfValue, typeof(a.value)) + assertEquals(expectedTypeOfValue, jsTypeOf(a.value)) } fun box(): String { diff --git a/js/js.translator/testData/native/cases/typeof.kt b/js/js.translator/testData/native/cases/typeof.kt index 98cc9190495..e15cefa139a 100644 --- a/js/js.translator/testData/native/cases/typeof.kt +++ b/js/js.translator/testData/native/cases/typeof.kt @@ -3,14 +3,14 @@ package foo class A fun box(): String { - assertEquals("number", typeof(1)) - assertEquals("number", typeof(1.2)) - assertEquals("boolean", typeof(true)) - assertEquals("string", typeof("sss")) - assertEquals("object", typeof(null)) - assertEquals("undefined", typeof(undefined)) - assertEquals("object", typeof(object {})) - assertEquals("object", typeof(A())) + assertEquals("number", jsTypeOf(1)) + assertEquals("number", jsTypeOf(1.2)) + assertEquals("boolean", jsTypeOf(true)) + assertEquals("string", jsTypeOf("sss")) + assertEquals("object", jsTypeOf(null)) + assertEquals("undefined", jsTypeOf(undefined)) + assertEquals("object", jsTypeOf(object {})) + assertEquals("object", jsTypeOf(A())) return "OK" } \ No newline at end of file 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 803924afd0c..ff188c409fd 100644 --- a/js/js.translator/testData/reservedWords/cases/SHOULD_BE_ESCAPED.txt +++ b/js/js.translator/testData/reservedWords/cases/SHOULD_BE_ESCAPED.txt @@ -17,6 +17,7 @@ this throw true try +typeof var 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 6a0b3f85313..f29d25770b2 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 @@ -26,7 +26,6 @@ protected public static switch -typeof undefined void with \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarInfinity.kt b/js/js.translator/testData/reservedWords/cases/dataClassValInfinity.kt similarity index 83% rename from js/js.translator/testData/reservedWords/cases/dataClassVarInfinity.kt rename to js/js.translator/testData/reservedWords/cases/dataClassValInfinity.kt index 23da1e006fc..8e7f0e380cf 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassVarInfinity.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassValInfinity.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -data class DataClass(var Infinity: String) { +data class DataClass(val Infinity: String) { init { testNotRenamed("Infinity", { Infinity }) } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarKotlin.kt b/js/js.translator/testData/reservedWords/cases/dataClassValKotlin.kt similarity index 84% rename from js/js.translator/testData/reservedWords/cases/dataClassVarKotlin.kt rename to js/js.translator/testData/reservedWords/cases/dataClassValKotlin.kt index a73fff589ff..21a59f69cd9 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassVarKotlin.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassValKotlin.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -data class DataClass(var Kotlin: String) { +data class DataClass(val Kotlin: String) { init { testNotRenamed("Kotlin", { Kotlin }) } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValTrue.kt b/js/js.translator/testData/reservedWords/cases/dataClassValTrue.kt new file mode 100644 index 00000000000..bfadf357f0e --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/dataClassValTrue.kt @@ -0,0 +1,15 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +data class DataClass(val `true`: String) { + init { + testNotRenamed("true", { `true` }) + } +} + +fun box(): String { + DataClass("123") + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValWith.kt b/js/js.translator/testData/reservedWords/cases/dataClassValTry.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/dataClassValWith.kt rename to js/js.translator/testData/reservedWords/cases/dataClassValTry.kt index 7f642e2eae6..3ba1f765797 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassValWith.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassValTry.kt @@ -2,9 +2,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -data class DataClass(val with: String) { +data class DataClass(val `try`: String) { init { - testNotRenamed("with", { with }) + testNotRenamed("try", { `try` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarArguments.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarArguments.kt new file mode 100644 index 00000000000..995d0dd9335 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/dataClassVarArguments.kt @@ -0,0 +1,15 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +data class DataClass(var arguments: String) { + init { + testNotRenamed("arguments", { arguments }) + } +} + +fun box(): String { + DataClass("123") + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarBreak.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarBreak.kt deleted file mode 100644 index 422b6616b15..00000000000 --- a/js/js.translator/testData/reservedWords/cases/dataClassVarBreak.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 `break`: String) { - init { - testNotRenamed("break", { `break` }) - } -} - -fun box(): String { - DataClass("123") - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValVoid.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarNaN.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/dataClassValVoid.kt rename to js/js.translator/testData/reservedWords/cases/dataClassVarNaN.kt index c605e329727..97fe4ad672a 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassValVoid.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassVarNaN.kt @@ -2,9 +2,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -data class DataClass(val void: String) { +data class DataClass(var NaN: String) { init { - testNotRenamed("void", { void }) + testNotRenamed("NaN", { NaN }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValWhile.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarTypeof.kt similarity index 66% rename from js/js.translator/testData/reservedWords/cases/dataClassValWhile.kt rename to js/js.translator/testData/reservedWords/cases/dataClassVarTypeof.kt index d0377034c8e..71eba1f978f 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassValWhile.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassVarTypeof.kt @@ -2,9 +2,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -data class DataClass(val `while`: String) { +data class DataClass(var `typeof`: String) { init { - testNotRenamed("while", { `while` }) + testNotRenamed("typeof", { `typeof` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValVar.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarVar.kt similarity index 84% rename from js/js.translator/testData/reservedWords/cases/dataClassValVar.kt rename to js/js.translator/testData/reservedWords/cases/dataClassVarVar.kt index f402b94320a..8b541bf40c8 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassValVar.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassVarVar.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -data class DataClass(val `var`: String) { +data class DataClass(var `var`: String) { init { testNotRenamed("var", { `var` }) } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarYield.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarYield.kt deleted file mode 100644 index 263ac2f2b4e..00000000000 --- a/js/js.translator/testData/reservedWords/cases/dataClassVarYield.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 `yield`: String) { - init { - testNotRenamed("yield", { `yield` }) - } -} - -fun box(): String { - DataClass("123") - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunDebugger.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunDebugger.kt deleted file mode 100644 index b484bd5cd60..00000000000 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunDebugger.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 debugger() -} - -class TraitImpl : Trait { - override fun debugger() { debugger() } -} - -class TestDelegate : Trait by TraitImpl() { - fun test() { - testNotRenamed("debugger", { debugger() }) - } -} - -fun box(): String { - TestDelegate().test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunDelete.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunDelete.kt new file mode 100644 index 00000000000..526bc183636 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunDelete.kt @@ -0,0 +1,23 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +interface Trait { + fun delete() +} + +class TraitImpl : Trait { + override fun delete() { delete() } +} + +class TestDelegate : Trait by TraitImpl() { + fun test() { + testNotRenamed("delete", { delete() }) + } +} + +fun box(): String { + TestDelegate().test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunIf.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunElse.kt similarity index 74% rename from js/js.translator/testData/reservedWords/cases/delegatedFunIf.kt rename to js/js.translator/testData/reservedWords/cases/delegatedFunElse.kt index f1bf64b0019..50e3b498cd6 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunIf.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunElse.kt @@ -3,16 +3,16 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - fun `if`() + fun `else`() } class TraitImpl : Trait { - override fun `if`() { `if`() } + override fun `else`() { `else`() } } class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("if", { `if`() }) + testNotRenamed("else", { `else`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValCase.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunEnum.kt similarity index 75% rename from js/js.translator/testData/reservedWords/cases/delegatedValCase.kt rename to js/js.translator/testData/reservedWords/cases/delegatedFunEnum.kt index e75477dd42b..f3925500cd2 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedValCase.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunEnum.kt @@ -3,16 +3,16 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - val case: Int + fun enum() } class TraitImpl : Trait { - override val case: Int = 0 + override fun enum() { enum() } } class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("case", { case }) + testNotRenamed("enum", { enum() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunFalse.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunFalse.kt new file mode 100644 index 00000000000..c45e23a070f --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunFalse.kt @@ -0,0 +1,23 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +interface Trait { + fun `false`() +} + +class TraitImpl : Trait { + override fun `false`() { `false`() } +} + +class TestDelegate : Trait by TraitImpl() { + fun test() { + testNotRenamed("false", { `false`() }) + } +} + +fun box(): String { + TestDelegate().test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunParamEnum.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunParamEval.kt similarity index 71% rename from js/js.translator/testData/reservedWords/cases/delegatedFunParamEnum.kt rename to js/js.translator/testData/reservedWords/cases/delegatedFunParamEval.kt index 0e168a885b2..57c9ee21a5f 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunParamEnum.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunParamEval.kt @@ -3,13 +3,13 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - fun foo(enum: String) + fun foo(eval: String) } class TraitImpl : Trait { - override fun foo(enum: String) { - assertEquals("123", enum) - testRenamed("enum", { enum }) + override fun foo(eval: String) { + assertEquals("123", eval) + testRenamed("eval", { eval }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunParamDelete.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunParamExport.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/delegatedFunParamDelete.kt rename to js/js.translator/testData/reservedWords/cases/delegatedFunParamExport.kt index c820a1b2763..a55312eeba8 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunParamDelete.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunParamExport.kt @@ -3,13 +3,13 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - fun foo(delete: String) + fun foo(export: String) } class TraitImpl : Trait { - override fun foo(delete: String) { - assertEquals("123", delete) - testRenamed("delete", { delete }) + override fun foo(export: String) { + assertEquals("123", export) + testRenamed("export", { export }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunParamNull.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunParamFor.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/delegatedFunParamNull.kt rename to js/js.translator/testData/reservedWords/cases/delegatedFunParamFor.kt index 033cf91f32c..51b3a09d463 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunParamNull.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunParamFor.kt @@ -3,13 +3,13 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - fun foo(`null`: String) + fun foo(`for`: String) } class TraitImpl : Trait { - override fun foo(`null`: String) { - assertEquals("123", `null`) - testRenamed("null", { `null` }) + override fun foo(`for`: String) { + assertEquals("123", `for`) + testRenamed("for", { `for` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunParamIf.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunParamIf.kt new file mode 100644 index 00000000000..472b17b26b7 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunParamIf.kt @@ -0,0 +1,26 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +interface Trait { + fun foo(`if`: String) +} + +class TraitImpl : Trait { + override fun foo(`if`: String) { + assertEquals("123", `if`) + testRenamed("if", { `if` }) +} +} + +class TestDelegate : Trait by TraitImpl() { + fun test() { + foo("123") + } +} + +fun box(): String { + TestDelegate().test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunParamInterface.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunParamInterface.kt deleted file mode 100644 index 3f3c69693d4..00000000000 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunParamInterface.kt +++ /dev/null @@ -1,26 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -interface Trait { - fun foo(`interface`: String) -} - -class TraitImpl : Trait { - override fun foo(`interface`: String) { - assertEquals("123", `interface`) - testRenamed("interface", { `interface` }) -} -} - -class TestDelegate : Trait by TraitImpl() { - fun test() { - foo("123") - } -} - -fun box(): String { - TestDelegate().test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedLabelExport.kt b/js/js.translator/testData/reservedWords/cases/delegatedLabelExtends.kt similarity index 84% rename from js/js.translator/testData/reservedWords/cases/delegatedLabelExport.kt rename to js/js.translator/testData/reservedWords/cases/delegatedLabelExtends.kt index 4da2d38642d..d8b7007abfe 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedLabelExport.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedLabelExtends.kt @@ -12,7 +12,7 @@ class TraitImpl : Trait { class TestDelegate : Trait by TraitImpl() { fun test() { - testRenamed("export", { export@ while (false) {} }) + testRenamed("extends", { extends@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedLabelReturn.kt b/js/js.translator/testData/reservedWords/cases/delegatedLabelFinally.kt similarity index 84% rename from js/js.translator/testData/reservedWords/cases/delegatedLabelReturn.kt rename to js/js.translator/testData/reservedWords/cases/delegatedLabelFinally.kt index 69c3b606683..055c3f5bd41 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedLabelReturn.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedLabelFinally.kt @@ -12,7 +12,7 @@ class TraitImpl : Trait { class TestDelegate : Trait by TraitImpl() { fun test() { - testRenamed("return", { `return`@ while (false) {} }) + testRenamed("finally", { finally@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedLabelEval.kt b/js/js.translator/testData/reservedWords/cases/delegatedLabelIn.kt similarity index 85% rename from js/js.translator/testData/reservedWords/cases/delegatedLabelEval.kt rename to js/js.translator/testData/reservedWords/cases/delegatedLabelIn.kt index 92fec6c006b..7a44bcdf3bc 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedLabelEval.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedLabelIn.kt @@ -12,7 +12,7 @@ class TraitImpl : Trait { class TestDelegate : Trait by TraitImpl() { fun test() { - testRenamed("eval", { eval@ while (false) {} }) + testRenamed("in", { `in`@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedLabelPackage.kt b/js/js.translator/testData/reservedWords/cases/delegatedLabelInterface.kt similarity index 83% rename from js/js.translator/testData/reservedWords/cases/delegatedLabelPackage.kt rename to js/js.translator/testData/reservedWords/cases/delegatedLabelInterface.kt index cf17d2da6c1..510ff5e100c 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedLabelPackage.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedLabelInterface.kt @@ -12,7 +12,7 @@ class TraitImpl : Trait { class TestDelegate : Trait by TraitImpl() { fun test() { - testRenamed("package", { `package`@ while (false) {} }) + testRenamed("interface", { `interface`@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunIn.kt b/js/js.translator/testData/reservedWords/cases/delegatedValBreak.kt similarity index 74% rename from js/js.translator/testData/reservedWords/cases/delegatedFunIn.kt rename to js/js.translator/testData/reservedWords/cases/delegatedValBreak.kt index fc7e8ee36aa..a867b2930f3 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunIn.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedValBreak.kt @@ -3,16 +3,16 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - fun `in`() + val `break`: Int } class TraitImpl : Trait { - override fun `in`() { `in`() } + override val `break`: Int = 0 } class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("in", { `in`() }) + testNotRenamed("break", { `break` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarCatch.kt b/js/js.translator/testData/reservedWords/cases/delegatedValCatch.kt similarity index 86% rename from js/js.translator/testData/reservedWords/cases/delegatedVarCatch.kt rename to js/js.translator/testData/reservedWords/cases/delegatedValCatch.kt index 1bb4e6c1020..99e59b823e6 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedVarCatch.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedValCatch.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - var catch: Int + val catch: Int } class TraitImpl : Trait { - override var catch: Int = 0 + override val catch: Int = 0 } class TestDelegate : Trait by TraitImpl() { diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValAwait.kt b/js/js.translator/testData/reservedWords/cases/delegatedValClass.kt similarity index 74% rename from js/js.translator/testData/reservedWords/cases/delegatedValAwait.kt rename to js/js.translator/testData/reservedWords/cases/delegatedValClass.kt index 1cd04171411..6425808fbe0 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedValAwait.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedValClass.kt @@ -3,16 +3,16 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - val await: Int + val `class`: Int } class TraitImpl : Trait { - override val await: Int = 0 + override val `class`: Int = 0 } class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("await", { await }) + testNotRenamed("class", { `class` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarConst.kt b/js/js.translator/testData/reservedWords/cases/delegatedValConst.kt similarity index 86% rename from js/js.translator/testData/reservedWords/cases/delegatedVarConst.kt rename to js/js.translator/testData/reservedWords/cases/delegatedValConst.kt index 469b16b71d2..2f3ae91636e 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedVarConst.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedValConst.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - var const: Int + val const: Int } class TraitImpl : Trait { - override var const: Int = 0 + override val const: Int = 0 } class TestDelegate : Trait by TraitImpl() { diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValElse.kt b/js/js.translator/testData/reservedWords/cases/delegatedValElse.kt deleted file mode 100644 index a7dc69ad23a..00000000000 --- a/js/js.translator/testData/reservedWords/cases/delegatedValElse.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 `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/delegatedFunDefault.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarContinue.kt similarity index 72% rename from js/js.translator/testData/reservedWords/cases/delegatedFunDefault.kt rename to js/js.translator/testData/reservedWords/cases/delegatedVarContinue.kt index a4567d90145..7085237cb31 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunDefault.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedVarContinue.kt @@ -3,16 +3,16 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - fun default() + var `continue`: Int } class TraitImpl : Trait { - override fun default() { default() } + override var `continue`: Int = 0 } class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("default", { default() }) + testNotRenamed("continue", { `continue` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarDebugger.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarDebugger.kt new file mode 100644 index 00000000000..19d48cc5e7f --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/delegatedVarDebugger.kt @@ -0,0 +1,23 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +interface Trait { + var debugger: Int +} + +class TraitImpl : Trait { + override var debugger: Int = 0 +} + +class TestDelegate : Trait by TraitImpl() { + fun test() { + testNotRenamed("debugger", { debugger }) + } +} + +fun box(): String { + TestDelegate().test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarDefault.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarDefault.kt new file mode 100644 index 00000000000..42a39e4f9a4 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/delegatedVarDefault.kt @@ -0,0 +1,23 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +interface Trait { + var default: Int +} + +class TraitImpl : Trait { + override var default: Int = 0 +} + +class TestDelegate : Trait by TraitImpl() { + fun test() { + testNotRenamed("default", { default }) + } +} + +fun box(): String { + TestDelegate().test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValDo.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarDo.kt similarity index 87% rename from js/js.translator/testData/reservedWords/cases/delegatedValDo.kt rename to js/js.translator/testData/reservedWords/cases/delegatedVarDo.kt index 077ba008983..9fcfcd7ef2a 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedValDo.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedVarDo.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! interface Trait { - val `do`: Int + var `do`: Int } class TraitImpl : Trait { - override val `do`: Int = 0 + override var `do`: Int = 0 } class TestDelegate : Trait by TraitImpl() { diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarFalse.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarFalse.kt deleted file mode 100644 index dbfbba316bd..00000000000 --- a/js/js.translator/testData/reservedWords/cases/delegatedVarFalse.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 `false`: Int -} - -class TraitImpl : Trait { - override var `false`: Int = 0 -} - -class TestDelegate : Trait by TraitImpl() { - fun test() { - testNotRenamed("false", { `false` }) - } -} - -fun box(): String { - TestDelegate().test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarFor.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarFor.kt deleted file mode 100644 index d30746aa852..00000000000 --- a/js/js.translator/testData/reservedWords/cases/delegatedVarFor.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 `for`: Int -} - -class TraitImpl : Trait { - override var `for`: Int = 0 -} - -class TestDelegate : Trait by TraitImpl() { - fun test() { - testNotRenamed("for", { `for` }) - } -} - -fun box(): String { - TestDelegate().test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumEntryDo.kt b/js/js.translator/testData/reservedWords/cases/enumEntrySwitch.kt similarity index 74% rename from js/js.translator/testData/reservedWords/cases/enumEntryDo.kt rename to js/js.translator/testData/reservedWords/cases/enumEntrySwitch.kt index a593141c31b..9c3d0346fcb 100644 --- a/js/js.translator/testData/reservedWords/cases/enumEntryDo.kt +++ b/js/js.translator/testData/reservedWords/cases/enumEntrySwitch.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - `do` + switch } fun box(): String { - testNotRenamed("do", { Foo.`do` }) + testNotRenamed("switch", { Foo.switch }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumEntryContinue.kt b/js/js.translator/testData/reservedWords/cases/enumEntryUndefined.kt similarity index 71% rename from js/js.translator/testData/reservedWords/cases/enumEntryContinue.kt rename to js/js.translator/testData/reservedWords/cases/enumEntryUndefined.kt index a6881b51875..03c45399630 100644 --- a/js/js.translator/testData/reservedWords/cases/enumEntryContinue.kt +++ b/js/js.translator/testData/reservedWords/cases/enumEntryUndefined.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - `continue` + undefined } fun box(): String { - testNotRenamed("continue", { Foo.`continue` }) + testNotRenamed("undefined", { Foo.undefined }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumEntryStatic.kt b/js/js.translator/testData/reservedWords/cases/enumEntryWhile.kt similarity index 74% rename from js/js.translator/testData/reservedWords/cases/enumEntryStatic.kt rename to js/js.translator/testData/reservedWords/cases/enumEntryWhile.kt index 6c4453b83b2..1ba2236cc9d 100644 --- a/js/js.translator/testData/reservedWords/cases/enumEntryStatic.kt +++ b/js/js.translator/testData/reservedWords/cases/enumEntryWhile.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - static + `while` } fun box(): String { - testNotRenamed("static", { Foo.static }) + testNotRenamed("while", { Foo.`while` }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumEntryPublic.kt b/js/js.translator/testData/reservedWords/cases/enumEntryYield.kt similarity index 73% rename from js/js.translator/testData/reservedWords/cases/enumEntryPublic.kt rename to js/js.translator/testData/reservedWords/cases/enumEntryYield.kt index 951d6ae0b2f..e16680690d9 100644 --- a/js/js.translator/testData/reservedWords/cases/enumEntryPublic.kt +++ b/js/js.translator/testData/reservedWords/cases/enumEntryYield.kt @@ -3,11 +3,11 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! enum class Foo { - `public` + `yield` } fun box(): String { - testNotRenamed("public", { Foo.`public` }) + testNotRenamed("yield", { Foo.`yield` }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt b/js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt deleted file mode 100644 index 309a1f7ae6c..00000000000 --- a/js/js.translator/testData/reservedWords/cases/enumFunInstanceof.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 instanceof() { instanceof() } - - fun test() { - testNotRenamed("instanceof", { instanceof() }) - } -} - -fun box(): String { - Foo.BAR.test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumValThis.kt b/js/js.translator/testData/reservedWords/cases/enumFunLet.kt similarity index 76% rename from js/js.translator/testData/reservedWords/cases/enumValThis.kt rename to js/js.translator/testData/reservedWords/cases/enumFunLet.kt index 1c8f1cb09cd..067513cabd7 100644 --- a/js/js.translator/testData/reservedWords/cases/enumValThis.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunLet.kt @@ -4,10 +4,10 @@ package foo enum class Foo { BAR; - val `this`: Int = 0 + fun let() { let() } fun test() { - testNotRenamed("this", { `this` }) + testNotRenamed("let", { let() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumVarTrue.kt b/js/js.translator/testData/reservedWords/cases/enumFunNew.kt similarity index 76% rename from js/js.translator/testData/reservedWords/cases/enumVarTrue.kt rename to js/js.translator/testData/reservedWords/cases/enumFunNew.kt index c227d249402..2dce136aedd 100644 --- a/js/js.translator/testData/reservedWords/cases/enumVarTrue.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunNew.kt @@ -4,10 +4,10 @@ package foo enum class Foo { BAR; - var `true`: Int = 0 + fun new() { new() } fun test() { - testNotRenamed("true", { `true` }) + testNotRenamed("new", { new() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt deleted file mode 100644 index 8a011e62d69..00000000000 --- a/js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt +++ /dev/null @@ -1,21 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -enum class Foo { - BAR; - fun foo(new: String) { - assertEquals("123", new) - testRenamed("new", { new }) -} - - fun test() { - foo("123") - } -} - -fun box(): String { - Foo.BAR.test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamWhile.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamPrivate.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/enumFunParamWhile.kt rename to js/js.translator/testData/reservedWords/cases/enumFunParamPrivate.kt index f4abf35a877..8a38a0455c8 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunParamWhile.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunParamPrivate.kt @@ -4,9 +4,9 @@ package foo enum class Foo { BAR; - fun foo(`while`: String) { - assertEquals("123", `while`) - testRenamed("while", { `while` }) + fun foo(private: String) { + assertEquals("123", private) + testRenamed("private", { private }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamYield.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamProtected.kt similarity index 68% rename from js/js.translator/testData/reservedWords/cases/enumFunParamYield.kt rename to js/js.translator/testData/reservedWords/cases/enumFunParamProtected.kt index 929a8f571a8..53c1bf56b42 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunParamYield.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunParamProtected.kt @@ -4,9 +4,9 @@ package foo enum class Foo { BAR; - fun foo(`yield`: String) { - assertEquals("123", `yield`) - testRenamed("yield", { `yield` }) + fun foo(protected: String) { + assertEquals("123", protected) + testRenamed("protected", { protected }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunParamTrue.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamTrue.kt similarity index 86% rename from js/js.translator/testData/reservedWords/cases/insideClassFunParamTrue.kt rename to js/js.translator/testData/reservedWords/cases/enumFunParamTrue.kt index 70e5deac1ac..96e5abe7b74 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassFunParamTrue.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunParamTrue.kt @@ -2,7 +2,8 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -class TestClass { +enum class Foo { + BAR; fun foo(`true`: String) { assertEquals("123", `true`) testRenamed("true", { `true` }) @@ -14,7 +15,7 @@ class TestClass { } fun box(): String { - TestClass().test() + Foo.BAR.test() return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamTry.kt similarity index 71% rename from js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt rename to js/js.translator/testData/reservedWords/cases/enumFunParamTry.kt index 7c1351c1f65..470bf585d2e 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunParamTry.kt @@ -4,9 +4,9 @@ package foo enum class Foo { BAR; - fun foo(let: String) { - assertEquals("123", let) - testRenamed("let", { let }) + fun foo(`try`: String) { + assertEquals("123", `try`) + testRenamed("try", { `try` }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunThis.kt b/js/js.translator/testData/reservedWords/cases/enumFunThis.kt similarity index 84% rename from js/js.translator/testData/reservedWords/cases/insideClassFunThis.kt rename to js/js.translator/testData/reservedWords/cases/enumFunThis.kt index 50ca6d192db..eb6fa78b4f4 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassFunThis.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunThis.kt @@ -2,7 +2,8 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -class TestClass { +enum class Foo { + BAR; fun `this`() { `this`() } fun test() { @@ -11,7 +12,7 @@ class TestClass { } fun box(): String { - TestClass().test() + 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/enumFunThrow.kt similarity index 73% rename from js/js.translator/testData/reservedWords/cases/enumFunImport.kt rename to js/js.translator/testData/reservedWords/cases/enumFunThrow.kt index ceebb4a8c31..74a67fad20d 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunImport.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunThrow.kt @@ -4,10 +4,10 @@ package foo enum class Foo { BAR; - fun import() { import() } + fun `throw`() { `throw`() } fun test() { - testNotRenamed("import", { import() }) + testNotRenamed("throw", { `throw`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumFunTry.kt b/js/js.translator/testData/reservedWords/cases/enumFunTry.kt deleted file mode 100644 index 1e7f201a027..00000000000 --- a/js/js.translator/testData/reservedWords/cases/enumFunTry.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 `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 deleted file mode 100644 index 9f493debec5..00000000000 --- a/js/js.translator/testData/reservedWords/cases/enumFunVar.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 `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/enumLabelProtected.kt b/js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt deleted file mode 100644 index 9c89ac68fc0..00000000000 --- a/js/js.translator/testData/reservedWords/cases/enumLabelProtected.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; - val t: Int = 0 - - fun test() { - testRenamed("protected", { protected@ while (false) {} }) - } -} - -fun box(): String { - Foo.BAR.test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelClass.kt b/js/js.translator/testData/reservedWords/cases/enumLabelPublic.kt similarity index 79% rename from js/js.translator/testData/reservedWords/cases/enumLabelClass.kt rename to js/js.translator/testData/reservedWords/cases/enumLabelPublic.kt index a1dfc6559ad..ade514d74c6 100644 --- a/js/js.translator/testData/reservedWords/cases/enumLabelClass.kt +++ b/js/js.translator/testData/reservedWords/cases/enumLabelPublic.kt @@ -7,7 +7,7 @@ enum class Foo { val t: Int = 0 fun test() { - testRenamed("class", { `class`@ while (false) {} }) + testRenamed("public", { public@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelBreak.kt b/js/js.translator/testData/reservedWords/cases/enumLabelStatic.kt similarity index 79% rename from js/js.translator/testData/reservedWords/cases/enumLabelBreak.kt rename to js/js.translator/testData/reservedWords/cases/enumLabelStatic.kt index e1aec6d8345..3532fb21247 100644 --- a/js/js.translator/testData/reservedWords/cases/enumLabelBreak.kt +++ b/js/js.translator/testData/reservedWords/cases/enumLabelStatic.kt @@ -7,7 +7,7 @@ enum class Foo { val t: Int = 0 fun test() { - testRenamed("break", { `break`@ while (false) {} }) + testRenamed("static", { static@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt b/js/js.translator/testData/reservedWords/cases/enumLabelTypeof.kt similarity index 79% rename from js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt rename to js/js.translator/testData/reservedWords/cases/enumLabelTypeof.kt index f1099348369..f6c6369df77 100644 --- a/js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt +++ b/js/js.translator/testData/reservedWords/cases/enumLabelTypeof.kt @@ -7,7 +7,7 @@ enum class Foo { val t: Int = 0 fun test() { - testRenamed("private", { private@ while (false) {} }) + testRenamed("typeof", { `typeof`@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassLabelVar.kt b/js/js.translator/testData/reservedWords/cases/enumLabelVar.kt similarity index 84% rename from js/js.translator/testData/reservedWords/cases/insideClassLabelVar.kt rename to js/js.translator/testData/reservedWords/cases/enumLabelVar.kt index e2c60736aab..8f03d737208 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassLabelVar.kt +++ b/js/js.translator/testData/reservedWords/cases/enumLabelVar.kt @@ -2,7 +2,8 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -class TestClass { +enum class Foo { + BAR; val t: Int = 0 fun test() { @@ -11,7 +12,7 @@ class TestClass { } fun box(): String { - TestClass().test() + Foo.BAR.test() return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumValExtends.kt b/js/js.translator/testData/reservedWords/cases/enumValExtends.kt deleted file mode 100644 index c140034ec4c..00000000000 --- a/js/js.translator/testData/reservedWords/cases/enumValExtends.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; - val extends: Int = 0 - - fun test() { - testNotRenamed("extends", { extends }) - } -} - -fun box(): String { - Foo.BAR.test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumValFinally.kt b/js/js.translator/testData/reservedWords/cases/enumValFinally.kt deleted file mode 100644 index f46b8045d09..00000000000 --- a/js/js.translator/testData/reservedWords/cases/enumValFinally.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; - val finally: Int = 0 - - fun test() { - testNotRenamed("finally", { finally }) - } -} - -fun box(): String { - Foo.BAR.test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumVarFunction.kt b/js/js.translator/testData/reservedWords/cases/enumValFunction.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/enumVarFunction.kt rename to js/js.translator/testData/reservedWords/cases/enumValFunction.kt index b9c710d5529..c486c236dad 100644 --- a/js/js.translator/testData/reservedWords/cases/enumVarFunction.kt +++ b/js/js.translator/testData/reservedWords/cases/enumValFunction.kt @@ -4,7 +4,7 @@ package foo enum class Foo { BAR; - var function: Int = 0 + val function: Int = 0 fun test() { testNotRenamed("function", { function }) diff --git a/js/js.translator/testData/reservedWords/cases/enumVarImplements.kt b/js/js.translator/testData/reservedWords/cases/enumValImplements.kt similarity index 90% rename from js/js.translator/testData/reservedWords/cases/enumVarImplements.kt rename to js/js.translator/testData/reservedWords/cases/enumValImplements.kt index b33e6926c14..511fa27c619 100644 --- a/js/js.translator/testData/reservedWords/cases/enumVarImplements.kt +++ b/js/js.translator/testData/reservedWords/cases/enumValImplements.kt @@ -4,7 +4,7 @@ package foo enum class Foo { BAR; - var implements: Int = 0 + val implements: Int = 0 fun test() { testNotRenamed("implements", { implements }) diff --git a/js/js.translator/testData/reservedWords/cases/enumValNull.kt b/js/js.translator/testData/reservedWords/cases/enumValNull.kt new file mode 100644 index 00000000000..49f70fb7b71 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/enumValNull.kt @@ -0,0 +1,18 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +enum class Foo { + BAR; + val `null`: Int = 0 + + fun test() { + testNotRenamed("null", { `null` }) + } +} + +fun box(): String { + Foo.BAR.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectVarPackage.kt b/js/js.translator/testData/reservedWords/cases/enumValPackage.kt similarity index 75% rename from js/js.translator/testData/reservedWords/cases/insideObjectVarPackage.kt rename to js/js.translator/testData/reservedWords/cases/enumValPackage.kt index fc7f5bd6076..3a853fe0c5b 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectVarPackage.kt +++ b/js/js.translator/testData/reservedWords/cases/enumValPackage.kt @@ -2,8 +2,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -object TestObject { - var `package`: Int = 0 +enum class Foo { + BAR; + val `package`: Int = 0 fun test() { testNotRenamed("package", { `package` }) @@ -11,7 +12,7 @@ object TestObject { } fun box(): String { - TestObject.test() + Foo.BAR.test() return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumVarThrow.kt b/js/js.translator/testData/reservedWords/cases/enumVarImport.kt similarity index 75% rename from js/js.translator/testData/reservedWords/cases/enumVarThrow.kt rename to js/js.translator/testData/reservedWords/cases/enumVarImport.kt index f7eee0afda7..a5e0752f346 100644 --- a/js/js.translator/testData/reservedWords/cases/enumVarThrow.kt +++ b/js/js.translator/testData/reservedWords/cases/enumVarImport.kt @@ -4,10 +4,10 @@ package foo enum class Foo { BAR; - var `throw`: Int = 0 + var import: Int = 0 fun test() { - testNotRenamed("throw", { `throw` }) + testNotRenamed("import", { import }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectValInstanceof.kt b/js/js.translator/testData/reservedWords/cases/enumVarInstanceof.kt similarity index 75% rename from js/js.translator/testData/reservedWords/cases/insideObjectValInstanceof.kt rename to js/js.translator/testData/reservedWords/cases/enumVarInstanceof.kt index 94761e6d0da..ca2835129c0 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectValInstanceof.kt +++ b/js/js.translator/testData/reservedWords/cases/enumVarInstanceof.kt @@ -2,8 +2,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -object TestObject { - val instanceof: Int = 0 +enum class Foo { + BAR; + var instanceof: Int = 0 fun test() { testNotRenamed("instanceof", { instanceof }) @@ -11,7 +12,7 @@ object TestObject { } fun box(): String { - TestObject.test() + Foo.BAR.test() return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassVarReturn.kt b/js/js.translator/testData/reservedWords/cases/enumVarReturn.kt similarity index 84% rename from js/js.translator/testData/reservedWords/cases/insideClassVarReturn.kt rename to js/js.translator/testData/reservedWords/cases/enumVarReturn.kt index 047ba1c5a1c..68bfcf55587 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassVarReturn.kt +++ b/js/js.translator/testData/reservedWords/cases/enumVarReturn.kt @@ -2,7 +2,8 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -class TestClass { +enum class Foo { + BAR; var `return`: Int = 0 fun test() { @@ -11,7 +12,7 @@ class TestClass { } fun box(): String { - TestClass().test() + Foo.BAR.test() return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/enumValSuper.kt b/js/js.translator/testData/reservedWords/cases/enumVarSuper.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/enumValSuper.kt rename to js/js.translator/testData/reservedWords/cases/enumVarSuper.kt index 5d8caad9e03..032518a0d84 100644 --- a/js/js.translator/testData/reservedWords/cases/enumValSuper.kt +++ b/js/js.translator/testData/reservedWords/cases/enumVarSuper.kt @@ -4,7 +4,7 @@ package foo enum class Foo { BAR; - val `super`: Int = 0 + var `super`: Int = 0 fun test() { testNotRenamed("super", { `super` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunArguments.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunArguments.kt deleted file mode 100644 index 15837791eaf..00000000000 --- a/js/js.translator/testData/reservedWords/cases/insideClassFunArguments.kt +++ /dev/null @@ -1,17 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -class TestClass { - fun arguments() { arguments() } - - fun test() { - testNotRenamed("arguments", { arguments() }) - } -} - -fun box(): String { - TestClass().test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunCase.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunCase.kt new file mode 100644 index 00000000000..edc12be8c74 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/insideClassFunCase.kt @@ -0,0 +1,17 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +class TestClass { + fun case() { case() } + + fun test() { + testNotRenamed("case", { case() }) + } +} + +fun box(): String { + TestClass().test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunParamCase.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunParamConst.kt similarity index 70% rename from js/js.translator/testData/reservedWords/cases/insideClassFunParamCase.kt rename to js/js.translator/testData/reservedWords/cases/insideClassFunParamConst.kt index c1dafa5ae75..57372b32528 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassFunParamCase.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassFunParamConst.kt @@ -3,9 +3,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - fun foo(case: String) { - assertEquals("123", case) - testRenamed("case", { case }) + fun foo(const: String) { + assertEquals("123", const) + testRenamed("const", { const }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamThis.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunParamThis.kt similarity index 87% rename from js/js.translator/testData/reservedWords/cases/insideObjectFunParamThis.kt rename to js/js.translator/testData/reservedWords/cases/insideClassFunParamThis.kt index 0b3dbd2ab79..9efb04c35cc 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamThis.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassFunParamThis.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -object TestObject { +class TestClass { fun foo(`this`: String) { assertEquals("123", `this`) testRenamed("this", { `this` }) @@ -14,7 +14,7 @@ object TestObject { } fun box(): String { - TestObject.test() + TestClass().test() return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunReturn.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunReturn.kt similarity index 85% rename from js/js.translator/testData/reservedWords/cases/insideObjectFunReturn.kt rename to js/js.translator/testData/reservedWords/cases/insideClassFunReturn.kt index 9c8cc674dd4..c5780faffd5 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunReturn.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassFunReturn.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -object TestObject { +class TestClass { fun `return`() { `return`() } fun test() { @@ -11,7 +11,7 @@ object TestObject { } fun box(): String { - TestObject.test() + TestClass().test() return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassLabelConst.kt b/js/js.translator/testData/reservedWords/cases/insideClassLabelDefault.kt similarity index 78% rename from js/js.translator/testData/reservedWords/cases/insideClassLabelConst.kt rename to js/js.translator/testData/reservedWords/cases/insideClassLabelDefault.kt index 79cb2312c02..311a2116076 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassLabelConst.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassLabelDefault.kt @@ -6,7 +6,7 @@ class TestClass { val t: Int = 0 fun test() { - testRenamed("const", { const@ while (false) {} }) + testRenamed("default", { default@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectLabelTrue.kt b/js/js.translator/testData/reservedWords/cases/insideClassLabelTrue.kt similarity index 85% rename from js/js.translator/testData/reservedWords/cases/insideObjectLabelTrue.kt rename to js/js.translator/testData/reservedWords/cases/insideClassLabelTrue.kt index 45e5debe7e2..815b1438b0e 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectLabelTrue.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassLabelTrue.kt @@ -2,7 +2,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! -object TestObject { +class TestClass { val t: Int = 0 fun test() { @@ -11,7 +11,7 @@ object TestObject { } fun box(): String { - TestObject.test() + TestClass().test() return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunExport.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunBreak.kt similarity index 74% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunExport.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunBreak.kt index 162d1c6cda7..d18da4ec37b 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunExport.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunBreak.kt @@ -4,10 +4,10 @@ package foo class TestClass { companion object { - fun export() { export() } + fun `break`() { `break`() } fun test() { - testNotRenamed("export", { export() }) + testNotRenamed("break", { `break`() }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunClass.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunClass.kt new file mode 100644 index 00000000000..5eb78fc32a9 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunClass.kt @@ -0,0 +1,19 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +class TestClass { + companion object { + fun `class`() { `class`() } + + fun test() { + testNotRenamed("class", { `class`() }) + } + } +} + +fun box(): String { + TestClass.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunContinue.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunContinue.kt deleted file mode 100644 index 1e62cea6422..00000000000 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunContinue.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 { - fun `continue`() { `continue`() } - - 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/insideClassObjectFunFinally.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFinally.kt new file mode 100644 index 00000000000..13a08b96ebf --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFinally.kt @@ -0,0 +1,19 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +class TestClass { + companion object { + fun finally() { finally() } + + fun test() { + testNotRenamed("finally", { finally() }) + } + } +} + +fun box(): String { + TestClass.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFalse.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamContinue.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFalse.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamContinue.kt index eff1ae92329..30775d505e6 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFalse.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamContinue.kt @@ -4,9 +4,9 @@ package foo class TestClass { companion object { - fun foo(`false`: String) { - assertEquals("123", `false`) - testRenamed("false", { `false` }) + fun foo(`continue`: String) { + assertEquals("123", `continue`) + testRenamed("continue", { `continue` }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamElse.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamDo.kt similarity index 72% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamElse.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamDo.kt index 95871050277..f1d922acd64 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamElse.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamDo.kt @@ -4,9 +4,9 @@ package foo class TestClass { companion object { - fun foo(`else`: String) { - assertEquals("123", `else`) - testRenamed("else", { `else` }) + fun foo(`do`: String) { + assertEquals("123", `do`) + testRenamed("do", { `do` }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFinally.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamImplements.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFinally.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamImplements.kt index 49d06755924..b7b3d10e934 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFinally.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamImplements.kt @@ -4,9 +4,9 @@ package foo class TestClass { companion object { - fun foo(finally: String) { - assertEquals("123", finally) - testRenamed("finally", { finally }) + fun foo(implements: String) { + assertEquals("123", implements) + testRenamed("implements", { implements }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIf.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelElse.kt similarity index 81% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIf.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectLabelElse.kt index c67c100a9c7..7a4dea4954a 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIf.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelElse.kt @@ -7,7 +7,7 @@ class TestClass { val t: Int = 0 fun test() { - testRenamed("if", { `if`@ while (false) {} }) + testRenamed("else", { `else`@ while (false) {} }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFor.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFalse.kt similarity index 80% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFor.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFalse.kt index 05291b6e0b4..8c377cf9d7a 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFor.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFalse.kt @@ -7,7 +7,7 @@ class TestClass { val t: Int = 0 fun test() { - testRenamed("for", { `for`@ while (false) {} }) + testRenamed("false", { `false`@ while (false) {} }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImplements.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInstanceof.kt similarity index 81% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImplements.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInstanceof.kt index a583fb6c7be..6b2b19db1b3 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImplements.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInstanceof.kt @@ -7,7 +7,7 @@ class TestClass { val t: Int = 0 fun test() { - testRenamed("implements", { implements@ while (false) {} }) + testRenamed("instanceof", { instanceof@ while (false) {} }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarEnum.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectValEnum.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectVarEnum.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectValEnum.kt index 4bcab5f96ef..1d4562d99b7 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarEnum.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectValEnum.kt @@ -4,7 +4,7 @@ package foo class TestClass { companion object { - var enum: Int = 0 + val enum: Int = 0 fun test() { testNotRenamed("enum", { enum }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValDefault.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectValTypeof.kt similarity index 75% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectValDefault.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectValTypeof.kt index a62069c2a4b..76b7c3878f5 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectValDefault.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectValTypeof.kt @@ -4,10 +4,10 @@ package foo class TestClass { companion object { - val default: Int = 0 + val `typeof`: Int = 0 fun test() { - testNotRenamed("default", { default }) + testNotRenamed("typeof", { `typeof` }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunDo.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectValVar.kt similarity index 76% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunDo.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectValVar.kt index 8af680af5ef..8cef16729de 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunDo.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectValVar.kt @@ -4,10 +4,10 @@ package foo class TestClass { companion object { - fun `do`() { `do`() } + val `var`: Int = 0 fun test() { - testNotRenamed("do", { `do`() }) + testNotRenamed("var", { `var` }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarClass.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarClass.kt deleted file mode 100644 index d9e49b844c6..00000000000 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarClass.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 `class`: Int = 0 - - fun test() { - testNotRenamed("class", { `class` }) - } - } -} - -fun box(): String { - TestClass.test() - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarBreak.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarExport.kt similarity index 76% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectVarBreak.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectVarExport.kt index 1530c652230..43977736280 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarBreak.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarExport.kt @@ -4,10 +4,10 @@ package foo class TestClass { companion object { - var `break`: Int = 0 + var export: Int = 0 fun test() { - testNotRenamed("break", { `break` }) + testNotRenamed("export", { export }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValWhile.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarWhile.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectValWhile.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectVarWhile.kt index 200055781ba..a13964b9e81 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectValWhile.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarWhile.kt @@ -4,7 +4,7 @@ package foo class TestClass { companion object { - val `while`: Int = 0 + var `while`: Int = 0 fun test() { testNotRenamed("while", { `while` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValYield.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarYield.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/insideClassObjectValYield.kt rename to js/js.translator/testData/reservedWords/cases/insideClassObjectVarYield.kt index eb5eed960bf..408ef3500da 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectValYield.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarYield.kt @@ -4,7 +4,7 @@ package foo class TestClass { companion object { - val `yield`: Int = 0 + var `yield`: Int = 0 fun test() { testNotRenamed("yield", { `yield` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassValWith.kt b/js/js.translator/testData/reservedWords/cases/insideClassValIn.kt similarity index 77% rename from js/js.translator/testData/reservedWords/cases/insideClassValWith.kt rename to js/js.translator/testData/reservedWords/cases/insideClassValIn.kt index 75c0ce02171..8579332fa78 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassValWith.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassValIn.kt @@ -3,10 +3,10 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - val with: Int = 0 + val `in`: Int = 0 fun test() { - testNotRenamed("with", { with }) + testNotRenamed("in", { `in` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassVarKotlin.kt b/js/js.translator/testData/reservedWords/cases/insideClassValKotlin.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/insideClassVarKotlin.kt rename to js/js.translator/testData/reservedWords/cases/insideClassValKotlin.kt index 5cc4bf35e20..1fbe380e3c1 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassVarKotlin.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassValKotlin.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - var Kotlin: Int = 0 + val Kotlin: Int = 0 fun test() { testNotRenamed("Kotlin", { Kotlin }) diff --git a/js/js.translator/testData/reservedWords/cases/insideClassVarArguments.kt b/js/js.translator/testData/reservedWords/cases/insideClassVarArguments.kt new file mode 100644 index 00000000000..13cc85460cd --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/insideClassVarArguments.kt @@ -0,0 +1,17 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +class TestClass { + var arguments: Int = 0 + + fun test() { + testNotRenamed("arguments", { arguments }) + } +} + +fun box(): String { + TestClass().test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideClassValNull.kt b/js/js.translator/testData/reservedWords/cases/insideClassVarNull.kt similarity index 91% rename from js/js.translator/testData/reservedWords/cases/insideClassValNull.kt rename to js/js.translator/testData/reservedWords/cases/insideClassVarNull.kt index c79c8fdc0aa..9f5e3eb5b19 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassValNull.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassVarNull.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! class TestClass { - val `null`: Int = 0 + var `null`: Int = 0 fun test() { testNotRenamed("null", { `null` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunNull.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunNull.kt new file mode 100644 index 00000000000..0502674665a --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunNull.kt @@ -0,0 +1,17 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +object TestObject { + fun `null`() { `null`() } + + fun test() { + testNotRenamed("null", { `null`() }) + } +} + +fun box(): String { + TestObject.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunSuper.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunPackage.kt similarity index 71% rename from js/js.translator/testData/reservedWords/cases/insideObjectFunSuper.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectFunPackage.kt index d42af11e255..711ee9f9881 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunSuper.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunPackage.kt @@ -3,10 +3,10 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - fun `super`() { `super`() } + fun `package`() { `package`() } fun test() { - testNotRenamed("super", { `super`() }) + testNotRenamed("package", { `package`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamThrow.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamReturn.kt similarity index 68% rename from js/js.translator/testData/reservedWords/cases/insideObjectFunParamThrow.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectFunParamReturn.kt index 889a9be641b..42327b2828d 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamThrow.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamReturn.kt @@ -3,9 +3,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - fun foo(`throw`: String) { - assertEquals("123", `throw`) - testRenamed("throw", { `throw` }) + fun foo(`return`: String) { + assertEquals("123", `return`) + testRenamed("return", { `return` }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamStatic.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamSuper.kt similarity index 69% rename from js/js.translator/testData/reservedWords/cases/insideObjectFunParamStatic.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectFunParamSuper.kt index 82c990ecfe2..a8a49fe6d03 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamStatic.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamSuper.kt @@ -3,9 +3,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - fun foo(static: String) { - assertEquals("123", static) - testRenamed("static", { static }) + fun foo(`super`: String) { + assertEquals("123", `super`) + testRenamed("super", { `super` }) } fun test() { diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunProtected.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamUndefined.kt similarity index 61% rename from js/js.translator/testData/reservedWords/cases/insideObjectFunProtected.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectFunParamUndefined.kt index c791fe7debf..0a1383189df 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunProtected.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamUndefined.kt @@ -3,10 +3,13 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - fun protected() { protected() } + fun foo(undefined: String) { + assertEquals("123", undefined) + testRenamed("undefined", { undefined }) +} fun test() { - testNotRenamed("protected", { protected() }) + foo("123") } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunStatic.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunStatic.kt new file mode 100644 index 00000000000..614aedfffcd --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunStatic.kt @@ -0,0 +1,17 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +object TestObject { + fun static() { static() } + + fun test() { + testNotRenamed("static", { static() }) + } +} + +fun box(): String { + TestObject.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectLabelTypeof.kt b/js/js.translator/testData/reservedWords/cases/insideObjectLabelThis.kt similarity index 79% rename from js/js.translator/testData/reservedWords/cases/insideObjectLabelTypeof.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectLabelThis.kt index eb1f1456899..3b3958a78c6 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectLabelTypeof.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectLabelThis.kt @@ -6,7 +6,7 @@ object TestObject { val t: Int = 0 fun test() { - testRenamed("typeof", { typeof@ while (false) {} }) + testRenamed("this", { `this`@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectLabelUndefined.kt b/js/js.translator/testData/reservedWords/cases/insideObjectLabelThrow.kt similarity index 77% rename from js/js.translator/testData/reservedWords/cases/insideObjectLabelUndefined.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectLabelThrow.kt index 690bb4e2eb7..d5d7e2d7407 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectLabelUndefined.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectLabelThrow.kt @@ -6,7 +6,7 @@ object TestObject { val t: Int = 0 fun test() { - testRenamed("undefined", { undefined@ while (false) {} }) + testRenamed("throw", { `throw`@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectLabelTry.kt b/js/js.translator/testData/reservedWords/cases/insideObjectLabelVoid.kt similarity index 80% rename from js/js.translator/testData/reservedWords/cases/insideObjectLabelTry.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectLabelVoid.kt index dac122e3026..69f2f74c739 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectLabelTry.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectLabelVoid.kt @@ -6,7 +6,7 @@ object TestObject { val t: Int = 0 fun test() { - testRenamed("try", { `try`@ while (false) {} }) + testRenamed("void", { void@ while (false) {} }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectLabelWith.kt b/js/js.translator/testData/reservedWords/cases/insideObjectLabelWith.kt new file mode 100644 index 00000000000..c7d0c20b746 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/insideObjectLabelWith.kt @@ -0,0 +1,17 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +object TestObject { + val t: Int = 0 + + fun test() { + testRenamed("with", { with@ while (false) {} }) + } +} + +fun box(): String { + TestObject.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectVarNull.kt b/js/js.translator/testData/reservedWords/cases/insideObjectValFor.kt similarity index 76% rename from js/js.translator/testData/reservedWords/cases/insideObjectVarNull.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectValFor.kt index f1bcb915f36..43e76c9e27a 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectVarNull.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectValFor.kt @@ -3,10 +3,10 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - var `null`: Int = 0 + val `for`: Int = 0 fun test() { - testNotRenamed("null", { `null` }) + testNotRenamed("for", { `for` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectValIf.kt b/js/js.translator/testData/reservedWords/cases/insideObjectValIf.kt new file mode 100644 index 00000000000..38aa9f125d3 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/insideObjectValIf.kt @@ -0,0 +1,17 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +object TestObject { + val `if`: Int = 0 + + fun test() { + testNotRenamed("if", { `if` }) + } +} + +fun box(): String { + TestObject.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectVarNew.kt b/js/js.translator/testData/reservedWords/cases/insideObjectValNew.kt similarity index 92% rename from js/js.translator/testData/reservedWords/cases/insideObjectVarNew.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectValNew.kt index 9681e8cac11..7501380c6e6 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectVarNew.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectValNew.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - var new: Int = 0 + val new: Int = 0 fun test() { testNotRenamed("new", { new }) diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectValIn.kt b/js/js.translator/testData/reservedWords/cases/insideObjectVarIn.kt similarity index 92% rename from js/js.translator/testData/reservedWords/cases/insideObjectValIn.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectVarIn.kt index 81d35823d23..58b9a3efafe 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectValIn.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectVarIn.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - val `in`: Int = 0 + var `in`: Int = 0 fun test() { testNotRenamed("in", { `in` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectValInterface.kt b/js/js.translator/testData/reservedWords/cases/insideObjectVarInterface.kt similarity index 90% rename from js/js.translator/testData/reservedWords/cases/insideObjectValInterface.kt rename to js/js.translator/testData/reservedWords/cases/insideObjectVarInterface.kt index 9e4b5452df4..4fb6aee2a76 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectValInterface.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectVarInterface.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! object TestObject { - val `interface`: Int = 0 + var `interface`: Int = 0 fun test() { testNotRenamed("interface", { `interface` }) diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectVarProtected.kt b/js/js.translator/testData/reservedWords/cases/insideObjectVarProtected.kt new file mode 100644 index 00000000000..10435616e98 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/insideObjectVarProtected.kt @@ -0,0 +1,17 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +object TestObject { + var protected: Int = 0 + + fun test() { + testNotRenamed("protected", { protected }) + } +} + +fun box(): String { + TestObject.test() + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/localCatchUndefined.kt b/js/js.translator/testData/reservedWords/cases/localCatchFor.kt similarity index 71% rename from js/js.translator/testData/reservedWords/cases/localCatchUndefined.kt rename to js/js.translator/testData/reservedWords/cases/localCatchFor.kt index bd2e72d8882..023482fb1ac 100644 --- a/js/js.translator/testData/reservedWords/cases/localCatchUndefined.kt +++ b/js/js.translator/testData/reservedWords/cases/localCatchFor.kt @@ -9,8 +9,8 @@ fun box(): String { try { throw Exception() } - catch(undefined: Exception) { - testRenamed("undefined", { undefined }) + catch(`for`: Exception) { + testRenamed("for", { `for` }) } return "OK" diff --git a/js/js.translator/testData/reservedWords/cases/localCatchIn.kt b/js/js.translator/testData/reservedWords/cases/localCatchWith.kt similarity index 75% rename from js/js.translator/testData/reservedWords/cases/localCatchIn.kt rename to js/js.translator/testData/reservedWords/cases/localCatchWith.kt index de4d5599ec5..31bc707453f 100644 --- a/js/js.translator/testData/reservedWords/cases/localCatchIn.kt +++ b/js/js.translator/testData/reservedWords/cases/localCatchWith.kt @@ -9,8 +9,8 @@ fun box(): String { try { throw Exception() } - catch(`in`: Exception) { - testRenamed("in", { `in` }) + catch(with: Exception) { + testRenamed("with", { with }) } return "OK" diff --git a/js/js.translator/testData/reservedWords/cases/localFunBreak.kt b/js/js.translator/testData/reservedWords/cases/localFunBreak.kt new file mode 100644 index 00000000000..9a05e0dea23 --- /dev/null +++ b/js/js.translator/testData/reservedWords/cases/localFunBreak.kt @@ -0,0 +1,11 @@ +package foo + +// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! + +fun box(): String { + fun `break`() { `break`() } + + testRenamed("break", { `break`() }) + + return "OK" +} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/localFunContinue.kt b/js/js.translator/testData/reservedWords/cases/localFunContinue.kt deleted file mode 100644 index 8e881f8fc89..00000000000 --- a/js/js.translator/testData/reservedWords/cases/localFunContinue.kt +++ /dev/null @@ -1,11 +0,0 @@ -package foo - -// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! - -fun box(): String { - fun `continue`() { `continue`() } - - testRenamed("continue", { `continue`() }) - - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/localFunParamElse.kt b/js/js.translator/testData/reservedWords/cases/localFunParamContinue.kt similarity index 58% rename from js/js.translator/testData/reservedWords/cases/localFunParamElse.kt rename to js/js.translator/testData/reservedWords/cases/localFunParamContinue.kt index 1ff0b81d4e0..6527756260f 100644 --- a/js/js.translator/testData/reservedWords/cases/localFunParamElse.kt +++ b/js/js.translator/testData/reservedWords/cases/localFunParamContinue.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(`else`: String) { - assertEquals("123", `else`) - testRenamed("else", { `else` }) + fun foo(`continue`: String) { + assertEquals("123", `continue`) + testRenamed("continue", { `continue` }) } foo("123") diff --git a/js/js.translator/testData/reservedWords/cases/localLabelFor.kt b/js/js.translator/testData/reservedWords/cases/localLabelElse.kt similarity index 75% rename from js/js.translator/testData/reservedWords/cases/localLabelFor.kt rename to js/js.translator/testData/reservedWords/cases/localLabelElse.kt index 5ef639051df..c6862b0fa45 100644 --- a/js/js.translator/testData/reservedWords/cases/localLabelFor.kt +++ b/js/js.translator/testData/reservedWords/cases/localLabelElse.kt @@ -5,7 +5,7 @@ package foo fun box(): String { val t: Int = 0 - testRenamed("for", { `for`@ while (false) {} }) + testRenamed("else", { `else`@ while (false) {} }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/localLabelTypeof.kt b/js/js.translator/testData/reservedWords/cases/localLabelUndefined.kt similarity index 72% rename from js/js.translator/testData/reservedWords/cases/localLabelTypeof.kt rename to js/js.translator/testData/reservedWords/cases/localLabelUndefined.kt index 2a05a8b31c3..27d949b2490 100644 --- a/js/js.translator/testData/reservedWords/cases/localLabelTypeof.kt +++ b/js/js.translator/testData/reservedWords/cases/localLabelUndefined.kt @@ -5,7 +5,7 @@ package foo fun box(): String { val t: Int = 0 - testRenamed("typeof", { typeof@ while (false) {} }) + testRenamed("undefined", { undefined@ while (false) {} }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/localVarBreak.kt b/js/js.translator/testData/reservedWords/cases/localValTypeof.kt similarity index 68% rename from js/js.translator/testData/reservedWords/cases/localVarBreak.kt rename to js/js.translator/testData/reservedWords/cases/localValTypeof.kt index d4bb9493d02..ec32996855c 100644 --- a/js/js.translator/testData/reservedWords/cases/localVarBreak.kt +++ b/js/js.translator/testData/reservedWords/cases/localValTypeof.kt @@ -3,9 +3,9 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! fun box(): String { - var `break`: Int = 0 + val `typeof`: Int = 0 - testRenamed("break", { `break` }) + testRenamed("typeof", { `typeof` }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/localValWhile.kt b/js/js.translator/testData/reservedWords/cases/localVarWhile.kt similarity index 88% rename from js/js.translator/testData/reservedWords/cases/localValWhile.kt rename to js/js.translator/testData/reservedWords/cases/localVarWhile.kt index 9e03f3c42ac..1e3b71049da 100644 --- a/js/js.translator/testData/reservedWords/cases/localValWhile.kt +++ b/js/js.translator/testData/reservedWords/cases/localVarWhile.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! fun box(): String { - val `while`: Int = 0 + var `while`: Int = 0 testRenamed("while", { `while` }) diff --git a/js/js.translator/testData/standardClasses/cases/hashMapTypeOfElement.kt b/js/js.translator/testData/standardClasses/cases/hashMapTypeOfElement.kt index 78b367b6aca..d6d2a023acb 100644 --- a/js/js.translator/testData/standardClasses/cases/hashMapTypeOfElement.kt +++ b/js/js.translator/testData/standardClasses/cases/hashMapTypeOfElement.kt @@ -2,8 +2,6 @@ package foo import java.util.HashMap -@native fun typeof(a: Any): String = noImpl - fun box(): String { val x = true @@ -11,75 +9,75 @@ fun box(): String { val mapWithIntKeys = HashMap() mapWithIntKeys[1] = 1 - assertEquals("number", typeof (mapWithIntKeys.keySet().iterator().next()), "mapWithIntKeys") + assertEquals("number", jsTypeOf (mapWithIntKeys.keySet().iterator().next()), "mapWithIntKeys") val mapWithShortKeys = HashMap() mapWithShortKeys[1.toShort()] = 1 - assertEquals("number", typeof (mapWithShortKeys.keySet().iterator().next()), "mapWithShortKeys") + assertEquals("number", jsTypeOf (mapWithShortKeys.keySet().iterator().next()), "mapWithShortKeys") val mapWithByteKeys = HashMap() mapWithByteKeys[1.toByte()] = 1 - assertEquals("number", typeof (mapWithByteKeys.keySet().iterator().next()), "mapWithByteKeys") + assertEquals("number", jsTypeOf (mapWithByteKeys.keySet().iterator().next()), "mapWithByteKeys") val mapWithDoubleKeys = HashMap() mapWithDoubleKeys[1.0] = 1 - assertEquals("number", typeof (mapWithDoubleKeys.keySet().iterator().next()), "mapWithDoubleKeys") + assertEquals("number", jsTypeOf (mapWithDoubleKeys.keySet().iterator().next()), "mapWithDoubleKeys") mapWithDoubleKeys.clear() var dNaN = 0.0 / 0.0 mapWithDoubleKeys[dNaN] = 100 assertEquals(100, mapWithDoubleKeys[dNaN]) - assertEquals("number", typeof (mapWithDoubleKeys.keySet().iterator().next()), "dNaN") + assertEquals("number", jsTypeOf (mapWithDoubleKeys.keySet().iterator().next()), "dNaN") mapWithDoubleKeys.clear() var dPositiveInfinity = +1.0 / 0.0 mapWithDoubleKeys[dPositiveInfinity] = 100 assertEquals(100, mapWithDoubleKeys[dPositiveInfinity]) - assertEquals("number", typeof (mapWithDoubleKeys.keySet().iterator().next()), "dPositiveInfinity") + assertEquals("number", jsTypeOf (mapWithDoubleKeys.keySet().iterator().next()), "dPositiveInfinity") mapWithDoubleKeys.clear() var dNegativeInfinity = -1.0 / 0.0 mapWithDoubleKeys[dNegativeInfinity] = 100 assertEquals(100, mapWithDoubleKeys[dNegativeInfinity]) - assertEquals("number", typeof (mapWithDoubleKeys.keySet().iterator().next()), "dNegativeInfinity") + assertEquals("number", jsTypeOf (mapWithDoubleKeys.keySet().iterator().next()), "dNegativeInfinity") val mapWithFloatKeys = HashMap() mapWithFloatKeys[1.0f] = 1 - assertEquals("number", typeof (mapWithFloatKeys.keySet().iterator().next()), "mapWithFloatKeys") + assertEquals("number", jsTypeOf (mapWithFloatKeys.keySet().iterator().next()), "mapWithFloatKeys") mapWithFloatKeys.clear() var fNaN: Float = 0.0f / 0.0f mapWithFloatKeys[fNaN] = 100 assertEquals(100, mapWithFloatKeys[fNaN]) - assertEquals("number", typeof (mapWithFloatKeys.keySet().iterator().next()), "fNaN") + assertEquals("number", jsTypeOf (mapWithFloatKeys.keySet().iterator().next()), "fNaN") mapWithFloatKeys.clear() var fPositiveInfinity = +1.0f / 0.0f mapWithFloatKeys[fPositiveInfinity] = 100 assertEquals(100, mapWithFloatKeys[fPositiveInfinity]) - assertEquals("number", typeof (mapWithFloatKeys.keySet().iterator().next()), "fPositiveInfinity") + assertEquals("number", jsTypeOf (mapWithFloatKeys.keySet().iterator().next()), "fPositiveInfinity") mapWithFloatKeys.clear() var NegativeInfinity = -1.0f / 0.0f mapWithFloatKeys[NegativeInfinity] = 100 assertEquals(100, mapWithFloatKeys[NegativeInfinity]) - assertEquals("number", typeof (mapWithFloatKeys.keySet().iterator().next()), "fNegativeInfinity") + assertEquals("number", jsTypeOf (mapWithFloatKeys.keySet().iterator().next()), "fNegativeInfinity") val mapWithCharKeys = HashMap() mapWithCharKeys['A'] = 1 - assertEquals("number", typeof (mapWithCharKeys.keySet().iterator().next()), "mapWithCharKeys") + assertEquals("number", jsTypeOf (mapWithCharKeys.keySet().iterator().next()), "mapWithCharKeys") val mapWithLongKeys = HashMap() mapWithLongKeys[1L] = 1 - assertEquals("number", typeof (mapWithLongKeys.keySet().iterator().next()), "mapWithLongKeys") + assertEquals("number", jsTypeOf (mapWithLongKeys.keySet().iterator().next()), "mapWithLongKeys") val mapWithBooleanKeys = HashMap() mapWithBooleanKeys[true] = 1 - assertEquals("boolean", typeof (mapWithBooleanKeys.keySet().iterator().next()), "mapWithBooleanKeys") + assertEquals("boolean", jsTypeOf (mapWithBooleanKeys.keySet().iterator().next()), "mapWithBooleanKeys") val mapWithStringKeys = HashMap() mapWithStringKeys["key"] = 1 - assertEquals("string", typeof (mapWithStringKeys.keySet().iterator().next()), "mapWithStringKeys") + assertEquals("string", jsTypeOf (mapWithStringKeys.keySet().iterator().next()), "mapWithStringKeys") return "OK" } diff --git a/js/js.translator/testData/standardClasses/cases/hashSetTypeOfElement.kt b/js/js.translator/testData/standardClasses/cases/hashSetTypeOfElement.kt index 90026374e38..a4663dc94a1 100644 --- a/js/js.translator/testData/standardClasses/cases/hashSetTypeOfElement.kt +++ b/js/js.translator/testData/standardClasses/cases/hashSetTypeOfElement.kt @@ -2,8 +2,6 @@ package foo import java.util.HashSet -@native fun typeof(a: Any): String = noImpl - fun box(): String { val x = true @@ -11,63 +9,63 @@ fun box(): String { val intSet = HashSet() intSet.add(1) - assertEquals("number", typeof (intSet.iterator().next()), "intSet") + assertEquals("number", jsTypeOf (intSet.iterator().next()), "intSet") val shortSet = HashSet() shortSet.add(1.toShort()) - assertEquals("number", typeof (shortSet.iterator().next()), "shortSet") + assertEquals("number", jsTypeOf (shortSet.iterator().next()), "shortSet") val byteSet = HashSet() byteSet.add(1.toByte()) - assertEquals("number", typeof (byteSet.iterator().next()), "byteSet") + assertEquals("number", jsTypeOf (byteSet.iterator().next()), "byteSet") val doubleSet = HashSet() doubleSet.add(1.0) - assertEquals("number", typeof (doubleSet.iterator().next()), "doubleSet") + assertEquals("number", jsTypeOf (doubleSet.iterator().next()), "doubleSet") doubleSet.clear() doubleSet.add(0.0 / 0.0) - assertEquals("number", typeof (doubleSet.iterator().next()), "dNaN") + assertEquals("number", jsTypeOf (doubleSet.iterator().next()), "dNaN") doubleSet.clear() doubleSet.add(1.0 / 0.0) - assertEquals("number", typeof (doubleSet.iterator().next()), "dPositiveInfinity") + assertEquals("number", jsTypeOf (doubleSet.iterator().next()), "dPositiveInfinity") doubleSet.clear() doubleSet.add(-1.0 / 0.0) - assertEquals("number", typeof (doubleSet.iterator().next()), "dNegativeInfinity") + assertEquals("number", jsTypeOf (doubleSet.iterator().next()), "dNegativeInfinity") val floatSet = HashSet() floatSet.add(1.0f) - assertEquals("number", typeof (floatSet.iterator().next()), "floatSet") + assertEquals("number", jsTypeOf (floatSet.iterator().next()), "floatSet") floatSet.clear() floatSet.add(0.0f / 0.0f) - assertEquals("number", typeof (floatSet.iterator().next()), "fNaN") + assertEquals("number", jsTypeOf (floatSet.iterator().next()), "fNaN") floatSet.clear() floatSet.add(+1.0f / 0.0f) - assertEquals("number", typeof (floatSet.iterator().next()), "fPositiveInfinity") + assertEquals("number", jsTypeOf (floatSet.iterator().next()), "fPositiveInfinity") floatSet.clear() floatSet.add(-1.0f / 0.0f) - assertEquals("number", typeof (floatSet.iterator().next()), "fNegativeInfinity") + assertEquals("number", jsTypeOf (floatSet.iterator().next()), "fNegativeInfinity") val charSet = HashSet() charSet.add('A') - assertEquals("number", typeof (charSet.iterator().next()), "charSet") + assertEquals("number", jsTypeOf (charSet.iterator().next()), "charSet") val longSet = HashSet() longSet.add(1L) - assertEquals("number", typeof (longSet.iterator().next()), "longSet") + assertEquals("number", jsTypeOf (longSet.iterator().next()), "longSet") val booleanSet = HashSet() booleanSet.add(true) - assertEquals("boolean", typeof (booleanSet.iterator().next()), "booleanSet") + assertEquals("boolean", jsTypeOf (booleanSet.iterator().next()), "booleanSet") val stringSet = HashSet() stringSet.add("text") - assertEquals("string", typeof (stringSet.iterator().next()), "stringSet") + assertEquals("string", jsTypeOf (stringSet.iterator().next()), "stringSet") return "OK" }