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 f5c74023151..8a1e730dd1d 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 4/28/16 4:31 PM */
+/* The following code was generated by JFlex 1.4.3 on 5/19/16 4:06 PM */
package org.jetbrains.kotlin.kdoc.lexer;
@@ -11,10 +11,10 @@ import org.jetbrains.kotlin.kdoc.parser.KDocKnownTag;
/**
- * This class is a scanner generated by
+ * This class is a scanner generated by
* JFlex 1.4.3
- * on 4/28/16 4:31 PM from the specification file
- * /Users/yole/jetbrains/kotlin/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDoc.flex
+ * on 5/19/16 4:06 PM from the specification file
+ * /home/dzharkov/work/kotlin/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDoc.flex
*/
class _KDocLexer implements FlexLexer {
/** initial size of the lookahead buffer */
@@ -37,83 +37,103 @@ class _KDocLexer implements FlexLexer {
* at the beginning of a line
* l is of the form l = 2*k, k a non negative integer
*/
- private static final int ZZ_LEXSTATE[] = {
- 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7,
+ private static final int ZZ_LEXSTATE[] = {
+ 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7,
8, 8
};
- /**
+ /**
* Translates characters to character classes
*/
- private static final String ZZ_CMAP_PACKED =
+ private static final String ZZ_CMAP_PACKED =
"\11\0\1\1\1\11\1\0\1\1\23\0\1\1\3\0\1\3\3\0"+
"\1\16\1\17\1\13\3\0\1\4\1\12\12\2\6\0\1\14\32\3"+
"\1\5\1\15\1\6\1\0\1\3\1\7\32\3\3\0\1\10\43\0"+
"\4\3\4\0\1\3\12\0\1\3\4\0\1\3\5\0\27\3\1\0"+
- "\37\3\1\0\u013f\3\31\0\162\3\4\0\14\3\16\0\5\3\11\0"+
- "\1\3\213\0\1\3\13\0\1\3\1\0\3\3\1\0\1\3\1\0"+
- "\24\3\1\0\54\3\1\0\46\3\1\0\5\3\4\0\202\3\10\0"+
- "\105\3\1\0\46\3\2\0\2\3\6\0\20\3\41\0\46\3\2\0"+
- "\1\3\7\0\47\3\110\0\33\3\5\0\3\3\56\0\32\3\5\0"+
- "\13\3\43\0\2\3\1\0\143\3\1\0\1\3\17\0\2\3\7\0"+
- "\2\3\12\0\3\3\2\0\1\3\20\0\1\3\1\0\36\3\35\0"+
- "\3\3\60\0\46\3\13\0\1\3\u0152\0\66\3\3\0\1\3\22\0"+
- "\1\3\7\0\12\3\43\0\10\3\2\0\2\3\2\0\26\3\1\0"+
- "\7\3\1\0\1\3\3\0\4\3\3\0\1\3\36\0\2\3\1\0"+
- "\3\3\16\0\4\3\21\0\6\3\4\0\2\3\2\0\26\3\1\0"+
- "\7\3\1\0\2\3\1\0\2\3\1\0\2\3\37\0\4\3\1\0"+
- "\1\3\23\0\3\3\20\0\11\3\1\0\3\3\1\0\26\3\1\0"+
- "\7\3\1\0\2\3\1\0\5\3\3\0\1\3\22\0\1\3\17\0"+
- "\2\3\17\0\1\3\23\0\10\3\2\0\2\3\2\0\26\3\1\0"+
- "\7\3\1\0\2\3\1\0\5\3\3\0\1\3\36\0\2\3\1\0"+
- "\3\3\17\0\1\3\21\0\1\3\1\0\6\3\3\0\3\3\1\0"+
- "\4\3\3\0\2\3\1\0\1\3\1\0\2\3\3\0\2\3\3\0"+
- "\3\3\3\0\10\3\1\0\3\3\77\0\1\3\13\0\10\3\1\0"+
- "\3\3\1\0\27\3\1\0\12\3\1\0\5\3\46\0\2\3\43\0"+
+ "\37\3\1\0\u01ca\3\4\0\14\3\16\0\5\3\7\0\1\3\1\0"+
+ "\1\3\201\0\5\3\1\0\2\3\2\0\4\3\10\0\1\3\1\0"+
+ "\3\3\1\0\1\3\1\0\24\3\1\0\123\3\1\0\213\3\10\0"+
+ "\236\3\11\0\46\3\2\0\1\3\7\0\47\3\7\0\1\3\100\0"+
+ "\33\3\5\0\3\3\30\0\1\3\24\0\53\3\43\0\2\3\1\0"+
+ "\143\3\1\0\1\3\17\0\2\3\7\0\2\3\12\0\3\3\2\0"+
+ "\1\3\20\0\1\3\1\0\36\3\35\0\131\3\13\0\1\3\30\0"+
+ "\41\3\11\0\2\3\4\0\1\3\5\0\26\3\4\0\1\3\11\0"+
+ "\1\3\3\0\1\3\27\0\31\3\107\0\1\3\1\0\13\3\127\0"+
+ "\66\3\3\0\1\3\22\0\1\3\7\0\12\3\17\0\7\3\1\0"+
+ "\7\3\5\0\10\3\2\0\2\3\2\0\26\3\1\0\7\3\1\0"+
+ "\1\3\3\0\4\3\3\0\1\3\20\0\1\3\15\0\2\3\1\0"+
+ "\3\3\16\0\4\3\7\0\1\3\11\0\6\3\4\0\2\3\2\0"+
+ "\26\3\1\0\7\3\1\0\2\3\1\0\2\3\1\0\2\3\37\0"+
+ "\4\3\1\0\1\3\23\0\3\3\20\0\11\3\1\0\3\3\1\0"+
+ "\26\3\1\0\7\3\1\0\2\3\1\0\5\3\3\0\1\3\22\0"+
+ "\1\3\17\0\2\3\17\0\1\3\23\0\10\3\2\0\2\3\2\0"+
+ "\26\3\1\0\7\3\1\0\2\3\1\0\5\3\3\0\1\3\36\0"+
+ "\2\3\1\0\3\3\17\0\1\3\21\0\1\3\1\0\6\3\3\0"+
+ "\3\3\1\0\4\3\3\0\2\3\1\0\1\3\1\0\2\3\3\0"+
+ "\2\3\3\0\3\3\3\0\14\3\26\0\1\3\50\0\1\3\13\0"+
"\10\3\1\0\3\3\1\0\27\3\1\0\12\3\1\0\5\3\3\0"+
- "\1\3\40\0\1\3\1\0\2\3\43\0\10\3\1\0\3\3\1\0"+
- "\27\3\1\0\20\3\46\0\2\3\43\0\22\3\3\0\30\3\1\0"+
- "\11\3\1\0\1\3\2\0\7\3\72\0\60\3\1\0\2\3\13\0"+
- "\10\3\72\0\2\3\1\0\1\3\2\0\2\3\1\0\1\3\2\0"+
- "\1\3\6\0\4\3\1\0\7\3\1\0\3\3\1\0\1\3\1\0"+
- "\1\3\2\0\2\3\1\0\4\3\1\0\2\3\11\0\1\3\2\0"+
- "\5\3\1\0\1\3\25\0\2\3\42\0\1\3\77\0\10\3\1\0"+
- "\42\3\35\0\4\3\164\0\42\3\1\0\5\3\1\0\2\3\45\0"+
- "\6\3\112\0\46\3\12\0\51\3\7\0\132\3\5\0\104\3\5\0"+
- "\122\3\6\0\7\3\1\0\77\3\1\0\1\3\1\0\4\3\2\0"+
- "\7\3\1\0\1\3\1\0\4\3\2\0\47\3\1\0\1\3\1\0"+
- "\4\3\2\0\37\3\1\0\1\3\1\0\4\3\2\0\7\3\1\0"+
- "\1\3\1\0\4\3\2\0\7\3\1\0\7\3\1\0\27\3\1\0"+
- "\37\3\1\0\1\3\1\0\4\3\2\0\7\3\1\0\47\3\1\0"+
- "\23\3\105\0\125\3\14\0\u026c\3\2\0\10\3\12\0\32\3\5\0"+
- "\113\3\3\0\3\3\17\0\15\3\1\0\4\3\16\0\22\3\16\0"+
- "\22\3\16\0\15\3\1\0\3\3\17\0\64\3\43\0\1\3\3\0"+
- "\2\3\103\0\130\3\10\0\51\3\127\0\35\3\63\0\36\3\2\0"+
- "\5\3\u038b\0\154\3\224\0\234\3\4\0\132\3\6\0\26\3\2\0"+
- "\6\3\2\0\46\3\2\0\6\3\2\0\10\3\1\0\1\3\1\0"+
- "\1\3\1\0\1\3\1\0\37\3\2\0\65\3\1\0\7\3\1\0"+
- "\1\3\3\0\3\3\1\0\7\3\3\0\4\3\2\0\6\3\4\0"+
- "\15\3\5\0\3\3\1\0\7\3\102\0\2\3\23\0\1\3\34\0"+
- "\1\3\15\0\1\3\40\0\22\3\120\0\1\3\4\0\1\3\2\0"+
- "\12\3\1\0\1\3\3\0\5\3\6\0\1\3\1\0\1\3\1\0"+
- "\1\3\1\0\4\3\1\0\3\3\1\0\7\3\3\0\3\3\5\0"+
- "\5\3\26\0\44\3\u0e81\0\3\3\31\0\11\3\7\0\5\3\2\0"+
- "\5\3\4\0\126\3\6\0\3\3\1\0\137\3\5\0\50\3\4\0"+
- "\136\3\21\0\30\3\70\0\20\3\u0200\0\u19b6\3\112\0\u51a6\3\132\0"+
- "\u048d\3\u0773\0\u2ba4\3\u215c\0\u012e\3\2\0\73\3\225\0\7\3\14\0"+
- "\5\3\5\0\1\3\1\0\12\3\1\0\15\3\1\0\5\3\1\0"+
- "\1\3\1\0\2\3\1\0\2\3\1\0\154\3\41\0\u016b\3\22\0"+
- "\100\3\2\0\66\3\50\0\15\3\66\0\2\3\30\0\3\3\31\0"+
- "\1\3\6\0\5\3\1\0\207\3\7\0\1\3\34\0\32\3\4\0"+
- "\1\3\1\0\32\3\12\0\132\3\3\0\6\3\2\0\6\3\2\0"+
- "\6\3\2\0\3\3\3\0\2\3\3\0\2\3\31\0";
+ "\1\3\32\0\2\3\6\0\2\3\43\0\10\3\1\0\3\3\1\0"+
+ "\27\3\1\0\12\3\1\0\5\3\3\0\1\3\40\0\1\3\1\0"+
+ "\2\3\17\0\2\3\22\0\10\3\1\0\3\3\1\0\51\3\2\0"+
+ "\1\3\20\0\1\3\21\0\2\3\30\0\6\3\5\0\22\3\3\0"+
+ "\30\3\1\0\11\3\1\0\1\3\2\0\7\3\72\0\60\3\1\0"+
+ "\2\3\13\0\10\3\72\0\2\3\1\0\1\3\2\0\2\3\1\0"+
+ "\1\3\2\0\1\3\6\0\4\3\1\0\7\3\1\0\3\3\1\0"+
+ "\1\3\1\0\1\3\2\0\2\3\1\0\4\3\1\0\2\3\11\0"+
+ "\1\3\2\0\5\3\1\0\1\3\25\0\4\3\40\0\1\3\77\0"+
+ "\10\3\1\0\44\3\33\0\5\3\163\0\53\3\24\0\1\3\20\0"+
+ "\6\3\4\0\4\3\3\0\1\3\3\0\2\3\7\0\3\3\4\0"+
+ "\15\3\14\0\1\3\21\0\46\3\1\0\1\3\5\0\1\3\2\0"+
+ "\53\3\1\0\u014d\3\1\0\4\3\2\0\7\3\1\0\1\3\1\0"+
+ "\4\3\2\0\51\3\1\0\4\3\2\0\41\3\1\0\4\3\2\0"+
+ "\7\3\1\0\1\3\1\0\4\3\2\0\17\3\1\0\71\3\1\0"+
+ "\4\3\2\0\103\3\45\0\20\3\20\0\125\3\14\0\u026c\3\2\0"+
+ "\21\3\1\0\32\3\5\0\113\3\3\0\3\3\17\0\15\3\1\0"+
+ "\4\3\16\0\22\3\16\0\22\3\16\0\15\3\1\0\3\3\17\0"+
+ "\64\3\43\0\1\3\3\0\2\3\103\0\130\3\10\0\51\3\1\0"+
+ "\1\3\5\0\106\3\12\0\35\3\63\0\36\3\2\0\5\3\13\0"+
+ "\54\3\25\0\7\3\70\0\27\3\11\0\65\3\122\0\1\3\135\0"+
+ "\57\3\21\0\7\3\67\0\36\3\15\0\2\3\12\0\54\3\32\0"+
+ "\44\3\51\0\3\3\12\0\44\3\153\0\4\3\1\0\4\3\3\0"+
+ "\2\3\11\0\300\3\100\0\u0116\3\2\0\6\3\2\0\46\3\2\0"+
+ "\6\3\2\0\10\3\1\0\1\3\1\0\1\3\1\0\1\3\1\0"+
+ "\37\3\2\0\65\3\1\0\7\3\1\0\1\3\3\0\3\3\1\0"+
+ "\7\3\3\0\4\3\2\0\6\3\4\0\15\3\5\0\3\3\1\0"+
+ "\7\3\102\0\2\3\23\0\1\3\34\0\1\3\15\0\1\3\20\0"+
+ "\15\3\3\0\33\3\107\0\1\3\4\0\1\3\2\0\12\3\1\0"+
+ "\1\3\3\0\5\3\6\0\1\3\1\0\1\3\1\0\1\3\1\0"+
+ "\4\3\1\0\13\3\2\0\4\3\5\0\5\3\4\0\1\3\21\0"+
+ "\51\3\u0a77\0\57\3\1\0\57\3\1\0\205\3\6\0\4\3\3\0"+
+ "\2\3\14\0\46\3\1\0\1\3\5\0\1\3\2\0\70\3\7\0"+
+ "\1\3\20\0\27\3\11\0\7\3\1\0\7\3\1\0\7\3\1\0"+
+ "\7\3\1\0\7\3\1\0\7\3\1\0\7\3\1\0\7\3\120\0"+
+ "\1\3\u01d5\0\3\3\31\0\11\3\7\0\5\3\2\0\5\3\4\0"+
+ "\126\3\6\0\3\3\1\0\132\3\1\0\4\3\5\0\51\3\3\0"+
+ "\136\3\21\0\33\3\65\0\20\3\u0200\0\u19b6\3\112\0\u51cd\3\63\0"+
+ "\u048d\3\103\0\56\3\2\0\u010d\3\3\0\20\3\12\0\2\3\24\0"+
+ "\57\3\20\0\31\3\10\0\120\3\47\0\11\3\2\0\147\3\2\0"+
+ "\4\3\1\0\4\3\14\0\13\3\115\0\12\3\1\0\3\3\1\0"+
+ "\4\3\1\0\27\3\25\0\1\3\7\0\64\3\16\0\62\3\76\0"+
+ "\6\3\3\0\1\3\16\0\34\3\12\0\27\3\31\0\35\3\7\0"+
+ "\57\3\34\0\1\3\60\0\51\3\27\0\3\3\1\0\10\3\24\0"+
+ "\27\3\3\0\1\3\5\0\60\3\1\0\1\3\3\0\2\3\2\0"+
+ "\5\3\2\0\1\3\1\0\1\3\30\0\3\3\2\0\13\3\7\0"+
+ "\3\3\14\0\6\3\2\0\6\3\2\0\6\3\11\0\7\3\1\0"+
+ "\7\3\221\0\43\3\35\0\u2ba4\3\14\0\27\3\4\0\61\3\u2104\0"+
+ "\u016e\3\2\0\152\3\46\0\7\3\14\0\5\3\5\0\1\3\1\0"+
+ "\12\3\1\0\15\3\1\0\5\3\1\0\1\3\1\0\2\3\1\0"+
+ "\2\3\1\0\154\3\41\0\u016b\3\22\0\100\3\2\0\66\3\50\0"+
+ "\15\3\66\0\2\3\30\0\3\3\31\0\1\3\6\0\5\3\1\0"+
+ "\207\3\7\0\1\3\34\0\32\3\4\0\1\3\1\0\32\3\13\0"+
+ "\131\3\3\0\6\3\2\0\6\3\2\0\6\3\2\0\3\3\3\0"+
+ "\2\3\3\0\2\3\31\0";
- /**
+ /**
* Translates characters to character classes
*/
private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
- /**
+ /**
* Translates DFA states to action switch labels.
*/
private static final int [] ZZ_ACTION = zzUnpackAction();
@@ -144,7 +164,7 @@ class _KDocLexer implements FlexLexer {
}
- /**
+ /**
* Translates a state to a row index in the transition table
*/
private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
@@ -177,7 +197,7 @@ class _KDocLexer implements FlexLexer {
return j;
}
- /**
+ /**
* The transition table of the DFA
*/
private static final int [] ZZ_TRANS = zzUnpackTrans();
@@ -345,7 +365,7 @@ class _KDocLexer implements FlexLexer {
}
- /**
+ /**
* Unpacks the compressed character translation table.
*
* @param packed the packed character translation table
@@ -355,7 +375,7 @@ class _KDocLexer implements FlexLexer {
char [] map = new char[0x10000];
int i = 0; /* index in packed string */
int j = 0; /* index in unpacked array */
- while (i < 1216) {
+ while (i < 1608) {
int count = packed.charAt(i++);
char value = packed.charAt(i++);
do map[j++] = value; while (--count > 0);
@@ -578,31 +598,31 @@ class _KDocLexer implements FlexLexer {
zzMarkedPos = zzMarkedPosL;
switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
- case 15:
+ case 15:
{ yybegin(CODE_BLOCK_LINE_BEGINNING);
return KDocTokens.TEXT;
}
case 21: break;
- case 10:
+ case 10:
{ yybegin(CODE_BLOCK_CONTENTS_BEGINNING);
return KDocTokens.LEADING_ASTERISK;
}
case 22: break;
- case 1:
+ case 1:
{ return TokenType.BAD_CHARACTER;
}
case 23: break;
- case 14:
+ case 14:
{ yybegin(CONTENTS_BEGINNING);
return KDocTokens.START;
}
case 24: break;
- case 2:
+ case 2:
{ yybegin(CONTENTS);
return KDocTokens.TEXT;
}
case 25: break;
- case 20:
+ case 20:
// lookahead expression with fixed base length
zzMarkedPos = zzStartRead + 3;
{ // Code fence end
@@ -610,32 +630,32 @@ class _KDocLexer implements FlexLexer {
return KDocTokens.TEXT;
}
case 26: break;
- case 19:
+ case 19:
{ yybegin(CONTENTS);
return KDocTokens.MARKDOWN_INLINE_LINK;
}
case 27: break;
- case 5:
+ case 5:
{ yybegin(CONTENTS);
return KDocTokens.TEXT;
}
case 28: break;
- case 12:
+ case 12:
{ yybegin(CONTENTS);
return KDocTokens.MARKDOWN_ESCAPED_CHAR;
}
case 29: break;
- case 16:
+ case 16:
{ yybegin(TAG_TEXT_BEGINNING);
return KDocTokens.MARKDOWN_LINK;
}
case 30: break;
- case 4:
+ case 4:
{ yybegin(CONTENTS_BEGINNING);
return KDocTokens.LEADING_ASTERISK;
}
case 31: break;
- case 9:
+ case 9:
{ if (yytextContainLineBreaks()) {
yybegin(CODE_BLOCK_LINE_BEGINNING);
return TokenType.WHITE_SPACE;
@@ -643,7 +663,7 @@ class _KDocLexer implements FlexLexer {
return KDocTokens.CODE_BLOCK_TEXT;
}
case 32: break;
- case 3:
+ case 3:
{ if (yytextContainLineBreaks()) {
yybegin(LINE_BEGINNING);
return TokenType.WHITE_SPACE;
@@ -653,42 +673,42 @@ class _KDocLexer implements FlexLexer {
}
}
case 33: break;
- case 18:
+ case 18:
// lookahead expression with fixed lookahead length
yypushback(1);
{ yybegin(CONTENTS);
return KDocTokens.MARKDOWN_LINK;
}
case 34: break;
- case 17:
+ case 17:
{ yybegin(CONTENTS);
return KDocTokens.MARKDOWN_LINK;
}
case 35: break;
- case 11:
+ case 11:
{ if (isLastToken()) return KDocTokens.END;
else return KDocTokens.TEXT;
}
case 36: break;
- case 7:
+ case 7:
{ yybegin(TAG_TEXT_BEGINNING);
return KDocTokens.MARKDOWN_LINK;
}
case 37: break;
- case 13:
+ case 13:
{ KDocKnownTag tag = KDocKnownTag.Companion.findByTagName(zzBuffer.subSequence(zzStartRead, zzMarkedPos));
yybegin(tag != null && tag.isReferenceRequired() ? TAG_BEGINNING : TAG_TEXT_BEGINNING);
return KDocTokens.TAG_NAME;
}
case 38: break;
- case 6:
+ case 6:
{ if (yytextContainLineBreaks()) {
yybegin(LINE_BEGINNING);
}
return TokenType.WHITE_SPACE;
}
case 39: break;
- case 8:
+ case 8:
{ yybegin(CODE_BLOCK);
return KDocTokens.CODE_BLOCK_TEXT;
}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex b/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex
index cba8e760814..b9c6ed1edce 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex
+++ b/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.lexer.KtTokens;
private final Stack states = new Stack();
private int lBraceCount;
-
+
private int commentStart;
private int commentDepth;
@@ -246,7 +246,6 @@ LONG_TEMPLATE_ENTRY_START=\$\{
"throw" { return KtTokens.THROW_KEYWORD ;}
"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 ;}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java b/compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java
index 5f4f2ca47ab..3545a7cc42c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/lexer/KtTokens.java
@@ -78,7 +78,6 @@ public interface KtTokens {
KtKeywordToken INTERFACE_KEYWORD = KtKeywordToken.keyword("interface");
// 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?");
@@ -197,7 +196,6 @@ 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,
TYPEOF_KEYWORD
);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/lexer/_JetLexer.java b/compiler/frontend/src/org/jetbrains/kotlin/lexer/_JetLexer.java
index 173fb23adf0..3dba02ba806 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/lexer/_JetLexer.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/lexer/_JetLexer.java
@@ -1,18 +1,21 @@
-/* The following code was generated by JFlex 1.4.3 on 12/9/15 7:45 PM */
+/* The following code was generated by JFlex 1.4.3 on 5/19/16 4:06 PM */
package org.jetbrains.kotlin.lexer;
-import com.intellij.lexer.FlexLexer;
-import com.intellij.psi.TokenType;
+import java.util.*;
+import com.intellij.lexer.*;
+import com.intellij.psi.*;
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 12/9/15 7:45 PM from the specification file
- * /home/user/projects/kotlin/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex
+ * on 5/19/16 4:06 PM from the specification file
+ * /home/dzharkov/work/kotlin/compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex
*/
class _JetLexer implements FlexLexer {
/** initial size of the lookahead buffer */
@@ -46,8 +49,8 @@ class _JetLexer implements FlexLexer {
"\1\20\1\11\1\14\11\1\1\70\1\75\1\63\1\60\1\64\1\61"+
"\1\77\1\2\1\16\2\2\1\22\1\21\5\4\1\17\13\4\1\15"+
"\2\4\1\71\1\25\1\72\1\0\1\4\1\6\1\42\1\53\1\47"+
- "\1\56\1\41\1\46\1\52\1\32\1\33\1\54\1\51\1\43\1\4"+
- "\1\44\1\50\1\40\1\4\1\45\1\34\1\31\1\26\1\57\1\55"+
+ "\1\57\1\41\1\46\1\52\1\32\1\33\1\54\1\51\1\43\1\4"+
+ "\1\44\1\50\1\40\1\4\1\45\1\34\1\31\1\26\1\56\1\55"+
"\1\15\1\37\1\4\1\30\1\66\1\35\54\0\1\4\12\0\1\4"+
"\4\0\1\4\5\0\27\4\1\0\37\4\1\0\u01ca\4\4\0\14\4"+
"\16\0\5\4\7\0\1\4\1\0\1\4\201\0\5\4\1\0\2\4"+
@@ -57,76 +60,77 @@ class _JetLexer implements FlexLexer {
"\4\0\2\4\1\0\143\4\1\0\1\4\17\0\2\4\7\0\2\4"+
"\12\5\3\4\2\0\1\4\20\0\1\4\1\0\36\4\35\0\131\4"+
"\13\0\1\4\16\0\12\5\41\4\11\0\2\4\4\0\1\4\5\0"+
- "\26\4\4\0\1\4\11\0\1\4\3\0\1\4\27\0\31\4\253\0"+
- "\66\4\3\0\1\4\22\0\1\4\7\0\12\4\4\0\12\5\1\0"+
- "\7\4\1\0\7\4\5\0\10\4\2\0\2\4\2\0\26\4\1\0"+
- "\7\4\1\0\1\4\3\0\4\4\3\0\1\4\20\0\1\4\15\0"+
- "\2\4\1\0\3\4\4\0\12\5\2\4\23\0\6\4\4\0\2\4"+
- "\2\0\26\4\1\0\7\4\1\0\2\4\1\0\2\4\1\0\2\4"+
- "\37\0\4\4\1\0\1\4\7\0\12\5\2\0\3\4\20\0\11\4"+
- "\1\0\3\4\1\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4"+
- "\3\0\1\4\22\0\1\4\17\0\2\4\4\0\12\5\25\0\10\4"+
- "\2\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4"+
- "\3\0\1\4\36\0\2\4\1\0\3\4\4\0\12\5\1\0\1\4"+
- "\21\0\1\4\1\0\6\4\3\0\3\4\1\0\4\4\3\0\2\4"+
- "\1\0\1\4\1\0\2\4\3\0\2\4\3\0\3\4\3\0\14\4"+
- "\26\0\1\4\25\0\12\5\25\0\10\4\1\0\3\4\1\0\27\4"+
- "\1\0\12\4\1\0\5\4\3\0\1\4\32\0\2\4\6\0\2\4"+
- "\4\0\12\5\25\0\10\4\1\0\3\4\1\0\27\4\1\0\12\4"+
- "\1\0\5\4\3\0\1\4\40\0\1\4\1\0\2\4\4\0\12\5"+
- "\1\0\2\4\22\0\10\4\1\0\3\4\1\0\51\4\2\0\1\4"+
- "\20\0\1\4\21\0\2\4\4\0\12\5\12\0\6\4\5\0\22\4"+
- "\3\0\30\4\1\0\11\4\1\0\1\4\2\0\7\4\72\0\60\4"+
- "\1\0\2\4\14\0\7\4\11\0\12\5\47\0\2\4\1\0\1\4"+
- "\2\0\2\4\1\0\1\4\2\0\1\4\6\0\4\4\1\0\7\4"+
- "\1\0\3\4\1\0\1\4\1\0\1\4\2\0\2\4\1\0\4\4"+
- "\1\0\2\4\11\0\1\4\2\0\5\4\1\0\1\4\11\0\12\5"+
- "\2\0\2\4\42\0\1\4\37\0\12\5\26\0\10\4\1\0\44\4"+
- "\33\0\5\4\163\0\53\4\24\0\1\4\12\5\6\0\6\4\4\0"+
- "\4\4\3\0\1\4\3\0\2\4\7\0\3\4\4\0\15\4\14\0"+
- "\1\4\1\0\12\5\6\0\46\4\12\0\53\4\1\0\1\4\3\0"+
- "\u0149\4\1\0\4\4\2\0\7\4\1\0\1\4\1\0\4\4\2\0"+
- "\51\4\1\0\4\4\2\0\41\4\1\0\4\4\2\0\7\4\1\0"+
- "\1\4\1\0\4\4\2\0\17\4\1\0\71\4\1\0\4\4\2\0"+
- "\103\4\45\0\20\4\20\0\125\4\14\0\u026c\4\2\0\21\4\1\0"+
- "\32\4\5\0\113\4\25\0\15\4\1\0\4\4\16\0\22\4\16\0"+
- "\22\4\16\0\15\4\1\0\3\4\17\0\64\4\43\0\1\4\4\0"+
- "\1\4\3\0\12\5\46\0\12\5\6\0\130\4\10\0\51\4\1\0"+
- "\1\4\5\0\106\4\12\0\35\4\51\0\12\5\36\4\2\0\5\4"+
- "\13\0\54\4\25\0\7\4\10\0\12\5\46\0\27\4\11\0\65\4"+
- "\53\0\12\5\6\0\12\5\15\0\1\4\135\0\57\4\21\0\7\4"+
- "\4\0\12\5\51\0\36\4\15\0\2\4\12\5\6\0\46\4\32\0"+
- "\44\4\34\0\12\5\3\0\3\4\12\5\44\4\153\0\4\4\1\0"+
- "\4\4\16\0\300\4\100\0\u0116\4\2\0\6\4\2\0\46\4\2\0"+
- "\6\4\2\0\10\4\1\0\1\4\1\0\1\4\1\0\1\4\1\0"+
- "\37\4\2\0\65\4\1\0\7\4\1\0\1\4\3\0\3\4\1\0"+
- "\7\4\3\0\4\4\2\0\6\4\4\0\15\4\5\0\3\4\1\0"+
- "\7\4\164\0\1\4\15\0\1\4\20\0\15\4\145\0\1\4\4\0"+
- "\1\4\2\0\12\4\1\0\1\4\3\0\5\4\6\0\1\4\1\0"+
- "\1\4\1\0\1\4\1\0\4\4\1\0\13\4\2\0\4\4\5\0"+
- "\5\4\4\0\1\4\64\0\2\4\u0a7b\0\57\4\1\0\57\4\1\0"+
- "\205\4\6\0\4\4\21\0\46\4\12\0\66\4\11\0\1\4\20\0"+
- "\27\4\11\0\7\4\1\0\7\4\1\0\7\4\1\0\7\4\1\0"+
- "\7\4\1\0\7\4\1\0\7\4\1\0\7\4\120\0\1\4\u01d5\0"+
- "\2\4\52\0\5\4\5\0\2\4\4\0\126\4\6\0\3\4\1\0"+
- "\132\4\1\0\4\4\5\0\51\4\3\0\136\4\21\0\33\4\65\0"+
- "\20\4\u0200\0\u19b6\4\112\0\u51cc\4\64\0\u048d\4\103\0\56\4\2\0"+
- "\u010d\4\3\0\20\4\12\5\2\4\24\0\57\4\20\0\31\4\10\0"+
- "\106\4\61\0\11\4\2\0\147\4\2\0\4\4\1\0\2\4\16\0"+
- "\12\4\120\0\10\4\1\0\3\4\1\0\4\4\1\0\27\4\35\0"+
- "\64\4\16\0\62\4\34\0\12\5\30\0\6\4\3\0\1\4\4\0"+
- "\12\5\34\4\12\0\27\4\31\0\35\4\7\0\57\4\34\0\1\4"+
- "\12\5\46\0\51\4\27\0\3\4\1\0\10\4\4\0\12\5\6\0"+
- "\27\4\3\0\1\4\5\0\60\4\1\0\1\4\3\0\2\4\2\0"+
- "\5\4\2\0\1\4\1\0\1\4\30\0\3\4\43\0\6\4\2\0"+
- "\6\4\2\0\6\4\11\0\7\4\1\0\7\4\221\0\43\4\15\0"+
- "\12\5\6\0\u2ba4\4\14\0\27\4\4\0\61\4\u2104\0\u012e\4\2\0"+
- "\76\4\2\0\152\4\46\0\7\4\14\0\5\4\5\0\1\4\1\0"+
- "\12\4\1\0\15\4\1\0\5\4\1\0\1\4\1\0\2\4\1\0"+
- "\2\4\1\0\154\4\41\0\u016b\4\22\0\100\4\2\0\66\4\50\0"+
- "\14\4\164\0\5\4\1\0\207\4\23\0\12\5\7\0\32\4\6\0"+
- "\32\4\13\0\131\4\3\0\6\4\2\0\6\4\2\0\6\4\2\0"+
- "\3\4\43\0";
+ "\26\4\4\0\1\4\11\0\1\4\3\0\1\4\27\0\31\4\107\0"+
+ "\1\4\1\0\13\4\127\0\66\4\3\0\1\4\22\0\1\4\7\0"+
+ "\12\4\4\0\12\5\1\0\7\4\1\0\7\4\5\0\10\4\2\0"+
+ "\2\4\2\0\26\4\1\0\7\4\1\0\1\4\3\0\4\4\3\0"+
+ "\1\4\20\0\1\4\15\0\2\4\1\0\3\4\4\0\12\5\2\4"+
+ "\23\0\6\4\4\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4"+
+ "\1\0\2\4\1\0\2\4\37\0\4\4\1\0\1\4\7\0\12\5"+
+ "\2\0\3\4\20\0\11\4\1\0\3\4\1\0\26\4\1\0\7\4"+
+ "\1\0\2\4\1\0\5\4\3\0\1\4\22\0\1\4\17\0\2\4"+
+ "\4\0\12\5\25\0\10\4\2\0\2\4\2\0\26\4\1\0\7\4"+
+ "\1\0\2\4\1\0\5\4\3\0\1\4\36\0\2\4\1\0\3\4"+
+ "\4\0\12\5\1\0\1\4\21\0\1\4\1\0\6\4\3\0\3\4"+
+ "\1\0\4\4\3\0\2\4\1\0\1\4\1\0\2\4\3\0\2\4"+
+ "\3\0\3\4\3\0\14\4\26\0\1\4\25\0\12\5\25\0\10\4"+
+ "\1\0\3\4\1\0\27\4\1\0\12\4\1\0\5\4\3\0\1\4"+
+ "\32\0\2\4\6\0\2\4\4\0\12\5\25\0\10\4\1\0\3\4"+
+ "\1\0\27\4\1\0\12\4\1\0\5\4\3\0\1\4\40\0\1\4"+
+ "\1\0\2\4\4\0\12\5\1\0\2\4\22\0\10\4\1\0\3\4"+
+ "\1\0\51\4\2\0\1\4\20\0\1\4\21\0\2\4\4\0\12\5"+
+ "\12\0\6\4\5\0\22\4\3\0\30\4\1\0\11\4\1\0\1\4"+
+ "\2\0\7\4\72\0\60\4\1\0\2\4\14\0\7\4\11\0\12\5"+
+ "\47\0\2\4\1\0\1\4\2\0\2\4\1\0\1\4\2\0\1\4"+
+ "\6\0\4\4\1\0\7\4\1\0\3\4\1\0\1\4\1\0\1\4"+
+ "\2\0\2\4\1\0\4\4\1\0\2\4\11\0\1\4\2\0\5\4"+
+ "\1\0\1\4\11\0\12\5\2\0\4\4\40\0\1\4\37\0\12\5"+
+ "\26\0\10\4\1\0\44\4\33\0\5\4\163\0\53\4\24\0\1\4"+
+ "\12\5\6\0\6\4\4\0\4\4\3\0\1\4\3\0\2\4\7\0"+
+ "\3\4\4\0\15\4\14\0\1\4\1\0\12\5\6\0\46\4\1\0"+
+ "\1\4\5\0\1\4\2\0\53\4\1\0\u014d\4\1\0\4\4\2\0"+
+ "\7\4\1\0\1\4\1\0\4\4\2\0\51\4\1\0\4\4\2\0"+
+ "\41\4\1\0\4\4\2\0\7\4\1\0\1\4\1\0\4\4\2\0"+
+ "\17\4\1\0\71\4\1\0\4\4\2\0\103\4\45\0\20\4\20\0"+
+ "\125\4\14\0\u026c\4\2\0\21\4\1\0\32\4\5\0\113\4\25\0"+
+ "\15\4\1\0\4\4\16\0\22\4\16\0\22\4\16\0\15\4\1\0"+
+ "\3\4\17\0\64\4\43\0\1\4\4\0\1\4\3\0\12\5\46\0"+
+ "\12\5\6\0\130\4\10\0\51\4\1\0\1\4\5\0\106\4\12\0"+
+ "\35\4\51\0\12\5\36\4\2\0\5\4\13\0\54\4\25\0\7\4"+
+ "\10\0\12\5\46\0\27\4\11\0\65\4\53\0\12\5\6\0\12\5"+
+ "\15\0\1\4\135\0\57\4\21\0\7\4\4\0\12\5\51\0\36\4"+
+ "\15\0\2\4\12\5\54\4\32\0\44\4\34\0\12\5\3\0\3\4"+
+ "\12\5\44\4\153\0\4\4\1\0\4\4\3\0\2\4\11\0\300\4"+
+ "\100\0\u0116\4\2\0\6\4\2\0\46\4\2\0\6\4\2\0\10\4"+
+ "\1\0\1\4\1\0\1\4\1\0\1\4\1\0\37\4\2\0\65\4"+
+ "\1\0\7\4\1\0\1\4\3\0\3\4\1\0\7\4\3\0\4\4"+
+ "\2\0\6\4\4\0\15\4\5\0\3\4\1\0\7\4\164\0\1\4"+
+ "\15\0\1\4\20\0\15\4\145\0\1\4\4\0\1\4\2\0\12\4"+
+ "\1\0\1\4\3\0\5\4\6\0\1\4\1\0\1\4\1\0\1\4"+
+ "\1\0\4\4\1\0\13\4\2\0\4\4\5\0\5\4\4\0\1\4"+
+ "\64\0\2\4\u0a7b\0\57\4\1\0\57\4\1\0\205\4\6\0\4\4"+
+ "\3\0\2\4\14\0\46\4\1\0\1\4\5\0\1\4\2\0\70\4"+
+ "\7\0\1\4\20\0\27\4\11\0\7\4\1\0\7\4\1\0\7\4"+
+ "\1\0\7\4\1\0\7\4\1\0\7\4\1\0\7\4\1\0\7\4"+
+ "\120\0\1\4\u01d5\0\2\4\52\0\5\4\5\0\2\4\4\0\126\4"+
+ "\6\0\3\4\1\0\132\4\1\0\4\4\5\0\51\4\3\0\136\4"+
+ "\21\0\33\4\65\0\20\4\u0200\0\u19b6\4\112\0\u51cd\4\63\0\u048d\4"+
+ "\103\0\56\4\2\0\u010d\4\3\0\20\4\12\5\2\4\24\0\57\4"+
+ "\20\0\31\4\10\0\106\4\61\0\11\4\2\0\147\4\2\0\4\4"+
+ "\1\0\4\4\14\0\13\4\115\0\12\4\1\0\3\4\1\0\4\4"+
+ "\1\0\27\4\35\0\64\4\16\0\62\4\34\0\12\5\30\0\6\4"+
+ "\3\0\1\4\4\0\12\5\34\4\12\0\27\4\31\0\35\4\7\0"+
+ "\57\4\34\0\1\4\12\5\46\0\51\4\27\0\3\4\1\0\10\4"+
+ "\4\0\12\5\6\0\27\4\3\0\1\4\5\0\60\4\1\0\1\4"+
+ "\3\0\2\4\2\0\5\4\2\0\1\4\1\0\1\4\30\0\3\4"+
+ "\2\0\13\4\7\0\3\4\14\0\6\4\2\0\6\4\2\0\6\4"+
+ "\11\0\7\4\1\0\7\4\221\0\43\4\15\0\12\5\6\0\u2ba4\4"+
+ "\14\0\27\4\4\0\61\4\u2104\0\u016e\4\2\0\152\4\46\0\7\4"+
+ "\14\0\5\4\5\0\1\4\1\0\12\4\1\0\15\4\1\0\5\4"+
+ "\1\0\1\4\1\0\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4"+
+ "\22\0\100\4\2\0\66\4\50\0\14\4\164\0\5\4\1\0\207\4"+
+ "\23\0\12\5\7\0\32\4\6\0\32\4\13\0\131\4\3\0\6\4"+
+ "\2\0\6\4\2\0\6\4\2\0\3\4\43\0";
/**
* Translates characters to character classes
@@ -141,28 +145,27 @@ class _JetLexer implements FlexLexer {
private static final String ZZ_ACTION_PACKED_0 =
"\6\0\1\1\1\2\1\3\1\4\2\1\1\5\1\6"+
"\1\7\1\2\1\10\1\11\1\12\1\13\1\14\3\3"+
- "\1\15\1\16\15\3\1\17\1\20\1\21\1\22\1\23"+
+ "\1\15\1\16\14\3\1\17\1\20\1\21\1\22\1\23"+
"\2\1\1\24\1\25\1\26\1\27\1\30\1\31\1\32"+
"\1\33\1\34\1\35\1\36\1\35\1\1\1\37\2\35"+
"\1\40\1\1\1\40\3\41\1\42\1\43\1\2\1\0"+
"\2\44\1\0\1\45\1\0\1\46\1\47\1\50\1\51"+
"\1\0\1\52\1\0\2\2\1\44\1\53\1\54\1\55"+
"\1\56\2\12\1\0\3\3\1\57\1\60\1\61\1\3"+
- "\1\62\3\3\1\63\12\3\1\64\1\3\1\65\1\66"+
- "\1\67\1\70\1\71\1\72\1\73\1\74\1\75\1\76"+
- "\1\77\1\100\1\0\1\101\2\102\2\0\1\40\1\103"+
- "\1\104\1\0\1\105\1\44\1\3\1\0\1\106\1\107"+
- "\1\110\1\111\1\0\1\112\1\113\4\3\1\114\5\3"+
- "\1\115\2\3\1\116\1\3\1\117\6\3\1\120\1\121"+
- "\1\122\2\0\1\123\2\40\1\45\1\124\1\125\1\126"+
- "\2\3\1\127\4\3\1\130\1\131\7\3\1\132\1\100"+
- "\1\0\1\133\1\134\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";
+ "\1\62\2\3\1\63\13\3\1\64\1\65\1\66\1\67"+
+ "\1\70\1\71\1\72\1\73\1\74\1\75\1\76\1\77"+
+ "\1\100\1\0\1\101\2\102\2\0\1\40\1\103\1\104"+
+ "\1\0\1\105\1\44\1\3\1\0\1\106\1\107\1\110"+
+ "\1\111\1\0\1\112\1\113\4\3\1\114\4\3\1\115"+
+ "\2\3\1\116\1\3\1\117\6\3\1\120\1\121\1\122"+
+ "\2\0\1\123\2\40\1\45\1\124\1\125\1\126\2\3"+
+ "\1\127\3\3\1\130\1\131\7\3\1\132\1\100\1\0"+
+ "\1\133\1\134\3\3\1\135\2\3\1\136\1\137\2\3"+
+ "\1\140\1\141\1\0\1\3\1\142\2\3\1\143\1\3"+
+ "\1\144\2\3\1\145\3\3\1\146\1\147\1\150";
private static int [] zzUnpackAction() {
- int [] result = new int[236];
+ int [] result = new int[231];
int offset = 0;
offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
return result;
@@ -191,35 +194,34 @@ class _JetLexer implements FlexLexer {
"\0\u0200\0\u0240\0\u0280\0\u02c0\0\u0300\0\u0340\0\u0380\0\u03c0"+
"\0\u0400\0\u0440\0\u0480\0\u04c0\0\u0180\0\u0500\0\u0540\0\u0580"+
"\0\u0180\0\u05c0\0\u0600\0\u0640\0\u0680\0\u06c0\0\u0700\0\u0740"+
- "\0\u0780\0\u07c0\0\u0800\0\u0840\0\u0880\0\u08c0\0\u0900\0\u0940"+
- "\0\u0180\0\u0980\0\u09c0\0\u0a00\0\u0a40\0\u0a80\0\u0ac0\0\u0b00"+
- "\0\u0180\0\u0180\0\u0180\0\u0180\0\u0b40\0\u0180\0\u0180\0\u0b80"+
- "\0\u0180\0\u0bc0\0\u0c00\0\u0180\0\u0180\0\u0c40\0\u0c80\0\u0cc0"+
- "\0\u0d00\0\u0180\0\u0d40\0\u0d80\0\u0180\0\u0180\0\u0dc0\0\u0e00"+
- "\0\u0180\0\u0e40\0\u0e80\0\u0ec0\0\u0f00\0\u0f40\0\u0f80\0\u0180"+
- "\0\u0fc0\0\u1000\0\u1040\0\u1080\0\u10c0\0\u1100\0\u1140\0\u1180"+
- "\0\u0180\0\u0180\0\u0180\0\u0180\0\u11c0\0\u1200\0\u1240\0\u1280"+
- "\0\u12c0\0\u0200\0\u1300\0\u0200\0\u1340\0\u0180\0\u1380\0\u13c0"+
+ "\0\u0780\0\u07c0\0\u0800\0\u0840\0\u0880\0\u08c0\0\u0900\0\u0180"+
+ "\0\u0940\0\u0980\0\u09c0\0\u0a00\0\u0a40\0\u0a80\0\u0ac0\0\u0180"+
+ "\0\u0180\0\u0180\0\u0180\0\u0b00\0\u0180\0\u0180\0\u0b40\0\u0180"+
+ "\0\u0b80\0\u0bc0\0\u0180\0\u0180\0\u0c00\0\u0c40\0\u0c80\0\u0cc0"+
+ "\0\u0180\0\u0d00\0\u0d40\0\u0180\0\u0180\0\u0d80\0\u0dc0\0\u0180"+
+ "\0\u0e00\0\u0e40\0\u0e80\0\u0ec0\0\u0f00\0\u0f40\0\u0180\0\u0f80"+
+ "\0\u0fc0\0\u1000\0\u1040\0\u1080\0\u10c0\0\u1100\0\u1140\0\u0180"+
+ "\0\u0180\0\u0180\0\u0180\0\u1180\0\u11c0\0\u1200\0\u1240\0\u1280"+
+ "\0\u0200\0\u12c0\0\u0200\0\u1300\0\u0180\0\u1340\0\u1380\0\u13c0"+
"\0\u1400\0\u1440\0\u1480\0\u14c0\0\u1500\0\u1540\0\u1580\0\u15c0"+
- "\0\u1600\0\u1640\0\u1680\0\u16c0\0\u0200\0\u1700\0\u1740\0\u0180"+
- "\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180"+
- "\0\u0180\0\u1780\0\u17c0\0\u0180\0\u0180\0\u1800\0\u1840\0\u1880"+
- "\0\u18c0\0\u0180\0\u0180\0\u1900\0\u0180\0\u1940\0\u0180\0\u1980"+
- "\0\u19c0\0\u1a00\0\u1a00\0\u0180\0\u1a40\0\u0180\0\u0180\0\u1a80"+
- "\0\u1ac0\0\u1b00\0\u1b40\0\u0200\0\u1b80\0\u1bc0\0\u1c00\0\u1c40"+
- "\0\u1c80\0\u0180\0\u1cc0\0\u1d00\0\u0200\0\u1d40\0\u0200\0\u1d80"+
- "\0\u1dc0\0\u1e00\0\u1e40\0\u1e80\0\u1ec0\0\u0200\0\u0200\0\u0180"+
- "\0\u1f00\0\u1f40\0\u1840\0\u0180\0\u1f80\0\u0180\0\u0180\0\u0180"+
- "\0\u0200\0\u1fc0\0\u2000\0\u0200\0\u2040\0\u2080\0\u20c0\0\u2100"+
- "\0\u0200\0\u0200\0\u2140\0\u2180\0\u21c0\0\u2200\0\u2240\0\u2280"+
- "\0\u22c0\0\u0200\0\u0180\0\u2300\0\u0c80\0\u0200\0\u2340\0\u2380"+
- "\0\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";
+ "\0\u1600\0\u1640\0\u1680\0\u0200\0\u16c0\0\u0180\0\u0180\0\u0180"+
+ "\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u1700"+
+ "\0\u1740\0\u0180\0\u0180\0\u1780\0\u17c0\0\u1800\0\u1840\0\u0180"+
+ "\0\u0180\0\u1880\0\u0180\0\u18c0\0\u0180\0\u1900\0\u1940\0\u1980"+
+ "\0\u1980\0\u0180\0\u19c0\0\u0180\0\u0180\0\u1a00\0\u1a40\0\u1a80"+
+ "\0\u1ac0\0\u0200\0\u1b00\0\u1b40\0\u1b80\0\u1bc0\0\u0180\0\u1c00"+
+ "\0\u1c40\0\u0200\0\u1c80\0\u0200\0\u1cc0\0\u1d00\0\u1d40\0\u1d80"+
+ "\0\u1dc0\0\u1e00\0\u0200\0\u0200\0\u0180\0\u1e40\0\u1e80\0\u17c0"+
+ "\0\u0180\0\u1ec0\0\u0180\0\u0180\0\u0180\0\u0200\0\u1f00\0\u1f40"+
+ "\0\u0200\0\u1f80\0\u1fc0\0\u2000\0\u0200\0\u0200\0\u2040\0\u2080"+
+ "\0\u20c0\0\u2100\0\u2140\0\u2180\0\u21c0\0\u0200\0\u0180\0\u2200"+
+ "\0\u0c40\0\u0200\0\u2240\0\u2280\0\u22c0\0\u0200\0\u2300\0\u2340"+
+ "\0\u0200\0\u0200\0\u2380\0\u23c0\0\u0200\0\u0200\0\u2400\0\u2440"+
+ "\0\u0200\0\u2480\0\u24c0\0\u0200\0\u2500\0\u0200\0\u2540\0\u2580"+
+ "\0\u0200\0\u25c0\0\u2600\0\u2640\0\u0200\0\u0200\0\u0200";
private static int [] zzUnpackRowMap() {
- int [] result = new int[236];
+ int [] result = new int[231];
int offset = 0;
offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
return result;
@@ -245,252 +247,244 @@ class _JetLexer implements FlexLexer {
"\1\7\1\10\1\11\1\12\1\11\1\7\1\13\1\12"+
"\1\14\1\15\1\16\1\17\1\20\3\11\1\21\2\11"+
"\1\22\1\23\1\7\1\11\1\24\1\25\1\26\1\11"+
- "\1\27\1\30\1\31\1\32\1\33\1\34\1\35\1\36"+
- "\1\11\1\37\1\40\1\41\1\42\1\43\2\11\1\44"+
- "\1\11\1\45\1\46\1\47\1\50\1\51\1\52\1\53"+
- "\1\54\1\55\1\56\1\57\1\60\1\61\1\62\1\63"+
- "\1\64\1\65\1\66\1\67\7\70\1\71\1\72\14\70"+
- "\1\73\1\70\1\74\57\70\1\75\1\72\14\70\1\75"+
- "\1\70\1\76\50\70\2\7\1\77\1\7\1\77\1\7"+
- "\1\100\1\0\5\7\3\77\1\7\2\77\3\7\1\77"+
- "\2\7\1\101\3\77\2\7\21\77\20\7\11\102\1\103"+
- "\24\102\1\104\41\102\1\7\1\10\1\11\1\12\1\11"+
+ "\1\27\1\30\1\31\1\32\1\11\1\33\1\34\1\35"+
+ "\1\11\1\36\1\37\1\40\1\41\1\42\2\11\1\43"+
+ "\1\11\1\44\1\45\1\46\1\47\1\50\1\51\1\52"+
+ "\1\53\1\54\1\55\1\56\1\57\1\60\1\61\1\62"+
+ "\1\63\1\64\1\65\1\66\7\67\1\70\1\71\14\67"+
+ "\1\72\1\67\1\73\57\67\1\74\1\71\14\67\1\74"+
+ "\1\67\1\75\50\67\2\7\1\76\1\7\1\76\1\7"+
+ "\1\77\1\0\5\7\3\76\1\7\2\76\3\7\1\76"+
+ "\2\7\1\100\3\76\2\7\21\76\20\7\11\101\1\102"+
+ "\24\101\1\103\41\101\1\7\1\10\1\11\1\12\1\11"+
"\1\7\1\13\1\12\1\14\1\15\1\16\1\17\1\20"+
"\3\11\1\21\2\11\1\22\1\23\1\7\1\11\1\24"+
- "\1\105\1\26\1\11\1\27\1\30\1\106\1\32\1\33"+
- "\1\34\1\35\1\36\1\11\1\37\1\40\1\41\1\42"+
- "\1\43\2\11\1\44\1\11\1\45\1\46\1\47\1\50"+
- "\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1\60"+
- "\1\61\1\62\1\63\1\64\1\65\1\66\1\67\101\0"+
- "\1\10\12\0\1\10\2\0\1\107\1\110\1\111\1\112"+
- "\16\0\1\112\1\0\1\107\2\0\1\111\32\0\2\11"+
+ "\1\104\1\26\1\11\1\27\1\30\1\105\1\32\1\11"+
+ "\1\33\1\34\1\35\1\11\1\36\1\37\1\40\1\41"+
+ "\1\42\2\11\1\43\1\11\1\44\1\45\1\46\1\47"+
+ "\1\50\1\51\1\52\1\53\1\54\1\55\1\56\1\57"+
+ "\1\60\1\61\1\62\1\63\1\64\1\65\1\66\101\0"+
+ "\1\10\12\0\1\10\2\0\1\106\1\107\1\110\1\111"+
+ "\16\0\1\111\1\0\1\106\2\0\1\110\32\0\2\11"+
"\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
"\2\0\4\11\2\0\21\11\23\0\1\12\3\0\1\12"+
- "\70\0\6\113\2\0\70\113\2\0\1\114\1\0\1\114"+
- "\1\0\1\115\6\0\3\114\1\0\2\114\3\0\1\114"+
- "\2\0\4\114\2\0\21\114\31\0\1\116\24\0\1\117"+
- "\21\0\1\120\32\0\1\121\117\0\1\122\24\0\1\123"+
- "\20\0\1\124\12\0\1\124\1\125\1\126\1\107\1\110"+
- "\1\111\1\112\16\0\1\112\1\0\1\107\2\0\1\111"+
- "\4\0\1\126\25\0\1\127\12\0\1\127\3\0\1\130"+
- "\102\0\1\131\34\0\1\132\3\0\1\133\13\0\7\23"+
- "\1\0\14\23\1\134\1\135\52\23\27\0\1\136\51\0"+
+ "\70\0\6\112\2\0\70\112\2\0\1\113\1\0\1\113"+
+ "\1\0\1\114\6\0\3\113\1\0\2\113\3\0\1\113"+
+ "\2\0\4\113\2\0\21\113\31\0\1\115\24\0\1\116"+
+ "\21\0\1\117\32\0\1\120\117\0\1\121\24\0\1\122"+
+ "\20\0\1\123\12\0\1\123\1\124\1\125\1\106\1\107"+
+ "\1\110\1\111\16\0\1\111\1\0\1\106\2\0\1\110"+
+ "\4\0\1\125\25\0\1\126\12\0\1\126\3\0\1\127"+
+ "\102\0\1\130\34\0\1\131\3\0\1\132\13\0\7\23"+
+ "\1\0\14\23\1\133\1\134\52\23\27\0\1\135\51\0"+
"\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
- "\1\11\2\0\1\11\1\137\2\11\2\0\1\140\5\11"+
- "\1\141\12\11\21\0\2\11\1\0\2\11\6\0\4\11"+
- "\1\0\2\11\3\0\1\11\2\0\3\11\1\142\2\0"+
- "\5\11\1\143\1\11\1\144\11\11\21\0\2\11\1\0"+
- "\2\11\6\0\4\11\1\0\2\11\3\0\1\145\2\0"+
- "\4\11\2\0\21\11\100\0\1\146\20\0\2\11\1\0"+
+ "\1\11\2\0\1\11\1\136\2\11\2\0\1\137\5\11"+
+ "\1\140\12\11\21\0\2\11\1\0\2\11\6\0\4\11"+
+ "\1\0\2\11\3\0\1\11\2\0\3\11\1\141\2\0"+
+ "\5\11\1\142\1\11\1\143\11\11\21\0\2\11\1\0"+
+ "\2\11\6\0\4\11\1\0\2\11\3\0\1\144\2\0"+
+ "\4\11\2\0\21\11\100\0\1\145\20\0\2\11\1\0"+
"\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
- "\2\11\1\147\1\11\2\0\21\11\21\0\2\11\1\0"+
+ "\4\11\2\0\3\11\1\146\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\3\11\1\150\15\11\21\0\2\11\1\0"+
+ "\4\11\2\0\4\11\1\147\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\4\11\1\151\14\11\21\0\2\11\1\0"+
- "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
- "\3\11\1\152\2\0\21\11\21\0\2\11\1\0\2\11"+
- "\6\0\4\11\1\0\2\11\3\0\1\153\2\0\4\11"+
+ "\3\11\1\150\2\0\21\11\21\0\2\11\1\0\2\11"+
+ "\6\0\4\11\1\0\2\11\3\0\1\151\2\0\4\11"+
"\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\154\16\11\21\0\2\11\1\0\2\11\6\0\4\11"+
- "\1\0\2\11\3\0\1\155\2\0\4\11\2\0\3\11"+
- "\1\156\5\11\1\157\7\11\21\0\2\11\1\0\2\11"+
+ "\1\152\16\11\21\0\2\11\1\0\2\11\6\0\4\11"+
+ "\1\0\2\11\3\0\1\153\2\0\4\11\2\0\3\11"+
+ "\1\154\5\11\1\155\7\11\21\0\2\11\1\0\2\11"+
"\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+
- "\2\0\4\11\1\160\4\11\1\161\7\11\21\0\2\11"+
+ "\2\0\4\11\1\156\4\11\1\157\7\11\21\0\2\11"+
"\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\4\11\2\0\14\11\1\162\4\11\21\0\2\11"+
+ "\2\0\4\11\2\0\14\11\1\160\4\11\21\0\2\11"+
"\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\4\11\2\0\6\11\1\163\12\11\21\0\2\11"+
+ "\2\0\4\11\2\0\6\11\1\161\12\11\21\0\2\11"+
"\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\1\11\1\164\2\11\2\0\21\11\21\0\2\11"+
+ "\2\0\1\11\1\162\2\11\2\0\21\11\21\0\2\11"+
"\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\4\11\2\0\11\11\1\165\7\11\21\0\2\11"+
+ "\2\0\4\11\2\0\3\11\1\163\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\3\11\1\166\15\11\100\0\1\167"+
- "\3\0\1\170\73\0\1\171\1\0\1\172\75\0\1\173"+
- "\77\0\1\174\104\0\1\175\100\0\1\176\71\0\1\177"+
- "\107\0\1\200\104\0\1\201\2\0\7\70\2\0\14\70"+
- "\1\0\1\70\1\0\50\70\2\0\1\202\1\0\1\202"+
- "\1\0\1\203\6\0\3\202\1\0\2\202\3\0\1\202"+
- "\1\0\1\204\4\202\2\0\21\202\20\0\7\205\1\0"+
- "\16\205\1\206\51\205\27\0\1\207\51\0\2\77\1\0"+
- "\2\77\6\0\4\77\1\0\2\77\3\0\1\77\2\0"+
- "\4\77\2\0\21\77\20\0\6\210\2\0\70\210\1\0"+
- "\2\77\1\0\2\77\6\0\4\77\1\0\2\77\3\0"+
- "\1\77\2\0\1\77\1\211\2\77\2\0\21\77\56\0"+
- "\1\212\52\0\1\213\106\0\1\214\60\0\1\127\12\0"+
- "\1\127\3\0\1\215\60\0\1\216\12\0\1\216\4\0"+
- "\1\111\1\0\1\216\22\0\1\111\13\0\1\216\15\0"+
- "\6\113\1\217\1\0\70\113\1\0\2\114\1\0\2\114"+
- "\6\0\4\114\1\0\2\114\3\0\1\114\2\0\4\114"+
- "\2\0\21\114\20\0\6\220\2\0\70\220\7\116\1\0"+
- "\70\116\36\0\1\221\41\0\7\121\1\0\70\121\34\0"+
- "\1\222\7\0\1\223\113\0\1\224\20\0\1\124\12\0"+
- "\1\124\3\0\1\225\1\111\1\112\16\0\1\112\4\0"+
- "\1\111\32\0\2\125\11\0\1\125\1\0\1\125\1\107"+
- "\1\214\2\125\16\0\2\125\1\107\2\0\2\125\3\0"+
- "\1\125\2\0\1\125\22\0\1\126\12\0\1\126\2\0"+
- "\1\107\1\214\22\0\1\107\35\0\1\127\12\0\1\127"+
- "\4\0\1\111\1\112\16\0\1\112\4\0\1\111\51\0"+
- "\1\226\57\0\7\23\1\0\70\23\27\0\1\227\51\0"+
+ "\2\0\4\11\2\0\11\11\1\164\7\11\100\0\1\165"+
+ "\3\0\1\166\73\0\1\167\1\0\1\170\75\0\1\171"+
+ "\77\0\1\172\104\0\1\173\100\0\1\174\71\0\1\175"+
+ "\107\0\1\176\104\0\1\177\2\0\7\67\2\0\14\67"+
+ "\1\0\1\67\1\0\50\67\2\0\1\200\1\0\1\200"+
+ "\1\0\1\201\6\0\3\200\1\0\2\200\3\0\1\200"+
+ "\1\0\1\202\4\200\2\0\21\200\20\0\7\203\1\0"+
+ "\16\203\1\204\51\203\27\0\1\205\51\0\2\76\1\0"+
+ "\2\76\6\0\4\76\1\0\2\76\3\0\1\76\2\0"+
+ "\4\76\2\0\21\76\20\0\6\206\2\0\70\206\1\0"+
+ "\2\76\1\0\2\76\6\0\4\76\1\0\2\76\3\0"+
+ "\1\76\2\0\1\76\1\207\2\76\2\0\21\76\56\0"+
+ "\1\210\52\0\1\211\106\0\1\212\60\0\1\126\12\0"+
+ "\1\126\3\0\1\213\60\0\1\214\12\0\1\214\4\0"+
+ "\1\110\1\0\1\214\22\0\1\110\13\0\1\214\15\0"+
+ "\6\112\1\215\1\0\70\112\1\0\2\113\1\0\2\113"+
+ "\6\0\4\113\1\0\2\113\3\0\1\113\2\0\4\113"+
+ "\2\0\21\113\20\0\6\216\2\0\70\216\7\115\1\0"+
+ "\70\115\36\0\1\217\41\0\7\120\1\0\70\120\34\0"+
+ "\1\220\7\0\1\221\113\0\1\222\20\0\1\123\12\0"+
+ "\1\123\3\0\1\223\1\110\1\111\16\0\1\111\4\0"+
+ "\1\110\32\0\2\124\11\0\1\124\1\0\1\124\1\106"+
+ "\1\212\2\124\16\0\2\124\1\106\2\0\2\124\3\0"+
+ "\1\124\3\0\1\124\21\0\1\125\12\0\1\125\2\0"+
+ "\1\106\1\212\22\0\1\106\35\0\1\126\12\0\1\126"+
+ "\4\0\1\110\1\111\16\0\1\111\4\0\1\110\51\0"+
+ "\1\224\57\0\7\23\1\0\70\23\27\0\1\225\51\0"+
"\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
- "\1\11\2\0\2\11\1\230\1\11\2\0\6\11\1\231"+
+ "\1\11\2\0\2\11\1\226\1\11\2\0\6\11\1\227"+
"\12\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+
- "\2\11\3\0\1\11\2\0\4\11\2\0\1\11\1\232"+
+ "\2\11\3\0\1\11\2\0\4\11\2\0\1\11\1\230"+
"\17\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+
- "\2\11\3\0\1\233\2\0\4\11\2\0\1\234\20\11"+
+ "\2\11\3\0\1\231\2\0\4\11\2\0\1\232\20\11"+
"\21\0\2\11\1\0\2\11\6\0\4\11\1\0\2\11"+
- "\3\0\1\11\2\0\1\235\3\11\2\0\21\11\21\0"+
+ "\3\0\1\11\2\0\1\233\3\11\2\0\21\11\21\0"+
"\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
- "\1\11\2\0\4\11\2\0\1\11\1\236\17\11\21\0"+
+ "\1\11\2\0\4\11\2\0\1\11\1\234\17\11\21\0"+
"\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
- "\1\11\2\0\4\11\2\0\2\11\1\237\16\11\21\0"+
+ "\1\11\2\0\4\11\2\0\10\11\1\235\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\10\11\1\240\10\11\21\0"+
- "\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
- "\1\11\2\0\3\11\1\241\2\0\21\11\21\0\2\11"+
+ "\1\11\2\0\3\11\1\236\2\0\21\11\21\0\2\11"+
"\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\4\11\2\0\21\11\1\0\1\242\17\0\2\11"+
+ "\2\0\4\11\2\0\21\11\1\0\1\237\17\0\2\11"+
"\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\4\11\2\0\4\11\1\243\14\11\21\0\2\11"+
+ "\2\0\4\11\2\0\4\11\1\240\14\11\21\0\2\11"+
"\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\1\244\3\11\2\0\21\11\21\0\2\11\1\0"+
+ "\2\0\1\241\3\11\2\0\21\11\21\0\2\11\1\0"+
"\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
- "\4\11\2\0\5\11\1\245\13\11\21\0\2\11\1\0"+
+ "\4\11\2\0\5\11\1\242\13\11\21\0\2\11\1\0"+
"\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
- "\4\11\2\0\4\11\1\246\14\11\21\0\2\11\1\0"+
+ "\4\11\2\0\4\11\1\243\14\11\21\0\2\11\1\0"+
"\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
- "\4\11\2\0\6\11\1\247\12\11\21\0\2\11\1\0"+
+ "\4\11\2\0\6\11\1\244\12\11\21\0\2\11\1\0"+
"\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
- "\4\11\2\0\3\11\1\250\15\11\21\0\2\11\1\0"+
+ "\4\11\2\0\3\11\1\245\15\11\21\0\2\11\1\0"+
"\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
- "\4\11\2\0\5\11\1\251\13\11\21\0\2\11\1\0"+
+ "\4\11\2\0\5\11\1\246\13\11\21\0\2\11\1\0"+
"\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
- "\4\11\2\0\15\11\1\252\3\11\21\0\2\11\1\0"+
+ "\4\11\2\0\15\11\1\247\3\11\21\0\2\11\1\0"+
"\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
- "\4\11\2\0\2\11\1\253\16\11\21\0\2\11\1\0"+
+ "\4\11\2\0\2\11\1\250\16\11\21\0\2\11\1\0"+
"\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
- "\2\11\1\254\1\11\2\0\2\11\1\255\16\11\21\0"+
+ "\2\11\1\251\1\11\2\0\2\11\1\252\16\11\21\0"+
"\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
- "\1\11\2\0\4\11\2\0\4\11\1\256\1\11\1\257"+
- "\12\11\100\0\1\260\20\0\2\202\1\0\2\202\6\0"+
- "\4\202\1\0\2\202\3\0\1\202\2\0\4\202\2\0"+
- "\21\202\20\0\6\261\2\0\70\261\1\0\2\262\11\0"+
- "\1\262\1\0\1\262\2\0\2\262\16\0\2\262\3\0"+
- "\2\262\3\0\1\262\2\0\1\262\50\0\1\263\50\0"+
- "\6\210\1\264\1\0\70\210\1\0\2\77\1\0\2\77"+
- "\6\0\4\77\1\0\2\77\3\0\1\77\2\0\2\77"+
- "\1\265\1\77\2\0\21\77\40\0\1\215\60\0\1\216"+
- "\12\0\1\216\4\0\1\111\24\0\1\111\31\0\6\220"+
- "\1\266\1\0\70\220\11\0\1\267\67\0\2\270\1\0"+
- "\2\270\6\0\4\270\1\0\2\270\3\0\1\270\2\0"+
- "\4\270\2\0\21\270\21\0\1\127\12\0\1\127\64\0"+
+ "\1\11\2\0\4\11\2\0\4\11\1\253\1\11\1\254"+
+ "\12\11\100\0\1\255\20\0\2\200\1\0\2\200\6\0"+
+ "\4\200\1\0\2\200\3\0\1\200\2\0\4\200\2\0"+
+ "\21\200\20\0\6\256\2\0\70\256\1\0\2\257\11\0"+
+ "\1\257\1\0\1\257\2\0\2\257\16\0\2\257\3\0"+
+ "\2\257\3\0\1\257\3\0\1\257\47\0\1\260\50\0"+
+ "\6\206\1\261\1\0\70\206\1\0\2\76\1\0\2\76"+
+ "\6\0\4\76\1\0\2\76\3\0\1\76\2\0\2\76"+
+ "\1\262\1\76\2\0\21\76\40\0\1\213\60\0\1\214"+
+ "\12\0\1\214\4\0\1\110\24\0\1\110\31\0\6\216"+
+ "\1\263\1\0\70\216\11\0\1\264\67\0\2\265\1\0"+
+ "\2\265\6\0\4\265\1\0\2\265\3\0\1\265\2\0"+
+ "\4\265\2\0\21\265\21\0\1\126\12\0\1\126\64\0"+
"\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
- "\1\11\2\0\3\11\1\271\2\0\21\11\21\0\2\11"+
+ "\1\11\2\0\3\11\1\266\2\0\21\11\21\0\2\11"+
"\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\4\11\2\0\11\11\1\272\7\11\21\0\2\11"+
+ "\2\0\4\11\2\0\11\11\1\267\7\11\21\0\2\11"+
+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
+ "\2\0\4\11\2\0\2\11\1\270\16\11\21\0\2\11"+
+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
+ "\2\0\4\11\2\0\2\11\1\271\16\11\21\0\2\11"+
+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
+ "\2\0\4\11\2\0\2\11\1\272\16\11\21\0\2\11"+
"\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
"\2\0\4\11\2\0\2\11\1\273\16\11\21\0\2\11"+
"\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\4\11\2\0\2\11\1\274\16\11\21\0\2\11"+
+ "\2\0\4\11\2\0\12\11\1\274\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\275\16\11\21\0\2\11"+
"\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\4\11\2\0\2\11\1\276\16\11\21\0\2\11"+
- "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\4\11\2\0\4\11\1\277\14\11\21\0\2\11"+
- "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\4\11\2\0\12\11\1\300\6\11\21\0\2\11"+
- "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\4\11\2\0\2\11\1\301\16\11\21\0\2\11"+
- "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\4\11\2\0\4\11\1\302\14\11\21\0\2\11"+
- "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\303"+
+ "\2\0\4\11\2\0\4\11\1\276\14\11\21\0\2\11"+
+ "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\277"+
"\2\0\4\11\2\0\21\11\21\0\2\11\1\0\2\11"+
"\6\0\4\11\1\0\2\11\3\0\1\11\2\0\3\11"+
- "\1\304\2\0\21\11\21\0\2\11\1\0\2\11\6\0"+
- "\4\11\1\0\2\11\3\0\1\11\2\0\3\11\1\305"+
+ "\1\300\2\0\21\11\21\0\2\11\1\0\2\11\6\0"+
+ "\4\11\1\0\2\11\3\0\1\11\2\0\3\11\1\301"+
"\2\0\21\11\21\0\2\11\1\0\2\11\6\0\4\11"+
- "\1\0\2\11\3\0\1\11\2\0\1\306\3\11\2\0"+
+ "\1\0\2\11\3\0\1\11\2\0\1\302\3\11\2\0"+
"\21\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+
- "\2\11\3\0\1\11\2\0\4\11\2\0\2\11\1\307"+
+ "\2\11\3\0\1\11\2\0\4\11\2\0\2\11\1\303"+
"\16\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+
- "\2\11\3\0\1\11\2\0\4\11\2\0\3\11\1\310"+
+ "\2\11\3\0\1\11\2\0\4\11\2\0\3\11\1\304"+
"\15\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+
- "\2\11\3\0\1\11\2\0\4\11\2\0\4\11\1\311"+
+ "\2\11\3\0\1\11\2\0\4\11\2\0\4\11\1\305"+
"\14\11\21\0\2\11\1\0\2\11\6\0\4\11\1\0"+
- "\2\11\3\0\1\11\2\0\4\11\2\0\5\11\1\312"+
- "\13\11\20\0\6\261\1\313\1\0\70\261\1\0\2\314"+
- "\11\0\1\314\1\0\1\314\2\0\2\314\16\0\2\314"+
- "\3\0\2\314\3\0\1\314\2\0\1\314\22\0\2\77"+
- "\1\0\2\77\6\0\4\77\1\0\2\77\3\0\1\77"+
- "\2\0\3\77\1\315\2\0\21\77\21\0\2\11\1\0"+
+ "\2\11\3\0\1\11\2\0\4\11\2\0\5\11\1\306"+
+ "\13\11\20\0\6\256\1\307\1\0\70\256\1\0\2\310"+
+ "\11\0\1\310\1\0\1\310\2\0\2\310\16\0\2\310"+
+ "\3\0\2\310\3\0\1\310\3\0\1\310\21\0\2\76"+
+ "\1\0\2\76\6\0\4\76\1\0\2\76\3\0\1\76"+
+ "\2\0\3\76\1\311\2\0\21\76\21\0\2\11\1\0"+
"\2\11\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"+
+ "\4\11\2\0\16\11\1\312\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\5\11\1\320\7\11\21\0"+
+ "\4\11\2\0\3\11\1\313\5\11\1\314\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"+
+ "\1\11\2\0\4\11\2\0\6\11\1\315\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"+
+ "\1\11\2\0\4\11\2\0\6\11\1\316\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"+
+ "\1\11\2\0\4\11\2\0\3\11\1\317\15\11\21\0"+
"\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
- "\1\11\2\0\4\11\2\0\3\11\1\324\15\11\21\0"+
+ "\1\11\2\0\4\11\2\0\6\11\1\320\12\11\21\0"+
"\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
- "\1\11\2\0\4\11\2\0\6\11\1\325\12\11\21\0"+
+ "\1\11\2\0\4\11\2\0\2\11\1\321\16\11\21\0"+
"\2\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
- "\1\11\2\0\4\11\2\0\2\11\1\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\11\2\0\3\11\1\322\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"+
+ "\2\0\2\11\1\323\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"+
+ "\2\0\4\11\2\0\10\11\1\324\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"+
+ "\2\0\4\11\2\0\12\11\1\325\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"+
+ "\2\0\4\11\2\0\2\11\1\326\16\11\21\0\2\327"+
+ "\11\0\1\327\1\0\1\327\2\0\2\327\16\0\2\327"+
+ "\3\0\2\327\3\0\1\327\3\0\1\327\21\0\2\11"+
"\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
- "\2\0\4\11\2\0\4\11\1\335\14\11\21\0\2\11"+
+ "\2\0\4\11\2\0\4\11\1\330\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"+
+ "\2\0\4\11\2\0\7\11\1\331\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"+
+ "\2\0\4\11\2\0\7\11\1\332\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"+
+ "\2\0\4\11\2\0\13\11\1\333\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"+
+ "\2\0\4\11\2\0\5\11\1\334\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"+
+ "\2\0\4\11\2\0\5\11\1\335\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\0\1\336\3\11\2\0\21\11\21\0\2\203\11\0"+
+ "\1\203\1\0\1\203\2\0\2\203\16\0\2\203\3\0"+
+ "\2\203\3\0\1\203\3\0\1\203\21\0\2\11\1\0"+
"\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
- "\2\11\1\344\1\11\2\0\21\11\21\0\2\11\1\0"+
+ "\2\11\1\337\1\11\2\0\21\11\21\0\2\11\1\0"+
"\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
- "\4\11\2\0\3\11\1\345\15\11\21\0\2\11\1\0"+
+ "\4\11\2\0\3\11\1\340\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\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\2\11\1\341\16\11\21\0\2\11\1\0"+
+ "\2\11\6\0\4\11\1\0\2\11\3\0\1\342\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\350\15\11\21\0\2\11\1\0\2\11\6\0"+
+ "\3\11\1\343\15\11\21\0\2\11\1\0\2\11\6\0"+
"\4\11\1\0\2\11\3\0\1\11\2\0\4\11\2\0"+
- "\10\11\1\351\10\11\21\0\2\11\1\0\2\11\6\0"+
+ "\10\11\1\344\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\11\1\345\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\346"+
"\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";
+ "\1\347\16\11\20\0";
private static int [] zzUnpackTrans() {
- int [] result = new int[10112];
+ int [] result = new int[9856];
int offset = 0;
offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
return result;
@@ -531,18 +525,18 @@ class _JetLexer implements FlexLexer {
private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
private static final String ZZ_ATTRIBUTE_PACKED_0 =
- "\6\0\1\11\15\1\1\11\3\1\1\11\17\1\1\11"+
+ "\6\0\1\11\15\1\1\11\3\1\1\11\16\1\1\11"+
"\7\1\4\11\1\1\2\11\1\1\1\11\2\1\2\11"+
"\4\1\1\11\2\1\2\11\1\1\1\0\1\11\1\1"+
"\1\0\1\1\1\0\2\1\1\11\1\1\1\0\1\1"+
- "\1\0\4\1\4\11\1\1\1\0\7\1\1\11\21\1"+
+ "\1\0\4\1\4\11\1\1\1\0\7\1\1\11\20\1"+
"\12\11\1\1\1\0\2\11\1\1\2\0\1\1\2\11"+
"\1\0\1\11\1\1\1\11\1\0\3\1\1\11\1\0"+
- "\2\11\12\1\1\11\15\1\1\11\2\0\1\1\1\11"+
- "\1\1\3\11\22\1\1\11\1\0\17\1\1\0\20\1";
+ "\2\11\11\1\1\11\15\1\1\11\2\0\1\1\1\11"+
+ "\1\1\3\11\21\1\1\11\1\0\16\1\1\0\20\1";
private static int [] zzUnpackAttribute() {
- int [] result = new int[236];
+ int [] result = new int[231];
int offset = 0;
offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
return result;
@@ -666,7 +660,7 @@ class _JetLexer implements FlexLexer {
char [] map = new char[0x10000];
int i = 0; /* index in packed string */
int j = 0; /* index in unpacked array */
- while (i < 1704) {
+ while (i < 1734) {
int count = packed.charAt(i++);
char value = packed.charAt(i++);
do map[j++] = value; while (--count > 0);
@@ -889,171 +883,171 @@ class _JetLexer implements FlexLexer {
zzMarkedPos = zzMarkedPosL;
switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
- case 22:
+ case 22:
{ return KtTokens.LBRACKET ;
}
- case 106: break;
- case 78:
+ case 105: break;
+ case 78:
{ return KtTokens.FUN_KEYWORD ;
}
- case 107: break;
- case 48:
+ case 106: break;
+ case 48:
{ return KtTokens.IN_KEYWORD ;
}
- case 108: break;
- case 58:
+ case 107: break;
+ case 58:
{ return KtTokens.GTEQ ;
}
- case 109: break;
- case 87:
+ case 108: break;
+ case 87:
{ return KtTokens.TRUE_KEYWORD ;
}
- case 110: break;
- case 13:
+ case 109: break;
+ case 13:
{ return KtTokens.RBRACE ;
}
- case 111: break;
- case 10:
+ case 110: break;
+ case 10:
{ return KtTokens.CHARACTER_LITERAL;
}
- case 112: break;
- case 7:
+ case 111: break;
+ case 7:
{ return KtTokens.EXCL ;
}
- case 113: break;
- case 80:
+ case 112: break;
+ case 80:
{ return KtTokens.VAL_KEYWORD ;
}
- case 114: break;
- case 42:
+ case 113: break;
+ case 42:
{ return KtTokens.EXCLEQ ;
}
- case 115: break;
- case 45:
+ case 114: break;
+ case 45:
{ return KtTokens.MINUSEQ ;
}
- case 116: break;
- case 36:
+ case 115: break;
+ case 36:
{ return KtTokens.FLOAT_LITERAL;
}
- case 117: break;
- case 51:
+ case 116: break;
+ case 51:
{ return KtTokens.AS_KEYWORD ;
}
- case 118: break;
- case 90:
+ case 117: break;
+ case 90:
{ return KtTokens.WHEN_KEYWORD ;
}
- case 119: break;
- case 16:
+ case 118: break;
+ case 16:
{ return KtTokens.QUEST ;
}
- case 120: break;
- case 95:
+ case 119: break;
+ case 94:
{ return KtTokens.FALSE_KEYWORD ;
}
- case 121: break;
- case 34:
+ case 120: break;
+ case 34:
{ lBraceCount++; return KtTokens.LBRACE;
}
- case 122: break;
- case 44:
+ case 121: break;
+ case 44:
{ return KtTokens.MINUSMINUS;
}
- case 123: break;
- case 66:
+ case 122: break;
+ case 66:
{ return KtTokens.ESCAPE_SEQUENCE;
}
- case 124: break;
- case 5:
+ case 123: break;
+ case 5:
{ return KtTokens.DIV ;
}
- case 125: break;
- case 79:
+ case 124: break;
+ case 79:
{ return KtTokens.FOR_KEYWORD ;
}
- case 126: break;
- case 30:
+ case 125: break;
+ case 30:
{ popState(); yypushback(1); return KtTokens.DANGLING_NEWLINE;
}
- case 127: break;
- case 52:
+ case 126: break;
+ case 52:
{ return KtTokens.DO_KEYWORD ;
}
- case 128: break;
- case 103:
+ case 127: break;
+ case 102:
{ return KtTokens.CONTINUE_KEYWORD ;
}
- case 129: break;
- case 105:
+ case 128: break;
+ case 104:
{ return KtTokens.INTERFACE_KEYWORD ;
}
- case 130: break;
- case 75:
+ case 129: break;
+ case 75:
{ pushState(RAW_STRING); return KtTokens.OPEN_QUOTE;
}
- case 131: break;
- case 4:
+ case 130: break;
+ case 4:
{ return KtTokens.WHITE_SPACE;
}
- case 132: break;
- case 97:
+ case 131: break;
+ case 96:
{ return KtTokens.BREAK_KEYWORD ;
}
- case 133: break;
- case 85:
+ case 132: break;
+ case 85:
{ yypushback(3); return KtTokens.EXCL;
}
- case 134: break;
- case 60:
+ case 133: break;
+ case 60:
{ return KtTokens.OROR ;
}
- case 135: break;
- case 20:
+ case 134: break;
+ case 20:
{ return KtTokens.PERC ;
}
- case 136: break;
- case 73:
+ case 135: break;
+ case 73:
{ return KtTokens.EXCLEQEQEQ;
}
- case 137: break;
- case 61:
+ case 136: break;
+ case 61:
{ return KtTokens.PERCEQ ;
}
- case 138: break;
- case 43:
+ case 137: break;
+ case 43:
{ return KtTokens.RANGE ;
}
- case 139: break;
- case 54:
+ case 138: break;
+ case 54:
{ return KtTokens.DOUBLE_ARROW;
}
- case 140: break;
- case 38:
+ case 139: break;
+ case 38:
{ return KtTokens.EOL_COMMENT;
}
- case 141: break;
- case 31:
+ case 140: break;
+ case 31:
{ popState(); return KtTokens.CLOSING_QUOTE;
}
- case 142: break;
- case 14:
+ case 141: break;
+ case 14:
{ return KtTokens.MUL ;
}
- case 143: break;
- case 23:
+ case 142: break;
+ case 23:
{ return KtTokens.RBRACKET ;
}
- case 144: break;
- case 56:
+ case 143: break;
+ case 56:
{ return KtTokens.PLUSPLUS ;
}
- case 145: break;
- case 101:
+ case 144: break;
+ case 100:
{ return KtTokens.OBJECT_KEYWORD ;
}
- case 146: break;
- case 68:
+ case 145: break;
+ case 68:
{ if (commentDepth > 0) {
commentDepth--;
}
@@ -1064,102 +1058,98 @@ class _JetLexer implements FlexLexer {
return commentStateToTokenType(state);
}
}
- case 147: break;
- case 8:
+ case 146: break;
+ case 8:
{ return KtTokens.DOT ;
}
- case 148: break;
- case 26:
+ case 147: break;
+ case 26:
{ return KtTokens.SEMICOLON ;
}
- case 149: break;
- case 94:
- { return KtTokens.YIELD_KEYWORD ;
- }
- case 150: break;
- case 69:
+ case 148: break;
+ case 69:
{ yypushback(2); return KtTokens.INTEGER_LITERAL;
}
- case 151: break;
- case 32:
+ case 149: break;
+ case 32:
{ popState(); return KtTokens.IDENTIFIER;
}
- case 152: break;
- case 81:
+ case 150: break;
+ case 81:
{ return KtTokens.VAR_KEYWORD ;
}
- case 153: break;
- case 104:
+ case 151: break;
+ case 103:
{ return KtTokens.TYPE_ALIAS_KEYWORD ;
}
- case 154: break;
- case 100:
+ case 152: break;
+ case 99:
{ return KtTokens.RETURN_KEYWORD ;
}
- case 155: break;
- case 37:
+ case 153: break;
+ case 37:
{ return KtTokens.FIELD_IDENTIFIER;
}
- case 156: break;
- case 15:
+ case 154: break;
+ case 15:
{ return KtTokens.EQ ;
}
- case 157: break;
- case 28:
+ case 155: break;
+ case 28:
{ return KtTokens.AT ;
}
- case 158: break;
- case 76:
+ case 156: break;
+ case 76:
{ return KtTokens.TRY_KEYWORD ;
}
- case 159: break;
- case 24:
+ case 157: break;
+ case 24:
{ return KtTokens.LPAR ;
}
- case 160: break;
- case 9:
+ case 158: break;
+ case 9:
{ return KtTokens.MINUS ;
}
- case 161: break;
- case 70:
+ case 159: break;
+ case 70:
{ pushState(DOC_COMMENT);
commentDepth = 0;
commentStart = getTokenStart();
}
- case 162: break;
- case 86:
+ case 160: break;
+ case 86:
{ return KtTokens.THIS_KEYWORD ;
}
- case 163: break;
- case 1:
+ case 161: break;
+ case 1:
{ return TokenType.BAD_CHARACTER;
}
- case 164: break;
- case 98:
+ case 162: break;
+ case 97:
{ return KtTokens.WHILE_KEYWORD ;
}
- case 165: break;
- case 99:
+ case 163: break;
+ case 98:
{ return KtTokens.TYPEOF_KEYWORD ;
}
- case 166: break;
- case 40:
+ case 164: break;
+ case 40:
{ return KtTokens.DIVEQ ;
}
- case 167: break;
- case 96:
+ case 165: break;
+ case 95:
{ return KtTokens.CLASS_KEYWORD ;
}
- case 168: break;
- case 53:
+ case 166: break;
+ case 53:
{ return KtTokens.EQEQ ;
}
- case 169: break;
- case 82:
+ case 167: break;
+ case 82:
{ return KtTokens.EQEQEQ ;
}
- case 170: break;
- case 83:
+ case 168: break;
+ case 83:
{ int length = yytext().length();
if (length <= 3) { // closing """
popState();
@@ -1170,122 +1160,122 @@ class _JetLexer implements FlexLexer {
return KtTokens.REGULAR_STRING_PART;
}
}
- case 171: break;
- case 50:
+ case 169: break;
+ case 50:
{ return KtTokens.MULTEQ ;
}
- case 172: break;
- case 65:
+ case 170: break;
+ case 65:
{ pushState(LONG_TEMPLATE_ENTRY); return KtTokens.LONG_TEMPLATE_ENTRY_START;
}
- case 173: break;
- case 12:
+ case 171: break;
+ case 12:
{ return KtTokens.LBRACE ;
}
- case 174: break;
- case 39:
+ case 172: break;
+ case 39:
{ pushState(BLOCK_COMMENT);
commentDepth = 0;
commentStart = getTokenStart();
}
- case 175: break;
- case 92:
+ case 173: break;
+ case 92:
{ return KtTokens.THROW_KEYWORD ;
}
- case 176: break;
- case 93:
+ case 174: break;
+ case 93:
{ return KtTokens.SUPER_KEYWORD ;
}
- case 177: break;
- case 62:
+ case 175: break;
+ case 62:
{ return KtTokens.COLONCOLON;
}
- case 178: break;
- case 72:
+ case 176: break;
+ case 72:
{ return KtTokens.NOT_IN;
}
- case 179: break;
- case 63:
+ case 177: break;
+ case 63:
{ return KtTokens.DOUBLE_SEMICOLON;
}
- case 180: break;
- case 6:
+ case 178: break;
+ case 6:
{ return KtTokens.HASH ;
}
- case 181: break;
- case 3:
+ case 179: break;
+ case 3:
{ return KtTokens.IDENTIFIER;
}
- case 182: break;
- case 2:
+ case 180: break;
+ case 2:
{ return KtTokens.INTEGER_LITERAL;
}
- case 183: break;
- case 88:
+ case 181: break;
+ case 88:
{ return KtTokens.ELSE_KEYWORD ;
}
- case 184: break;
- case 11:
+ case 182: break;
+ case 11:
{ pushState(STRING); return KtTokens.OPEN_QUOTE;
}
- case 185: break;
- case 102:
+ case 183: break;
+ case 101:
{ return KtTokens.PACKAGE_KEYWORD ;
}
- case 186: break;
- case 49:
+ case 184: break;
+ case 49:
{ return KtTokens.IF_KEYWORD ;
}
- case 187: break;
- case 18:
+ case 185: break;
+ case 18:
{ return KtTokens.LT ;
}
- case 188: break;
- case 17:
+ case 186: break;
+ case 17:
{ return KtTokens.PLUS ;
}
- case 189: break;
- case 55:
+ case 187: break;
+ case 55:
{ return KtTokens.PLUSEQ ;
}
- case 190: break;
- case 74:
+ case 188: break;
+ case 74:
{ return KtTokens.RESERVED ;
}
- case 191: break;
- case 67:
+ case 189: break;
+ case 67:
{ commentDepth++;
}
- case 192: break;
- case 27:
+ case 190: break;
+ case 27:
{ return KtTokens.COMMA ;
}
- case 193: break;
- case 19:
+ case 191: break;
+ case 19:
{ return KtTokens.GT ;
}
- case 194: break;
- case 77:
+ case 192: break;
+ case 77:
{ return KtTokens.AS_SAFE;
}
- case 195: break;
- case 25:
+ case 193: break;
+ case 25:
{ return KtTokens.RPAR ;
}
- case 196: break;
- case 71:
+ case 194: break;
+ case 71:
{ return KtTokens.NOT_IS;
}
- case 197: break;
- case 89:
+ case 195: break;
+ case 89:
{ return KtTokens.NULL_KEYWORD ;
}
- case 198: break;
- case 59:
+ case 196: break;
+ case 59:
{ return KtTokens.ANDAND ;
}
- case 199: break;
- case 35:
+ case 197: break;
+ case 35:
{ if (lBraceCount == 0) {
popState();
return KtTokens.LONG_TEMPLATE_ENTRY_END;
@@ -1293,12 +1283,12 @@ class _JetLexer implements FlexLexer {
lBraceCount--;
return KtTokens.RBRACE;
}
- case 200: break;
- case 84:
+ case 198: break;
+ case 84:
{ return KtTokens.BLOCK_COMMENT;
}
- case 201: break;
- case 41:
+ case 199: break;
+ case 41:
{ if (zzCurrentPos == 0) {
return KtTokens.SHEBANG_COMMENT;
}
@@ -1307,41 +1297,41 @@ class _JetLexer implements FlexLexer {
return KtTokens.HASH;
}
}
- case 202: break;
- case 29:
+ case 200: break;
+ case 29:
{ return KtTokens.REGULAR_STRING_PART;
}
- case 203: break;
- case 47:
+ case 201: break;
+ case 47:
{ return KtTokens.IS_KEYWORD ;
}
- case 204: break;
- case 91:
+ case 202: break;
+ case 91:
{ popState(); return KtTokens.THIS_KEYWORD;
}
- case 205: break;
- case 21:
+ case 203: break;
+ case 21:
{ return KtTokens.COLON ;
}
- case 206: break;
- case 57:
+ case 204: break;
+ case 57:
{ return KtTokens.LTEQ ;
}
- case 207: break;
- case 33:
- {
+ case 205: break;
+ case 33:
+ {
}
- case 208: break;
- case 64:
+ case 206: break;
+ case 64:
{ pushState(SHORT_TEMPLATE_ENTRY);
yypushback(yylength() - 1);
return KtTokens.SHORT_TEMPLATE_ENTRY_START;
}
- case 209: break;
- case 46:
+ case 207: break;
+ case 46:
{ return KtTokens.ARROW ;
}
- case 210: break;
+ case 208: break;
default:
if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
zzAtEOF = true;
@@ -1353,14 +1343,14 @@ class _JetLexer implements FlexLexer {
zzStartRead = commentStart;
return commentStateToTokenType(state);
}
- case 237: break;
+ case 232: break;
case DOC_COMMENT: {
int state = yystate();
popState();
zzStartRead = commentStart;
return commentStateToTokenType(state);
}
- case 238: break;
+ case 233: break;
default:
return null;
}
diff --git a/compiler/testData/psi/Reserved.txt b/compiler/testData/psi/Reserved.txt
index 0da3830f9c6..d329459695a 100644
--- a/compiler/testData/psi/Reserved.txt
+++ b/compiler/testData/psi/Reserved.txt
@@ -6,8 +6,7 @@ JetFile: Reserved.kt
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
- PsiErrorElement:Expecting function name or receiver type
- PsiElement(yield)('yield')
+ PsiElement(IDENTIFIER)('yield')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
@@ -40,10 +39,10 @@ JetFile: Reserved.kt
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
- PsiErrorElement:Expecting an element
- PsiElement(yield)('yield')
+ REFERENCE_EXPRESSION
+ PsiElement(IDENTIFIER)('yield')
PsiWhiteSpace('\n ')
PsiErrorElement:Expecting an element
PsiElement(typeof)('typeof')
PsiWhiteSpace('\n')
- PsiElement(RBRACE)('}')
\ No newline at end of file
+ PsiElement(RBRACE)('}')
diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java
index cf99b76810b..1d058da05f2 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java
@@ -52,7 +52,6 @@ public class KeywordStringsGenerated {
"do",
"when",
"interface",
- "yield",
"typeof"
));
}
diff --git a/j2k/testData/fileOrElement/identifier/keywords.java b/j2k/testData/fileOrElement/identifier/keywords.java
index 9e01416b650..16f2ef657df 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, typeof;
\ No newline at end of file
+int as, type, val, var, fun, is, in, object, when, typeof;
diff --git a/j2k/testData/fileOrElement/identifier/keywords.kt b/j2k/testData/fileOrElement/identifier/keywords.kt
index 80a9944ff9d..f86836805a6 100644
--- a/j2k/testData/fileOrElement/identifier/keywords.kt
+++ b/j2k/testData/fileOrElement/identifier/keywords.kt
@@ -7,5 +7,4 @@ val `is`: Int
val `in`: Int
val `object`: Int
val `when`: Int
-val `yield`: Int
-val `typeof`: Int
\ No newline at end of file
+val `typeof`: Int
diff --git a/j2k/testData/fileOrElement/importStatement/importWithKeywords.java b/j2k/testData/fileOrElement/importStatement/importWithKeywords.java
index 0cd3ea22260..9a6d9c0a4b8 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.typeof;
+import as.type.val.var.fun.is.in.object.when.typeof;
-class Test {}
\ No newline at end of file
+class Test {}
diff --git a/j2k/testData/fileOrElement/importStatement/importWithKeywords.kt b/j2k/testData/fileOrElement/importStatement/importWithKeywords.kt
index f9e673f1d4f..928b01efa3b 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`.`typeof`
+import `as`.type.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`typeof`
-internal class Test
\ No newline at end of file
+internal class Test
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 9e2d44ff696..edca8f13e8b 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,315 +35,321 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/reservedWords/cases"), Pattern.compile("^(.+)\\.kt$"), true);
}
- @TestMetadata("dataClassValInfinity.kt")
- public void testDataClassValInfinity() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValInfinity.kt");
+ @TestMetadata("dataClassValTypeof.kt")
+ public void testDataClassValTypeof() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValTypeof.kt");
doTest(fileName);
}
- @TestMetadata("dataClassValKotlin.kt")
- public void testDataClassValKotlin() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValKotlin.kt");
+ @TestMetadata("dataClassValVar.kt")
+ public void testDataClassValVar() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValVar.kt");
doTest(fileName);
}
- @TestMetadata("dataClassValTrue.kt")
- public void testDataClassValTrue() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValTrue.kt");
+ @TestMetadata("dataClassValWith.kt")
+ public void testDataClassValWith() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValWith.kt");
doTest(fileName);
}
- @TestMetadata("dataClassValTry.kt")
- public void testDataClassValTry() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValTry.kt");
+ @TestMetadata("dataClassValYield.kt")
+ public void testDataClassValYield() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValYield.kt");
doTest(fileName);
}
- @TestMetadata("dataClassVarArguments.kt")
- public void testDataClassVarArguments() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarArguments.kt");
+ @TestMetadata("dataClassVarBreak.kt")
+ public void testDataClassVarBreak() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarBreak.kt");
doTest(fileName);
}
- @TestMetadata("dataClassVarNaN.kt")
- public void testDataClassVarNaN() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarNaN.kt");
+ @TestMetadata("dataClassVarInfinity.kt")
+ public void testDataClassVarInfinity() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarInfinity.kt");
doTest(fileName);
}
- @TestMetadata("dataClassVarTypeof.kt")
- public void testDataClassVarTypeof() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarTypeof.kt");
+ @TestMetadata("dataClassVarKotlin.kt")
+ public void testDataClassVarKotlin() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarKotlin.kt");
doTest(fileName);
}
- @TestMetadata("dataClassVarVar.kt")
- public void testDataClassVarVar() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarVar.kt");
+ @TestMetadata("dataClassVarWhile.kt")
+ public void testDataClassVarWhile() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarWhile.kt");
doTest(fileName);
}
- @TestMetadata("delegatedFunDelete.kt")
- public void testDelegatedFunDelete() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunDelete.kt");
+ @TestMetadata("delegatedFunDebugger.kt")
+ public void testDelegatedFunDebugger() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunDebugger.kt");
doTest(fileName);
}
- @TestMetadata("delegatedFunElse.kt")
- public void testDelegatedFunElse() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunElse.kt");
+ @TestMetadata("delegatedFunDefault.kt")
+ public void testDelegatedFunDefault() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunDefault.kt");
doTest(fileName);
}
- @TestMetadata("delegatedFunEnum.kt")
- public void testDelegatedFunEnum() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunEnum.kt");
+ @TestMetadata("delegatedFunIf.kt")
+ public void testDelegatedFunIf() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunIf.kt");
doTest(fileName);
}
- @TestMetadata("delegatedFunFalse.kt")
- public void testDelegatedFunFalse() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunFalse.kt");
+ @TestMetadata("delegatedFunIn.kt")
+ public void testDelegatedFunIn() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunIn.kt");
doTest(fileName);
}
- @TestMetadata("delegatedFunParamEval.kt")
- public void testDelegatedFunParamEval() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamEval.kt");
+ @TestMetadata("delegatedFunParamDelete.kt")
+ public void testDelegatedFunParamDelete() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamDelete.kt");
doTest(fileName);
}
- @TestMetadata("delegatedFunParamExport.kt")
- public void testDelegatedFunParamExport() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamExport.kt");
+ @TestMetadata("delegatedFunParamEnum.kt")
+ public void testDelegatedFunParamEnum() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamEnum.kt");
doTest(fileName);
}
- @TestMetadata("delegatedFunParamFor.kt")
- public void testDelegatedFunParamFor() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamFor.kt");
+ @TestMetadata("delegatedFunParamInterface.kt")
+ public void testDelegatedFunParamInterface() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamInterface.kt");
doTest(fileName);
}
- @TestMetadata("delegatedFunParamIf.kt")
- public void testDelegatedFunParamIf() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamIf.kt");
+ @TestMetadata("delegatedFunParamNull.kt")
+ public void testDelegatedFunParamNull() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamNull.kt");
doTest(fileName);
}
- @TestMetadata("delegatedLabelExtends.kt")
- public void testDelegatedLabelExtends() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelExtends.kt");
+ @TestMetadata("delegatedLabelEval.kt")
+ public void testDelegatedLabelEval() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelEval.kt");
doTest(fileName);
}
- @TestMetadata("delegatedLabelFinally.kt")
- public void testDelegatedLabelFinally() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelFinally.kt");
+ @TestMetadata("delegatedLabelExport.kt")
+ public void testDelegatedLabelExport() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelExport.kt");
doTest(fileName);
}
- @TestMetadata("delegatedLabelIn.kt")
- public void testDelegatedLabelIn() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelIn.kt");
+ @TestMetadata("delegatedLabelPackage.kt")
+ public void testDelegatedLabelPackage() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelPackage.kt");
doTest(fileName);
}
- @TestMetadata("delegatedLabelInterface.kt")
- public void testDelegatedLabelInterface() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelInterface.kt");
+ @TestMetadata("delegatedLabelReturn.kt")
+ public void testDelegatedLabelReturn() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelReturn.kt");
doTest(fileName);
}
- @TestMetadata("delegatedValBreak.kt")
- public void testDelegatedValBreak() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValBreak.kt");
+ @TestMetadata("delegatedValAwait.kt")
+ public void testDelegatedValAwait() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValAwait.kt");
doTest(fileName);
}
- @TestMetadata("delegatedValCatch.kt")
- public void testDelegatedValCatch() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValCatch.kt");
+ @TestMetadata("delegatedValCase.kt")
+ public void testDelegatedValCase() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValCase.kt");
doTest(fileName);
}
- @TestMetadata("delegatedValClass.kt")
- public void testDelegatedValClass() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValClass.kt");
+ @TestMetadata("delegatedValDo.kt")
+ public void testDelegatedValDo() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValDo.kt");
doTest(fileName);
}
- @TestMetadata("delegatedValConst.kt")
- public void testDelegatedValConst() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValConst.kt");
+ @TestMetadata("delegatedValElse.kt")
+ public void testDelegatedValElse() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValElse.kt");
doTest(fileName);
}
- @TestMetadata("delegatedVarContinue.kt")
- public void testDelegatedVarContinue() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarContinue.kt");
+ @TestMetadata("delegatedVarCatch.kt")
+ public void testDelegatedVarCatch() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarCatch.kt");
doTest(fileName);
}
- @TestMetadata("delegatedVarDebugger.kt")
- public void testDelegatedVarDebugger() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarDebugger.kt");
+ @TestMetadata("delegatedVarConst.kt")
+ public void testDelegatedVarConst() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarConst.kt");
doTest(fileName);
}
- @TestMetadata("delegatedVarDefault.kt")
- public void testDelegatedVarDefault() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarDefault.kt");
+ @TestMetadata("delegatedVarFalse.kt")
+ public void testDelegatedVarFalse() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarFalse.kt");
doTest(fileName);
}
- @TestMetadata("delegatedVarDo.kt")
- public void testDelegatedVarDo() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarDo.kt");
+ @TestMetadata("delegatedVarFor.kt")
+ public void testDelegatedVarFor() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarFor.kt");
doTest(fileName);
}
- @TestMetadata("enumEntrySwitch.kt")
- public void testEnumEntrySwitch() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntrySwitch.kt");
+ @TestMetadata("enumEntryContinue.kt")
+ public void testEnumEntryContinue() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryContinue.kt");
doTest(fileName);
}
- @TestMetadata("enumEntryUndefined.kt")
- public void testEnumEntryUndefined() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryUndefined.kt");
+ @TestMetadata("enumEntryDo.kt")
+ public void testEnumEntryDo() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryDo.kt");
doTest(fileName);
}
- @TestMetadata("enumEntryWhile.kt")
- public void testEnumEntryWhile() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryWhile.kt");
+ @TestMetadata("enumEntryPublic.kt")
+ public void testEnumEntryPublic() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryPublic.kt");
doTest(fileName);
}
- @TestMetadata("enumEntryYield.kt")
- public void testEnumEntryYield() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryYield.kt");
+ @TestMetadata("enumEntryStatic.kt")
+ public void testEnumEntryStatic() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryStatic.kt");
doTest(fileName);
}
- @TestMetadata("enumFunLet.kt")
- public void testEnumFunLet() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunLet.kt");
+ @TestMetadata("enumFunImport.kt")
+ public void testEnumFunImport() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunImport.kt");
doTest(fileName);
}
- @TestMetadata("enumFunNew.kt")
- public void testEnumFunNew() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunNew.kt");
+ @TestMetadata("enumFunInstanceof.kt")
+ public void testEnumFunInstanceof() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt");
doTest(fileName);
}
- @TestMetadata("enumFunParamPrivate.kt")
- public void testEnumFunParamPrivate() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamPrivate.kt");
+ @TestMetadata("enumFunParamLet.kt")
+ public void testEnumFunParamLet() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt");
doTest(fileName);
}
- @TestMetadata("enumFunParamProtected.kt")
- public void testEnumFunParamProtected() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamProtected.kt");
+ @TestMetadata("enumFunParamNew.kt")
+ public void testEnumFunParamNew() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt");
doTest(fileName);
}
- @TestMetadata("enumFunParamTrue.kt")
- public void testEnumFunParamTrue() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamTrue.kt");
+ @TestMetadata("enumFunParamVar.kt")
+ public void testEnumFunParamVar() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamVar.kt");
doTest(fileName);
}
- @TestMetadata("enumFunParamTry.kt")
- public void testEnumFunParamTry() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamTry.kt");
+ @TestMetadata("enumFunParamWhile.kt")
+ public void testEnumFunParamWhile() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamWhile.kt");
doTest(fileName);
}
- @TestMetadata("enumFunThis.kt")
- public void testEnumFunThis() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunThis.kt");
+ @TestMetadata("enumFunTry.kt")
+ public void testEnumFunTry() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunTry.kt");
doTest(fileName);
}
- @TestMetadata("enumFunThrow.kt")
- public void testEnumFunThrow() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunThrow.kt");
+ @TestMetadata("enumFunTypeof.kt")
+ public void testEnumFunTypeof() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunTypeof.kt");
doTest(fileName);
}
- @TestMetadata("enumLabelPublic.kt")
- public void testEnumLabelPublic() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelPublic.kt");
+ @TestMetadata("enumLabelBreak.kt")
+ public void testEnumLabelBreak() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelBreak.kt");
doTest(fileName);
}
- @TestMetadata("enumLabelStatic.kt")
- public void testEnumLabelStatic() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelStatic.kt");
+ @TestMetadata("enumLabelClass.kt")
+ public void testEnumLabelClass() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelClass.kt");
doTest(fileName);
}
- @TestMetadata("enumLabelTypeof.kt")
- public void testEnumLabelTypeof() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelTypeof.kt");
+ @TestMetadata("enumLabelPrivate.kt")
+ public void testEnumLabelPrivate() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt");
doTest(fileName);
}
- @TestMetadata("enumLabelVar.kt")
- public void testEnumLabelVar() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelVar.kt");
+ @TestMetadata("enumLabelProtected.kt")
+ public void testEnumLabelProtected() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt");
doTest(fileName);
}
- @TestMetadata("enumValFunction.kt")
- public void testEnumValFunction() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValFunction.kt");
+ @TestMetadata("enumValExtends.kt")
+ public void testEnumValExtends() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValExtends.kt");
doTest(fileName);
}
- @TestMetadata("enumValImplements.kt")
- public void testEnumValImplements() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValImplements.kt");
+ @TestMetadata("enumValFinally.kt")
+ public void testEnumValFinally() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValFinally.kt");
doTest(fileName);
}
- @TestMetadata("enumValNull.kt")
- public void testEnumValNull() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValNull.kt");
+ @TestMetadata("enumValSuper.kt")
+ public void testEnumValSuper() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValSuper.kt");
doTest(fileName);
}
- @TestMetadata("enumValPackage.kt")
- public void testEnumValPackage() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValPackage.kt");
+ @TestMetadata("enumValThis.kt")
+ public void testEnumValThis() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValThis.kt");
doTest(fileName);
}
- @TestMetadata("enumVarImport.kt")
- public void testEnumVarImport() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarImport.kt");
+ @TestMetadata("enumVarFunction.kt")
+ public void testEnumVarFunction() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarFunction.kt");
doTest(fileName);
}
- @TestMetadata("enumVarInstanceof.kt")
- public void testEnumVarInstanceof() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarInstanceof.kt");
+ @TestMetadata("enumVarImplements.kt")
+ public void testEnumVarImplements() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarImplements.kt");
doTest(fileName);
}
- @TestMetadata("enumVarReturn.kt")
- public void testEnumVarReturn() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarReturn.kt");
+ @TestMetadata("enumVarThrow.kt")
+ public void testEnumVarThrow() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarThrow.kt");
doTest(fileName);
}
- @TestMetadata("enumVarSuper.kt")
- public void testEnumVarSuper() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarSuper.kt");
+ @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");
doTest(fileName);
}
@@ -353,9 +359,9 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
doTest(fileName);
}
- @TestMetadata("insideClassFunCase.kt")
- public void testInsideClassFunCase() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunCase.kt");
+ @TestMetadata("insideClassFunParamCase.kt")
+ public void testInsideClassFunParamCase() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamCase.kt");
doTest(fileName);
}
@@ -365,27 +371,15 @@ 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("insideClassFunReturn.kt")
- public void testInsideClassFunReturn() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunReturn.kt");
+ @TestMetadata("insideClassFunParamTrue.kt")
+ public void testInsideClassFunParamTrue() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamTrue.kt");
doTest(fileName);
}
@@ -395,39 +389,51 @@ 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("insideClassObjectFunBreak.kt")
- public void testInsideClassObjectFunBreak() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunBreak.kt");
+ @TestMetadata("insideClassLabelTypeof.kt")
+ public void testInsideClassLabelTypeof() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelTypeof.kt");
doTest(fileName);
}
- @TestMetadata("insideClassObjectFunClass.kt")
- public void testInsideClassObjectFunClass() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunClass.kt");
+ @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");
doTest(fileName);
}
@@ -437,21 +443,21 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
doTest(fileName);
}
- @TestMetadata("insideClassObjectFunFinally.kt")
- public void testInsideClassObjectFunFinally() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunFinally.kt");
+ @TestMetadata("insideClassObjectFunParamElse.kt")
+ public void testInsideClassObjectFunParamElse() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamElse.kt");
doTest(fileName);
}
- @TestMetadata("insideClassObjectFunParamContinue.kt")
- public void testInsideClassObjectFunParamContinue() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamContinue.kt");
+ @TestMetadata("insideClassObjectFunParamFalse.kt")
+ public void testInsideClassObjectFunParamFalse() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFalse.kt");
doTest(fileName);
}
- @TestMetadata("insideClassObjectFunParamDo.kt")
- public void testInsideClassObjectFunParamDo() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamDo.kt");
+ @TestMetadata("insideClassObjectFunParamFinally.kt")
+ public void testInsideClassObjectFunParamFinally() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFinally.kt");
doTest(fileName);
}
@@ -461,21 +467,21 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
doTest(fileName);
}
- @TestMetadata("insideClassObjectFunParamImplements.kt")
- public void testInsideClassObjectFunParamImplements() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamImplements.kt");
+ @TestMetadata("insideClassObjectLabelFor.kt")
+ public void testInsideClassObjectLabelFor() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFor.kt");
doTest(fileName);
}
- @TestMetadata("insideClassObjectLabelElse.kt")
- public void testInsideClassObjectLabelElse() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelElse.kt");
+ @TestMetadata("insideClassObjectLabelIf.kt")
+ public void testInsideClassObjectLabelIf() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIf.kt");
doTest(fileName);
}
- @TestMetadata("insideClassObjectLabelFalse.kt")
- public void testInsideClassObjectLabelFalse() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFalse.kt");
+ @TestMetadata("insideClassObjectLabelImplements.kt")
+ public void testInsideClassObjectLabelImplements() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImplements.kt");
doTest(fileName);
}
@@ -485,9 +491,9 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
doTest(fileName);
}
- @TestMetadata("insideClassObjectLabelInstanceof.kt")
- public void testInsideClassObjectLabelInstanceof() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInstanceof.kt");
+ @TestMetadata("insideClassObjectValDefault.kt")
+ public void testInsideClassObjectValDefault() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValDefault.kt");
doTest(fileName);
}
@@ -497,54 +503,42 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
doTest(fileName);
}
- @TestMetadata("insideClassObjectValEnum.kt")
- public void testInsideClassObjectValEnum() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValEnum.kt");
- doTest(fileName);
- }
-
- @TestMetadata("insideClassObjectValTypeof.kt")
- public void testInsideClassObjectValTypeof() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValTypeof.kt");
- doTest(fileName);
- }
-
@TestMetadata("insideClassObjectValVar.kt")
public void testInsideClassObjectValVar() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValVar.kt");
doTest(fileName);
}
+ @TestMetadata("insideClassObjectValWhile.kt")
+ public void testInsideClassObjectValWhile() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValWhile.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");
+ doTest(fileName);
+ }
+
@TestMetadata("insideClassObjectVarEval.kt")
public void testInsideClassObjectVarEval() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarEval.kt");
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");
@@ -557,15 +551,21 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
doTest(fileName);
}
- @TestMetadata("insideClassValKotlin.kt")
- public void testInsideClassValKotlin() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValKotlin.kt");
+ @TestMetadata("insideClassValNull.kt")
+ public void testInsideClassValNull() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValNull.kt");
doTest(fileName);
}
- @TestMetadata("insideClassVarArguments.kt")
- public void testInsideClassVarArguments() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarArguments.kt");
+ @TestMetadata("insideClassValYield.kt")
+ public void testInsideClassValYield() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValYield.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("insideClassVarKotlin.kt")
+ public void testInsideClassVarKotlin() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarKotlin.kt");
doTest(fileName);
}
@@ -575,39 +575,21 @@ 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("insideObjectFunNull.kt")
- public void testInsideObjectFunNull() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunNull.kt");
+ @TestMetadata("insideClassVarReturn.kt")
+ public void testInsideClassVarReturn() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarReturn.kt");
doTest(fileName);
}
- @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");
+ @TestMetadata("insideObjectFunParamStatic.kt")
+ public void testInsideObjectFunParamStatic() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamStatic.kt");
doTest(fileName);
}
@@ -617,9 +599,21 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
doTest(fileName);
}
- @TestMetadata("insideObjectFunParamUndefined.kt")
- public void testInsideObjectFunParamUndefined() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamUndefined.kt");
+ @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");
doTest(fileName);
}
@@ -629,21 +623,33 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
doTest(fileName);
}
- @TestMetadata("insideObjectFunStatic.kt")
- public void testInsideObjectFunStatic() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunStatic.kt");
+ @TestMetadata("insideObjectFunReturn.kt")
+ public void testInsideObjectFunReturn() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunReturn.kt");
doTest(fileName);
}
- @TestMetadata("insideObjectLabelThis.kt")
- public void testInsideObjectLabelThis() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelThis.kt");
+ @TestMetadata("insideObjectFunSuper.kt")
+ public void testInsideObjectFunSuper() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunSuper.kt");
doTest(fileName);
}
- @TestMetadata("insideObjectLabelThrow.kt")
- public void testInsideObjectLabelThrow() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelThrow.kt");
+ @TestMetadata("insideObjectLabelTrue.kt")
+ public void testInsideObjectLabelTrue() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelTrue.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("insideObjectLabelTry.kt")
+ public void testInsideObjectLabelTry() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelTry.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("insideObjectLabelUndefined.kt")
+ public void testInsideObjectLabelUndefined() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelUndefined.kt");
doTest(fileName);
}
@@ -653,21 +659,21 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
doTest(fileName);
}
- @TestMetadata("insideObjectLabelWith.kt")
- public void testInsideObjectLabelWith() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelWith.kt");
+ @TestMetadata("insideObjectValIn.kt")
+ public void testInsideObjectValIn() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValIn.kt");
doTest(fileName);
}
- @TestMetadata("insideObjectValFor.kt")
- public void testInsideObjectValFor() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValFor.kt");
+ @TestMetadata("insideObjectValInstanceof.kt")
+ public void testInsideObjectValInstanceof() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValInstanceof.kt");
doTest(fileName);
}
- @TestMetadata("insideObjectValIf.kt")
- public void testInsideObjectValIf() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValIf.kt");
+ @TestMetadata("insideObjectValInterface.kt")
+ public void testInsideObjectValInterface() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValInterface.kt");
doTest(fileName);
}
@@ -677,21 +683,21 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
doTest(fileName);
}
- @TestMetadata("insideObjectValNew.kt")
- public void testInsideObjectValNew() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValNew.kt");
+ @TestMetadata("insideObjectVarNew.kt")
+ public void testInsideObjectVarNew() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarNew.kt");
doTest(fileName);
}
- @TestMetadata("insideObjectVarIn.kt")
- public void testInsideObjectVarIn() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarIn.kt");
+ @TestMetadata("insideObjectVarNull.kt")
+ public void testInsideObjectVarNull() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarNull.kt");
doTest(fileName);
}
- @TestMetadata("insideObjectVarInterface.kt")
- public void testInsideObjectVarInterface() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarInterface.kt");
+ @TestMetadata("insideObjectVarPackage.kt")
+ public void testInsideObjectVarPackage() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarPackage.kt");
doTest(fileName);
}
@@ -701,24 +707,18 @@ 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("localCatchVoid.kt")
public void testLocalCatchVoid() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchVoid.kt");
@@ -731,21 +731,15 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
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("localFunParamContinue.kt")
- public void testLocalFunParamContinue() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamContinue.kt");
+ @TestMetadata("localFunContinue.kt")
+ public void testLocalFunContinue() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunContinue.kt");
doTest(fileName);
}
@@ -755,6 +749,12 @@ 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,18 +779,18 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
doTest(fileName);
}
- @TestMetadata("localLabelElse.kt")
- public void testLocalLabelElse() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelElse.kt");
- doTest(fileName);
- }
-
@TestMetadata("localLabelFalse.kt")
public void testLocalLabelFalse() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelFalse.kt");
doTest(fileName);
}
+ @TestMetadata("localLabelFor.kt")
+ public void testLocalLabelFor() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelFor.kt");
+ doTest(fileName);
+ }
+
@TestMetadata("localLabelSwitch.kt")
public void testLocalLabelSwitch() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelSwitch.kt");
@@ -827,6 +827,12 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
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,12 +851,6 @@ public class ReservedWordTestGenerated extends AbstractReservedWordTest {
doTest(fileName);
}
- @TestMetadata("localVarYield.kt")
- public void testLocalVarYield() throws Exception {
- String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarYield.kt");
- doTest(fileName);
- }
-
@TestMetadata("toplevelClassDelete.kt")
public void testToplevelClassDelete() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelClassDelete.kt");
diff --git a/js/js.translator/testData/reservedWords/cases/SHOULD_BE_ESCAPED.txt b/js/js.translator/testData/reservedWords/cases/SHOULD_BE_ESCAPED.txt
index ff188c409fd..a207b8d1bb9 100644
--- a/js/js.translator/testData/reservedWords/cases/SHOULD_BE_ESCAPED.txt
+++ b/js/js.translator/testData/reservedWords/cases/SHOULD_BE_ESCAPED.txt
@@ -19,5 +19,4 @@ true
try
typeof
var
-while
-yield
\ No newline at end of file
+while
\ 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 f29d25770b2..e7954fabd27 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
@@ -28,4 +28,5 @@ static
switch
undefined
void
-with
\ No newline at end of file
+with
+yield
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarTypeof.kt b/js/js.translator/testData/reservedWords/cases/dataClassValTypeof.kt
similarity index 83%
rename from js/js.translator/testData/reservedWords/cases/dataClassVarTypeof.kt
rename to js/js.translator/testData/reservedWords/cases/dataClassValTypeof.kt
index 71eba1f978f..e0fc9c40245 100644
--- a/js/js.translator/testData/reservedWords/cases/dataClassVarTypeof.kt
+++ b/js/js.translator/testData/reservedWords/cases/dataClassValTypeof.kt
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-data class DataClass(var `typeof`: String) {
+data class DataClass(val `typeof`: String) {
init {
testNotRenamed("typeof", { `typeof` })
}
diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarVar.kt b/js/js.translator/testData/reservedWords/cases/dataClassValVar.kt
similarity index 84%
rename from js/js.translator/testData/reservedWords/cases/dataClassVarVar.kt
rename to js/js.translator/testData/reservedWords/cases/dataClassValVar.kt
index 8b541bf40c8..f402b94320a 100644
--- a/js/js.translator/testData/reservedWords/cases/dataClassVarVar.kt
+++ b/js/js.translator/testData/reservedWords/cases/dataClassValVar.kt
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-data class DataClass(var `var`: String) {
+data class DataClass(val `var`: String) {
init {
testNotRenamed("var", { `var` })
}
diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarNaN.kt b/js/js.translator/testData/reservedWords/cases/dataClassValWith.kt
similarity index 69%
rename from js/js.translator/testData/reservedWords/cases/dataClassVarNaN.kt
rename to js/js.translator/testData/reservedWords/cases/dataClassValWith.kt
index 97fe4ad672a..7f642e2eae6 100644
--- a/js/js.translator/testData/reservedWords/cases/dataClassVarNaN.kt
+++ b/js/js.translator/testData/reservedWords/cases/dataClassValWith.kt
@@ -2,9 +2,9 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-data class DataClass(var NaN: String) {
+data class DataClass(val with: String) {
init {
- testNotRenamed("NaN", { NaN })
+ testNotRenamed("with", { with })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValTry.kt b/js/js.translator/testData/reservedWords/cases/dataClassValYield.kt
similarity index 68%
rename from js/js.translator/testData/reservedWords/cases/dataClassValTry.kt
rename to js/js.translator/testData/reservedWords/cases/dataClassValYield.kt
index 3ba1f765797..ba692348f88 100644
--- a/js/js.translator/testData/reservedWords/cases/dataClassValTry.kt
+++ b/js/js.translator/testData/reservedWords/cases/dataClassValYield.kt
@@ -2,9 +2,9 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-data class DataClass(val `try`: String) {
+data class DataClass(val yield: String) {
init {
- testNotRenamed("try", { `try` })
+ testNotRenamed("yield", { yield })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarArguments.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarArguments.kt
deleted file mode 100644
index 995d0dd9335..00000000000
--- a/js/js.translator/testData/reservedWords/cases/dataClassVarArguments.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 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/dataClassValTrue.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarBreak.kt
similarity index 67%
rename from js/js.translator/testData/reservedWords/cases/dataClassValTrue.kt
rename to js/js.translator/testData/reservedWords/cases/dataClassVarBreak.kt
index bfadf357f0e..422b6616b15 100644
--- a/js/js.translator/testData/reservedWords/cases/dataClassValTrue.kt
+++ b/js/js.translator/testData/reservedWords/cases/dataClassVarBreak.kt
@@ -2,9 +2,9 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-data class DataClass(val `true`: String) {
+data class DataClass(var `break`: String) {
init {
- testNotRenamed("true", { `true` })
+ testNotRenamed("break", { `break` })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValInfinity.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarInfinity.kt
similarity index 83%
rename from js/js.translator/testData/reservedWords/cases/dataClassValInfinity.kt
rename to js/js.translator/testData/reservedWords/cases/dataClassVarInfinity.kt
index 8e7f0e380cf..23da1e006fc 100644
--- a/js/js.translator/testData/reservedWords/cases/dataClassValInfinity.kt
+++ b/js/js.translator/testData/reservedWords/cases/dataClassVarInfinity.kt
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-data class DataClass(val Infinity: String) {
+data class DataClass(var Infinity: String) {
init {
testNotRenamed("Infinity", { Infinity })
}
diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValKotlin.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarKotlin.kt
similarity index 84%
rename from js/js.translator/testData/reservedWords/cases/dataClassValKotlin.kt
rename to js/js.translator/testData/reservedWords/cases/dataClassVarKotlin.kt
index 21a59f69cd9..a73fff589ff 100644
--- a/js/js.translator/testData/reservedWords/cases/dataClassValKotlin.kt
+++ b/js/js.translator/testData/reservedWords/cases/dataClassVarKotlin.kt
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-data class DataClass(val Kotlin: String) {
+data class DataClass(var Kotlin: String) {
init {
testNotRenamed("Kotlin", { Kotlin })
}
diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarWhile.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarWhile.kt
new file mode 100644
index 00000000000..776e4acc7aa
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/dataClassVarWhile.kt
@@ -0,0 +1,15 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+data class DataClass(var `while`: String) {
+ init {
+ testNotRenamed("while", { `while` })
+ }
+}
+
+fun box(): String {
+ DataClass("123")
+
+ return "OK"
+}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunElse.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunDebugger.kt
similarity index 72%
rename from js/js.translator/testData/reservedWords/cases/delegatedFunElse.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedFunDebugger.kt
index 50e3b498cd6..b484bd5cd60 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedFunElse.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedFunDebugger.kt
@@ -3,16 +3,16 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
interface Trait {
- fun `else`()
+ fun debugger()
}
class TraitImpl : Trait {
- override fun `else`() { `else`() }
+ override fun debugger() { debugger() }
}
class TestDelegate : Trait by TraitImpl() {
fun test() {
- testNotRenamed("else", { `else`() })
+ testNotRenamed("debugger", { debugger() })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunDelete.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunDefault.kt
similarity index 72%
rename from js/js.translator/testData/reservedWords/cases/delegatedFunDelete.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedFunDefault.kt
index 526bc183636..a4567d90145 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedFunDelete.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedFunDefault.kt
@@ -3,16 +3,16 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
interface Trait {
- fun delete()
+ fun default()
}
class TraitImpl : Trait {
- override fun delete() { delete() }
+ override fun default() { default() }
}
class TestDelegate : Trait by TraitImpl() {
fun test() {
- testNotRenamed("delete", { delete() })
+ testNotRenamed("default", { default() })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunFalse.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunFalse.kt
deleted file mode 100644
index c45e23a070f..00000000000
--- a/js/js.translator/testData/reservedWords/cases/delegatedFunFalse.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 `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/delegatedFunEnum.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunIf.kt
similarity index 75%
rename from js/js.translator/testData/reservedWords/cases/delegatedFunEnum.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedFunIf.kt
index f3925500cd2..f1bf64b0019 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedFunEnum.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedFunIf.kt
@@ -3,16 +3,16 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
interface Trait {
- fun enum()
+ fun `if`()
}
class TraitImpl : Trait {
- override fun enum() { enum() }
+ override fun `if`() { `if`() }
}
class TestDelegate : Trait by TraitImpl() {
fun test() {
- testNotRenamed("enum", { enum() })
+ testNotRenamed("if", { `if`() })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunIn.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunIn.kt
new file mode 100644
index 00000000000..fc7e8ee36aa
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/delegatedFunIn.kt
@@ -0,0 +1,23 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+interface Trait {
+ fun `in`()
+}
+
+class TraitImpl : Trait {
+ override fun `in`() { `in`() }
+}
+
+class TestDelegate : Trait by TraitImpl() {
+ fun test() {
+ testNotRenamed("in", { `in`() })
+ }
+}
+
+fun box(): String {
+ TestDelegate().test()
+
+ return "OK"
+}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunParamExport.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunParamDelete.kt
similarity index 69%
rename from js/js.translator/testData/reservedWords/cases/delegatedFunParamExport.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedFunParamDelete.kt
index a55312eeba8..c820a1b2763 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedFunParamExport.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedFunParamDelete.kt
@@ -3,13 +3,13 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
interface Trait {
- fun foo(export: String)
+ fun foo(delete: String)
}
class TraitImpl : Trait {
- override fun foo(export: String) {
- assertEquals("123", export)
- testRenamed("export", { export })
+ override fun foo(delete: String) {
+ assertEquals("123", delete)
+ testRenamed("delete", { delete })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunParamEval.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunParamEnum.kt
similarity index 71%
rename from js/js.translator/testData/reservedWords/cases/delegatedFunParamEval.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedFunParamEnum.kt
index 57c9ee21a5f..0e168a885b2 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedFunParamEval.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedFunParamEnum.kt
@@ -3,13 +3,13 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
interface Trait {
- fun foo(eval: String)
+ fun foo(enum: String)
}
class TraitImpl : Trait {
- override fun foo(eval: String) {
- assertEquals("123", eval)
- testRenamed("eval", { eval })
+ override fun foo(enum: String) {
+ assertEquals("123", enum)
+ testRenamed("enum", { enum })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunParamIf.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunParamInterface.kt
similarity index 66%
rename from js/js.translator/testData/reservedWords/cases/delegatedFunParamIf.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedFunParamInterface.kt
index 472b17b26b7..3f3c69693d4 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedFunParamIf.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedFunParamInterface.kt
@@ -3,13 +3,13 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
interface Trait {
- fun foo(`if`: String)
+ fun foo(`interface`: String)
}
class TraitImpl : Trait {
- override fun foo(`if`: String) {
- assertEquals("123", `if`)
- testRenamed("if", { `if` })
+ override fun foo(`interface`: String) {
+ assertEquals("123", `interface`)
+ testRenamed("interface", { `interface` })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunParamFor.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunParamNull.kt
similarity index 69%
rename from js/js.translator/testData/reservedWords/cases/delegatedFunParamFor.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedFunParamNull.kt
index 51b3a09d463..033cf91f32c 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedFunParamFor.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedFunParamNull.kt
@@ -3,13 +3,13 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
interface Trait {
- fun foo(`for`: String)
+ fun foo(`null`: String)
}
class TraitImpl : Trait {
- override fun foo(`for`: String) {
- assertEquals("123", `for`)
- testRenamed("for", { `for` })
+ override fun foo(`null`: String) {
+ assertEquals("123", `null`)
+ testRenamed("null", { `null` })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedLabelIn.kt b/js/js.translator/testData/reservedWords/cases/delegatedLabelEval.kt
similarity index 85%
rename from js/js.translator/testData/reservedWords/cases/delegatedLabelIn.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedLabelEval.kt
index 7a44bcdf3bc..92fec6c006b 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedLabelIn.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedLabelEval.kt
@@ -12,7 +12,7 @@ class TraitImpl : Trait {
class TestDelegate : Trait by TraitImpl() {
fun test() {
- testRenamed("in", { `in`@ while (false) {} })
+ testRenamed("eval", { eval@ while (false) {} })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedLabelFinally.kt b/js/js.translator/testData/reservedWords/cases/delegatedLabelExport.kt
similarity index 84%
rename from js/js.translator/testData/reservedWords/cases/delegatedLabelFinally.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedLabelExport.kt
index 055c3f5bd41..4da2d38642d 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedLabelFinally.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedLabelExport.kt
@@ -12,7 +12,7 @@ class TraitImpl : Trait {
class TestDelegate : Trait by TraitImpl() {
fun test() {
- testRenamed("finally", { finally@ while (false) {} })
+ testRenamed("export", { export@ while (false) {} })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedLabelInterface.kt b/js/js.translator/testData/reservedWords/cases/delegatedLabelPackage.kt
similarity index 83%
rename from js/js.translator/testData/reservedWords/cases/delegatedLabelInterface.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedLabelPackage.kt
index 510ff5e100c..cf17d2da6c1 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedLabelInterface.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedLabelPackage.kt
@@ -12,7 +12,7 @@ class TraitImpl : Trait {
class TestDelegate : Trait by TraitImpl() {
fun test() {
- testRenamed("interface", { `interface`@ while (false) {} })
+ testRenamed("package", { `package`@ while (false) {} })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedLabelExtends.kt b/js/js.translator/testData/reservedWords/cases/delegatedLabelReturn.kt
similarity index 84%
rename from js/js.translator/testData/reservedWords/cases/delegatedLabelExtends.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedLabelReturn.kt
index d8b7007abfe..69c3b606683 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedLabelExtends.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedLabelReturn.kt
@@ -12,7 +12,7 @@ class TraitImpl : Trait {
class TestDelegate : Trait by TraitImpl() {
fun test() {
- testRenamed("extends", { extends@ while (false) {} })
+ testRenamed("return", { `return`@ while (false) {} })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValAwait.kt b/js/js.translator/testData/reservedWords/cases/delegatedValAwait.kt
new file mode 100644
index 00000000000..1cd04171411
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/delegatedValAwait.kt
@@ -0,0 +1,23 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+interface Trait {
+ val await: Int
+}
+
+class TraitImpl : Trait {
+ override val await: Int = 0
+}
+
+class TestDelegate : Trait by TraitImpl() {
+ fun test() {
+ testNotRenamed("await", { await })
+ }
+}
+
+fun box(): String {
+ TestDelegate().test()
+
+ return "OK"
+}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValCase.kt b/js/js.translator/testData/reservedWords/cases/delegatedValCase.kt
new file mode 100644
index 00000000000..e75477dd42b
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/delegatedValCase.kt
@@ -0,0 +1,23 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+interface Trait {
+ val case: Int
+}
+
+class TraitImpl : Trait {
+ override val case: Int = 0
+}
+
+class TestDelegate : Trait by TraitImpl() {
+ fun test() {
+ testNotRenamed("case", { case })
+ }
+}
+
+fun box(): String {
+ TestDelegate().test()
+
+ return "OK"
+}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValClass.kt b/js/js.translator/testData/reservedWords/cases/delegatedValClass.kt
deleted file mode 100644
index 6425808fbe0..00000000000
--- a/js/js.translator/testData/reservedWords/cases/delegatedValClass.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 `class`: Int
-}
-
-class TraitImpl : Trait {
- override val `class`: Int = 0
-}
-
-class TestDelegate : Trait by TraitImpl() {
- fun test() {
- testNotRenamed("class", { `class` })
- }
-}
-
-fun box(): String {
- TestDelegate().test()
-
- return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarDo.kt b/js/js.translator/testData/reservedWords/cases/delegatedValDo.kt
similarity index 87%
rename from js/js.translator/testData/reservedWords/cases/delegatedVarDo.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedValDo.kt
index 9fcfcd7ef2a..077ba008983 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedVarDo.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedValDo.kt
@@ -3,11 +3,11 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
interface Trait {
- var `do`: Int
+ val `do`: Int
}
class TraitImpl : Trait {
- override var `do`: Int = 0
+ override val `do`: 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
new file mode 100644
index 00000000000..a7dc69ad23a
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/delegatedValElse.kt
@@ -0,0 +1,23 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+interface Trait {
+ val `else`: Int
+}
+
+class TraitImpl : Trait {
+ override val `else`: Int = 0
+}
+
+class TestDelegate : Trait by TraitImpl() {
+ fun test() {
+ testNotRenamed("else", { `else` })
+ }
+}
+
+fun box(): String {
+ TestDelegate().test()
+
+ return "OK"
+}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValCatch.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarCatch.kt
similarity index 86%
rename from js/js.translator/testData/reservedWords/cases/delegatedValCatch.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedVarCatch.kt
index 99e59b823e6..1bb4e6c1020 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedValCatch.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedVarCatch.kt
@@ -3,11 +3,11 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
interface Trait {
- val catch: Int
+ var catch: Int
}
class TraitImpl : Trait {
- override val catch: Int = 0
+ override var catch: Int = 0
}
class TestDelegate : Trait by TraitImpl() {
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedValConst.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarConst.kt
similarity index 86%
rename from js/js.translator/testData/reservedWords/cases/delegatedValConst.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedVarConst.kt
index 2f3ae91636e..469b16b71d2 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedValConst.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedVarConst.kt
@@ -3,11 +3,11 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
interface Trait {
- val const: Int
+ var const: Int
}
class TraitImpl : Trait {
- override val const: Int = 0
+ override var const: Int = 0
}
class TestDelegate : Trait by TraitImpl() {
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarContinue.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarContinue.kt
deleted file mode 100644
index 7085237cb31..00000000000
--- a/js/js.translator/testData/reservedWords/cases/delegatedVarContinue.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 `continue`: Int
-}
-
-class TraitImpl : Trait {
- override var `continue`: Int = 0
-}
-
-class TestDelegate : Trait by TraitImpl() {
- fun test() {
- testNotRenamed("continue", { `continue` })
- }
-}
-
-fun box(): String {
- TestDelegate().test()
-
- return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarDebugger.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarDebugger.kt
deleted file mode 100644
index 19d48cc5e7f..00000000000
--- a/js/js.translator/testData/reservedWords/cases/delegatedVarDebugger.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 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
deleted file mode 100644
index 42a39e4f9a4..00000000000
--- a/js/js.translator/testData/reservedWords/cases/delegatedVarDefault.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 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/delegatedValBreak.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarFalse.kt
similarity index 74%
rename from js/js.translator/testData/reservedWords/cases/delegatedValBreak.kt
rename to js/js.translator/testData/reservedWords/cases/delegatedVarFalse.kt
index a867b2930f3..dbfbba316bd 100644
--- a/js/js.translator/testData/reservedWords/cases/delegatedValBreak.kt
+++ b/js/js.translator/testData/reservedWords/cases/delegatedVarFalse.kt
@@ -3,16 +3,16 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
interface Trait {
- val `break`: Int
+ var `false`: Int
}
class TraitImpl : Trait {
- override val `break`: Int = 0
+ override var `false`: Int = 0
}
class TestDelegate : Trait by TraitImpl() {
fun test() {
- testNotRenamed("break", { `break` })
+ testNotRenamed("false", { `false` })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/delegatedVarFor.kt b/js/js.translator/testData/reservedWords/cases/delegatedVarFor.kt
new file mode 100644
index 00000000000..d30746aa852
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/delegatedVarFor.kt
@@ -0,0 +1,23 @@
+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/enumEntryUndefined.kt b/js/js.translator/testData/reservedWords/cases/enumEntryContinue.kt
similarity index 71%
rename from js/js.translator/testData/reservedWords/cases/enumEntryUndefined.kt
rename to js/js.translator/testData/reservedWords/cases/enumEntryContinue.kt
index 03c45399630..a6881b51875 100644
--- a/js/js.translator/testData/reservedWords/cases/enumEntryUndefined.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumEntryContinue.kt
@@ -3,11 +3,11 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
enum class Foo {
- undefined
+ `continue`
}
fun box(): String {
- testNotRenamed("undefined", { Foo.undefined })
+ testNotRenamed("continue", { Foo.`continue` })
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/enumEntrySwitch.kt b/js/js.translator/testData/reservedWords/cases/enumEntryDo.kt
similarity index 74%
rename from js/js.translator/testData/reservedWords/cases/enumEntrySwitch.kt
rename to js/js.translator/testData/reservedWords/cases/enumEntryDo.kt
index 9c3d0346fcb..a593141c31b 100644
--- a/js/js.translator/testData/reservedWords/cases/enumEntrySwitch.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumEntryDo.kt
@@ -3,11 +3,11 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
enum class Foo {
- switch
+ `do`
}
fun box(): String {
- testNotRenamed("switch", { Foo.switch })
+ testNotRenamed("do", { Foo.`do` })
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/enumEntryWhile.kt b/js/js.translator/testData/reservedWords/cases/enumEntryPublic.kt
similarity index 73%
rename from js/js.translator/testData/reservedWords/cases/enumEntryWhile.kt
rename to js/js.translator/testData/reservedWords/cases/enumEntryPublic.kt
index 1ba2236cc9d..951d6ae0b2f 100644
--- a/js/js.translator/testData/reservedWords/cases/enumEntryWhile.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumEntryPublic.kt
@@ -3,11 +3,11 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
enum class Foo {
- `while`
+ `public`
}
fun box(): String {
- testNotRenamed("while", { Foo.`while` })
+ testNotRenamed("public", { Foo.`public` })
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/enumEntryYield.kt b/js/js.translator/testData/reservedWords/cases/enumEntryStatic.kt
similarity index 74%
rename from js/js.translator/testData/reservedWords/cases/enumEntryYield.kt
rename to js/js.translator/testData/reservedWords/cases/enumEntryStatic.kt
index e16680690d9..6c4453b83b2 100644
--- a/js/js.translator/testData/reservedWords/cases/enumEntryYield.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumEntryStatic.kt
@@ -3,11 +3,11 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
enum class Foo {
- `yield`
+ static
}
fun box(): String {
- testNotRenamed("yield", { Foo.`yield` })
+ testNotRenamed("static", { Foo.static })
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/enumFunImport.kt b/js/js.translator/testData/reservedWords/cases/enumFunImport.kt
new file mode 100644
index 00000000000..ceebb4a8c31
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/enumFunImport.kt
@@ -0,0 +1,18 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+enum class Foo {
+ BAR;
+ fun import() { import() }
+
+ fun test() {
+ testNotRenamed("import", { import() })
+ }
+}
+
+fun box(): String {
+ Foo.BAR.test()
+
+ return "OK"
+}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt b/js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt
new file mode 100644
index 00000000000..309a1f7ae6c
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/enumFunInstanceof.kt
@@ -0,0 +1,18 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+enum class Foo {
+ BAR;
+ fun 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/enumFunParamTry.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt
similarity index 71%
rename from js/js.translator/testData/reservedWords/cases/enumFunParamTry.kt
rename to js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt
index 470bf585d2e..7c1351c1f65 100644
--- a/js/js.translator/testData/reservedWords/cases/enumFunParamTry.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumFunParamLet.kt
@@ -4,9 +4,9 @@ package foo
enum class Foo {
BAR;
- fun foo(`try`: String) {
- assertEquals("123", `try`)
- testRenamed("try", { `try` })
+ fun foo(let: String) {
+ assertEquals("123", let)
+ testRenamed("let", { let })
}
fun test() {
diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamPrivate.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt
similarity index 69%
rename from js/js.translator/testData/reservedWords/cases/enumFunParamPrivate.kt
rename to js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt
index 8a38a0455c8..8a011e62d69 100644
--- a/js/js.translator/testData/reservedWords/cases/enumFunParamPrivate.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumFunParamNew.kt
@@ -4,9 +4,9 @@ package foo
enum class Foo {
BAR;
- fun foo(private: String) {
- assertEquals("123", private)
- testRenamed("private", { private })
+ fun foo(new: String) {
+ assertEquals("123", new)
+ testRenamed("new", { new })
}
fun test() {
diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamProtected.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamVar.kt
similarity index 68%
rename from js/js.translator/testData/reservedWords/cases/enumFunParamProtected.kt
rename to js/js.translator/testData/reservedWords/cases/enumFunParamVar.kt
index 53c1bf56b42..1aed84b4c86 100644
--- a/js/js.translator/testData/reservedWords/cases/enumFunParamProtected.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumFunParamVar.kt
@@ -4,9 +4,9 @@ package foo
enum class Foo {
BAR;
- fun foo(protected: String) {
- assertEquals("123", protected)
- testRenamed("protected", { protected })
+ fun foo(`var`: String) {
+ assertEquals("123", `var`)
+ testRenamed("var", { `var` })
}
fun test() {
diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamWhile.kt b/js/js.translator/testData/reservedWords/cases/enumFunParamWhile.kt
new file mode 100644
index 00000000000..f4abf35a877
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/enumFunParamWhile.kt
@@ -0,0 +1,21 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+enum class Foo {
+ BAR;
+ fun foo(`while`: String) {
+ assertEquals("123", `while`)
+ testRenamed("while", { `while` })
+}
+
+ 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/enumVarImport.kt b/js/js.translator/testData/reservedWords/cases/enumFunTry.kt
similarity index 75%
rename from js/js.translator/testData/reservedWords/cases/enumVarImport.kt
rename to js/js.translator/testData/reservedWords/cases/enumFunTry.kt
index a5e0752f346..1e7f201a027 100644
--- a/js/js.translator/testData/reservedWords/cases/enumVarImport.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumFunTry.kt
@@ -4,10 +4,10 @@ package foo
enum class Foo {
BAR;
- var import: Int = 0
+ fun `try`() { `try`() }
fun test() {
- testNotRenamed("import", { import })
+ testNotRenamed("try", { `try`() })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/enumFunThrow.kt b/js/js.translator/testData/reservedWords/cases/enumFunTypeof.kt
similarity index 72%
rename from js/js.translator/testData/reservedWords/cases/enumFunThrow.kt
rename to js/js.translator/testData/reservedWords/cases/enumFunTypeof.kt
index 74a67fad20d..62c35e1c7f6 100644
--- a/js/js.translator/testData/reservedWords/cases/enumFunThrow.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumFunTypeof.kt
@@ -4,10 +4,10 @@ package foo
enum class Foo {
BAR;
- fun `throw`() { `throw`() }
+ fun `typeof`() { `typeof`() }
fun test() {
- testNotRenamed("throw", { `throw`() })
+ testNotRenamed("typeof", { `typeof`() })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelPublic.kt b/js/js.translator/testData/reservedWords/cases/enumLabelBreak.kt
similarity index 79%
rename from js/js.translator/testData/reservedWords/cases/enumLabelPublic.kt
rename to js/js.translator/testData/reservedWords/cases/enumLabelBreak.kt
index ade514d74c6..e1aec6d8345 100644
--- a/js/js.translator/testData/reservedWords/cases/enumLabelPublic.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumLabelBreak.kt
@@ -7,7 +7,7 @@ enum class Foo {
val t: Int = 0
fun test() {
- testRenamed("public", { public@ while (false) {} })
+ testRenamed("break", { `break`@ while (false) {} })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelStatic.kt b/js/js.translator/testData/reservedWords/cases/enumLabelClass.kt
similarity index 79%
rename from js/js.translator/testData/reservedWords/cases/enumLabelStatic.kt
rename to js/js.translator/testData/reservedWords/cases/enumLabelClass.kt
index 3532fb21247..a1dfc6559ad 100644
--- a/js/js.translator/testData/reservedWords/cases/enumLabelStatic.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumLabelClass.kt
@@ -7,7 +7,7 @@ enum class Foo {
val t: Int = 0
fun test() {
- testRenamed("static", { static@ while (false) {} })
+ testRenamed("class", { `class`@ while (false) {} })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelVar.kt b/js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt
similarity index 79%
rename from js/js.translator/testData/reservedWords/cases/enumLabelVar.kt
rename to js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt
index 8f03d737208..f1099348369 100644
--- a/js/js.translator/testData/reservedWords/cases/enumLabelVar.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumLabelPrivate.kt
@@ -7,7 +7,7 @@ enum class Foo {
val t: Int = 0
fun test() {
- testRenamed("var", { `var`@ while (false) {} })
+ testRenamed("private", { private@ while (false) {} })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt b/js/js.translator/testData/reservedWords/cases/enumLabelProtected.kt
new file mode 100644
index 00000000000..9c89ac68fc0
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/enumLabelProtected.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 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/enumValExtends.kt b/js/js.translator/testData/reservedWords/cases/enumValExtends.kt
new file mode 100644
index 00000000000..c140034ec4c
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/enumValExtends.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 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
new file mode 100644
index 00000000000..f46b8045d09
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/enumValFinally.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 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/enumVarSuper.kt b/js/js.translator/testData/reservedWords/cases/enumValSuper.kt
similarity index 91%
rename from js/js.translator/testData/reservedWords/cases/enumVarSuper.kt
rename to js/js.translator/testData/reservedWords/cases/enumValSuper.kt
index 032518a0d84..5d8caad9e03 100644
--- a/js/js.translator/testData/reservedWords/cases/enumVarSuper.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumValSuper.kt
@@ -4,7 +4,7 @@ package foo
enum class Foo {
BAR;
- var `super`: Int = 0
+ val `super`: Int = 0
fun test() {
testNotRenamed("super", { `super` })
diff --git a/js/js.translator/testData/reservedWords/cases/enumFunLet.kt b/js/js.translator/testData/reservedWords/cases/enumValThis.kt
similarity index 76%
rename from js/js.translator/testData/reservedWords/cases/enumFunLet.kt
rename to js/js.translator/testData/reservedWords/cases/enumValThis.kt
index 067513cabd7..1c8f1cb09cd 100644
--- a/js/js.translator/testData/reservedWords/cases/enumFunLet.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumValThis.kt
@@ -4,10 +4,10 @@ package foo
enum class Foo {
BAR;
- fun let() { let() }
+ val `this`: Int = 0
fun test() {
- testNotRenamed("let", { let() })
+ testNotRenamed("this", { `this` })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/enumValFunction.kt b/js/js.translator/testData/reservedWords/cases/enumVarFunction.kt
similarity index 91%
rename from js/js.translator/testData/reservedWords/cases/enumValFunction.kt
rename to js/js.translator/testData/reservedWords/cases/enumVarFunction.kt
index c486c236dad..b9c710d5529 100644
--- a/js/js.translator/testData/reservedWords/cases/enumValFunction.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumVarFunction.kt
@@ -4,7 +4,7 @@ package foo
enum class Foo {
BAR;
- val function: Int = 0
+ var function: Int = 0
fun test() {
testNotRenamed("function", { function })
diff --git a/js/js.translator/testData/reservedWords/cases/enumValImplements.kt b/js/js.translator/testData/reservedWords/cases/enumVarImplements.kt
similarity index 90%
rename from js/js.translator/testData/reservedWords/cases/enumValImplements.kt
rename to js/js.translator/testData/reservedWords/cases/enumVarImplements.kt
index 511fa27c619..b33e6926c14 100644
--- a/js/js.translator/testData/reservedWords/cases/enumValImplements.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumVarImplements.kt
@@ -4,7 +4,7 @@ package foo
enum class Foo {
BAR;
- val implements: Int = 0
+ var 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/enumVarThrow.kt
similarity index 75%
rename from js/js.translator/testData/reservedWords/cases/enumValNull.kt
rename to js/js.translator/testData/reservedWords/cases/enumVarThrow.kt
index 49f70fb7b71..f7eee0afda7 100644
--- a/js/js.translator/testData/reservedWords/cases/enumValNull.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumVarThrow.kt
@@ -4,10 +4,10 @@ package foo
enum class Foo {
BAR;
- val `null`: Int = 0
+ var `throw`: Int = 0
fun test() {
- testNotRenamed("null", { `null` })
+ testNotRenamed("throw", { `throw` })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/enumFunNew.kt b/js/js.translator/testData/reservedWords/cases/enumVarTrue.kt
similarity index 76%
rename from js/js.translator/testData/reservedWords/cases/enumFunNew.kt
rename to js/js.translator/testData/reservedWords/cases/enumVarTrue.kt
index 2dce136aedd..c227d249402 100644
--- a/js/js.translator/testData/reservedWords/cases/enumFunNew.kt
+++ b/js/js.translator/testData/reservedWords/cases/enumVarTrue.kt
@@ -4,10 +4,10 @@ package foo
enum class Foo {
BAR;
- fun new() { new() }
+ var `true`: Int = 0
fun test() {
- testNotRenamed("new", { new() })
+ testNotRenamed("true", { `true` })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunCase.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunArguments.kt
similarity index 70%
rename from js/js.translator/testData/reservedWords/cases/insideClassFunCase.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassFunArguments.kt
index edc12be8c74..15837791eaf 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassFunCase.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassFunArguments.kt
@@ -3,10 +3,10 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
- fun case() { case() }
+ fun arguments() { arguments() }
fun test() {
- testNotRenamed("case", { case() })
+ testNotRenamed("arguments", { arguments() })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunParamConst.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunParamCase.kt
similarity index 70%
rename from js/js.translator/testData/reservedWords/cases/insideClassFunParamConst.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassFunParamCase.kt
index 57372b32528..c1dafa5ae75 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassFunParamConst.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassFunParamCase.kt
@@ -3,9 +3,9 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
- fun foo(const: String) {
- assertEquals("123", const)
- testRenamed("const", { const })
+ fun foo(case: String) {
+ assertEquals("123", case)
+ testRenamed("case", { case })
}
fun test() {
diff --git a/js/js.translator/testData/reservedWords/cases/enumFunParamTrue.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunParamTrue.kt
similarity index 86%
rename from js/js.translator/testData/reservedWords/cases/enumFunParamTrue.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassFunParamTrue.kt
index 96e5abe7b74..70e5deac1ac 100644
--- a/js/js.translator/testData/reservedWords/cases/enumFunParamTrue.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassFunParamTrue.kt
@@ -2,8 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-enum class Foo {
- BAR;
+class TestClass {
fun foo(`true`: String) {
assertEquals("123", `true`)
testRenamed("true", { `true` })
@@ -15,7 +14,7 @@ enum class Foo {
}
fun box(): String {
- Foo.BAR.test()
+ TestClass().test()
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/enumFunThis.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunThis.kt
similarity index 84%
rename from js/js.translator/testData/reservedWords/cases/enumFunThis.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassFunThis.kt
index eb6fa78b4f4..50ca6d192db 100644
--- a/js/js.translator/testData/reservedWords/cases/enumFunThis.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassFunThis.kt
@@ -2,8 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-enum class Foo {
- BAR;
+class TestClass {
fun `this`() { `this`() }
fun test() {
@@ -12,7 +11,7 @@ enum class Foo {
}
fun box(): String {
- Foo.BAR.test()
+ TestClass().test()
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassLabelDefault.kt b/js/js.translator/testData/reservedWords/cases/insideClassLabelConst.kt
similarity index 78%
rename from js/js.translator/testData/reservedWords/cases/insideClassLabelDefault.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassLabelConst.kt
index 311a2116076..79cb2312c02 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassLabelDefault.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassLabelConst.kt
@@ -6,7 +6,7 @@ class TestClass {
val t: Int = 0
fun test() {
- testRenamed("default", { default@ while (false) {} })
+ testRenamed("const", { const@ while (false) {} })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/enumLabelTypeof.kt b/js/js.translator/testData/reservedWords/cases/insideClassLabelTypeof.kt
similarity index 84%
rename from js/js.translator/testData/reservedWords/cases/enumLabelTypeof.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassLabelTypeof.kt
index f6c6369df77..113f302ff3a 100644
--- a/js/js.translator/testData/reservedWords/cases/enumLabelTypeof.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassLabelTypeof.kt
@@ -2,8 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-enum class Foo {
- BAR;
+class TestClass {
val t: Int = 0
fun test() {
@@ -12,7 +11,7 @@ enum class Foo {
}
fun box(): String {
- Foo.BAR.test()
+ TestClass().test()
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunClass.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunClass.kt
deleted file mode 100644
index 5eb78fc32a9..00000000000
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunClass.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 `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/insideClassObjectFunBreak.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunContinue.kt
similarity index 71%
rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunBreak.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunContinue.kt
index d18da4ec37b..1e62cea6422 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunBreak.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunContinue.kt
@@ -4,10 +4,10 @@ package foo
class TestClass {
companion object {
- fun `break`() { `break`() }
+ fun `continue`() { `continue`() }
fun test() {
- testNotRenamed("break", { `break`() })
+ testNotRenamed("continue", { `continue`() })
}
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarExport.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunDo.kt
similarity index 76%
rename from js/js.translator/testData/reservedWords/cases/insideClassObjectVarExport.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunDo.kt
index 43977736280..8af680af5ef 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarExport.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunDo.kt
@@ -4,10 +4,10 @@ package foo
class TestClass {
companion object {
- var export: Int = 0
+ fun `do`() { `do`() }
fun test() {
- testNotRenamed("export", { export })
+ testNotRenamed("do", { `do`() })
}
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValTypeof.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunExport.kt
similarity index 74%
rename from js/js.translator/testData/reservedWords/cases/insideClassObjectValTypeof.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunExport.kt
index 76b7c3878f5..162d1c6cda7 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectValTypeof.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunExport.kt
@@ -4,10 +4,10 @@ package foo
class TestClass {
companion object {
- val `typeof`: Int = 0
+ fun export() { export() }
fun test() {
- testNotRenamed("typeof", { `typeof` })
+ testNotRenamed("export", { export() })
}
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFinally.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFinally.kt
deleted file mode 100644
index 13a08b96ebf..00000000000
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFinally.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 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/insideClassObjectFunParamDo.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamElse.kt
similarity index 72%
rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamDo.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamElse.kt
index f1d922acd64..95871050277 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamDo.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamElse.kt
@@ -4,9 +4,9 @@ package foo
class TestClass {
companion object {
- fun foo(`do`: String) {
- assertEquals("123", `do`)
- testRenamed("do", { `do` })
+ fun foo(`else`: String) {
+ assertEquals("123", `else`)
+ testRenamed("else", { `else` })
}
fun test() {
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamContinue.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFalse.kt
similarity index 69%
rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamContinue.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFalse.kt
index 30775d505e6..eff1ae92329 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamContinue.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFalse.kt
@@ -4,9 +4,9 @@ package foo
class TestClass {
companion object {
- fun foo(`continue`: String) {
- assertEquals("123", `continue`)
- testRenamed("continue", { `continue` })
+ fun foo(`false`: String) {
+ assertEquals("123", `false`)
+ testRenamed("false", { `false` })
}
fun test() {
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamImplements.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFinally.kt
similarity index 69%
rename from js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamImplements.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFinally.kt
index b7b3d10e934..49d06755924 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamImplements.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFinally.kt
@@ -4,9 +4,9 @@ package foo
class TestClass {
companion object {
- fun foo(implements: String) {
- assertEquals("123", implements)
- testRenamed("implements", { implements })
+ fun foo(finally: String) {
+ assertEquals("123", finally)
+ testRenamed("finally", { finally })
}
fun test() {
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelElse.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFor.kt
similarity index 81%
rename from js/js.translator/testData/reservedWords/cases/insideClassObjectLabelElse.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFor.kt
index 7a4dea4954a..05291b6e0b4 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelElse.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFor.kt
@@ -7,7 +7,7 @@ class TestClass {
val t: Int = 0
fun test() {
- testRenamed("else", { `else`@ while (false) {} })
+ testRenamed("for", { `for`@ while (false) {} })
}
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFalse.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIf.kt
similarity index 80%
rename from js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFalse.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIf.kt
index 8c377cf9d7a..c67c100a9c7 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFalse.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIf.kt
@@ -7,7 +7,7 @@ class TestClass {
val t: Int = 0
fun test() {
- testRenamed("false", { `false`@ while (false) {} })
+ testRenamed("if", { `if`@ while (false) {} })
}
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInstanceof.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImplements.kt
similarity index 81%
rename from js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInstanceof.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImplements.kt
index 6b2b19db1b3..a583fb6c7be 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInstanceof.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImplements.kt
@@ -7,7 +7,7 @@ class TestClass {
val t: Int = 0
fun test() {
- testRenamed("instanceof", { instanceof@ while (false) {} })
+ testRenamed("implements", { implements@ while (false) {} })
}
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectValDefault.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectValDefault.kt
new file mode 100644
index 00000000000..a62069c2a4b
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectValDefault.kt
@@ -0,0 +1,19 @@
+package foo
+
+// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
+
+class TestClass {
+ companion object {
+ val default: Int = 0
+
+ fun test() {
+ testNotRenamed("default", { default })
+ }
+ }
+}
+
+fun box(): String {
+ TestClass.test()
+
+ return "OK"
+}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarWhile.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectValWhile.kt
similarity index 91%
rename from js/js.translator/testData/reservedWords/cases/insideClassObjectVarWhile.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassObjectValWhile.kt
index a13964b9e81..200055781ba 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarWhile.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectValWhile.kt
@@ -4,7 +4,7 @@ package foo
class TestClass {
companion object {
- var `while`: Int = 0
+ val `while`: Int = 0
fun test() {
testNotRenamed("while", { `while` })
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarYield.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarBreak.kt
similarity index 76%
rename from js/js.translator/testData/reservedWords/cases/insideClassObjectVarYield.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassObjectVarBreak.kt
index 408ef3500da..1530c652230 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarYield.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarBreak.kt
@@ -4,10 +4,10 @@ package foo
class TestClass {
companion object {
- var `yield`: Int = 0
+ var `break`: Int = 0
fun test() {
- testNotRenamed("yield", { `yield` })
+ testNotRenamed("break", { `break` })
}
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectVarClass.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarClass.kt
new file mode 100644
index 00000000000..d9e49b844c6
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarClass.kt
@@ -0,0 +1,19 @@
+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/insideClassObjectValEnum.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarEnum.kt
similarity index 91%
rename from js/js.translator/testData/reservedWords/cases/insideClassObjectValEnum.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassObjectVarEnum.kt
index 1d4562d99b7..4bcab5f96ef 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassObjectValEnum.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectVarEnum.kt
@@ -4,7 +4,7 @@ package foo
class TestClass {
companion object {
- val enum: Int = 0
+ var enum: Int = 0
fun test() {
testNotRenamed("enum", { enum })
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassVarNull.kt b/js/js.translator/testData/reservedWords/cases/insideClassValNull.kt
similarity index 91%
rename from js/js.translator/testData/reservedWords/cases/insideClassVarNull.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassValNull.kt
index 9f5e3eb5b19..c79c8fdc0aa 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassVarNull.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassValNull.kt
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
- var `null`: Int = 0
+ val `null`: Int = 0
fun test() {
testNotRenamed("null", { `null` })
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassValIn.kt b/js/js.translator/testData/reservedWords/cases/insideClassValYield.kt
similarity index 76%
rename from js/js.translator/testData/reservedWords/cases/insideClassValIn.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassValYield.kt
index 8579332fa78..0b071cd9d58 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassValIn.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassValYield.kt
@@ -3,10 +3,10 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
- val `in`: Int = 0
+ val yield: Int = 0
fun test() {
- testNotRenamed("in", { `in` })
+ testNotRenamed("yield", { yield })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassVarArguments.kt b/js/js.translator/testData/reservedWords/cases/insideClassVarArguments.kt
deleted file mode 100644
index 13cc85460cd..00000000000
--- a/js/js.translator/testData/reservedWords/cases/insideClassVarArguments.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-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/insideClassValKotlin.kt b/js/js.translator/testData/reservedWords/cases/insideClassVarKotlin.kt
similarity index 91%
rename from js/js.translator/testData/reservedWords/cases/insideClassValKotlin.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassVarKotlin.kt
index 1fbe380e3c1..5cc4bf35e20 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassValKotlin.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassVarKotlin.kt
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
class TestClass {
- val Kotlin: Int = 0
+ var Kotlin: Int = 0
fun test() {
testNotRenamed("Kotlin", { Kotlin })
diff --git a/js/js.translator/testData/reservedWords/cases/enumVarReturn.kt b/js/js.translator/testData/reservedWords/cases/insideClassVarReturn.kt
similarity index 84%
rename from js/js.translator/testData/reservedWords/cases/enumVarReturn.kt
rename to js/js.translator/testData/reservedWords/cases/insideClassVarReturn.kt
index 68bfcf55587..047ba1c5a1c 100644
--- a/js/js.translator/testData/reservedWords/cases/enumVarReturn.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideClassVarReturn.kt
@@ -2,8 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-enum class Foo {
- BAR;
+class TestClass {
var `return`: Int = 0
fun test() {
@@ -12,7 +11,7 @@ enum class Foo {
}
fun box(): String {
- Foo.BAR.test()
+ TestClass().test()
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamSuper.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamStatic.kt
similarity index 69%
rename from js/js.translator/testData/reservedWords/cases/insideObjectFunParamSuper.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectFunParamStatic.kt
index a8a49fe6d03..82c990ecfe2 100644
--- a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamSuper.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamStatic.kt
@@ -3,9 +3,9 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
object TestObject {
- fun foo(`super`: String) {
- assertEquals("123", `super`)
- testRenamed("super", { `super` })
+ fun foo(static: String) {
+ assertEquals("123", static)
+ testRenamed("static", { static })
}
fun test() {
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunParamThis.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamThis.kt
similarity index 87%
rename from js/js.translator/testData/reservedWords/cases/insideClassFunParamThis.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectFunParamThis.kt
index 9efb04c35cc..0b3dbd2ab79 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassFunParamThis.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamThis.kt
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-class TestClass {
+object TestObject {
fun foo(`this`: String) {
assertEquals("123", `this`)
testRenamed("this", { `this` })
@@ -14,7 +14,7 @@ class TestClass {
}
fun box(): String {
- TestClass().test()
+ TestObject.test()
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamReturn.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamThrow.kt
similarity index 68%
rename from js/js.translator/testData/reservedWords/cases/insideObjectFunParamReturn.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectFunParamThrow.kt
index 42327b2828d..889a9be641b 100644
--- a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamReturn.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamThrow.kt
@@ -3,9 +3,9 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
object TestObject {
- fun foo(`return`: String) {
- assertEquals("123", `return`)
- testRenamed("return", { `return` })
+ fun foo(`throw`: String) {
+ assertEquals("123", `throw`)
+ testRenamed("throw", { `throw` })
}
fun test() {
diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamUndefined.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunParamUndefined.kt
deleted file mode 100644
index 0a1383189df..00000000000
--- a/js/js.translator/testData/reservedWords/cases/insideObjectFunParamUndefined.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-object TestObject {
- fun foo(undefined: String) {
- assertEquals("123", undefined)
- testRenamed("undefined", { undefined })
-}
-
- fun test() {
- foo("123")
- }
-}
-
-fun box(): String {
- TestObject.test()
-
- return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunPackage.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunProtected.kt
similarity index 70%
rename from js/js.translator/testData/reservedWords/cases/insideObjectFunPackage.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectFunProtected.kt
index 711ee9f9881..c791fe7debf 100644
--- a/js/js.translator/testData/reservedWords/cases/insideObjectFunPackage.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunProtected.kt
@@ -3,10 +3,10 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
object TestObject {
- fun `package`() { `package`() }
+ fun protected() { protected() }
fun test() {
- testNotRenamed("package", { `package`() })
+ testNotRenamed("protected", { protected() })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunReturn.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunReturn.kt
similarity index 85%
rename from js/js.translator/testData/reservedWords/cases/insideClassFunReturn.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectFunReturn.kt
index c5780faffd5..9c8cc674dd4 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassFunReturn.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunReturn.kt
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-class TestClass {
+object TestObject {
fun `return`() { `return`() }
fun test() {
@@ -11,7 +11,7 @@ class TestClass {
}
fun box(): String {
- TestClass().test()
+ TestObject.test()
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunStatic.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunStatic.kt
deleted file mode 100644
index 614aedfffcd..00000000000
--- a/js/js.translator/testData/reservedWords/cases/insideObjectFunStatic.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-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/insideObjectFunNull.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunSuper.kt
similarity index 73%
rename from js/js.translator/testData/reservedWords/cases/insideObjectFunNull.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectFunSuper.kt
index 0502674665a..d42af11e255 100644
--- a/js/js.translator/testData/reservedWords/cases/insideObjectFunNull.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunSuper.kt
@@ -3,10 +3,10 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
object TestObject {
- fun `null`() { `null`() }
+ fun `super`() { `super`() }
fun test() {
- testNotRenamed("null", { `null`() })
+ testNotRenamed("super", { `super`() })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectLabelThis.kt b/js/js.translator/testData/reservedWords/cases/insideObjectLabelThis.kt
deleted file mode 100644
index 3b3958a78c6..00000000000
--- a/js/js.translator/testData/reservedWords/cases/insideObjectLabelThis.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-object TestObject {
- val t: Int = 0
-
- fun test() {
- testRenamed("this", { `this`@ while (false) {} })
- }
-}
-
-fun box(): String {
- TestObject.test()
-
- return "OK"
-}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/insideClassLabelTrue.kt b/js/js.translator/testData/reservedWords/cases/insideObjectLabelTrue.kt
similarity index 85%
rename from js/js.translator/testData/reservedWords/cases/insideClassLabelTrue.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectLabelTrue.kt
index 815b1438b0e..45e5debe7e2 100644
--- a/js/js.translator/testData/reservedWords/cases/insideClassLabelTrue.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectLabelTrue.kt
@@ -2,7 +2,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-class TestClass {
+object TestObject {
val t: Int = 0
fun test() {
@@ -11,7 +11,7 @@ class TestClass {
}
fun box(): String {
- TestClass().test()
+ TestObject.test()
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectLabelWith.kt b/js/js.translator/testData/reservedWords/cases/insideObjectLabelTry.kt
similarity index 80%
rename from js/js.translator/testData/reservedWords/cases/insideObjectLabelWith.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectLabelTry.kt
index c7d0c20b746..dac122e3026 100644
--- a/js/js.translator/testData/reservedWords/cases/insideObjectLabelWith.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectLabelTry.kt
@@ -6,7 +6,7 @@ object TestObject {
val t: Int = 0
fun test() {
- testRenamed("with", { with@ while (false) {} })
+ testRenamed("try", { `try`@ while (false) {} })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectLabelThrow.kt b/js/js.translator/testData/reservedWords/cases/insideObjectLabelUndefined.kt
similarity index 77%
rename from js/js.translator/testData/reservedWords/cases/insideObjectLabelThrow.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectLabelUndefined.kt
index d5d7e2d7407..690bb4e2eb7 100644
--- a/js/js.translator/testData/reservedWords/cases/insideObjectLabelThrow.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectLabelUndefined.kt
@@ -6,7 +6,7 @@ object TestObject {
val t: Int = 0
fun test() {
- testRenamed("throw", { `throw`@ while (false) {} })
+ testRenamed("undefined", { undefined@ while (false) {} })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectValIf.kt b/js/js.translator/testData/reservedWords/cases/insideObjectValIf.kt
deleted file mode 100644
index 38aa9f125d3..00000000000
--- a/js/js.translator/testData/reservedWords/cases/insideObjectValIf.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-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/insideObjectVarIn.kt b/js/js.translator/testData/reservedWords/cases/insideObjectValIn.kt
similarity index 92%
rename from js/js.translator/testData/reservedWords/cases/insideObjectVarIn.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectValIn.kt
index 58b9a3efafe..81d35823d23 100644
--- a/js/js.translator/testData/reservedWords/cases/insideObjectVarIn.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectValIn.kt
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
object TestObject {
- var `in`: Int = 0
+ val `in`: Int = 0
fun test() {
testNotRenamed("in", { `in` })
diff --git a/js/js.translator/testData/reservedWords/cases/enumVarInstanceof.kt b/js/js.translator/testData/reservedWords/cases/insideObjectValInstanceof.kt
similarity index 75%
rename from js/js.translator/testData/reservedWords/cases/enumVarInstanceof.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectValInstanceof.kt
index ca2835129c0..94761e6d0da 100644
--- a/js/js.translator/testData/reservedWords/cases/enumVarInstanceof.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectValInstanceof.kt
@@ -2,9 +2,8 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-enum class Foo {
- BAR;
- var instanceof: Int = 0
+object TestObject {
+ val instanceof: Int = 0
fun test() {
testNotRenamed("instanceof", { instanceof })
@@ -12,7 +11,7 @@ enum class Foo {
}
fun box(): String {
- Foo.BAR.test()
+ TestObject.test()
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectVarInterface.kt b/js/js.translator/testData/reservedWords/cases/insideObjectValInterface.kt
similarity index 90%
rename from js/js.translator/testData/reservedWords/cases/insideObjectVarInterface.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectValInterface.kt
index 4fb6aee2a76..9e4b5452df4 100644
--- a/js/js.translator/testData/reservedWords/cases/insideObjectVarInterface.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectValInterface.kt
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
object TestObject {
- var `interface`: Int = 0
+ val `interface`: Int = 0
fun test() {
testNotRenamed("interface", { `interface` })
diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectValNew.kt b/js/js.translator/testData/reservedWords/cases/insideObjectVarNew.kt
similarity index 92%
rename from js/js.translator/testData/reservedWords/cases/insideObjectValNew.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectVarNew.kt
index 7501380c6e6..9681e8cac11 100644
--- a/js/js.translator/testData/reservedWords/cases/insideObjectValNew.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectVarNew.kt
@@ -3,7 +3,7 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
object TestObject {
- val new: Int = 0
+ var new: Int = 0
fun test() {
testNotRenamed("new", { new })
diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectValFor.kt b/js/js.translator/testData/reservedWords/cases/insideObjectVarNull.kt
similarity index 76%
rename from js/js.translator/testData/reservedWords/cases/insideObjectValFor.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectVarNull.kt
index 43e76c9e27a..f1bcb915f36 100644
--- a/js/js.translator/testData/reservedWords/cases/insideObjectValFor.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectVarNull.kt
@@ -3,10 +3,10 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
object TestObject {
- val `for`: Int = 0
+ var `null`: Int = 0
fun test() {
- testNotRenamed("for", { `for` })
+ testNotRenamed("null", { `null` })
}
}
diff --git a/js/js.translator/testData/reservedWords/cases/enumValPackage.kt b/js/js.translator/testData/reservedWords/cases/insideObjectVarPackage.kt
similarity index 75%
rename from js/js.translator/testData/reservedWords/cases/enumValPackage.kt
rename to js/js.translator/testData/reservedWords/cases/insideObjectVarPackage.kt
index 3a853fe0c5b..fc7f5bd6076 100644
--- a/js/js.translator/testData/reservedWords/cases/enumValPackage.kt
+++ b/js/js.translator/testData/reservedWords/cases/insideObjectVarPackage.kt
@@ -2,9 +2,8 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-enum class Foo {
- BAR;
- val `package`: Int = 0
+object TestObject {
+ var `package`: Int = 0
fun test() {
testNotRenamed("package", { `package` })
@@ -12,7 +11,7 @@ enum class Foo {
}
fun box(): String {
- Foo.BAR.test()
+ TestObject.test()
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectVarProtected.kt b/js/js.translator/testData/reservedWords/cases/insideObjectVarProtected.kt
deleted file mode 100644
index 10435616e98..00000000000
--- a/js/js.translator/testData/reservedWords/cases/insideObjectVarProtected.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package foo
-
-// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
-
-object TestObject {
- var 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/localCatchFor.kt b/js/js.translator/testData/reservedWords/cases/localCatchIn.kt
similarity index 75%
rename from js/js.translator/testData/reservedWords/cases/localCatchFor.kt
rename to js/js.translator/testData/reservedWords/cases/localCatchIn.kt
index 023482fb1ac..de4d5599ec5 100644
--- a/js/js.translator/testData/reservedWords/cases/localCatchFor.kt
+++ b/js/js.translator/testData/reservedWords/cases/localCatchIn.kt
@@ -9,8 +9,8 @@ fun box(): String {
try {
throw Exception()
}
- catch(`for`: Exception) {
- testRenamed("for", { `for` })
+ catch(`in`: Exception) {
+ testRenamed("in", { `in` })
}
return "OK"
diff --git a/js/js.translator/testData/reservedWords/cases/localFunBreak.kt b/js/js.translator/testData/reservedWords/cases/localFunBreak.kt
deleted file mode 100644
index 9a05e0dea23..00000000000
--- a/js/js.translator/testData/reservedWords/cases/localFunBreak.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 `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
new file mode 100644
index 00000000000..8e881f8fc89
--- /dev/null
+++ b/js/js.translator/testData/reservedWords/cases/localFunContinue.kt
@@ -0,0 +1,11 @@
+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/localFunParamContinue.kt b/js/js.translator/testData/reservedWords/cases/localFunParamElse.kt
similarity index 58%
rename from js/js.translator/testData/reservedWords/cases/localFunParamContinue.kt
rename to js/js.translator/testData/reservedWords/cases/localFunParamElse.kt
index 6527756260f..1ff0b81d4e0 100644
--- a/js/js.translator/testData/reservedWords/cases/localFunParamContinue.kt
+++ b/js/js.translator/testData/reservedWords/cases/localFunParamElse.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(`continue`: String) {
- assertEquals("123", `continue`)
- testRenamed("continue", { `continue` })
+ fun foo(`else`: String) {
+ assertEquals("123", `else`)
+ testRenamed("else", { `else` })
}
foo("123")
diff --git a/js/js.translator/testData/reservedWords/cases/localLabelElse.kt b/js/js.translator/testData/reservedWords/cases/localLabelFor.kt
similarity index 75%
rename from js/js.translator/testData/reservedWords/cases/localLabelElse.kt
rename to js/js.translator/testData/reservedWords/cases/localLabelFor.kt
index c6862b0fa45..5ef639051df 100644
--- a/js/js.translator/testData/reservedWords/cases/localLabelElse.kt
+++ b/js/js.translator/testData/reservedWords/cases/localLabelFor.kt
@@ -5,7 +5,7 @@ package foo
fun box(): String {
val t: Int = 0
- testRenamed("else", { `else`@ while (false) {} })
+ testRenamed("for", { `for`@ while (false) {} })
return "OK"
}
\ No newline at end of file
diff --git a/js/js.translator/testData/reservedWords/cases/localVarYield.kt b/js/js.translator/testData/reservedWords/cases/localVarBreak.kt
similarity index 69%
rename from js/js.translator/testData/reservedWords/cases/localVarYield.kt
rename to js/js.translator/testData/reservedWords/cases/localVarBreak.kt
index 325d12f88ad..d4bb9493d02 100644
--- a/js/js.translator/testData/reservedWords/cases/localVarYield.kt
+++ b/js/js.translator/testData/reservedWords/cases/localVarBreak.kt
@@ -3,9 +3,9 @@ package foo
// NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT!
fun box(): String {
- var `yield`: Int = 0
+ var `break`: Int = 0
- testRenamed("yield", { `yield` })
+ testRenamed("break", { `break` })
return "OK"
}
\ No newline at end of file