diff --git a/compiler/frontend/src/org/jetbrains/jet/kdoc/lexer/_KDocLexer.java b/compiler/frontend/src/org/jetbrains/jet/kdoc/lexer/_KDocLexer.java index 008af783635..df591bb78c2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/kdoc/lexer/_KDocLexer.java +++ b/compiler/frontend/src/org/jetbrains/jet/kdoc/lexer/_KDocLexer.java @@ -1,20 +1,4 @@ -/* - * Copyright 2010-2014 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* The following code was generated by JFlex 1.4.3 on 7/15/14 9:40 PM */ +/* The following code was generated by JFlex 1.4.3 on 10/13/14 2:48 PM */ package org.jetbrains.jet.kdoc.lexer; @@ -28,8 +12,8 @@ import java.lang.Character; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 7/15/14 9:40 PM from the specification file - * C:/Projects/kotlin/compiler/frontend/src/org/jetbrains/jet/kdoc/lexer/KDoc.flex + * on 10/13/14 2:48 PM from the specification file + * /Users/abreslav/work/kotlin/compiler/frontend/src/org/jetbrains/jet/kdoc/lexer/KDoc.flex */ class _KDocLexer implements FlexLexer { /** initial size of the lookahead buffer */ @@ -569,11 +553,6 @@ class _KDocLexer implements FlexLexer { zzMarkedPos = zzMarkedPosL; switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { - case 5: - { if (isLastToken()) return KDocTokens.END; - else return KDocTokens.TEXT; - } - case 11: break; case 3: { if (yytextContainLineBreaks()) { yybegin(LINE_BEGINNING); @@ -583,6 +562,11 @@ class _KDocLexer implements FlexLexer { return KDocTokens.TEXT; // internal white space } } + case 11: break; + case 5: + { if (isLastToken()) return KDocTokens.END; + else return KDocTokens.TEXT; + } case 12: break; case 9: { yybegin(CONTENTS); @@ -594,9 +578,9 @@ class _KDocLexer implements FlexLexer { return KDocTokens.WIKI_LINK_CLOSE; } case 14: break; - case 6: + case 8: { yybegin(CONTENTS); - return KDocTokens.MARKDOWN_ESCAPED_CHAR; + return KDocTokens.WIKI_LINK_OPEN; } case 15: break; case 10: @@ -604,24 +588,24 @@ class _KDocLexer implements FlexLexer { return KDocTokens.START; } case 16: break; + case 1: + { return TokenType.BAD_CHARACTER; + } + case 17: break; + case 6: + { yybegin(CONTENTS); + return KDocTokens.MARKDOWN_ESCAPED_CHAR; + } + case 18: break; case 2: { yybegin(CONTENTS); return KDocTokens.TEXT; } - case 17: break; - case 1: - { return TokenType.BAD_CHARACTER; - } - case 18: break; + case 19: break; case 4: { yybegin(CONTENTS_BEGINNING); return KDocTokens.LEADING_ASTERISK; } - case 19: break; - case 8: - { yybegin(CONTENTS); - return KDocTokens.WIKI_LINK_OPEN; - } case 20: break; default: if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java index 415b52ed94d..b3d3f673623 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java @@ -51,7 +51,7 @@ public class JetExpressionParsing extends AbstractJetParsing { private static final TokenSet TYPE_ARGUMENT_LIST_STOPPERS = TokenSet.create( INTEGER_LITERAL, FLOAT_LITERAL, CHARACTER_LITERAL, OPEN_QUOTE, - PACKAGE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD, THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, + PACKAGE_KEYWORD, AS_KEYWORD, TYPE_ALIAS_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD, THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, FUN_KEYWORD, FOR_KEYWORD, NULL_KEYWORD, TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD, THROW_KEYWORD, RETURN_KEYWORD, BREAK_KEYWORD, CONTINUE_KEYWORD, OBJECT_KEYWORD, IF_KEYWORD, TRY_KEYWORD, ELSE_KEYWORD, WHILE_KEYWORD, DO_KEYWORD, @@ -121,7 +121,7 @@ public class JetExpressionParsing extends AbstractJetParsing { VAL_KEYWORD, VAR_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD, - TYPE_KEYWORD + TYPE_ALIAS_KEYWORD ), MODIFIER_KEYWORDS ); @@ -600,7 +600,7 @@ public class JetExpressionParsing extends AbstractJetParsing { parseDoWhile(); } else if (atSet(CLASS_KEYWORD, FUN_KEYWORD, VAL_KEYWORD, - VAR_KEYWORD, TYPE_KEYWORD)) { + VAR_KEYWORD, TYPE_ALIAS_KEYWORD)) { parseLocalDeclaration(); } else if (at(FIELD_IDENTIFIER)) { @@ -1295,8 +1295,8 @@ public class JetExpressionParsing extends AbstractJetParsing { else if (keywordToken == VAL_KEYWORD || keywordToken == VAR_KEYWORD) { declType = myJetParsing.parseProperty(true); } - else if (keywordToken == TYPE_KEYWORD) { - declType = myJetParsing.parseTypeDef(); + else if (keywordToken == TYPE_ALIAS_KEYWORD) { + declType = myJetParsing.parseTypeAlias(); } else if (keywordToken == OBJECT_KEYWORD) { // Object expression may appear at the statement position: should parse it diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java index 6704ec01e54..fc40a92440a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java @@ -43,9 +43,9 @@ public class JetParsing extends AbstractJetParsing { } } - private static final TokenSet TOPLEVEL_OBJECT_FIRST = TokenSet.create(TYPE_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD, + private static final TokenSet TOPLEVEL_OBJECT_FIRST = TokenSet.create(TYPE_ALIAS_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD, FUN_KEYWORD, VAL_KEYWORD, PACKAGE_KEYWORD); - private static final TokenSet ENUM_MEMBER_FIRST = TokenSet.create(TYPE_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD, + private static final TokenSet ENUM_MEMBER_FIRST = TokenSet.create(TYPE_ALIAS_KEYWORD, TRAIT_KEYWORD, CLASS_KEYWORD, FUN_KEYWORD, VAL_KEYWORD, IDENTIFIER); private static final TokenSet CLASS_NAME_RECOVERY_SET = TokenSet.orSet(TokenSet.create(LT, LPAR, COLON, LBRACE), TOPLEVEL_OBJECT_FIRST); @@ -367,8 +367,8 @@ public class JetParsing extends AbstractJetParsing { else if (keywordToken == VAL_KEYWORD || keywordToken == VAR_KEYWORD) { declType = parseProperty(); } - else if (keywordToken == TYPE_KEYWORD) { - declType = parseTypeDef(); + else if (keywordToken == TYPE_ALIAS_KEYWORD) { + declType = parseTypeAlias(); } else if (keywordToken == OBJECT_KEYWORD) { parseObject(true, true); @@ -754,8 +754,8 @@ public class JetParsing extends AbstractJetParsing { else if (keywordToken == VAL_KEYWORD || keywordToken == VAR_KEYWORD) { declType = parseProperty(); } - else if (keywordToken == TYPE_KEYWORD) { - declType = parseTypeDef(); + else if (keywordToken == TYPE_ALIAS_KEYWORD) { + declType = parseTypeAlias(); } else if (keywordToken == OBJECT_KEYWORD) { parseObject(true, true); @@ -877,13 +877,13 @@ public class JetParsing extends AbstractJetParsing { /* * typedef - * : modifiers "type" SimpleName (typeParameters typeConstraints)? "=" type + * : modifiers "typealias" SimpleName (typeParameters typeConstraints)? "=" type * ; */ - JetNodeType parseTypeDef() { - assert _at(TYPE_KEYWORD); + JetNodeType parseTypeAlias() { + assert _at(TYPE_ALIAS_KEYWORD); - advance(); // TYPE_KEYWORD + advance(); // TYPE_ALIAS_KEYWORD expect(IDENTIFIER, "Type name expected", TokenSet.orSet(TokenSet.create(LT, EQ, SEMICOLON), TOPLEVEL_OBJECT_FIRST)); diff --git a/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex b/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex index 22d80b4a3a4..15a8346d1dc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex +++ b/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex @@ -242,6 +242,7 @@ LONG_TEMPLATE_ENTRY_START=\$\{ {CHARACTER_LITERAL} { return JetTokens.CHARACTER_LITERAL; } +"typealias" { return JetTokens.TYPE_ALIAS_KEYWORD ;} "continue" { return JetTokens.CONTINUE_KEYWORD ;} "package" { return JetTokens.PACKAGE_KEYWORD ;} "return" { return JetTokens.RETURN_KEYWORD ;} @@ -255,7 +256,6 @@ LONG_TEMPLATE_ENTRY_START=\$\{ "super" { return JetTokens.SUPER_KEYWORD ;} "when" { return JetTokens.WHEN_KEYWORD ;} "true" { return JetTokens.TRUE_KEYWORD ;} -"type" { return JetTokens.TYPE_KEYWORD ;} "this" { return JetTokens.THIS_KEYWORD ;} "null" { return JetTokens.NULL_KEYWORD ;} "else" { return JetTokens.ELSE_KEYWORD ;} diff --git a/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java b/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java index 2d13a5b70c4..43d5e1c2e95 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java +++ b/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java @@ -46,12 +46,12 @@ public interface JetTokens { JetToken LONG_TEMPLATE_ENTRY_END = new JetToken("LONG_TEMPLATE_ENTRY_END"); JetToken DANGLING_NEWLINE = new JetToken("DANGLING_NEWLINE"); - JetKeywordToken PACKAGE_KEYWORD = JetKeywordToken.keyword("package"); + JetKeywordToken PACKAGE_KEYWORD = JetKeywordToken.keyword("package"); JetKeywordToken AS_KEYWORD = JetKeywordToken.keyword("as"); - JetKeywordToken TYPE_KEYWORD = JetKeywordToken.keyword("type"); + JetKeywordToken TYPE_ALIAS_KEYWORD = JetKeywordToken.keyword("typealias"); JetKeywordToken CLASS_KEYWORD = JetKeywordToken.keyword("class"); JetKeywordToken THIS_KEYWORD = JetKeywordToken.keyword("this"); - JetKeywordToken SUPER_KEYWORD = JetKeywordToken.keyword("super"); + JetKeywordToken SUPER_KEYWORD = JetKeywordToken.keyword("super"); JetKeywordToken VAL_KEYWORD = JetKeywordToken.keyword("val"); JetKeywordToken VAR_KEYWORD = JetKeywordToken.keyword("var"); JetKeywordToken FUN_KEYWORD = JetKeywordToken.keyword("fun"); @@ -71,8 +71,8 @@ public interface JetTokens { JetKeywordToken ELSE_KEYWORD = JetKeywordToken.keyword("else"); JetKeywordToken WHILE_KEYWORD = JetKeywordToken.keyword("while"); JetKeywordToken DO_KEYWORD = JetKeywordToken.keyword("do"); - JetKeywordToken WHEN_KEYWORD = JetKeywordToken.keyword("when"); - JetKeywordToken TRAIT_KEYWORD = JetKeywordToken.keyword("trait"); + JetKeywordToken WHEN_KEYWORD = JetKeywordToken.keyword("when"); + JetKeywordToken TRAIT_KEYWORD = JetKeywordToken.keyword("trait"); // TODO: Discuss "This" keyword JetKeywordToken CAPITALIZED_THIS_KEYWORD = JetKeywordToken.keyword("This"); @@ -155,7 +155,7 @@ public interface JetTokens { JetKeywordToken FINALLY_KEYWORD = JetKeywordToken.softKeyword("finally"); JetModifierKeywordToken FINAL_KEYWORD = JetModifierKeywordToken.softKeywordModifier("final"); - TokenSet KEYWORDS = TokenSet.create(PACKAGE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, CLASS_KEYWORD, TRAIT_KEYWORD, + TokenSet KEYWORDS = TokenSet.create(PACKAGE_KEYWORD, AS_KEYWORD, TYPE_ALIAS_KEYWORD, CLASS_KEYWORD, TRAIT_KEYWORD, THIS_KEYWORD, SUPER_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, FUN_KEYWORD, FOR_KEYWORD, NULL_KEYWORD, TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD, diff --git a/compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java b/compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java index d7f666338f7..ed905565ddf 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java @@ -1,20 +1,4 @@ -/* - * Copyright 2010-2014 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* The following code was generated by JFlex 1.4.3 on 7/15/14 9:40 PM */ +/* The following code was generated by JFlex 1.4.3 on 10/13/14 2:48 PM */ package org.jetbrains.jet.lexer; @@ -31,8 +15,8 @@ import org.jetbrains.jet.lexer.JetTokens; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 7/15/14 9:40 PM from the specification file - * C:/Projects/kotlin/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex + * on 10/13/14 2:48 PM from the specification file + * /Users/abreslav/work/kotlin/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex */ class _JetLexer implements FlexLexer { /** initial size of the lookahead buffer */ @@ -66,9 +50,9 @@ class _JetLexer implements FlexLexer { "\1\21\1\12\1\15\11\1\1\73\1\100\1\66\1\63\1\67\1\64"+ "\1\11\1\2\1\17\2\2\1\23\1\22\5\4\1\20\3\4\1\25"+ "\3\4\1\60\3\4\1\16\2\4\1\74\1\27\1\75\1\0\1\4"+ - "\1\6\1\46\1\52\1\41\1\62\1\44\1\56\1\50\1\34\1\35"+ - "\1\53\1\47\1\55\1\4\1\43\1\42\1\45\1\4\1\51\1\36"+ - "\1\33\1\30\1\61\1\54\1\16\1\57\1\4\1\32\1\71\1\37"+ + "\1\6\1\44\1\54\1\46\1\62\1\43\1\57\1\52\1\34\1\35"+ + "\1\55\1\51\1\45\1\4\1\50\1\47\1\42\1\4\1\53\1\36"+ + "\1\33\1\30\1\61\1\56\1\16\1\41\1\4\1\32\1\71\1\37"+ "\54\0\1\4\12\0\1\4\4\0\1\4\5\0\27\4\1\0\37\4"+ "\1\0\u013f\4\31\0\162\4\4\0\14\4\16\0\5\4\11\0\1\4"+ "\213\0\1\4\13\0\1\4\1\0\3\4\1\0\1\4\1\0\24\4"+ @@ -149,21 +133,21 @@ class _JetLexer implements FlexLexer { "\2\44\1\0\1\45\1\0\1\5\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\13\1\0\3\3\1\57\1\60"+ - "\1\61\1\3\1\62\6\3\1\63\10\3\1\64\1\65"+ + "\1\61\1\3\1\62\2\3\1\63\14\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\0\1\100\2\101\2\0\1\40\1\102"+ "\1\103\1\0\1\104\1\44\1\3\2\0\1\105\1\106"+ "\1\107\1\110\1\0\1\2\2\0\1\111\4\3\1\112"+ - "\10\3\1\113\4\3\1\114\1\115\2\3\1\116\1\117"+ - "\1\120\2\0\1\121\2\40\1\45\1\5\1\122\1\123"+ - "\2\44\1\0\1\124\1\3\1\125\1\3\1\126\4\3"+ - "\1\127\1\130\4\3\1\131\1\3\1\132\1\77\1\0"+ - "\1\133\1\134\1\135\1\136\1\3\1\137\3\3\1\140"+ - "\1\141\1\142\1\0\1\3\1\143\1\3\1\144\1\3"+ - "\1\145\1\146"; + "\4\3\1\113\10\3\1\114\1\3\1\115\1\3\1\116"+ + "\1\117\1\120\2\0\1\121\2\40\1\45\1\5\1\122"+ + "\1\123\2\44\1\0\1\124\2\3\1\125\3\3\1\126"+ + "\3\3\1\127\3\3\1\130\1\3\1\131\1\77\1\0"+ + "\1\132\1\133\1\3\1\134\1\135\1\3\1\136\3\3"+ + "\1\137\1\140\1\141\1\0\3\3\1\142\1\143\1\3"+ + "\1\144\2\3\1\145\1\146"; private static int [] zzUnpackAction() { - int [] result = new int[232]; + int [] result = new int[237]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -208,18 +192,19 @@ class _JetLexer implements FlexLexer { "\0\u1944\0\u1986\0\u018c\0\u018c\0\u19c8\0\u018c\0\u1a0a\0\u018c"+ "\0\u1a4c\0\u1a8e\0\u1ad0\0\u1b12\0\u1b12\0\u018c\0\u1b54\0\u1b96"+ "\0\u1bd8\0\u1c1a\0\u018c\0\u1c5c\0\u1c9e\0\u1ce0\0\u1d22\0\u0210"+ - "\0\u1d64\0\u1da6\0\u1de8\0\u1e2a\0\u1e6c\0\u1eae\0\u1ef0\0\u1f32"+ - "\0\u018c\0\u1f74\0\u1fb6\0\u1ff8\0\u203a\0\u0210\0\u0210\0\u207c"+ + "\0\u1d64\0\u1da6\0\u1de8\0\u1e2a\0\u018c\0\u1e6c\0\u1eae\0\u1ef0"+ + "\0\u1f32\0\u1f74\0\u1fb6\0\u1ff8\0\u203a\0\u0210\0\u207c\0\u0210"+ "\0\u20be\0\u0210\0\u0210\0\u018c\0\u2100\0\u2142\0\u1902\0\u018c"+ "\0\u2184\0\u018c\0\u018c\0\u018c\0\u018c\0\u21c6\0\u2208\0\u2208"+ - "\0\u0210\0\u224a\0\u0210\0\u228c\0\u0210\0\u22ce\0\u2310\0\u2352"+ - "\0\u2394\0\u0210\0\u0210\0\u23d6\0\u2418\0\u245a\0\u249c\0\u0210"+ - "\0\u24de\0\u0210\0\u018c\0\u2520\0\u0ce4\0\u0210\0\u0210\0\u0210"+ - "\0\u2562\0\u0210\0\u25a4\0\u25e6\0\u2628\0\u0210\0\u0210\0\u0210"+ - "\0\u266a\0\u26ac\0\u0210\0\u26ee\0\u0210\0\u2730\0\u0210\0\u0210"; + "\0\u0210\0\u224a\0\u228c\0\u0210\0\u22ce\0\u2310\0\u2352\0\u0210"+ + "\0\u2394\0\u23d6\0\u2418\0\u0210\0\u245a\0\u249c\0\u24de\0\u0210"+ + "\0\u2520\0\u0210\0\u018c\0\u2562\0\u0ce4\0\u0210\0\u25a4\0\u0210"+ + "\0\u0210\0\u25e6\0\u0210\0\u2628\0\u266a\0\u26ac\0\u0210\0\u0210"+ + "\0\u0210\0\u26ee\0\u2730\0\u2772\0\u27b4\0\u0210\0\u0210\0\u27f6"+ + "\0\u0210\0\u2838\0\u287a\0\u0210\0\u0210"; private static int [] zzUnpackRowMap() { - int [] result = new int[232]; + int [] result = new int[237]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -245,9 +230,9 @@ 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\1\21\3\11\1\22"+ "\2\11\1\23\1\11\1\24\1\7\1\11\1\25\1\26"+ - "\1\27\1\11\1\30\1\31\1\32\1\33\1\34\1\35"+ - "\1\36\1\37\1\40\1\41\2\11\1\42\1\43\1\11"+ - "\1\44\1\11\1\45\1\11\1\46\1\47\1\50\1\51"+ + "\1\27\1\11\1\30\1\31\1\32\1\33\1\11\1\34"+ + "\1\35\1\36\1\11\1\37\1\40\1\41\2\11\1\42"+ + "\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\1\67\7\70\1\71"+ "\1\72\16\70\1\73\1\70\1\74\57\70\1\75\1\72"+ @@ -258,251 +243,260 @@ class _JetLexer implements FlexLexer { "\1\10\1\11\1\12\1\11\1\7\1\13\1\12\1\14"+ "\1\15\1\16\1\17\1\20\1\21\3\11\1\22\2\11"+ "\1\23\1\11\1\24\1\7\1\11\1\25\1\105\1\27"+ - "\1\11\1\30\1\31\1\106\1\33\1\34\1\35\1\36"+ - "\1\37\1\40\1\41\2\11\1\42\1\43\1\11\1\44"+ - "\1\11\1\45\1\11\1\46\1\47\1\50\1\51\1\52"+ + "\1\11\1\30\1\31\1\106\1\33\1\11\1\34\1\35"+ + "\1\36\1\11\1\37\1\40\1\41\2\11\1\42\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\1\67\103\0\1\10\13\0"+ - "\1\10\2\0\1\107\1\110\1\111\1\112\20\0\1\112"+ - "\10\0\1\107\1\111\24\0\2\11\1\0\2\11\7\0"+ - "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ - "\4\11\2\0\22\11\22\0\1\12\3\0\1\12\72\0"+ - "\6\113\2\0\72\113\2\0\1\114\1\0\1\114\1\0"+ - "\1\115\7\0\3\114\1\0\2\114\1\0\1\114\2\0"+ - "\1\114\2\0\4\114\2\0\22\114\21\0\1\116\1\0"+ - "\1\116\1\0\1\117\7\0\3\116\1\0\2\116\1\0"+ - "\1\116\2\0\1\116\2\0\4\116\2\0\22\116\31\0"+ - "\1\120\25\0\1\121\22\0\1\122\32\0\1\123\122\0"+ - "\1\124\25\0\1\125\17\0\1\126\13\0\1\126\1\127"+ - "\1\130\1\107\1\110\1\111\1\112\20\0\1\112\5\0"+ - "\1\130\2\0\1\107\1\111\24\0\1\131\13\0\1\131"+ - "\3\0\1\132\104\0\1\133\36\0\1\134\3\0\1\135"+ - "\12\0\7\24\1\0\16\24\1\136\1\137\52\24\31\0"+ - "\1\140\51\0\2\11\1\0\2\11\7\0\4\11\1\0"+ - "\2\11\1\0\1\11\2\0\1\11\2\0\1\11\1\141"+ - "\2\11\2\0\10\11\1\142\5\11\1\143\3\11\20\0"+ - "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ - "\1\11\2\0\1\11\2\0\3\11\1\144\2\0\2\11"+ - "\1\145\12\11\1\146\4\11\20\0\2\11\1\0\2\11"+ - "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\147"+ - "\2\0\4\11\2\0\22\11\102\0\1\150\17\0\2\11"+ - "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ - "\2\0\1\11\2\0\4\11\2\0\1\11\1\151\12\11"+ - "\1\152\5\11\20\0\2\11\1\0\2\11\7\0\4\11"+ - "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ - "\2\0\11\11\1\153\10\11\20\0\2\11\1\0\2\11"+ - "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\154"+ - "\2\0\4\11\2\0\22\11\20\0\2\11\1\0\2\11"+ + "\1\10\2\0\1\107\1\110\1\111\1\112\17\0\1\112"+ + "\1\0\1\107\11\0\1\111\23\0\2\11\1\0\2\11"+ "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ - "\2\0\4\11\2\0\14\11\1\155\5\11\20\0\2\11"+ - "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ - "\2\0\1\11\2\0\4\11\2\0\5\11\1\156\14\11"+ + "\2\0\4\11\2\0\22\11\22\0\1\12\3\0\1\12"+ + "\72\0\6\113\2\0\72\113\2\0\1\114\1\0\1\114"+ + "\1\0\1\115\7\0\3\114\1\0\2\114\1\0\1\114"+ + "\2\0\1\114\2\0\4\114\2\0\22\114\21\0\1\116"+ + "\1\0\1\116\1\0\1\117\7\0\3\116\1\0\2\116"+ + "\1\0\1\116\2\0\1\116\2\0\4\116\2\0\22\116"+ + "\31\0\1\120\25\0\1\121\22\0\1\122\32\0\1\123"+ + "\122\0\1\124\25\0\1\125\17\0\1\126\13\0\1\126"+ + "\1\127\1\130\1\107\1\110\1\111\1\112\17\0\1\112"+ + "\1\0\1\107\6\0\1\130\2\0\1\111\23\0\1\131"+ + "\13\0\1\131\3\0\1\132\104\0\1\133\36\0\1\134"+ + "\3\0\1\135\12\0\7\24\1\0\16\24\1\136\1\137"+ + "\52\24\31\0\1\140\51\0\2\11\1\0\2\11\7\0"+ + "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ + "\1\11\1\141\2\11\2\0\1\142\11\11\1\143\7\11"+ "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ - "\1\0\1\11\2\0\1\11\2\0\3\11\1\157\2\0"+ - "\22\11\20\0\2\11\1\0\2\11\7\0\4\11\1\0"+ - "\2\11\1\0\1\11\2\0\1\11\2\0\4\11\2\0"+ - "\3\11\1\160\16\11\20\0\2\11\1\0\2\11\7\0"+ - "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ - "\4\11\2\0\10\11\1\161\11\11\20\0\2\11\1\0"+ + "\1\0\1\11\2\0\1\11\2\0\3\11\1\144\2\0"+ + "\7\11\1\145\6\11\1\146\3\11\20\0\2\11\1\0"+ "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ - "\1\11\2\0\1\11\1\162\2\11\2\0\22\11\20\0"+ + "\1\147\2\0\4\11\2\0\22\11\102\0\1\150\17\0"+ "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ - "\1\11\2\0\1\163\2\0\4\11\2\0\1\11\1\164"+ - "\3\11\1\165\14\11\20\0\2\11\1\0\2\11\7\0"+ - "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ - "\1\11\1\166\2\11\2\0\22\11\20\0\2\11\1\0"+ - "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ - "\1\11\2\0\4\11\2\0\5\11\1\167\14\11\20\0"+ - "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ - "\1\11\2\0\1\11\2\0\4\11\2\0\1\11\1\170"+ - "\20\11\102\0\1\171\3\0\1\172\75\0\1\173\1\0"+ - "\1\174\77\0\1\175\101\0\1\176\106\0\1\177\102\0"+ - "\1\200\73\0\1\201\111\0\1\202\6\0\7\70\2\0"+ - "\16\70\1\0\1\70\1\0\50\70\2\0\1\203\1\0"+ - "\1\203\1\0\1\204\7\0\3\203\1\0\2\203\1\0"+ - "\1\203\2\0\1\203\1\0\1\205\4\203\2\0\22\203"+ - "\17\0\7\206\1\0\20\206\1\207\51\206\31\0\1\210"+ - "\51\0\2\77\1\0\2\77\7\0\4\77\1\0\2\77"+ - "\1\0\1\77\2\0\1\77\2\0\4\77\2\0\22\77"+ - "\17\0\6\211\2\0\72\211\1\0\2\77\1\0\2\77"+ - "\7\0\4\77\1\0\2\77\1\0\1\77\2\0\1\77"+ - "\2\0\1\77\1\212\2\77\2\0\22\77\57\0\1\213"+ - "\53\0\1\214\110\0\1\215\61\0\1\131\13\0\1\131"+ - "\3\0\1\216\61\0\1\217\13\0\1\217\4\0\1\111"+ - "\1\0\1\217\31\0\1\111\6\0\1\217\14\0\6\113"+ - "\1\220\1\0\72\113\1\0\2\114\1\0\2\114\7\0"+ - "\4\114\1\0\2\114\1\0\1\114\2\0\1\114\2\0"+ - "\4\114\2\0\22\114\17\0\6\221\2\0\72\221\1\0"+ - "\2\116\1\0\2\116\7\0\4\116\1\0\2\116\1\0"+ - "\1\116\2\0\1\116\2\0\4\116\2\0\22\116\17\0"+ - "\6\222\2\0\72\222\7\120\1\0\72\120\40\0\1\223"+ - "\41\0\7\123\1\0\72\123\36\0\1\224\4\0\1\225"+ - "\121\0\1\226\17\0\1\126\13\0\1\126\3\0\1\227"+ - "\1\111\1\112\20\0\1\112\11\0\1\111\24\0\2\127"+ - "\12\0\1\127\1\0\1\127\1\230\1\231\2\127\1\0"+ - "\1\232\13\0\1\127\2\0\1\127\1\232\1\127\3\0"+ - "\1\127\2\0\1\230\1\127\3\0\1\127\20\0\1\130"+ - "\13\0\1\130\2\0\1\107\1\215\33\0\1\107\25\0"+ - "\1\131\13\0\1\131\4\0\1\111\1\112\20\0\1\112"+ - "\11\0\1\111\23\0\7\24\1\0\72\24\31\0\1\233"+ - "\51\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ - "\1\0\1\11\2\0\1\11\2\0\2\11\1\234\1\11"+ - "\2\0\10\11\1\235\11\11\20\0\2\11\1\0\2\11"+ - "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\236"+ - "\2\0\4\11\2\0\5\11\1\237\10\11\1\240\3\11"+ - "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ - "\1\0\1\11\2\0\1\11\2\0\4\11\2\0\4\11"+ - "\1\241\15\11\20\0\2\11\1\0\2\11\7\0\4\11"+ - "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ - "\2\0\4\11\1\242\15\11\20\0\2\11\1\0\2\11"+ - "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ - "\2\0\4\11\2\0\2\11\1\243\17\11\20\0\2\11"+ - "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ - "\2\0\1\11\2\0\4\11\2\0\5\11\1\244\14\11"+ - "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ - "\1\0\1\11\2\0\1\11\2\0\4\11\2\0\12\11"+ - "\1\245\7\11\20\0\2\11\1\0\2\11\7\0\4\11"+ - "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ - "\2\0\14\11\1\246\5\11\20\0\2\11\1\0\2\11"+ - "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ - "\2\0\3\11\1\247\2\0\22\11\20\0\2\11\1\0"+ - "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ - "\1\11\2\0\4\11\2\0\1\250\21\11\20\0\2\11"+ - "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ - "\2\0\1\11\2\0\4\11\2\0\22\11\1\0\1\251"+ - "\16\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ - "\1\0\1\11\2\0\1\11\2\0\1\252\3\11\2\0"+ - "\22\11\20\0\2\11\1\0\2\11\7\0\4\11\1\0"+ - "\2\11\1\0\1\11\2\0\1\11\2\0\4\11\2\0"+ - "\3\11\1\253\16\11\20\0\2\11\1\0\2\11\7\0"+ - "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ - "\2\11\1\254\1\11\2\0\3\11\1\255\16\11\20\0"+ - "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ - "\1\11\2\0\1\11\2\0\4\11\2\0\2\11\1\256"+ - "\17\11\20\0\2\11\1\0\2\11\7\0\4\11\1\0"+ - "\2\11\1\0\1\11\2\0\1\11\2\0\4\11\2\0"+ - "\10\11\1\257\11\11\20\0\2\11\1\0\2\11\7\0"+ - "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ - "\4\11\2\0\14\11\1\260\5\11\20\0\2\11\1\0"+ - "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ - "\1\11\2\0\2\11\1\261\1\11\2\0\22\11\20\0"+ - "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ - "\1\11\2\0\1\11\2\0\4\11\2\0\10\11\1\262"+ - "\3\11\1\263\5\11\102\0\1\264\17\0\2\203\1\0"+ - "\2\203\7\0\4\203\1\0\2\203\1\0\1\203\2\0"+ - "\1\203\2\0\4\203\2\0\22\203\17\0\6\265\2\0"+ - "\72\265\1\0\2\266\12\0\1\266\1\0\1\266\2\0"+ - "\2\266\15\0\1\266\2\0\1\266\1\0\1\266\3\0"+ - "\1\266\3\0\1\266\3\0\1\266\50\0\1\267\50\0"+ - "\6\211\1\270\1\0\72\211\1\0\2\77\1\0\2\77"+ - "\7\0\4\77\1\0\2\77\1\0\1\77\2\0\1\77"+ - "\2\0\2\77\1\271\1\77\2\0\22\77\40\0\1\216"+ - "\61\0\1\217\13\0\1\217\4\0\1\111\33\0\1\111"+ - "\23\0\6\221\1\272\1\0\72\221\6\222\1\273\1\0"+ - "\72\222\12\0\1\274\70\0\2\275\1\0\2\275\7\0"+ - "\4\275\1\0\2\275\1\0\1\275\2\0\1\275\2\0"+ - "\4\275\2\0\22\275\20\0\1\131\13\0\1\131\105\0"+ - "\1\215\3\0\1\232\17\0\1\232\35\0\2\276\12\0"+ - "\1\276\1\0\1\276\1\0\1\216\2\276\15\0\1\276"+ - "\2\0\1\276\1\0\1\276\3\0\1\276\3\0\1\276"+ - "\3\0\1\276\20\0\1\277\13\0\1\277\6\0\1\300"+ - "\40\0\1\300\15\0\2\11\1\0\2\11\7\0\4\11"+ - "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\3\11"+ - "\1\301\2\0\22\11\20\0\2\11\1\0\2\11\7\0"+ - "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ - "\4\11\2\0\1\11\1\302\20\11\20\0\2\11\1\0"+ - "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ - "\1\11\2\0\4\11\2\0\3\11\1\303\16\11\20\0"+ - "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ - "\1\11\2\0\1\11\2\0\2\11\1\304\1\11\2\0"+ - "\22\11\20\0\2\11\1\0\2\11\7\0\4\11\1\0"+ - "\2\11\1\0\1\11\2\0\1\11\2\0\4\11\2\0"+ - "\3\11\1\305\16\11\20\0\2\11\1\0\2\11\7\0"+ - "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ - "\4\11\2\0\3\11\1\306\16\11\20\0\2\11\1\0"+ - "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ - "\1\11\2\0\1\307\3\11\2\0\22\11\20\0\2\11"+ - "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ - "\2\0\1\11\2\0\3\11\1\310\2\0\22\11\20\0"+ - "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ - "\1\11\2\0\1\11\2\0\4\11\2\0\3\11\1\311"+ + "\1\11\2\0\1\11\2\0\4\11\2\0\3\11\1\151"+ "\16\11\20\0\2\11\1\0\2\11\7\0\4\11\1\0"+ "\2\11\1\0\1\11\2\0\1\11\2\0\4\11\2\0"+ - "\14\11\1\312\5\11\20\0\2\11\1\0\2\11\7\0"+ + "\4\11\1\152\15\11\20\0\2\11\1\0\2\11\7\0"+ "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ - "\4\11\2\0\3\11\1\313\16\11\20\0\2\11\1\0"+ - "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ - "\1\11\2\0\4\11\2\0\6\11\1\314\13\11\20\0"+ - "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ - "\1\11\2\0\1\315\2\0\4\11\2\0\22\11\20\0"+ - "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ - "\1\11\2\0\1\11\2\0\4\11\2\0\5\11\1\316"+ - "\14\11\20\0\2\11\1\0\2\11\7\0\4\11\1\0"+ - "\2\11\1\0\1\11\2\0\1\11\2\0\4\11\2\0"+ - "\14\11\1\317\5\11\20\0\2\11\1\0\2\11\7\0"+ - "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ - "\4\11\2\0\2\11\1\320\17\11\20\0\2\11\1\0"+ - "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ - "\1\11\2\0\3\11\1\321\2\0\22\11\20\0\2\11"+ - "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ - "\2\0\1\11\2\0\3\11\1\322\2\0\22\11\17\0"+ - "\6\265\1\323\1\0\72\265\1\0\2\324\12\0\1\324"+ - "\1\0\1\324\2\0\2\324\15\0\1\324\2\0\1\324"+ - "\1\0\1\324\3\0\1\324\3\0\1\324\3\0\1\324"+ - "\20\0\2\77\1\0\2\77\7\0\4\77\1\0\2\77"+ - "\1\0\1\77\2\0\1\77\2\0\3\77\1\325\2\0"+ - "\22\77\20\0\2\276\12\0\1\276\1\0\1\276\2\0"+ - "\2\276\1\0\1\232\13\0\1\276\2\0\1\276\1\232"+ - "\1\276\3\0\1\276\3\0\1\276\3\0\1\276\20\0"+ - "\1\277\13\0\1\277\65\0\2\11\1\0\2\11\7\0"+ - "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ - "\4\11\2\0\13\11\1\326\6\11\20\0\2\11\1\0"+ - "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ - "\1\11\2\0\1\327\3\11\2\0\22\11\20\0\2\11"+ - "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ - "\2\0\1\11\2\0\4\11\2\0\10\11\1\330\11\11"+ - "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ - "\1\0\1\11\2\0\1\11\2\0\2\11\1\331\1\11"+ - "\2\0\22\11\20\0\2\11\1\0\2\11\7\0\4\11"+ - "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\3\11"+ - "\1\332\2\0\22\11\20\0\2\11\1\0\2\11\7\0"+ - "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ - "\4\11\2\0\1\333\21\11\20\0\2\11\1\0\2\11"+ + "\3\11\1\153\2\0\22\11\20\0\2\11\1\0\2\11"+ "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ - "\2\0\4\11\2\0\5\11\1\334\14\11\20\0\2\11"+ + "\2\0\4\11\2\0\4\11\1\154\1\11\1\155\13\11"+ + "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ + "\1\0\1\11\2\0\1\11\2\0\4\11\2\0\13\11"+ + "\1\156\6\11\20\0\2\11\1\0\2\11\7\0\4\11"+ + "\1\0\2\11\1\0\1\11\2\0\1\157\2\0\4\11"+ + "\2\0\22\11\20\0\2\11\1\0\2\11\7\0\4\11"+ + "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ + "\2\0\2\11\1\160\17\11\20\0\2\11\1\0\2\11"+ + "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ + "\2\0\4\11\2\0\12\11\1\161\7\11\20\0\2\11"+ "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ - "\2\0\1\11\2\0\4\11\2\0\10\11\1\335\11\11"+ + "\2\0\1\11\2\0\1\11\1\162\2\11\2\0\22\11"+ + "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ + "\1\0\1\11\2\0\1\163\2\0\4\11\2\0\3\11"+ + "\1\164\2\11\1\165\13\11\20\0\2\11\1\0\2\11"+ + "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ + "\2\0\1\11\1\166\2\11\2\0\22\11\20\0\2\11"+ + "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ + "\2\0\1\11\2\0\4\11\2\0\3\11\1\167\16\11"+ "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ "\1\0\1\11\2\0\1\11\2\0\4\11\2\0\6\11"+ - "\1\336\13\11\20\0\2\11\1\0\2\11\7\0\4\11"+ - "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ - "\2\0\3\11\1\337\16\11\20\0\2\11\1\0\2\11"+ - "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ - "\2\0\4\11\2\0\3\11\1\340\16\11\20\0\2\341"+ - "\12\0\1\341\1\0\1\341\2\0\2\341\15\0\1\341"+ - "\2\0\1\341\1\0\1\341\3\0\1\341\3\0\1\341"+ - "\3\0\1\341\20\0\2\11\1\0\2\11\7\0\4\11"+ - "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ - "\2\0\2\11\1\342\17\11\20\0\2\11\1\0\2\11"+ - "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ - "\2\0\1\343\3\11\2\0\22\11\20\0\2\11\1\0"+ - "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ - "\1\11\2\0\4\11\2\0\7\11\1\344\12\11\20\0"+ + "\1\170\13\11\102\0\1\171\3\0\1\172\75\0\1\173"+ + "\1\0\1\174\77\0\1\175\101\0\1\176\106\0\1\177"+ + "\102\0\1\200\73\0\1\201\111\0\1\202\6\0\7\70"+ + "\2\0\16\70\1\0\1\70\1\0\50\70\2\0\1\203"+ + "\1\0\1\203\1\0\1\204\7\0\3\203\1\0\2\203"+ + "\1\0\1\203\2\0\1\203\1\0\1\205\4\203\2\0"+ + "\22\203\17\0\7\206\1\0\20\206\1\207\51\206\31\0"+ + "\1\210\51\0\2\77\1\0\2\77\7\0\4\77\1\0"+ + "\2\77\1\0\1\77\2\0\1\77\2\0\4\77\2\0"+ + "\22\77\17\0\6\211\2\0\72\211\1\0\2\77\1\0"+ + "\2\77\7\0\4\77\1\0\2\77\1\0\1\77\2\0"+ + "\1\77\2\0\1\77\1\212\2\77\2\0\22\77\57\0"+ + "\1\213\53\0\1\214\110\0\1\215\61\0\1\131\13\0"+ + "\1\131\3\0\1\216\61\0\1\217\13\0\1\217\4\0"+ + "\1\111\1\0\1\217\32\0\1\111\5\0\1\217\14\0"+ + "\6\113\1\220\1\0\72\113\1\0\2\114\1\0\2\114"+ + "\7\0\4\114\1\0\2\114\1\0\1\114\2\0\1\114"+ + "\2\0\4\114\2\0\22\114\17\0\6\221\2\0\72\221"+ + "\1\0\2\116\1\0\2\116\7\0\4\116\1\0\2\116"+ + "\1\0\1\116\2\0\1\116\2\0\4\116\2\0\22\116"+ + "\17\0\6\222\2\0\72\222\7\120\1\0\72\120\40\0"+ + "\1\223\41\0\7\123\1\0\72\123\36\0\1\224\11\0"+ + "\1\225\114\0\1\226\17\0\1\126\13\0\1\126\3\0"+ + "\1\227\1\111\1\112\17\0\1\112\13\0\1\111\23\0"+ + "\2\127\12\0\1\127\1\0\1\127\1\230\1\231\2\127"+ + "\1\0\1\232\14\0\1\232\2\127\1\230\1\127\5\0"+ + "\1\127\2\0\1\127\2\0\1\127\20\0\1\130\13\0"+ + "\1\130\2\0\1\107\1\215\23\0\1\107\35\0\1\131"+ + "\13\0\1\131\4\0\1\111\1\112\17\0\1\112\13\0"+ + "\1\111\22\0\7\24\1\0\72\24\31\0\1\233\51\0"+ "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ - "\1\11\2\0\1\11\2\0\4\11\2\0\2\11\1\345"+ - "\17\11\20\0\2\206\12\0\1\206\1\0\1\206\2\0"+ - "\2\206\15\0\1\206\2\0\1\206\1\0\1\206\3\0"+ - "\1\206\3\0\1\206\3\0\1\206\20\0\2\11\1\0"+ + "\1\11\2\0\1\11\2\0\2\11\1\234\1\11\2\0"+ + "\12\11\1\235\7\11\20\0\2\11\1\0\2\11\7\0"+ + "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ + "\4\11\2\0\1\11\1\236\20\11\20\0\2\11\1\0"+ "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ - "\1\346\2\0\4\11\2\0\22\11\20\0\2\11\1\0"+ + "\1\237\2\0\4\11\2\0\1\240\2\11\1\241\16\11"+ + "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ + "\1\0\1\11\2\0\1\11\2\0\4\11\2\0\1\11"+ + "\1\242\20\11\20\0\2\11\1\0\2\11\7\0\4\11"+ + "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ + "\2\0\5\11\1\243\14\11\20\0\2\11\1\0\2\11"+ + "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ + "\2\0\3\11\1\244\2\0\22\11\20\0\2\11\1\0"+ "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ - "\1\11\2\0\4\11\2\0\3\11\1\347\16\11\20\0"+ + "\1\11\2\0\4\11\2\0\22\11\1\0\1\245\16\0"+ "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ - "\1\11\2\0\1\11\2\0\4\11\2\0\3\11\1\350"+ - "\16\11\17\0"; + "\1\11\2\0\1\11\2\0\4\11\2\0\3\11\1\246"+ + "\16\11\20\0\2\11\1\0\2\11\7\0\4\11\1\0"+ + "\2\11\1\0\1\11\2\0\1\11\2\0\4\11\2\0"+ + "\7\11\1\247\12\11\20\0\2\11\1\0\2\11\7\0"+ + "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ + "\4\11\2\0\14\11\1\250\5\11\20\0\2\11\1\0"+ + "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ + "\1\11\2\0\4\11\2\0\4\11\1\251\15\11\20\0"+ + "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ + "\1\11\2\0\1\11\2\0\1\252\3\11\2\0\22\11"+ + "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ + "\1\0\1\11\2\0\1\11\2\0\4\11\2\0\2\11"+ + "\1\253\17\11\20\0\2\11\1\0\2\11\7\0\4\11"+ + "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\2\11"+ + "\1\254\1\11\2\0\2\11\1\255\17\11\20\0\2\11"+ + "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ + "\2\0\1\11\2\0\4\11\2\0\7\11\1\256\12\11"+ + "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ + "\1\0\1\11\2\0\1\11\2\0\4\11\2\0\4\11"+ + "\1\257\15\11\20\0\2\11\1\0\2\11\7\0\4\11"+ + "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ + "\2\0\12\11\1\260\7\11\20\0\2\11\1\0\2\11"+ + "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ + "\2\0\2\11\1\261\1\11\2\0\22\11\20\0\2\11"+ + "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ + "\2\0\1\11\2\0\4\11\2\0\4\11\1\262\5\11"+ + "\1\263\7\11\102\0\1\264\17\0\2\203\1\0\2\203"+ + "\7\0\4\203\1\0\2\203\1\0\1\203\2\0\1\203"+ + "\2\0\4\203\2\0\22\203\17\0\6\265\2\0\72\265"+ + "\1\0\2\266\12\0\1\266\1\0\1\266\2\0\2\266"+ + "\17\0\2\266\1\0\1\266\5\0\1\266\2\0\1\266"+ + "\2\0\1\266\50\0\1\267\50\0\6\211\1\270\1\0"+ + "\72\211\1\0\2\77\1\0\2\77\7\0\4\77\1\0"+ + "\2\77\1\0\1\77\2\0\1\77\2\0\2\77\1\271"+ + "\1\77\2\0\22\77\40\0\1\216\61\0\1\217\13\0"+ + "\1\217\4\0\1\111\34\0\1\111\22\0\6\221\1\272"+ + "\1\0\72\221\6\222\1\273\1\0\72\222\12\0\1\274"+ + "\70\0\2\275\1\0\2\275\7\0\4\275\1\0\2\275"+ + "\1\0\1\275\2\0\1\275\2\0\4\275\2\0\22\275"+ + "\20\0\1\131\13\0\1\131\105\0\1\215\3\0\1\232"+ + "\14\0\1\232\40\0\2\276\12\0\1\276\1\0\1\276"+ + "\1\0\1\216\2\276\17\0\2\276\1\0\1\276\5\0"+ + "\1\276\2\0\1\276\2\0\1\276\20\0\1\277\13\0"+ + "\1\277\6\0\1\300\40\0\1\300\15\0\2\11\1\0"+ + "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ + "\1\11\2\0\3\11\1\301\2\0\22\11\20\0\2\11"+ + "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ + "\2\0\1\11\2\0\4\11\2\0\6\11\1\302\13\11"+ + "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ + "\1\0\1\11\2\0\1\11\2\0\4\11\2\0\2\11"+ + "\1\303\17\11\20\0\2\11\1\0\2\11\7\0\4\11"+ + "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ + "\2\0\2\11\1\304\17\11\20\0\2\11\1\0\2\11"+ + "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ + "\2\0\2\11\1\305\1\11\2\0\22\11\20\0\2\11"+ + "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ + "\2\0\1\11\2\0\4\11\2\0\2\11\1\306\17\11"+ + "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ + "\1\0\1\11\2\0\1\11\2\0\4\11\2\0\10\11"+ + "\1\307\11\11\20\0\2\11\1\0\2\11\7\0\4\11"+ + "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ + "\2\0\2\11\1\310\17\11\20\0\2\11\1\0\2\11"+ + "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ + "\2\0\3\11\1\311\2\0\22\11\20\0\2\11\1\0"+ + "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ + "\1\11\2\0\1\312\3\11\2\0\22\11\20\0\2\11"+ + "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ + "\2\0\1\11\2\0\4\11\2\0\2\11\1\313\17\11"+ + "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ + "\1\0\1\11\2\0\1\11\2\0\4\11\2\0\4\11"+ + "\1\314\15\11\20\0\2\11\1\0\2\11\7\0\4\11"+ + "\1\0\2\11\1\0\1\11\2\0\1\315\2\0\4\11"+ + "\2\0\22\11\20\0\2\11\1\0\2\11\7\0\4\11"+ + "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ + "\2\0\3\11\1\316\16\11\20\0\2\11\1\0\2\11"+ + "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ + "\2\0\4\11\2\0\4\11\1\317\15\11\20\0\2\11"+ + "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ + "\2\0\1\11\2\0\4\11\2\0\7\11\1\320\12\11"+ + "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ + "\1\0\1\11\2\0\1\11\2\0\3\11\1\321\2\0"+ + "\22\11\20\0\2\11\1\0\2\11\7\0\4\11\1\0"+ + "\2\11\1\0\1\11\2\0\1\11\2\0\3\11\1\322"+ + "\2\0\22\11\17\0\6\265\1\323\1\0\72\265\1\0"+ + "\2\324\12\0\1\324\1\0\1\324\2\0\2\324\17\0"+ + "\2\324\1\0\1\324\5\0\1\324\2\0\1\324\2\0"+ + "\1\324\20\0\2\77\1\0\2\77\7\0\4\77\1\0"+ + "\2\77\1\0\1\77\2\0\1\77\2\0\3\77\1\325"+ + "\2\0\22\77\20\0\2\276\12\0\1\276\1\0\1\276"+ + "\2\0\2\276\1\0\1\232\14\0\1\232\2\276\1\0"+ + "\1\276\5\0\1\276\2\0\1\276\2\0\1\276\20\0"+ + "\1\277\13\0\1\277\65\0\2\11\1\0\2\11\7\0"+ + "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ + "\4\11\2\0\15\11\1\326\4\11\20\0\2\11\1\0"+ + "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ + "\1\11\2\0\4\11\2\0\3\11\1\327\16\11\20\0"+ + "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ + "\1\11\2\0\1\11\2\0\1\330\3\11\2\0\22\11"+ + "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ + "\1\0\1\11\2\0\1\11\2\0\4\11\2\0\12\11"+ + "\1\331\7\11\20\0\2\11\1\0\2\11\7\0\4\11"+ + "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ + "\2\0\3\11\1\332\16\11\20\0\2\11\1\0\2\11"+ + "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ + "\2\0\3\11\1\333\2\0\22\11\20\0\2\11\1\0"+ + "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ + "\1\11\2\0\2\11\1\334\1\11\2\0\22\11\20\0"+ + "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ + "\1\11\2\0\1\11\2\0\4\11\2\0\5\11\1\335"+ + "\14\11\20\0\2\11\1\0\2\11\7\0\4\11\1\0"+ + "\2\11\1\0\1\11\2\0\1\11\2\0\4\11\2\0"+ + "\12\11\1\336\7\11\20\0\2\11\1\0\2\11\7\0"+ + "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ + "\4\11\2\0\10\11\1\337\11\11\20\0\2\11\1\0"+ + "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ + "\1\11\2\0\4\11\2\0\2\11\1\340\17\11\20\0"+ + "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ + "\1\11\2\0\1\11\2\0\4\11\2\0\2\11\1\341"+ + "\17\11\20\0\2\342\12\0\1\342\1\0\1\342\2\0"+ + "\2\342\17\0\2\342\1\0\1\342\5\0\1\342\2\0"+ + "\1\342\2\0\1\342\20\0\2\11\1\0\2\11\7\0"+ + "\4\11\1\0\2\11\1\0\1\11\2\0\1\11\2\0"+ + "\4\11\2\0\4\11\1\343\15\11\20\0\2\11\1\0"+ + "\2\11\7\0\4\11\1\0\2\11\1\0\1\11\2\0"+ + "\1\11\2\0\4\11\2\0\11\11\1\344\10\11\20\0"+ + "\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+ + "\1\11\2\0\1\11\2\0\4\11\2\0\7\11\1\345"+ + "\12\11\20\0\2\11\1\0\2\11\7\0\4\11\1\0"+ + "\2\11\1\0\1\11\2\0\1\11\2\0\1\346\3\11"+ + "\2\0\22\11\20\0\2\11\1\0\2\11\7\0\4\11"+ + "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ + "\2\0\7\11\1\347\12\11\20\0\2\206\12\0\1\206"+ + "\1\0\1\206\2\0\2\206\17\0\2\206\1\0\1\206"+ + "\5\0\1\206\2\0\1\206\2\0\1\206\20\0\2\11"+ + "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ + "\2\0\1\11\2\0\2\11\1\350\1\11\2\0\22\11"+ + "\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+ + "\1\0\1\11\2\0\1\11\2\0\4\11\2\0\2\11"+ + "\1\351\17\11\20\0\2\11\1\0\2\11\7\0\4\11"+ + "\1\0\2\11\1\0\1\11\2\0\1\352\2\0\4\11"+ + "\2\0\22\11\20\0\2\11\1\0\2\11\7\0\4\11"+ + "\1\0\2\11\1\0\1\11\2\0\1\11\2\0\4\11"+ + "\2\0\3\11\1\353\16\11\20\0\2\11\1\0\2\11"+ + "\7\0\4\11\1\0\2\11\1\0\1\11\2\0\1\11"+ + "\2\0\4\11\2\0\2\11\1\354\17\11\20\0\2\11"+ + "\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+ + "\2\0\1\11\2\0\3\11\1\355\2\0\22\11\17\0"; private static int [] zzUnpackTrans() { - int [] result = new int[10098]; + int [] result = new int[10428]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -550,12 +544,12 @@ class _JetLexer implements FlexLexer { "\1\0\3\1\5\11\1\1\1\0\7\1\1\11\21\1"+ "\11\11\1\1\1\0\2\11\1\1\2\0\1\1\2\11"+ "\1\0\1\11\1\1\1\11\2\0\3\1\1\11\1\0"+ - "\1\1\2\0\1\11\15\1\1\11\12\1\1\11\2\0"+ + "\1\1\2\0\1\11\11\1\1\11\16\1\1\11\2\0"+ "\1\1\1\11\1\1\4\11\2\1\1\0\22\1\1\11"+ - "\1\0\14\1\1\0\7\1"; + "\1\0\15\1\1\0\13\1"; private static int [] zzUnpackAttribute() { - int [] result = new int[232]; + int [] result = new int[237]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; @@ -906,326 +900,187 @@ class _JetLexer implements FlexLexer { zzMarkedPos = zzMarkedPosL; switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { + case 102: + { return JetTokens.TYPE_ALIAS_KEYWORD ; + } + case 103: break; case 3: { return JetTokens.IDENTIFIER; } - case 103: break; + case 104: break; case 12: { pushState(STRING); return JetTokens.OPEN_QUOTE; } - case 104: break; + case 105: break; case 77: { return JetTokens.FOR_KEYWORD ; } - case 105: break; - case 100: + case 106: break; + case 99: { return JetTokens.RETURN_KEYWORD ; } - case 106: break; + case 107: break; case 87: { return JetTokens.NULL_KEYWORD ; } - case 107: break; + case 108: break; + case 35: + { if (lBraceCount == 0) { + popState(); + return JetTokens.LONG_TEMPLATE_ENTRY_END; + } + lBraceCount--; + return JetTokens.RBRACE; + } + case 109: break; case 19: { return JetTokens.LT ; } - case 108: break; + case 110: break; case 52: { return JetTokens.DO_KEYWORD ; } - case 109: break; + case 111: break; case 18: { return JetTokens.PLUS ; } - case 110: break; + case 112: break; case 55: { return JetTokens.PLUSEQ ; } - case 111: break; - case 91: + case 113: break; + case 90: { popState(); return JetTokens.THIS_KEYWORD; } - case 112: break; + case 114: break; case 28: { return JetTokens.COMMA ; } - case 113: break; + case 115: break; case 20: { return JetTokens.GT ; } - case 114: break; + case 116: break; case 4: { return JetTokens.WHITE_SPACE; } - case 115: break; + case 117: break; case 26: { return JetTokens.RPAR ; } - case 116: break; + case 118: break; case 54: { return JetTokens.DOUBLE_ARROW; } - case 117: break; + case 119: break; case 85: { return JetTokens.TRUE_KEYWORD ; } - case 118: break; + case 120: break; case 37: { return JetTokens.FIELD_IDENTIFIER; } - case 119: break; + case 121: break; case 59: { return JetTokens.ANDAND ; } - case 120: break; + case 122: break; case 64: { pushState(LONG_TEMPLATE_ENTRY); return JetTokens.LONG_TEMPLATE_ENTRY_START; } - case 121: break; + case 123: break; case 36: { return JetTokens.FLOAT_LITERAL; } - case 122: break; + case 124: break; case 38: { return JetTokens.EOL_COMMENT; } - case 123: break; - case 89: + case 125: break; + case 88: { return JetTokens.WHEN_KEYWORD ; } - case 124: break; + case 126: break; case 73: { pushState(RAW_STRING); return JetTokens.OPEN_QUOTE; } - case 125: break; + case 127: break; case 22: { return JetTokens.COLON ; } - case 126: break; + case 128: break; case 57: { return JetTokens.LTEQ ; } - case 127: break; + case 129: break; case 46: { return JetTokens.ARROW ; } - case 128: break; + case 130: break; case 32: { popState(); return JetTokens.IDENTIFIER; } - case 129: break; + case 131: break; case 23: { return JetTokens.LBRACKET ; } - case 130: break; + case 132: break; case 68: { yypushback(2); return JetTokens.INTEGER_LITERAL; } - case 131: break; + case 133: break; case 11: { return JetTokens.CHARACTER_LITERAL; } - case 132: break; - case 78: + case 134: break; + case 79: { return JetTokens.VAR_KEYWORD ; } - case 133: break; + case 135: break; case 58: { return JetTokens.GTEQ ; } - case 134: break; + case 136: break; case 2: { return JetTokens.INTEGER_LITERAL; } - case 135: break; + case 137: break; case 14: { return JetTokens.RBRACE ; } - case 136: break; - case 95: + case 138: break; + case 94: { return JetTokens.CLASS_KEYWORD ; } - case 137: break; + case 139: break; case 74: { return JetTokens.TRY_KEYWORD ; } - case 138: break; + case 140: break; case 8: { return JetTokens.EXCL ; } - case 139: break; + case 141: break; case 42: { return JetTokens.EXCLEQ ; } - case 140: break; + case 142: break; case 45: { return JetTokens.MINUSEQ ; } - case 141: break; - case 101: + case 143: break; + case 100: { return JetTokens.PACKAGE_KEYWORD ; } - case 142: break; - case 92: + case 144: break; + case 91: { return JetTokens.THROW_KEYWORD ; } - case 143: break; - case 94: + case 145: break; + case 93: { return JetTokens.SUPER_KEYWORD ; } - case 144: break; - case 97: - { return JetTokens.WHILE_KEYWORD ; - } - case 145: break; - case 44: - { return JetTokens.MINUSMINUS; - } case 146: break; - case 102: - { return JetTokens.CONTINUE_KEYWORD ; - } - case 147: break; - case 71: - { return JetTokens.NOT_IN; - } - case 148: break; - case 69: - { pushState(DOC_COMMENT); - commentDepth = 0; - commentStart = getTokenStart(); - } - case 149: break; - case 6: - { return JetTokens.DIV ; - } - case 150: break; - case 63: - { pushState(SHORT_TEMPLATE_ENTRY); - yypushback(yylength() - 1); - return JetTokens.SHORT_TEMPLATE_ENTRY_START; - } - case 151: break; - case 81: - { int length = yytext().length(); - if (length <= 3) { // closing """ - popState(); - return JetTokens.CLOSING_QUOTE; - } - else { // some quotes at the end of a string, e.g. """ "foo"""" - yypushback(3); // return the closing quotes (""") to the stream - return JetTokens.REGULAR_STRING_PART; - } - } - case 152: break; - case 5: - { return JetTokens.LABEL_IDENTIFIER; - } - case 153: break; - case 29: - { return JetTokens.REGULAR_STRING_PART; - } - case 154: break; - case 17: - { return JetTokens.QUEST ; - } - case 155: break; - case 41: - { if (zzCurrentPos == 0) { - return JetTokens.SHEBANG_COMMENT; - } - else { - yypushback(yylength() - 1); - return JetTokens.HASH; - } - } - case 156: break; - case 60: - { return JetTokens.OROR ; - } - case 157: break; - case 21: - { return JetTokens.PERC ; - } - case 158: break; - case 72: - { return JetTokens.EXCLEQEQEQ; - } - case 159: break; - case 61: - { return JetTokens.PERCEQ ; - } - case 160: break; - case 43: - { return JetTokens.RANGE ; - } - case 161: break; - case 1: - { return TokenType.BAD_CHARACTER; - } - case 162: break; - case 70: - { return JetTokens.NOT_IS; - } - case 163: break; - case 15: - { return JetTokens.MUL ; - } - case 164: break; - case 24: - { return JetTokens.RBRACKET ; - } - case 165: break; - case 56: - { return JetTokens.PLUSPLUS ; - } - case 166: break; - case 84: - { return JetTokens.THIS_KEYWORD ; - } - case 167: break; - case 9: - { return JetTokens.DOT ; - } - case 168: break; - case 27: - { return JetTokens.SEMICOLON ; - } - case 169: break; - case 49: - { return JetTokens.IF_KEYWORD ; - } - case 170: break; - case 65: - { return JetTokens.ESCAPE_SEQUENCE; - } - case 171: break; - case 39: - { pushState(BLOCK_COMMENT); - commentDepth = 0; - commentStart = getTokenStart(); - } - case 172: break; - case 31: - { popState(); return JetTokens.CLOSING_QUOTE; - } - case 173: break; - case 16: - { return JetTokens.EQ ; - } - case 174: break; - case 75: - { return JetTokens.AS_SAFE; - } - case 175: break; - case 25: - { return JetTokens.LPAR ; - } - case 176: break; - case 10: - { return JetTokens.MINUS ; - } - case 177: break; case 67: { if (commentDepth > 0) { commentDepth--; @@ -1237,13 +1092,151 @@ class _JetLexer implements FlexLexer { return commentStateToTokenType(state); } } + case 147: break; + case 96: + { return JetTokens.WHILE_KEYWORD ; + } + case 148: break; + case 44: + { return JetTokens.MINUSMINUS; + } + case 149: break; + case 101: + { return JetTokens.CONTINUE_KEYWORD ; + } + case 150: break; + case 71: + { return JetTokens.NOT_IN; + } + case 151: break; + case 6: + { return JetTokens.DIV ; + } + case 152: break; + case 81: + { int length = yytext().length(); + if (length <= 3) { // closing """ + popState(); + return JetTokens.CLOSING_QUOTE; + } + else { // some quotes at the end of a string, e.g. """ "foo"""" + yypushback(3); // return the closing quotes (""") to the stream + return JetTokens.REGULAR_STRING_PART; + } + } + case 153: break; + case 5: + { return JetTokens.LABEL_IDENTIFIER; + } + case 154: break; + case 29: + { return JetTokens.REGULAR_STRING_PART; + } + case 155: break; + case 17: + { return JetTokens.QUEST ; + } + case 156: break; + case 69: + { pushState(DOC_COMMENT); + commentDepth = 0; + commentStart = getTokenStart(); + } + case 157: break; + case 60: + { return JetTokens.OROR ; + } + case 158: break; + case 21: + { return JetTokens.PERC ; + } + case 159: break; + case 72: + { return JetTokens.EXCLEQEQEQ; + } + case 160: break; + case 61: + { return JetTokens.PERCEQ ; + } + case 161: break; + case 43: + { return JetTokens.RANGE ; + } + case 162: break; + case 1: + { return TokenType.BAD_CHARACTER; + } + case 163: break; + case 63: + { pushState(SHORT_TEMPLATE_ENTRY); + yypushback(yylength() - 1); + return JetTokens.SHORT_TEMPLATE_ENTRY_START; + } + case 164: break; + case 70: + { return JetTokens.NOT_IS; + } + case 165: break; + case 15: + { return JetTokens.MUL ; + } + case 166: break; + case 24: + { return JetTokens.RBRACKET ; + } + case 167: break; + case 56: + { return JetTokens.PLUSPLUS ; + } + case 168: break; + case 39: + { pushState(BLOCK_COMMENT); + commentDepth = 0; + commentStart = getTokenStart(); + } + case 169: break; + case 84: + { return JetTokens.THIS_KEYWORD ; + } + case 170: break; + case 9: + { return JetTokens.DOT ; + } + case 171: break; + case 27: + { return JetTokens.SEMICOLON ; + } + case 172: break; + case 49: + { return JetTokens.IF_KEYWORD ; + } + case 173: break; + case 65: + { return JetTokens.ESCAPE_SEQUENCE; + } + case 174: break; + case 31: + { popState(); return JetTokens.CLOSING_QUOTE; + } + case 175: break; + case 16: + { return JetTokens.EQ ; + } + case 176: break; + case 75: + { return JetTokens.AS_SAFE; + } + case 177: break; + case 25: + { return JetTokens.LPAR ; + } case 178: break; - case 98: - { return JetTokens.FALSE_KEYWORD ; + case 10: + { return JetTokens.MINUS ; } case 179: break; - case 86: - { return JetTokens.TYPE_KEYWORD ; + case 97: + { return JetTokens.FALSE_KEYWORD ; } case 180: break; case 66: @@ -1274,7 +1267,7 @@ class _JetLexer implements FlexLexer { { return JetTokens.DIVEQ ; } case 187: break; - case 88: + case 86: { return JetTokens.ELSE_KEYWORD ; } case 188: break; @@ -1294,11 +1287,11 @@ class _JetLexer implements FlexLexer { { return JetTokens.EQEQEQ ; } case 192: break; - case 79: + case 78: { return JetTokens.VAL_KEYWORD ; } case 193: break; - case 90: + case 89: { return JetTokens.CAPITALIZED_THIS_KEYWORD ; } case 194: break; @@ -1306,42 +1299,43 @@ class _JetLexer implements FlexLexer { { return JetTokens.MULTEQ ; } case 195: break; + case 41: + { if (zzCurrentPos == 0) { + return JetTokens.SHEBANG_COMMENT; + } + else { + yypushback(yylength() - 1); + return JetTokens.HASH; + } + } + case 196: break; case 13: { return JetTokens.LBRACE ; } - case 196: break; - case 99: + case 197: break; + case 98: { return JetTokens.OBJECT_KEYWORD ; } - case 197: break; - case 96: + case 198: break; + case 95: { return JetTokens.BREAK_KEYWORD ; } - case 198: break; + case 199: break; case 82: { return JetTokens.BLOCK_COMMENT; } - case 199: break; - case 93: + case 200: break; + case 92: { return JetTokens.TRAIT_KEYWORD ; } - case 200: break; + case 201: break; case 62: { return JetTokens.COLONCOLON; } - case 201: break; + case 202: break; case 33: { } - case 202: break; - case 35: - { if (lBraceCount == 0) { - popState(); - return JetTokens.LONG_TEMPLATE_ENTRY_END; - } - lBraceCount--; - return JetTokens.RBRACE; - } case 203: break; case 7: { return JetTokens.HASH ; @@ -1358,14 +1352,14 @@ class _JetLexer implements FlexLexer { zzStartRead = commentStart; return commentStateToTokenType(state); } - case 233: break; + case 238: break; case DOC_COMMENT: { int state = yystate(); popState(); zzStartRead = commentStart; return commentStateToTokenType(state); } - case 234: break; + case 239: break; default: return null; } diff --git a/compiler/testData/diagnostics/tests/typedefs/TypedefsUnsupported.kt b/compiler/testData/diagnostics/tests/typedefs/TypedefsUnsupported.kt index aa2928a4f64..28d59b7d04a 100644 --- a/compiler/testData/diagnostics/tests/typedefs/TypedefsUnsupported.kt +++ b/compiler/testData/diagnostics/tests/typedefs/TypedefsUnsupported.kt @@ -1,5 +1,5 @@ -type Foo = Any +typealias Foo = Any fun foo() { - type Bar = Any + typealias Bar = Any } \ No newline at end of file diff --git a/compiler/testData/psi/EOLsOnRollback.kt b/compiler/testData/psi/EOLsOnRollback.kt index b5bd7b1a9e3..7b1ad990541 100644 --- a/compiler/testData/psi/EOLsOnRollback.kt +++ b/compiler/testData/psi/EOLsOnRollback.kt @@ -3,7 +3,7 @@ fun foo() { fun foo() class foo - type x = t + typealias x = t var r [a] var foo = 4 diff --git a/compiler/testData/psi/EOLsOnRollback.txt b/compiler/testData/psi/EOLsOnRollback.txt index 67fd5a0d6a1..a7182b39b83 100644 --- a/compiler/testData/psi/EOLsOnRollback.txt +++ b/compiler/testData/psi/EOLsOnRollback.txt @@ -31,7 +31,7 @@ JetFile: EOLsOnRollback.kt PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n\n ') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('x') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/FunctionTypes.kt b/compiler/testData/psi/FunctionTypes.kt index 66ff24f8e26..7ed7c03bc0a 100644 --- a/compiler/testData/psi/FunctionTypes.kt +++ b/compiler/testData/psi/FunctionTypes.kt @@ -1,24 +1,24 @@ -type f = ([a] a) -> b -type f = (a) -> b -type f = () -> [x] b -type f = () -> Unit +typealias f = ([a] a) -> b +typealias f = (a) -> b +typealias f = () -> [x] b +typealias f = () -> Unit -type f = (a : [a] a) -> b -type f = (a : a) -> b -type f = () -> b -type f = () -> Unit +typealias f = (a : [a] a) -> b +typealias f = (a : a) -> b +typealias f = () -> b +typealias f = () -> Unit -type f = (a : [a] a, foo, x : bar) -> b -type f = (foo, a : a) -> b -type f = (foo, a : (a) -> b) -> b -type f = (foo, a : (a) -> b) -> () -> Unit +typealias f = (a : [a] a, foo, x : bar) -> b +typealias f = (foo, a : a) -> b +typealias f = (foo, a : (a) -> b) -> b +typealias f = (foo, a : (a) -> b) -> () -> Unit //type f = (ref foo, ref a : (ref a) -> b) -> () -> Unit -type f = T.() -> Unit -type f = T.T.() -> Unit -type f = T.T.() -> Unit +typealias f = T.() -> Unit +typealias f = T.T.() -> Unit +typealias f = T.T.() -> Unit -type f = [a] T.() -> Unit -type f = [a] T.T.() -> Unit -type f = [a] T.T.() -> Unit +typealias f = [a] T.() -> Unit +typealias f = [a] T.T.() -> Unit +typealias f = [a] T.T.() -> Unit diff --git a/compiler/testData/psi/FunctionTypes.txt b/compiler/testData/psi/FunctionTypes.txt index 5b8ec73d331..4a644614f6f 100644 --- a/compiler/testData/psi/FunctionTypes.txt +++ b/compiler/testData/psi/FunctionTypes.txt @@ -2,7 +2,7 @@ JetFile: FunctionTypes.kt PACKAGE_DIRECTIVE TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -38,7 +38,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -63,7 +63,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -93,7 +93,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -113,7 +113,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('Unit') PsiWhiteSpace('\n\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -152,7 +152,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -181,7 +181,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -201,7 +201,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -221,7 +221,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('Unit') PsiWhiteSpace('\n\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -278,7 +278,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -314,7 +314,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -363,7 +363,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -422,7 +422,7 @@ JetFile: FunctionTypes.kt PsiComment(EOL_COMMENT)('//type f = (ref foo, ref a : (ref a) -> b) -> () -> Unit') PsiWhiteSpace('\n\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -448,7 +448,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('Unit') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -478,7 +478,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('Unit') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -531,7 +531,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('Unit') PsiWhiteSpace('\n\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -567,7 +567,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('Unit') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -607,7 +607,7 @@ JetFile: FunctionTypes.kt PsiElement(IDENTIFIER)('Unit') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/FunctionTypes_ERR.kt b/compiler/testData/psi/FunctionTypes_ERR.kt index f948522e84e..14ef9e8387b 100644 --- a/compiler/testData/psi/FunctionTypes_ERR.kt +++ b/compiler/testData/psi/FunctionTypes_ERR.kt @@ -1 +1 @@ -type f = (a, ) -> b +typealias f = (a, ) -> b diff --git a/compiler/testData/psi/FunctionTypes_ERR.txt b/compiler/testData/psi/FunctionTypes_ERR.txt index 2e6f737d3b8..e0ebf3cec12 100644 --- a/compiler/testData/psi/FunctionTypes_ERR.txt +++ b/compiler/testData/psi/FunctionTypes_ERR.txt @@ -2,7 +2,7 @@ JetFile: FunctionTypes_ERR.kt PACKAGE_DIRECTIVE TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/LocalDeclarations.kt b/compiler/testData/psi/LocalDeclarations.kt index ea2b188f94c..c66ba32efec 100644 --- a/compiler/testData/psi/LocalDeclarations.kt +++ b/compiler/testData/psi/LocalDeclarations.kt @@ -6,6 +6,6 @@ fun foo() { out val foo = 5 [a] var foo = 4 - type f = T.() -> Unit + typealias f = T.() -> Unit } diff --git a/compiler/testData/psi/LocalDeclarations.txt b/compiler/testData/psi/LocalDeclarations.txt index 81c6ae367df..3caf07a5552 100644 --- a/compiler/testData/psi/LocalDeclarations.txt +++ b/compiler/testData/psi/LocalDeclarations.txt @@ -97,7 +97,7 @@ JetFile: LocalDeclarations.kt PsiElement(INTEGER_LITERAL)('4') PsiWhiteSpace('\n ') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/SimpleClassMembers.kt b/compiler/testData/psi/SimpleClassMembers.kt index 0064efeaea8..2dc287da009 100644 --- a/compiler/testData/psi/SimpleClassMembers.kt +++ b/compiler/testData/psi/SimpleClassMembers.kt @@ -13,7 +13,7 @@ class foo { var f - type foo = bar + typealias foo = bar } @@ -46,7 +46,7 @@ class foo { var f - type foo = bar + typealias foo = bar } @@ -56,7 +56,7 @@ class foo { var f - type foo = bar + typealias foo = bar class object { diff --git a/compiler/testData/psi/SimpleClassMembers.txt b/compiler/testData/psi/SimpleClassMembers.txt index 6db3e1c804a..22122f0364b 100644 --- a/compiler/testData/psi/SimpleClassMembers.txt +++ b/compiler/testData/psi/SimpleClassMembers.txt @@ -56,7 +56,7 @@ JetFile: SimpleClassMembers.kt PsiElement(IDENTIFIER)('f') PsiWhiteSpace('\n\n ') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') @@ -240,7 +240,7 @@ JetFile: SimpleClassMembers.kt PsiElement(IDENTIFIER)('f') PsiWhiteSpace('\n\n ') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') @@ -272,7 +272,7 @@ JetFile: SimpleClassMembers.kt PsiElement(IDENTIFIER)('f') PsiWhiteSpace('\n\n ') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/SimpleClassMembers_ERR.kt b/compiler/testData/psi/SimpleClassMembers_ERR.kt index a8c2cc272c6..db6c137ad35 100644 --- a/compiler/testData/psi/SimpleClassMembers_ERR.kt +++ b/compiler/testData/psi/SimpleClassMembers_ERR.kt @@ -12,6 +12,6 @@ class foo { var f - type foo = ; + typealias foo = ; } \ No newline at end of file diff --git a/compiler/testData/psi/SimpleClassMembers_ERR.txt b/compiler/testData/psi/SimpleClassMembers_ERR.txt index 881d446ba96..dac6b145ff0 100644 --- a/compiler/testData/psi/SimpleClassMembers_ERR.txt +++ b/compiler/testData/psi/SimpleClassMembers_ERR.txt @@ -60,7 +60,7 @@ JetFile: SimpleClassMembers_ERR.kt PsiElement(IDENTIFIER)('f') PsiWhiteSpace('\n\n ') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/TypeDef.kt b/compiler/testData/psi/TypeDef.kt index 12365eae7e7..c622e0b0bb9 100644 --- a/compiler/testData/psi/TypeDef.kt +++ b/compiler/testData/psi/TypeDef.kt @@ -1,14 +1,14 @@ package foo.bar.goo -type foo = bar -type foo = bar -type foo = bar -type foo = bar -type foo = bar +typealias foo = bar +typealias foo = bar +typealias foo = bar +typealias foo = bar +typealias foo = bar -type foo = bar ; -type foo = bar ; +typealias foo = bar ; +typealias foo = bar ; -type foo = bar ; -type foo = bar ; -type foo = bar ; +typealias foo = bar ; +typealias foo = bar ; +typealias foo = bar ; diff --git a/compiler/testData/psi/TypeDef.txt b/compiler/testData/psi/TypeDef.txt index eac894dc895..15f6f4bbe10 100644 --- a/compiler/testData/psi/TypeDef.txt +++ b/compiler/testData/psi/TypeDef.txt @@ -14,7 +14,7 @@ JetFile: TypeDef.kt PsiElement(IDENTIFIER)('goo') PsiWhiteSpace('\n\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') @@ -26,7 +26,7 @@ JetFile: TypeDef.kt PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -43,7 +43,7 @@ JetFile: TypeDef.kt PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -67,7 +67,7 @@ JetFile: TypeDef.kt PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -88,7 +88,7 @@ JetFile: TypeDef.kt PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -116,7 +116,7 @@ JetFile: TypeDef.kt PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') @@ -130,7 +130,7 @@ JetFile: TypeDef.kt PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -149,7 +149,7 @@ JetFile: TypeDef.kt PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -175,7 +175,7 @@ JetFile: TypeDef.kt PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -198,7 +198,7 @@ JetFile: TypeDef.kt PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST diff --git a/compiler/testData/psi/TypeDef_ERR.kt b/compiler/testData/psi/TypeDef_ERR.kt index 6c03a8632fa..1681d75bf3e 100644 --- a/compiler/testData/psi/TypeDef_ERR.kt +++ b/compiler/testData/psi/TypeDef_ERR.kt @@ -1,17 +1,17 @@ -type -type foo -type foo = -type ; -type foo ; -type foo = ; -type = foo -type = -type = foo ; -type = ; +typealias +typealias foo +typealias foo = +typealias ; +typealias foo ; +typealias foo = ; +typealias = foo +typealias = +typealias = foo ; +typealias = ; -type foo<> = bar -type foo = bar -type foo = bar +typealias foo<> = bar +typealias foo = bar +typealias foo = bar class -type foo = bar \ No newline at end of file +typealias foo = bar \ No newline at end of file diff --git a/compiler/testData/psi/TypeDef_ERR.txt b/compiler/testData/psi/TypeDef_ERR.txt index 1619d91f2b4..b032ecf10d8 100644 --- a/compiler/testData/psi/TypeDef_ERR.txt +++ b/compiler/testData/psi/TypeDef_ERR.txt @@ -2,7 +2,7 @@ JetFile: TypeDef_ERR.kt PACKAGE_DIRECTIVE TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiErrorElement:Type name expected PsiWhiteSpace('\n') @@ -10,7 +10,7 @@ JetFile: TypeDef_ERR.kt PsiErrorElement:Type expected TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') PsiErrorElement:Expecting '=' @@ -20,7 +20,7 @@ JetFile: TypeDef_ERR.kt PsiErrorElement:Type expected TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') @@ -30,7 +30,7 @@ JetFile: TypeDef_ERR.kt PsiErrorElement:Type expected TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiErrorElement:Type name expected PsiWhiteSpace(' ') @@ -40,7 +40,7 @@ JetFile: TypeDef_ERR.kt PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') PsiErrorElement:Expecting '=' @@ -52,7 +52,7 @@ JetFile: TypeDef_ERR.kt PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') @@ -64,7 +64,7 @@ JetFile: TypeDef_ERR.kt PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiErrorElement:Type name expected PsiWhiteSpace(' ') @@ -76,7 +76,7 @@ JetFile: TypeDef_ERR.kt PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiErrorElement:Type name expected PsiWhiteSpace(' ') @@ -86,7 +86,7 @@ JetFile: TypeDef_ERR.kt PsiErrorElement:Type expected TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiErrorElement:Type name expected PsiWhiteSpace(' ') @@ -100,7 +100,7 @@ JetFile: TypeDef_ERR.kt PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiErrorElement:Type name expected PsiWhiteSpace(' ') @@ -112,7 +112,7 @@ JetFile: TypeDef_ERR.kt PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -129,7 +129,7 @@ JetFile: TypeDef_ERR.kt PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -150,7 +150,7 @@ JetFile: TypeDef_ERR.kt PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -182,7 +182,7 @@ JetFile: TypeDef_ERR.kt PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/annotation/ShortAnnotations.kt b/compiler/testData/psi/annotation/ShortAnnotations.kt index e9143aa3496..9c66904ab52 100644 --- a/compiler/testData/psi/annotation/ShortAnnotations.kt +++ b/compiler/testData/psi/annotation/ShortAnnotations.kt @@ -5,7 +5,7 @@ foo bar(1) buzz(1) zoo object B foo bar(1) buzz(1) zoo fun a() {} foo bar(1) buzz(1) zoo val c : Int = 0 foo bar(1) buzz(1) zoo var v : Int = 0 -foo bar(1) buzz(1) zoo type T = Int +foo bar(1) buzz(1) zoo typealias T = Int class Foo { @@ -15,7 +15,7 @@ class Foo { foo bar(1) buzz(1) zoo fun a() {} foo bar(1) buzz(1) zoo val c : Int = 0 foo bar(1) buzz(1) zoo var v : Int = 0 - foo bar(1) buzz(1) zoo type T = Int + foo bar(1) buzz(1) zoo typealias T = Int foo bar(1) buzz(1) zoo {} } diff --git a/compiler/testData/psi/annotation/ShortAnnotations.txt b/compiler/testData/psi/annotation/ShortAnnotations.txt index 0a74e037e03..4d1d92863f0 100644 --- a/compiler/testData/psi/annotation/ShortAnnotations.txt +++ b/compiler/testData/psi/annotation/ShortAnnotations.txt @@ -406,7 +406,7 @@ JetFile: ShortAnnotations.kt REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('zoo') PsiWhiteSpace(' ') - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') @@ -836,7 +836,7 @@ JetFile: ShortAnnotations.kt REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('zoo') PsiWhiteSpace(' ') - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/annotation/TypeAnnotations.kt b/compiler/testData/psi/annotation/TypeAnnotations.kt index c8c948c3f43..07d9dbcfa38 100644 --- a/compiler/testData/psi/annotation/TypeAnnotations.kt +++ b/compiler/testData/psi/annotation/TypeAnnotations.kt @@ -1,3 +1,3 @@ class F(a : [a] [b] B) -type f = [b] [x] F<[x] A, B> \ No newline at end of file +typealias f = [b] [x] F<[x] A, B> \ No newline at end of file diff --git a/compiler/testData/psi/annotation/TypeAnnotations.txt b/compiler/testData/psi/annotation/TypeAnnotations.txt index ab6f234d3df..b5152f1d345 100644 --- a/compiler/testData/psi/annotation/TypeAnnotations.txt +++ b/compiler/testData/psi/annotation/TypeAnnotations.txt @@ -39,7 +39,7 @@ JetFile: TypeAnnotations.kt PsiElement(RPAR)(')') PsiWhiteSpace('\n\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') diff --git a/compiler/testData/psi/examples/FunctionsAndTypes.kt b/compiler/testData/psi/examples/FunctionsAndTypes.kt index 41313ae0374..b5098ae406f 100644 --- a/compiler/testData/psi/examples/FunctionsAndTypes.kt +++ b/compiler/testData/psi/examples/FunctionsAndTypes.kt @@ -1,24 +1,24 @@ -type f1 = (T) -> X +typealias f1 = (T) -> X // type f1 = {(T) => X} -type f2 = (T, E) -> X +typealias f2 = (T, E) -> X // type f2 = {(T, E) => X} -type f_tuple = (Pair) -> X +typealias f_tuple = (Pair) -> X //type f_tuple = {((T, E)) => X} -type hof = (X) -> (T) -> Y +typealias hof = (X) -> (T) -> Y //type hof = { (X) => {(T) => Y} } -type hof2 = ( (X) -> Y) -> (Y) -> Z +typealias hof2 = ( (X) -> Y) -> (Y) -> Z //type hof2 = { {(X) => Y} => {(Y) => Z} } -type Comparison = (a : T, b : T) -> Int +typealias Comparison = (a : T, b : T) -> Int //type Comparison = {(a : T, b : T) => Int} -type Equality = (a : T, b : T) -> Boolean +typealias Equality = (a : T, b : T) -> Boolean //type Equality = {(a : T, b : T) => Boolean} -type HashFunction = (obj : T) -> Int +typealias HashFunction = (obj : T) -> Int //type HashFunction = {(obj : T) => Int} -type Runnable = () -> Unit +typealias Runnable = () -> Unit //type Runnable = {() => ()} -type Function1 = (input : T) -> R +typealias Function1 = (input : T) -> R //type Function1 = {(input : T) => R} diff --git a/compiler/testData/psi/examples/FunctionsAndTypes.txt b/compiler/testData/psi/examples/FunctionsAndTypes.txt index 28848594c25..7eb63b4348e 100644 --- a/compiler/testData/psi/examples/FunctionsAndTypes.txt +++ b/compiler/testData/psi/examples/FunctionsAndTypes.txt @@ -2,7 +2,7 @@ JetFile: FunctionsAndTypes.kt PACKAGE_DIRECTIVE TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f1') PsiWhiteSpace(' ') @@ -29,7 +29,7 @@ JetFile: FunctionsAndTypes.kt PsiComment(EOL_COMMENT)('// type f1 = {(T) => X}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f2') PsiWhiteSpace(' ') @@ -63,7 +63,7 @@ JetFile: FunctionsAndTypes.kt PsiComment(EOL_COMMENT)('// type f2 = {(T, E) => X}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f_tuple') PsiWhiteSpace(' ') @@ -105,7 +105,7 @@ JetFile: FunctionsAndTypes.kt PsiComment(EOL_COMMENT)('//type f_tuple = {((T, E)) => X}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('hof') PsiWhiteSpace(' ') @@ -145,7 +145,7 @@ JetFile: FunctionsAndTypes.kt PsiComment(EOL_COMMENT)('//type hof = { (X) => {(T) => Y} }') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('hof2') PsiWhiteSpace(' ') @@ -199,7 +199,7 @@ JetFile: FunctionsAndTypes.kt PsiComment(EOL_COMMENT)('//type hof2 = { {(X) => Y} => {(Y) => Z} }') PsiWhiteSpace('\n\n\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('Comparison') TYPE_PARAMETER_LIST @@ -249,7 +249,7 @@ JetFile: FunctionsAndTypes.kt PsiComment(EOL_COMMENT)('//type Comparison = {(a : T, b : T) => Int}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('Equality') TYPE_PARAMETER_LIST @@ -299,7 +299,7 @@ JetFile: FunctionsAndTypes.kt PsiComment(EOL_COMMENT)('//type Equality = {(a : T, b : T) => Boolean}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('HashFunction') TYPE_PARAMETER_LIST @@ -338,7 +338,7 @@ JetFile: FunctionsAndTypes.kt PsiComment(EOL_COMMENT)('//type HashFunction = {(obj : T) => Int}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('Runnable') PsiWhiteSpace(' ') @@ -360,7 +360,7 @@ JetFile: FunctionsAndTypes.kt PsiComment(EOL_COMMENT)('//type Runnable = {() => ()}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('Function1') TYPE_PARAMETER_LIST diff --git a/compiler/testData/psi/examples/util/Comparison.kt b/compiler/testData/psi/examples/util/Comparison.kt index ad53be8f67c..114a061147a 100644 --- a/compiler/testData/psi/examples/util/Comparison.kt +++ b/compiler/testData/psi/examples/util/Comparison.kt @@ -1,4 +1,4 @@ -type Comparison = (T, T) -> Int +typealias Comparison = (T, T) -> Int fun naturalOrder>(a : T, b : T) : Int = a.compareTo(b) @@ -8,7 +8,7 @@ enum class ComparisonResult { LS; EQ; GR } -type MatchableComparison = (T, T) -> ComparisonResult +typealias MatchableComparison = (T, T) -> ComparisonResult fun asMatchableComparison(cmp : Comparison) : MatchableComparison = {(a, b) -> val res = cmp(a, b) diff --git a/compiler/testData/psi/examples/util/Comparison.txt b/compiler/testData/psi/examples/util/Comparison.txt index 1cecdfbc166..95dcd8417cd 100644 --- a/compiler/testData/psi/examples/util/Comparison.txt +++ b/compiler/testData/psi/examples/util/Comparison.txt @@ -2,7 +2,7 @@ JetFile: Comparison.kt PACKAGE_DIRECTIVE TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('Comparison') TYPE_PARAMETER_LIST @@ -231,7 +231,7 @@ JetFile: Comparison.kt PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('MatchableComparison') TYPE_PARAMETER_LIST diff --git a/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.kt b/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.kt index b71df72a9f3..d56d01b4a0d 100644 --- a/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.kt +++ b/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.kt @@ -1,12 +1,12 @@ -type f = {T.T.() : ()} -type f = {{(S).() : ()}.() : ()} -type f = {{T.() : ()}.() : ()} -type f = {{T.T.() : ()}.() : ()} -type f = {{T.T.() : ()}.() : ()} -type f = {{(S).() : ()}.() : ()} +typealias f = {T.T.() : ()} +typealias f = {{(S).() : ()}.() : ()} +typealias f = {{T.() : ()}.() : ()} +typealias f = {{T.T.() : ()}.() : ()} +typealias f = {{T.T.() : ()}.() : ()} +typealias f = {{(S).() : ()}.() : ()} -type f = [a] {[a] {(S).() : ()}.() : ()} -type f = [a] {[a] {T.() : ()}.() : ()} -type f = [a] {[a] {T.T.() : ()}.() : ()} -type f = [a] {[a] {T.T.() : ()}.() : ()} -type f = [a] {[a] {(S).() : ()}.() : ()} \ No newline at end of file +typealias f = [a] {[a] {(S).() : ()}.() : ()} +typealias f = [a] {[a] {T.() : ()}.() : ()} +typealias f = [a] {[a] {T.T.() : ()}.() : ()} +typealias f = [a] {[a] {T.T.() : ()}.() : ()} +typealias f = [a] {[a] {(S).() : ()}.() : ()} \ No newline at end of file diff --git a/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt b/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt index 73c6b136111..247348b0c54 100644 --- a/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt +++ b/compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.txt @@ -2,7 +2,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt PACKAGE_DIRECTIVE TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -65,7 +65,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -123,7 +123,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -177,7 +177,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -235,7 +235,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -316,7 +316,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -374,7 +374,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -453,7 +453,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -528,7 +528,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -607,7 +607,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') @@ -709,7 +709,7 @@ JetFile: FunctionTypesWithFunctionReceivers.kt PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF - PsiElement(type)('type') + PsiElement(typealias)('typealias') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java b/core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java index 8c9716a9ce7..779666a155a 100644 --- a/core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java +++ b/core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java @@ -27,7 +27,7 @@ public class KeywordStringsGenerated { public static final Set KEYWORDS = new HashSet(Arrays.asList( "package", "as", - "type", + "typealias", "class", "this", "super", diff --git a/grammar/src/toplevel.grm b/grammar/src/toplevel.grm index 75a01a840cd..0aec595175b 100644 --- a/grammar/src/toplevel.grm +++ b/grammar/src/toplevel.grm @@ -61,5 +61,5 @@ See [Packages](packages.html) [undocumented] typedef - : modifiers "type" SimpleName (typeParameters typeConstraints)? "=" type + : modifiers "typealias" SimpleName (typeParameters typeConstraints)? "=" type ; diff --git a/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt index 57a8024c8ec..6a39ad72bea 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt @@ -109,7 +109,7 @@ class KeywordCompletion { add(JetTokens.TRAIT_KEYWORD, inTopLevel, inClassBody, inNonClassBlock) add(JetTokens.VAL_KEYWORD, inTopLevel, inClassBody, inNonClassBlock) add(JetTokens.VAR_KEYWORD, inTopLevel, inClassBody, inNonClassBlock) - add(JetTokens.TYPE_KEYWORD, inTopLevel, inClassBody, inNonClassBlock) + add(JetTokens.TYPE_ALIAS_KEYWORD, inTopLevel, inClassBody, inNonClassBlock) add(JetTokens.IMPORT_KEYWORD, inTopLevel) add(JetTokens.PACKAGE_KEYWORD, inTopLevel) diff --git a/idea/testData/completion/keywords/InClassBeforeFun.kt b/idea/testData/completion/keywords/InClassBeforeFun.kt index acfa7f8754d..e11ad1ba696 100644 --- a/idea/testData/completion/keywords/InClassBeforeFun.kt +++ b/idea/testData/completion/keywords/InClassBeforeFun.kt @@ -49,7 +49,7 @@ public class Test { // EXIST: trait // ABSENT: true // ABSENT: try -// EXIST: type +// EXIST: typealias // EXIST: val // EXIST: var // ABSENT: vararg diff --git a/idea/testData/completion/keywords/InClassScope.kt b/idea/testData/completion/keywords/InClassScope.kt index cdb16d13a23..1c73fb2c8c3 100644 --- a/idea/testData/completion/keywords/InClassScope.kt +++ b/idea/testData/completion/keywords/InClassScope.kt @@ -44,7 +44,7 @@ class TestClass { // EXIST: trait // ABSENT: true // ABSENT: try -// EXIST: type +// EXIST: typealias // EXIST: val // EXIST: var // ABSENT: vararg diff --git a/idea/testData/completion/keywords/InFunctionScope.kt b/idea/testData/completion/keywords/InFunctionScope.kt index db7f2ca5f09..14f3acfc7d9 100644 --- a/idea/testData/completion/keywords/InFunctionScope.kt +++ b/idea/testData/completion/keywords/InFunctionScope.kt @@ -42,7 +42,7 @@ fun foo() { // EXIST: trait // EXIST: true // EXIST: try -// EXIST: type +// EXIST: typealias // EXIST: val // EXIST: var // EXIST: vararg diff --git a/idea/testData/completion/keywords/InTypeScope.kt b/idea/testData/completion/keywords/InTypeScope.kt index 084476efdd1..8d698bd4ae4 100644 --- a/idea/testData/completion/keywords/InTypeScope.kt +++ b/idea/testData/completion/keywords/InTypeScope.kt @@ -42,7 +42,7 @@ fun foo() { // EXIST: trait // EXIST: true // EXIST: try -// EXIST: type +// EXIST: typealias // EXIST: val // EXIST: var // EXIST: vararg diff --git a/idea/testData/completion/keywords/TopScope.kt b/idea/testData/completion/keywords/TopScope.kt index 07a32f340b0..975086a9c9b 100644 --- a/idea/testData/completion/keywords/TopScope.kt +++ b/idea/testData/completion/keywords/TopScope.kt @@ -41,7 +41,7 @@ // EXIST: trait // ABSENT: true // ABSENT: try -// EXIST: type +// EXIST: typealias // EXIST: val // EXIST: var // ABSENT: vararg