From dcfeea4029b586ed30ea5fa6b95a815e233e1894 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 17 Sep 2013 17:56:49 +0400 Subject: [PATCH] Removed IDE templates support from compiler. --- .../messages/AnalyzerWithCompilerReport.java | 11 - .../src/org/jetbrains/jet/JetNodeTypes.java | 2 - .../lang/diagnostics/AbstractDiagnostic.java | 1 - .../lang/parsing/JetExpressionParsing.java | 26 +- .../jet/lang/parsing/JetParsing.java | 163 ++-- .../jet/lang/psi/JetIdeTemplate.java | 45 -- .../jetbrains/jet/lang/psi/JetVisitor.java | 4 - .../jet/lang/psi/JetVisitorVoid.java | 3 - .../jet/lang/resolve/AnalyzingUtils.java | 3 - .../ExpressionTypingVisitorDispatcher.java | 5 - .../src/org/jetbrains/jet/lexer/Jet.flex | 2 - .../org/jetbrains/jet/lexer/JetTokens.java | 3 - .../org/jetbrains/jet/lexer/_JetLexer.java | 752 +++++++++--------- compiler/testData/cli/ideTemplates.kt | 41 - compiler/testData/cli/ideTemplates.out | 27 - compiler/testData/psi/IdeTemplates.jet | 42 - compiler/testData/psi/IdeTemplates.txt | 294 ------- .../org/jetbrains/jet/cli/jvm/CliTest.java | 5 - .../jetbrains/jet/parsing/JetParsingTest.java | 6 +- 19 files changed, 442 insertions(+), 993 deletions(-) delete mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIdeTemplate.java delete mode 100644 compiler/testData/cli/ideTemplates.kt delete mode 100644 compiler/testData/cli/ideTemplates.out delete mode 100644 compiler/testData/psi/IdeTemplates.jet delete mode 100644 compiler/testData/psi/IdeTemplates.txt diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java b/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java index 1af028ffdd3..681d6810e01 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java @@ -30,7 +30,6 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.*; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetIdeTemplate; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; @@ -62,9 +61,6 @@ public final class AnalyzerWithCompilerReport { @NotNull private static final DiagnosticFactory0 SYNTAX_ERROR_FACTORY = DiagnosticFactory0.create(Severity.ERROR); - @NotNull - private static final DiagnosticFactory0 UNRESOLVED_IDE_TEMPLATE_ERROR_FACTORY - = DiagnosticFactory0.create(Severity.ERROR); private boolean hasErrors = false; @NotNull @@ -201,13 +197,6 @@ public final class AnalyzerWithCompilerReport { hasErrors = true; } - @Override - public void visitIdeTemplate(JetIdeTemplate expression) { - String placeholderText = expression.getPlaceholderText(); - reportDiagnostic(expression, UNRESOLVED_IDE_TEMPLATE_ERROR_FACTORY, - "Unresolved IDE template" + (StringUtil.isEmpty(placeholderText) ? "" : ": " + placeholderText)); - } - @Override public void visitErrorElement(PsiErrorElement element) { String description = element.getErrorDescription(); diff --git a/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java b/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java index e38fe393858..3a87496d899 100644 --- a/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java +++ b/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java @@ -148,8 +148,6 @@ public interface JetNodeTypes { JetNodeType NAMESPACE_HEADER = new JetNodeType("NAMESPACE_HEADER", JetNamespaceHeader.class); JetNodeType SCRIPT = new JetNodeType("SCRIPT", JetScript.class); - JetNodeType IDE_TEMPLATE_EXPRESSION = new JetNodeType("IDE_TEMPLATE_EXPRESSION", JetIdeTemplate.class); - IFileElementType TYPE_CODE_FRAGMENT = new JetTypeCodeFragmentType(); IFileElementType EXPRESSION_CODE_FRAGMENT = new JetExpressionCodeFragmentType(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnostic.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnostic.java index ab26aa0d0ea..698c71c13ee 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnostic.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/AbstractDiagnostic.java @@ -71,7 +71,6 @@ public abstract class AbstractDiagnostic implements Parame @Override public boolean isValid() { if (!getFactory().isValid(this)) return false; - if (psiElement.getNode().findChildByType(JetNodeTypes.IDE_TEMPLATE_EXPRESSION) != null) return false; return true; } } 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 691836bc753..435fcab80fc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java @@ -106,8 +106,7 @@ public class JetExpressionParsing extends AbstractJetParsing { IDENTIFIER, // SimpleName FIELD_IDENTIFIER, // Field reference - PACKAGE_KEYWORD, // for absolute qualified names - IDE_TEMPLATE_START + PACKAGE_KEYWORD // for absolute qualified names ); private static final TokenSet STATEMENT_FIRST = TokenSet.orSet( @@ -125,7 +124,7 @@ public class JetExpressionParsing extends AbstractJetParsing { ); /*package*/ static final TokenSet EXPRESSION_FOLLOW = TokenSet.create( - SEMICOLON, ARROW, COMMA, RBRACE, RPAR, RBRACKET, IDE_TEMPLATE_END + SEMICOLON, ARROW, COMMA, RBRACE, RPAR, RBRACKET ); @SuppressWarnings({"UnusedDeclaration"}) @@ -532,9 +531,6 @@ public class JetExpressionParsing extends AbstractJetParsing { if (at(LPAR)) { parseParenthesizedExpression(); } - else if (at(IDE_TEMPLATE_START)) { - myJetParsing.parseIdeTemplate(); - } else if (at(HASH)) { parseTupleExpression(); } @@ -820,14 +816,13 @@ public class JetExpressionParsing extends AbstractJetParsing { * : whenCondition{","} "->" element SEMI */ private void parseWhenEntryNotElse() { - if (!myJetParsing.parseIdeTemplate()) { - while (true) { - while (at(COMMA)) errorAndAdvance("Expecting a when-condition"); - parseWhenCondition(); - if (!at(COMMA)) break; - advance(); // COMMA - } + while (true) { + while (at(COMMA)) errorAndAdvance("Expecting a when-condition"); + parseWhenCondition(); + if (!at(COMMA)) break; + advance(); // COMMA } + expect(ARROW, "Expecting '->' or 'when'", WHEN_CONDITION_RECOVERY_SET); if (atSet(WHEN_CONDITION_RECOVERY_SET)) { error("Expecting an element"); @@ -1359,9 +1354,8 @@ public class JetExpressionParsing extends AbstractJetParsing { parameter.done(MULTI_VARIABLE_DECLARATION); } else { - if (!myJetParsing.parseIdeTemplate()) { - expect(IDENTIFIER, "Expecting a variable name", TokenSet.create(COLON)); - } + expect(IDENTIFIER, "Expecting a variable name", TokenSet.create(COLON)); + if (at(COLON)) { advance(); // COLON myJetParsing.parseTypeRef(TokenSet.create(IN_KEYWORD)); 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 a56cd115ef9..b5392ef28f7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java @@ -465,9 +465,7 @@ public class JetParsing extends AbstractJetParsing { assert _atSet(CLASS_KEYWORD, TRAIT_KEYWORD); advance(); // CLASS_KEYWORD or TRAIT_KEYWORD - if (!parseIdeTemplate()) { - expect(IDENTIFIER, "Class name expected", CLASS_NAME_RECOVERY_SET); - } + expect(IDENTIFIER, "Class name expected", CLASS_NAME_RECOVERY_SET); boolean typeParametersDeclared = parseTypeParameterList(TYPE_PARAMETER_GT_RECOVERY_SET); PsiBuilder.Marker beforeConstructorModifiers = mark(); @@ -525,31 +523,29 @@ public class JetParsing extends AbstractJetParsing { myBuilder.enableNewlines(); advance(); // LBRACE - if (!parseIdeTemplate()) { - while (!eof() && !at(RBRACE)) { - PsiBuilder.Marker entryOrMember = mark(); + while (!eof() && !at(RBRACE)) { + PsiBuilder.Marker entryOrMember = mark(); - TokenSet constructorNameFollow = TokenSet.create(SEMICOLON, COLON, LPAR, LT, LBRACE); - int lastId = findLastBefore(ENUM_MEMBER_FIRST, constructorNameFollow, false); - TokenDetector enumDetector = new TokenDetector(ENUM_KEYWORD); - createTruncatedBuilder(lastId).parseModifierList(MODIFIER_LIST, enumDetector, false); + TokenSet constructorNameFollow = TokenSet.create(SEMICOLON, COLON, LPAR, LT, LBRACE); + int lastId = findLastBefore(ENUM_MEMBER_FIRST, constructorNameFollow, false); + TokenDetector enumDetector = new TokenDetector(ENUM_KEYWORD); + createTruncatedBuilder(lastId).parseModifierList(MODIFIER_LIST, enumDetector, false); - IElementType type; - if (at(IDENTIFIER)) { - parseEnumEntry(); - type = ENUM_ENTRY; - } - else { - type = parseMemberDeclarationRest(enumDetector.isDetected()); - } + IElementType type; + if (at(IDENTIFIER)) { + parseEnumEntry(); + type = ENUM_ENTRY; + } + else { + type = parseMemberDeclarationRest(enumDetector.isDetected()); + } - if (type == null) { - errorAndAdvance("Expecting an enum entry or member declaration"); - entryOrMember.drop(); - } - else { - entryOrMember.done(type); - } + if (type == null) { + errorAndAdvance("Expecting an enum entry or member declaration"); + entryOrMember.drop(); + } + else { + entryOrMember.done(type); } } @@ -595,13 +591,11 @@ public class JetParsing extends AbstractJetParsing { myBuilder.enableNewlines(); expect(LBRACE, "Expecting a class body", TokenSet.create(LBRACE)); - if (!parseIdeTemplate()) { - while (!eof()) { - if (at(RBRACE)) { - break; - } - parseMemberDeclaration(); + while (!eof()) { + if (at(RBRACE)) { + break; } + parseMemberDeclaration(); } expect(RBRACE, "Missing '}"); myBuilder.restoreNewlinesState(); @@ -689,9 +683,7 @@ public class JetParsing extends AbstractJetParsing { if (named) { PsiBuilder.Marker propertyDeclaration = mark(); - if (!parseIdeTemplate()) { - expect(IDENTIFIER, "Expecting object name", TokenSet.create(LBRACE)); - } + expect(IDENTIFIER, "Expecting object name", TokenSet.create(LBRACE)); propertyDeclaration.done(OBJECT_DECLARATION_NAME); } else { @@ -879,9 +871,7 @@ public class JetParsing extends AbstractJetParsing { if (at(COLON)) { PsiBuilder.Marker type = mark(); advance(); // COLON - if (!parseIdeTemplate()) { - parseTypeRef(); - } + parseTypeRef(); errorIf(type, multiDeclaration, "Type annotations are not allowed on multi-declarations"); } @@ -1097,9 +1087,7 @@ public class JetParsing extends AbstractJetParsing { if (at(COLON)) { advance(); // COLON - if (!parseIdeTemplate()) { - parseTypeRef(); - } + parseTypeRef(); } parseTypeConstraintsGuarded(typeParameterListOccurred); @@ -1122,20 +1110,14 @@ public class JetParsing extends AbstractJetParsing { parseAnnotations(false); } else { - if (parseIdeTemplate()) { - expect(DOT, "Expecting '.' after receiver template"); + createTruncatedBuilder(lastDot).parseTypeRef(); + + if (atSet(RECEIVER_TYPE_TERMINATORS)) { + advance(); // expectation } else { - createTruncatedBuilder(lastDot).parseTypeRef(); - - if (atSet(RECEIVER_TYPE_TERMINATORS)) { - advance(); // expectation - } - else { - errorWithRecovery("Expecting '.' before a " + title + " name", nameFollow); - } + errorWithRecovery("Expecting '.' before a " + title + " name", nameFollow); } - } } @@ -1144,14 +1126,10 @@ public class JetParsing extends AbstractJetParsing { */ private void parseFunctionOrPropertyName(boolean receiverFound, String title, TokenSet nameFollow) { if (!receiverFound) { - if (!parseIdeTemplate()) { - expect(IDENTIFIER, "Expecting " + title + " name or receiver type", nameFollow); - } + expect(IDENTIFIER, "Expecting " + title + " name or receiver type", nameFollow); } else { - if (!parseIdeTemplate()) { - expect(IDENTIFIER, "Expecting " + title + " name", nameFollow); - } + expect(IDENTIFIER, "Expecting " + title + " name", nameFollow); } } @@ -1702,32 +1680,30 @@ public class JetParsing extends AbstractJetParsing { myBuilder.disableNewlines(); advance(); // LPAR - if (!parseIdeTemplate()) { - if (!at(RPAR) && !atSet(recoverySet)) { - while (true) { - if (at(COMMA)) { - errorAndAdvance("Expecting a parameter declaration"); - } - else if (at(RPAR)) { - error("Expecting a parameter declaration"); - break; - } - if (isFunctionTypeContents) { - if (!tryParseValueParameter()) { - PsiBuilder.Marker valueParameter = mark(); - parseModifierList(MODIFIER_LIST, false); // lazy, out, ref - parseTypeRef(); - valueParameter.done(VALUE_PARAMETER); - } - } - else { - parseValueParameter(); - } - if (at(COMMA)) { - advance(); // COMMA - } - else if (!atSet(VALUE_PARAMETER_FIRST)) break; + if (!at(RPAR) && !atSet(recoverySet)) { + while (true) { + if (at(COMMA)) { + errorAndAdvance("Expecting a parameter declaration"); } + else if (at(RPAR)) { + error("Expecting a parameter declaration"); + break; + } + if (isFunctionTypeContents) { + if (!tryParseValueParameter()) { + PsiBuilder.Marker valueParameter = mark(); + parseModifierList(MODIFIER_LIST, false); // lazy, out, ref + parseTypeRef(); + valueParameter.done(VALUE_PARAMETER); + } + } + else { + parseValueParameter(); + } + if (at(COMMA)) { + advance(); // COMMA + } + else if (!atSet(VALUE_PARAMETER_FIRST)) break; } } @@ -1803,29 +1779,6 @@ public class JetParsing extends AbstractJetParsing { return noErrors; } - /* - * "<#<" expression ">#>" - */ - boolean parseIdeTemplate() { - @Nullable JetNodeType nodeType = IDE_TEMPLATE_EXPRESSION; - if (at(IDE_TEMPLATE_START)) { - PsiBuilder.Marker mark = null; - if (nodeType != null) { - mark = mark(); - } - advance(); - expect(IDENTIFIER, "Expecting identifier inside template"); - expect(IDE_TEMPLATE_END, "Expecting IDE template end after identifier"); - if (nodeType != null) { - mark.done(nodeType); - } - return true; - } - else { - return false; - } - } - @Override protected JetParsing create(SemanticWhitespaceAwarePsiBuilder builder) { return createForTopLevel(builder); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIdeTemplate.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIdeTemplate.java deleted file mode 100644 index 80929738f72..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIdeTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2010-2013 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. - */ - -package org.jetbrains.jet.lang.psi; - -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lexer.JetTokens; - -public class JetIdeTemplate extends JetElementImpl { - public JetIdeTemplate(@NotNull ASTNode node) { - super(node); - } - - @Override - public void accept(@NotNull JetVisitorVoid visitor) { - visitor.visitIdeTemplate(this); - } - - @Override - public R accept(@NotNull JetVisitor visitor, D data) { - return visitor.visitIdeTemplate(this, data); - } - - @Nullable - public String getPlaceholderText() { - PsiElement idElement = findChildByType(JetTokens.IDENTIFIER); - return idElement == null ? null : idElement.getText(); - } -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java index 7c6058ef924..1fdfdaee25c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java @@ -273,10 +273,6 @@ public class JetVisitor extends PsiElementVisitor { return visitExpression(expression, data); } - public R visitIdeTemplate(JetIdeTemplate expression, D data) { - return null; - } - public R visitCatchSection(JetCatchClause catchClause, D data) { return visitJetElement(catchClause, data); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java index 1e33c5279dc..3005dc33124 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java @@ -263,9 +263,6 @@ public class JetVisitorVoid extends PsiElementVisitor { visitExpression(expression); } - public void visitIdeTemplate(JetIdeTemplate expression) { - } - public void visitCatchSection(JetCatchClause catchClause) { visitJetElement(catchClause); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java index 2d20763857d..beddfd96fd6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java @@ -17,16 +17,13 @@ package org.jetbrains.jet.lang.resolve; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; import com.intellij.psi.PsiErrorElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticHolder; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; -import org.jetbrains.jet.lang.psi.JetIdeTemplate; import org.jetbrains.jet.lang.psi.JetTreeVisitorVoid; -import org.jetbrains.jet.lang.psi.JetVisitorVoid; import java.util.ArrayList; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java index 0c9a22f237e..ad20dad21a0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java @@ -33,11 +33,6 @@ import static org.jetbrains.jet.lang.diagnostics.Errors.TYPECHECKER_HAS_RUN_INTO public class ExpressionTypingVisitorDispatcher extends JetVisitor implements ExpressionTypingInternals { - @Override - public JetTypeInfo visitIdeTemplate(JetIdeTemplate expression, ExpressionTypingContext data) { - return basic.visitIdeTemplate(expression, data); - } - @NotNull public static ExpressionTypingFacade create(@NotNull PlatformToKotlinClassMap platformToKotlinClassMap) { return new ExpressionTypingVisitorDispatcher(platformToKotlinClassMap, null); diff --git a/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex b/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex index c554d75238b..91d7687f703 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex +++ b/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex @@ -268,8 +268,6 @@ LONG_TEMPLATE_ENTRY_END=\} \!in{IDENTIFIER_PART} { yypushback(3); return JetTokens.EXCL; } \!is{IDENTIFIER_PART} { yypushback(3); return JetTokens.EXCL; } -"<#<" { return JetTokens.IDE_TEMPLATE_START ; } -">#>" { return JetTokens.IDE_TEMPLATE_END ; } "===" { return JetTokens.EQEQEQ ; } "!==" { return JetTokens.EXCLEQEQEQ; } "!in" { return JetTokens.NOT_IN; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java b/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java index 0093a8ac51c..54ce12d59b9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java +++ b/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java @@ -132,9 +132,6 @@ public interface JetTokens { JetToken AT = new JetToken("AT"); JetToken ATAT = new JetToken("ATAT"); - JetToken IDE_TEMPLATE_START = new JetToken("IDE_TEMPLATE_START"); - JetToken IDE_TEMPLATE_END = new JetToken("IDE_TEMPLATE_END"); - TokenSet LABELS = TokenSet.create(AT, ATAT, LABEL_IDENTIFIER); JetToken COMMA = new JetToken("COMMA"); diff --git a/compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java b/compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java index 3cdd6255b6e..991044b3511 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java @@ -1,18 +1,21 @@ -/* The following code was generated by JFlex 1.4.3 on 25.05.13 15:08 */ +/* The following code was generated by JFlex 1.4.3 on 9/13/13 12:54 AM */ package org.jetbrains.jet.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.jet.lexer.JetTokens; + /** * This class is a scanner generated by * JFlex 1.4.3 - * on 25.05.13 15:08 from the specification file - * /Users/factitious/Documents/kotlin/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex + * on 9/13/13 12:54 AM from the specification file + * /Users/geevee/kotlin/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex */ class _JetLexer implements FlexLexer { /** initial size of the lookahead buffer */ @@ -42,8 +45,8 @@ class _JetLexer implements FlexLexer { */ private static final String ZZ_CMAP_PACKED = "\11\0\1\3\1\7\1\0\1\3\23\0\1\3\1\14\1\26\1\13"+ - "\1\10\1\70\1\66\1\24\1\74\1\75\1\36\1\65\1\77\1\22"+ - "\1\20\1\12\1\15\11\1\1\71\1\76\1\61\1\63\1\62\1\64"+ + "\1\10\1\70\1\66\1\24\1\74\1\75\1\36\1\63\1\77\1\22"+ + "\1\20\1\12\1\15\11\1\1\71\1\76\1\64\1\61\1\65\1\62"+ "\1\11\1\2\1\17\2\2\1\21\1\2\11\4\1\23\3\4\1\56"+ "\3\4\1\16\2\4\1\72\1\25\1\73\1\0\1\4\1\6\1\44"+ "\1\50\1\37\1\60\1\42\1\54\1\46\1\33\1\34\1\51\1\45"+ @@ -129,21 +132,20 @@ class _JetLexer implements FlexLexer { "\1\0\1\45\1\0\1\46\1\0\1\47\1\50\1\51"+ "\1\52\1\53\1\0\1\54\1\44\2\2\1\44\1\55"+ "\1\56\1\57\1\60\2\13\1\0\3\3\1\61\1\62"+ - "\1\63\1\3\1\64\6\3\1\65\10\3\1\66\1\0"+ - "\1\67\1\0\1\70\1\71\1\72\1\73\1\74\1\75"+ - "\1\76\1\77\1\100\1\101\1\0\1\102\2\103\2\0"+ - "\1\40\1\104\1\105\1\106\1\44\1\3\2\0\1\107"+ - "\1\110\1\111\1\112\4\0\1\113\4\3\1\114\10\3"+ - "\1\115\4\3\1\116\1\117\2\3\1\120\1\121\1\122"+ - "\1\123\1\124\2\0\2\40\1\45\1\46\1\125\1\126"+ - "\1\44\1\0\1\127\1\3\1\130\1\3\1\131\4\3"+ - "\1\132\1\133\4\3\1\134\1\3\1\135\1\101\1\0"+ - "\1\136\1\137\1\140\1\141\1\3\1\142\3\3\1\143"+ - "\1\144\1\145\1\0\1\3\1\146\1\3\1\147\1\3"+ - "\1\150\1\151"; + "\1\63\1\3\1\64\6\3\1\65\10\3\1\66\1\67"+ + "\1\70\1\71\1\72\1\73\1\74\1\75\1\76\1\77"+ + "\1\100\1\101\1\0\1\102\2\103\2\0\1\40\1\104"+ + "\1\105\1\106\1\44\1\3\2\0\1\107\1\110\1\111"+ + "\1\112\4\0\1\113\4\3\1\114\10\3\1\115\4\3"+ + "\1\116\1\117\2\3\1\120\1\121\1\122\2\0\2\40"+ + "\1\45\1\46\1\123\1\124\1\44\1\0\1\125\1\3"+ + "\1\126\1\3\1\127\4\3\1\130\1\131\4\3\1\132"+ + "\1\3\1\133\1\101\1\0\1\134\1\135\1\136\1\137"+ + "\1\3\1\140\3\3\1\141\1\142\1\143\1\0\1\3"+ + "\1\144\1\3\1\145\1\3\1\146\1\147"; private static int [] zzUnpackAction() { - int [] result = new int[232]; + int [] result = new int[228]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -173,7 +175,7 @@ class _JetLexer implements FlexLexer { "\0\u0400\0\u0440\0\u0480\0\u04c0\0\u0500\0\u0180\0\u0180\0\u0540"+ "\0\u0580\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\u0980\0\u09c0\0\u0a00\0\u0180\0\u0a40\0\u0a80\0\u0ac0\0\u0b00"+ + "\0\u0980\0\u0180\0\u09c0\0\u0a00\0\u0a40\0\u0a80\0\u0ac0\0\u0b00"+ "\0\u0b40\0\u0180\0\u0180\0\u0180\0\u0180\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"+ @@ -183,23 +185,23 @@ class _JetLexer implements FlexLexer { "\0\u1280\0\u12c0\0\u0200\0\u0200\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\u0180\0\u1740\0\u0180\0\u0180\0\u1780\0\u0180\0\u0180\0\u0180"+ - "\0\u0180\0\u0180\0\u0180\0\u17c0\0\u1800\0\u0180\0\u0180\0\u1840"+ - "\0\u1880\0\u18c0\0\u1900\0\u0180\0\u0180\0\u0180\0\u1940\0\u0180"+ - "\0\u1980\0\u19c0\0\u1a00\0\u1a40\0\u1a40\0\u0180\0\u1a80\0\u1ac0"+ - "\0\u1b00\0\u1b40\0\u0180\0\u1b80\0\u1bc0\0\u1c00\0\u1c40\0\u0200"+ - "\0\u1c80\0\u1cc0\0\u1d00\0\u1d40\0\u1d80\0\u1dc0\0\u1e00\0\u1e40"+ - "\0\u0180\0\u1e80\0\u1ec0\0\u1f00\0\u1f40\0\u0200\0\u0200\0\u1f80"+ - "\0\u1fc0\0\u0200\0\u0200\0\u0180\0\u0180\0\u0180\0\u2000\0\u2040"+ - "\0\u0180\0\u2080\0\u0180\0\u0180\0\u0180\0\u0180\0\u20c0\0\u1940"+ - "\0\u0200\0\u2100\0\u0200\0\u2140\0\u0200\0\u2180\0\u21c0\0\u2200"+ - "\0\u2240\0\u0200\0\u0200\0\u2280\0\u22c0\0\u2300\0\u2340\0\u0200"+ - "\0\u2380\0\u0200\0\u0180\0\u23c0\0\u0c80\0\u0200\0\u0200\0\u0200"+ - "\0\u2400\0\u0200\0\u2440\0\u2480\0\u24c0\0\u0200\0\u0200\0\u0200"+ - "\0\u2500\0\u2540\0\u0200\0\u2580\0\u0200\0\u25c0\0\u0200\0\u0200"; + "\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180\0\u0180"+ + "\0\u0180\0\u1740\0\u1780\0\u0180\0\u0180\0\u17c0\0\u1800\0\u1840"+ + "\0\u1880\0\u0180\0\u0180\0\u0180\0\u18c0\0\u0180\0\u1900\0\u1940"+ + "\0\u1980\0\u19c0\0\u19c0\0\u0180\0\u1a00\0\u1a40\0\u1a80\0\u1ac0"+ + "\0\u0180\0\u1b00\0\u1b40\0\u1b80\0\u1bc0\0\u0200\0\u1c00\0\u1c40"+ + "\0\u1c80\0\u1cc0\0\u1d00\0\u1d40\0\u1d80\0\u1dc0\0\u0180\0\u1e00"+ + "\0\u1e40\0\u1e80\0\u1ec0\0\u0200\0\u0200\0\u1f00\0\u1f40\0\u0200"+ + "\0\u0200\0\u0180\0\u1f80\0\u1fc0\0\u0180\0\u2000\0\u0180\0\u0180"+ + "\0\u0180\0\u0180\0\u2040\0\u18c0\0\u0200\0\u2080\0\u0200\0\u20c0"+ + "\0\u0200\0\u2100\0\u2140\0\u2180\0\u21c0\0\u0200\0\u0200\0\u2200"+ + "\0\u2240\0\u2280\0\u22c0\0\u0200\0\u2300\0\u0200\0\u0180\0\u2340"+ + "\0\u0c80\0\u0200\0\u0200\0\u0200\0\u2380\0\u0200\0\u23c0\0\u2400"+ + "\0\u2440\0\u0200\0\u0200\0\u0200\0\u2480\0\u24c0\0\u0200\0\u2500"+ + "\0\u0200\0\u2540\0\u0200\0\u0200"; private static int [] zzUnpackRowMap() { - int [] result = new int[232]; + int [] result = new int[228]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -251,233 +253,232 @@ class _JetLexer implements FlexLexer { "\1\112\2\0\4\112\1\0\22\112\21\0\1\114\1\0"+ "\1\114\1\0\1\115\2\0\1\116\4\0\2\114\1\0"+ "\1\114\1\0\1\114\3\0\1\114\2\0\4\114\1\0"+ - "\22\114\31\0\1\117\23\0\1\120\24\0\1\121\30\0"+ - "\1\122\117\0\1\123\26\0\1\124\15\0\1\125\13\0"+ + "\22\114\31\0\1\117\23\0\1\120\22\0\1\121\32\0"+ + "\1\122\117\0\1\123\24\0\1\124\17\0\1\125\13\0"+ "\1\125\1\126\1\127\1\107\1\110\20\0\1\110\5\0"+ "\1\127\30\0\1\130\13\0\1\130\2\0\1\131\101\0"+ - "\1\132\37\0\1\133\1\134\14\0\7\24\1\0\14\24"+ - "\1\135\1\136\52\24\26\0\1\137\52\0\2\11\1\0"+ - "\2\11\7\0\3\11\1\0\1\11\1\0\1\11\3\0"+ - "\1\11\2\0\1\11\1\140\2\11\1\0\10\11\1\141"+ - "\5\11\1\142\3\11\20\0\2\11\1\0\2\11\7\0"+ - "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\3\11\1\143\1\0\2\11\1\144\12\11\1\145\4\11"+ - "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\146\2\0\4\11\1\0\22\11"+ - "\102\0\1\147\15\0\2\11\1\0\2\11\7\0\3\11"+ - "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ - "\1\0\1\11\1\150\12\11\1\151\5\11\20\0\2\11"+ + "\1\132\36\0\1\133\3\0\1\134\12\0\7\24\1\0"+ + "\14\24\1\135\1\136\52\24\26\0\1\137\52\0\2\11"+ "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\4\11\1\0\11\11\1\152\10\11"+ - "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\153\2\0\4\11\1\0\22\11"+ - "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\14\11"+ - "\1\154\5\11\20\0\2\11\1\0\2\11\7\0\3\11"+ - "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ - "\1\0\5\11\1\155\14\11\20\0\2\11\1\0\2\11"+ + "\3\0\1\11\2\0\1\11\1\140\2\11\1\0\10\11"+ + "\1\141\5\11\1\142\3\11\20\0\2\11\1\0\2\11"+ "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\3\11\1\156\1\0\22\11\20\0\2\11\1\0"+ - "\2\11\7\0\3\11\1\0\1\11\1\0\1\11\3\0"+ - "\1\11\2\0\4\11\1\0\3\11\1\157\16\11\20\0"+ + "\2\0\3\11\1\143\1\0\2\11\1\144\12\11\1\145"+ + "\4\11\20\0\2\11\1\0\2\11\7\0\3\11\1\0"+ + "\1\11\1\0\1\11\3\0\1\146\2\0\4\11\1\0"+ + "\22\11\100\0\1\147\17\0\2\11\1\0\2\11\7\0"+ + "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ + "\4\11\1\0\1\11\1\150\12\11\1\151\5\11\20\0"+ "\2\11\1\0\2\11\7\0\3\11\1\0\1\11\1\0"+ - "\1\11\3\0\1\11\2\0\4\11\1\0\10\11\1\160"+ - "\11\11\20\0\2\11\1\0\2\11\7\0\3\11\1\0"+ - "\1\11\1\0\1\11\3\0\1\11\2\0\1\11\1\161"+ - "\2\11\1\0\22\11\20\0\2\11\1\0\2\11\7\0"+ - "\3\11\1\0\1\11\1\0\1\11\3\0\1\162\2\0"+ - "\4\11\1\0\1\11\1\163\3\11\1\164\14\11\20\0"+ - "\2\11\1\0\2\11\7\0\3\11\1\0\1\11\1\0"+ - "\1\11\3\0\1\11\2\0\1\11\1\165\2\11\1\0"+ + "\1\11\3\0\1\11\2\0\4\11\1\0\11\11\1\152"+ + "\10\11\20\0\2\11\1\0\2\11\7\0\3\11\1\0"+ + "\1\11\1\0\1\11\3\0\1\153\2\0\4\11\1\0"+ "\22\11\20\0\2\11\1\0\2\11\7\0\3\11\1\0"+ "\1\11\1\0\1\11\3\0\1\11\2\0\4\11\1\0"+ - "\5\11\1\166\14\11\20\0\2\11\1\0\2\11\7\0"+ + "\14\11\1\154\5\11\20\0\2\11\1\0\2\11\7\0"+ "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\4\11\1\0\1\11\1\167\20\11\32\0\1\170\47\0"+ - "\1\171\27\0\1\172\47\0\1\173\76\0\1\174\1\175"+ - "\77\0\1\176\1\0\1\177\100\0\1\200\100\0\1\201"+ - "\73\0\1\202\105\0\1\203\6\0\7\70\2\0\14\70"+ - "\2\0\51\70\2\0\1\204\1\0\1\204\1\0\1\205"+ - "\7\0\2\204\1\0\1\204\1\0\1\204\3\0\1\204"+ - "\1\206\1\0\4\204\1\0\22\204\17\0\7\207\1\0"+ - "\17\207\1\210\50\207\26\0\1\211\52\0\2\77\1\0"+ - "\2\77\7\0\3\77\1\0\1\77\1\0\1\77\3\0"+ - "\1\77\2\0\4\77\1\0\22\77\17\0\6\212\2\0"+ - "\70\212\1\0\2\77\1\0\2\77\7\0\3\77\1\0"+ - "\1\77\1\0\1\77\3\0\1\77\2\0\1\77\1\213"+ - "\2\77\1\0\22\77\55\0\1\214\53\0\1\215\66\0"+ - "\1\130\13\0\1\130\2\0\1\216\60\0\1\217\13\0"+ - "\1\217\4\0\1\217\42\0\1\217\12\0\6\111\1\220"+ - "\1\0\70\111\1\0\2\112\1\0\2\112\7\0\3\112"+ - "\1\0\1\112\1\0\1\112\3\0\1\112\2\0\4\112"+ - "\1\0\22\112\17\0\6\221\2\0\70\221\1\0\2\114"+ - "\1\0\2\114\7\0\3\114\1\0\1\114\1\0\1\114"+ - "\3\0\1\114\2\0\4\114\1\0\22\114\17\0\6\222"+ - "\2\0\70\222\7\117\1\0\70\117\36\0\1\223\41\0"+ - "\7\122\1\0\70\122\35\0\1\224\3\0\1\225\121\0"+ - "\1\226\15\0\1\125\13\0\1\125\2\0\1\227\1\110"+ - "\20\0\1\110\36\0\2\126\12\0\1\126\1\0\1\126"+ - "\1\230\1\126\1\0\1\231\13\0\1\126\2\0\1\126"+ - "\1\231\1\126\3\0\1\126\3\0\1\126\3\0\1\126"+ - "\20\0\1\127\13\0\1\127\2\0\1\232\60\0\1\130"+ - "\13\0\1\130\3\0\1\110\20\0\1\110\35\0\7\24"+ - "\1\0\70\24\26\0\1\233\52\0\2\11\1\0\2\11"+ - "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\2\11\1\234\1\11\1\0\10\11\1\235\11\11"+ - "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\236\2\0\4\11\1\0\5\11"+ - "\1\237\10\11\1\240\3\11\20\0\2\11\1\0\2\11"+ - "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\4\11\1\0\4\11\1\241\15\11\20\0\2\11"+ + "\4\11\1\0\5\11\1\155\14\11\20\0\2\11\1\0"+ + "\2\11\7\0\3\11\1\0\1\11\1\0\1\11\3\0"+ + "\1\11\2\0\3\11\1\156\1\0\22\11\20\0\2\11"+ "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\4\11\1\0\4\11\1\242\15\11"+ + "\3\0\1\11\2\0\4\11\1\0\3\11\1\157\16\11"+ "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\2\11"+ - "\1\243\17\11\20\0\2\11\1\0\2\11\7\0\3\11"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\10\11"+ + "\1\160\11\11\20\0\2\11\1\0\2\11\7\0\3\11"+ + "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\1\11"+ + "\1\161\2\11\1\0\22\11\20\0\2\11\1\0\2\11"+ + "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\162"+ + "\2\0\4\11\1\0\1\11\1\163\3\11\1\164\14\11"+ + "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ + "\1\0\1\11\3\0\1\11\2\0\1\11\1\165\2\11"+ + "\1\0\22\11\20\0\2\11\1\0\2\11\7\0\3\11"+ "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ - "\1\0\5\11\1\244\14\11\20\0\2\11\1\0\2\11"+ + "\1\0\5\11\1\166\14\11\20\0\2\11\1\0\2\11"+ "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\4\11\1\0\12\11\1\245\7\11\20\0\2\11"+ + "\2\0\4\11\1\0\1\11\1\167\20\11\100\0\1\170"+ + "\3\0\1\171\73\0\1\172\1\0\1\173\75\0\1\174"+ + "\77\0\1\175\104\0\1\176\100\0\1\177\71\0\1\200"+ + "\107\0\1\201\6\0\7\70\2\0\14\70\2\0\51\70"+ + "\2\0\1\202\1\0\1\202\1\0\1\203\7\0\2\202"+ + "\1\0\1\202\1\0\1\202\3\0\1\202\1\204\1\0"+ + "\4\202\1\0\22\202\17\0\7\205\1\0\17\205\1\206"+ + "\50\205\26\0\1\207\52\0\2\77\1\0\2\77\7\0"+ + "\3\77\1\0\1\77\1\0\1\77\3\0\1\77\2\0"+ + "\4\77\1\0\22\77\17\0\6\210\2\0\70\210\1\0"+ + "\2\77\1\0\2\77\7\0\3\77\1\0\1\77\1\0"+ + "\1\77\3\0\1\77\2\0\1\77\1\211\2\77\1\0"+ + "\22\77\55\0\1\212\53\0\1\213\66\0\1\130\13\0"+ + "\1\130\2\0\1\214\60\0\1\215\13\0\1\215\4\0"+ + "\1\215\40\0\1\215\14\0\6\111\1\216\1\0\70\111"+ + "\1\0\2\112\1\0\2\112\7\0\3\112\1\0\1\112"+ + "\1\0\1\112\3\0\1\112\2\0\4\112\1\0\22\112"+ + "\17\0\6\217\2\0\70\217\1\0\2\114\1\0\2\114"+ + "\7\0\3\114\1\0\1\114\1\0\1\114\3\0\1\114"+ + "\2\0\4\114\1\0\22\114\17\0\6\220\2\0\70\220"+ + "\7\117\1\0\70\117\36\0\1\221\41\0\7\122\1\0"+ + "\70\122\35\0\1\222\3\0\1\223\117\0\1\224\17\0"+ + "\1\125\13\0\1\125\2\0\1\225\1\110\20\0\1\110"+ + "\36\0\2\126\12\0\1\126\1\0\1\126\1\226\1\126"+ + "\1\0\1\227\13\0\1\126\2\0\1\126\1\227\1\126"+ + "\3\0\1\126\3\0\1\126\3\0\1\126\20\0\1\127"+ + "\13\0\1\127\2\0\1\230\60\0\1\130\13\0\1\130"+ + "\3\0\1\110\20\0\1\110\35\0\7\24\1\0\70\24"+ + "\26\0\1\231\52\0\2\11\1\0\2\11\7\0\3\11"+ + "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\2\11"+ + "\1\232\1\11\1\0\10\11\1\233\11\11\20\0\2\11"+ "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\4\11\1\0\14\11\1\246\5\11"+ + "\3\0\1\234\2\0\4\11\1\0\5\11\1\235\10\11"+ + "\1\236\3\11\20\0\2\11\1\0\2\11\7\0\3\11"+ + "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ + "\1\0\4\11\1\237\15\11\20\0\2\11\1\0\2\11"+ + "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ + "\2\0\4\11\1\0\4\11\1\240\15\11\20\0\2\11"+ + "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ + "\3\0\1\11\2\0\4\11\1\0\2\11\1\241\17\11"+ "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\11\2\0\3\11\1\247\1\0"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\5\11"+ + "\1\242\14\11\20\0\2\11\1\0\2\11\7\0\3\11"+ + "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ + "\1\0\12\11\1\243\7\11\20\0\2\11\1\0\2\11"+ + "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ + "\2\0\4\11\1\0\14\11\1\244\5\11\20\0\2\11"+ + "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ + "\3\0\1\11\2\0\3\11\1\245\1\0\22\11\20\0"+ + "\2\11\1\0\2\11\7\0\3\11\1\0\1\11\1\0"+ + "\1\11\3\0\1\11\2\0\4\11\1\0\1\246\21\11"+ + "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\22\11"+ + "\1\0\1\247\16\0\2\11\1\0\2\11\7\0\3\11"+ + "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\1\250"+ + "\3\11\1\0\22\11\20\0\2\11\1\0\2\11\7\0"+ + "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ + "\4\11\1\0\3\11\1\251\16\11\20\0\2\11\1\0"+ + "\2\11\7\0\3\11\1\0\1\11\1\0\1\11\3\0"+ + "\1\11\2\0\2\11\1\252\1\11\1\0\3\11\1\253"+ + "\16\11\20\0\2\11\1\0\2\11\7\0\3\11\1\0"+ + "\1\11\1\0\1\11\3\0\1\11\2\0\4\11\1\0"+ + "\2\11\1\254\17\11\20\0\2\11\1\0\2\11\7\0"+ + "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ + "\4\11\1\0\10\11\1\255\11\11\20\0\2\11\1\0"+ + "\2\11\7\0\3\11\1\0\1\11\1\0\1\11\3\0"+ + "\1\11\2\0\4\11\1\0\14\11\1\256\5\11\20\0"+ + "\2\11\1\0\2\11\7\0\3\11\1\0\1\11\1\0"+ + "\1\11\3\0\1\11\2\0\2\11\1\257\1\11\1\0"+ "\22\11\20\0\2\11\1\0\2\11\7\0\3\11\1\0"+ "\1\11\1\0\1\11\3\0\1\11\2\0\4\11\1\0"+ - "\1\250\21\11\20\0\2\11\1\0\2\11\7\0\3\11"+ + "\10\11\1\260\3\11\1\261\5\11\100\0\1\262\17\0"+ + "\2\202\1\0\2\202\7\0\3\202\1\0\1\202\1\0"+ + "\1\202\3\0\1\202\2\0\4\202\1\0\22\202\17\0"+ + "\6\263\2\0\70\263\1\0\2\264\12\0\1\264\1\0"+ + "\1\264\1\0\1\264\15\0\1\264\2\0\1\264\1\0"+ + "\1\264\3\0\1\264\3\0\1\264\3\0\1\264\45\0"+ + "\1\74\51\0\6\210\1\265\1\0\70\210\1\0\2\77"+ + "\1\0\2\77\7\0\3\77\1\0\1\77\1\0\1\77"+ + "\3\0\1\77\2\0\2\77\1\266\1\77\1\0\22\77"+ + "\20\0\1\215\13\0\1\215\62\0\6\217\1\267\1\0"+ + "\70\217\6\220\1\270\1\0\70\220\12\0\1\271\66\0"+ + "\2\272\1\0\2\272\7\0\3\272\1\0\1\272\1\0"+ + "\1\272\3\0\1\272\2\0\4\272\1\0\22\272\20\0"+ + "\1\130\13\0\1\130\63\0\2\273\12\0\1\273\1\0"+ + "\1\273\1\214\1\273\15\0\1\273\2\0\1\273\1\0"+ + "\1\273\3\0\1\273\3\0\1\273\3\0\1\273\20\0"+ + "\1\215\13\0\1\215\4\0\1\274\40\0\1\274\34\0"+ + "\1\214\60\0\2\11\1\0\2\11\7\0\3\11\1\0"+ + "\1\11\1\0\1\11\3\0\1\11\2\0\3\11\1\275"+ + "\1\0\22\11\20\0\2\11\1\0\2\11\7\0\3\11"+ "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ - "\1\0\22\11\3\0\1\251\14\0\2\11\1\0\2\11"+ + "\1\0\1\11\1\276\20\11\20\0\2\11\1\0\2\11"+ "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\1\252\3\11\1\0\22\11\20\0\2\11\1\0"+ - "\2\11\7\0\3\11\1\0\1\11\1\0\1\11\3\0"+ - "\1\11\2\0\4\11\1\0\3\11\1\253\16\11\20\0"+ - "\2\11\1\0\2\11\7\0\3\11\1\0\1\11\1\0"+ - "\1\11\3\0\1\11\2\0\2\11\1\254\1\11\1\0"+ - "\3\11\1\255\16\11\20\0\2\11\1\0\2\11\7\0"+ - "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\4\11\1\0\2\11\1\256\17\11\20\0\2\11\1\0"+ - "\2\11\7\0\3\11\1\0\1\11\1\0\1\11\3\0"+ - "\1\11\2\0\4\11\1\0\10\11\1\257\11\11\20\0"+ - "\2\11\1\0\2\11\7\0\3\11\1\0\1\11\1\0"+ - "\1\11\3\0\1\11\2\0\4\11\1\0\14\11\1\260"+ - "\5\11\20\0\2\11\1\0\2\11\7\0\3\11\1\0"+ - "\1\11\1\0\1\11\3\0\1\11\2\0\2\11\1\261"+ - "\1\11\1\0\22\11\20\0\2\11\1\0\2\11\7\0"+ - "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\4\11\1\0\10\11\1\262\3\11\1\263\5\11\100\0"+ - "\1\264\100\0\1\265\100\0\1\266\15\0\2\204\1\0"+ - "\2\204\7\0\3\204\1\0\1\204\1\0\1\204\3\0"+ - "\1\204\2\0\4\204\1\0\22\204\17\0\6\267\2\0"+ - "\70\267\1\0\2\270\12\0\1\270\1\0\1\270\1\0"+ - "\1\270\15\0\1\270\2\0\1\270\1\0\1\270\3\0"+ - "\1\270\3\0\1\270\3\0\1\270\45\0\1\74\51\0"+ - "\6\212\1\271\1\0\70\212\1\0\2\77\1\0\2\77"+ - "\7\0\3\77\1\0\1\77\1\0\1\77\3\0\1\77"+ - "\2\0\2\77\1\272\1\77\1\0\22\77\20\0\1\217"+ - "\13\0\1\217\62\0\6\221\1\273\1\0\70\221\6\222"+ - "\1\274\1\0\70\222\12\0\1\275\66\0\2\276\1\0"+ - "\2\276\7\0\3\276\1\0\1\276\1\0\1\276\3\0"+ - "\1\276\2\0\4\276\1\0\22\276\20\0\1\130\13\0"+ - "\1\130\63\0\2\277\12\0\1\277\1\0\1\277\1\216"+ - "\1\277\15\0\1\277\2\0\1\277\1\0\1\277\3\0"+ - "\1\277\3\0\1\277\3\0\1\277\20\0\1\217\13\0"+ - "\1\217\4\0\1\300\42\0\1\300\32\0\1\216\60\0"+ - "\2\11\1\0\2\11\7\0\3\11\1\0\1\11\1\0"+ - "\1\11\3\0\1\11\2\0\3\11\1\301\1\0\22\11"+ + "\2\0\4\11\1\0\3\11\1\277\16\11\20\0\2\11"+ + "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ + "\3\0\1\11\2\0\2\11\1\300\1\11\1\0\22\11"+ "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\1\11"+ - "\1\302\20\11\20\0\2\11\1\0\2\11\7\0\3\11"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\3\11"+ + "\1\301\16\11\20\0\2\11\1\0\2\11\7\0\3\11"+ "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ - "\1\0\3\11\1\303\16\11\20\0\2\11\1\0\2\11"+ + "\1\0\3\11\1\302\16\11\20\0\2\11\1\0\2\11"+ "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\2\11\1\304\1\11\1\0\22\11\20\0\2\11"+ + "\2\0\1\303\3\11\1\0\22\11\20\0\2\11\1\0"+ + "\2\11\7\0\3\11\1\0\1\11\1\0\1\11\3\0"+ + "\1\11\2\0\3\11\1\304\1\0\22\11\20\0\2\11"+ "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ "\3\0\1\11\2\0\4\11\1\0\3\11\1\305\16\11"+ "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\3\11"+ - "\1\306\16\11\20\0\2\11\1\0\2\11\7\0\3\11"+ - "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\1\307"+ - "\3\11\1\0\22\11\20\0\2\11\1\0\2\11\7\0"+ - "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\3\11\1\310\1\0\22\11\20\0\2\11\1\0\2\11"+ - "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\4\11\1\0\3\11\1\311\16\11\20\0\2\11"+ - "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\4\11\1\0\14\11\1\312\5\11"+ - "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\3\11"+ - "\1\313\16\11\20\0\2\11\1\0\2\11\7\0\3\11"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\14\11"+ + "\1\306\5\11\20\0\2\11\1\0\2\11\7\0\3\11"+ "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ - "\1\0\6\11\1\314\13\11\20\0\2\11\1\0\2\11"+ - "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\315"+ - "\2\0\4\11\1\0\22\11\20\0\2\11\1\0\2\11"+ + "\1\0\3\11\1\307\16\11\20\0\2\11\1\0\2\11"+ "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\4\11\1\0\5\11\1\316\14\11\20\0\2\11"+ + "\2\0\4\11\1\0\6\11\1\310\13\11\20\0\2\11"+ "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\4\11\1\0\14\11\1\317\5\11"+ + "\3\0\1\311\2\0\4\11\1\0\22\11\20\0\2\11"+ + "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ + "\3\0\1\11\2\0\4\11\1\0\5\11\1\312\14\11"+ "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\2\11"+ - "\1\320\17\11\20\0\2\11\1\0\2\11\7\0\3\11"+ - "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\3\11"+ - "\1\321\1\0\22\11\20\0\2\11\1\0\2\11\7\0"+ - "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\3\11\1\322\1\0\22\11\17\0\6\267\1\323\1\0"+ - "\70\267\1\0\2\324\12\0\1\324\1\0\1\324\1\0"+ - "\1\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\3\77\1\0\1\77\1\0\1\77\3\0"+ - "\1\77\2\0\3\77\1\325\1\0\22\77\20\0\2\277"+ - "\12\0\1\277\1\0\1\277\1\0\1\277\1\0\1\231"+ - "\13\0\1\277\2\0\1\277\1\231\1\277\3\0\1\277"+ - "\3\0\1\277\3\0\1\277\20\0\2\11\1\0\2\11"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\14\11"+ + "\1\313\5\11\20\0\2\11\1\0\2\11\7\0\3\11"+ + "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ + "\1\0\2\11\1\314\17\11\20\0\2\11\1\0\2\11"+ "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\4\11\1\0\13\11\1\326\6\11\20\0\2\11"+ - "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\1\327\3\11\1\0\22\11\20\0"+ - "\2\11\1\0\2\11\7\0\3\11\1\0\1\11\1\0"+ - "\1\11\3\0\1\11\2\0\4\11\1\0\10\11\1\330"+ - "\11\11\20\0\2\11\1\0\2\11\7\0\3\11\1\0"+ - "\1\11\1\0\1\11\3\0\1\11\2\0\2\11\1\331"+ - "\1\11\1\0\22\11\20\0\2\11\1\0\2\11\7\0"+ - "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\3\11\1\332\1\0\22\11\20\0\2\11\1\0\2\11"+ - "\7\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\4\11\1\0\1\333\21\11\20\0\2\11\1\0"+ + "\2\0\3\11\1\315\1\0\22\11\20\0\2\11\1\0"+ "\2\11\7\0\3\11\1\0\1\11\1\0\1\11\3\0"+ - "\1\11\2\0\4\11\1\0\5\11\1\334\14\11\20\0"+ - "\2\11\1\0\2\11\7\0\3\11\1\0\1\11\1\0"+ - "\1\11\3\0\1\11\2\0\4\11\1\0\10\11\1\335"+ - "\11\11\20\0\2\11\1\0\2\11\7\0\3\11\1\0"+ + "\1\11\2\0\3\11\1\316\1\0\22\11\17\0\6\263"+ + "\1\317\1\0\70\263\1\0\2\320\12\0\1\320\1\0"+ + "\1\320\1\0\1\320\15\0\1\320\2\0\1\320\1\0"+ + "\1\320\3\0\1\320\3\0\1\320\3\0\1\320\20\0"+ + "\2\77\1\0\2\77\7\0\3\77\1\0\1\77\1\0"+ + "\1\77\3\0\1\77\2\0\3\77\1\321\1\0\22\77"+ + "\20\0\2\273\12\0\1\273\1\0\1\273\1\0\1\273"+ + "\1\0\1\227\13\0\1\273\2\0\1\273\1\227\1\273"+ + "\3\0\1\273\3\0\1\273\3\0\1\273\20\0\2\11"+ + "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ + "\3\0\1\11\2\0\4\11\1\0\13\11\1\322\6\11"+ + "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ + "\1\0\1\11\3\0\1\11\2\0\1\323\3\11\1\0"+ + "\22\11\20\0\2\11\1\0\2\11\7\0\3\11\1\0"+ "\1\11\1\0\1\11\3\0\1\11\2\0\4\11\1\0"+ - "\6\11\1\336\13\11\20\0\2\11\1\0\2\11\7\0"+ + "\10\11\1\324\11\11\20\0\2\11\1\0\2\11\7\0"+ "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\4\11\1\0\3\11\1\337\16\11\20\0\2\11\1\0"+ + "\2\11\1\325\1\11\1\0\22\11\20\0\2\11\1\0"+ "\2\11\7\0\3\11\1\0\1\11\1\0\1\11\3\0"+ - "\1\11\2\0\4\11\1\0\3\11\1\340\16\11\20\0"+ - "\2\341\12\0\1\341\1\0\1\341\1\0\1\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"+ - "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\4\11\1\0\2\11\1\342\17\11\20\0\2\11\1\0"+ - "\2\11\7\0\3\11\1\0\1\11\1\0\1\11\3\0"+ - "\1\11\2\0\1\343\3\11\1\0\22\11\20\0\2\11"+ + "\1\11\2\0\3\11\1\326\1\0\22\11\20\0\2\11"+ "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\4\11\1\0\7\11\1\344\12\11"+ + "\3\0\1\11\2\0\4\11\1\0\1\327\21\11\20\0"+ + "\2\11\1\0\2\11\7\0\3\11\1\0\1\11\1\0"+ + "\1\11\3\0\1\11\2\0\4\11\1\0\5\11\1\330"+ + "\14\11\20\0\2\11\1\0\2\11\7\0\3\11\1\0"+ + "\1\11\1\0\1\11\3\0\1\11\2\0\4\11\1\0"+ + "\10\11\1\331\11\11\20\0\2\11\1\0\2\11\7\0"+ + "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ + "\4\11\1\0\6\11\1\332\13\11\20\0\2\11\1\0"+ + "\2\11\7\0\3\11\1\0\1\11\1\0\1\11\3\0"+ + "\1\11\2\0\4\11\1\0\3\11\1\333\16\11\20\0"+ + "\2\11\1\0\2\11\7\0\3\11\1\0\1\11\1\0"+ + "\1\11\3\0\1\11\2\0\4\11\1\0\3\11\1\334"+ + "\16\11\20\0\2\335\12\0\1\335\1\0\1\335\1\0"+ + "\1\335\15\0\1\335\2\0\1\335\1\0\1\335\3\0"+ + "\1\335\3\0\1\335\3\0\1\335\20\0\2\11\1\0"+ + "\2\11\7\0\3\11\1\0\1\11\1\0\1\11\3\0"+ + "\1\11\2\0\4\11\1\0\2\11\1\336\17\11\20\0"+ + "\2\11\1\0\2\11\7\0\3\11\1\0\1\11\1\0"+ + "\1\11\3\0\1\11\2\0\1\337\3\11\1\0\22\11"+ "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\2\11"+ - "\1\345\17\11\20\0\2\207\12\0\1\207\1\0\1\207"+ - "\1\0\1\207\15\0\1\207\2\0\1\207\1\0\1\207"+ - "\3\0\1\207\3\0\1\207\3\0\1\207\20\0\2\11"+ - "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\346\2\0\4\11\1\0\22\11\20\0\2\11"+ - "\1\0\2\11\7\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\4\11\1\0\3\11\1\347\16\11"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\7\11"+ + "\1\340\12\11\20\0\2\11\1\0\2\11\7\0\3\11"+ + "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ + "\1\0\2\11\1\341\17\11\20\0\2\205\12\0\1\205"+ + "\1\0\1\205\1\0\1\205\15\0\1\205\2\0\1\205"+ + "\1\0\1\205\3\0\1\205\3\0\1\205\3\0\1\205"+ + "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ + "\1\0\1\11\3\0\1\342\2\0\4\11\1\0\22\11"+ "\20\0\2\11\1\0\2\11\7\0\3\11\1\0\1\11"+ "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\3\11"+ - "\1\350\16\11\17\0"; + "\1\343\16\11\20\0\2\11\1\0\2\11\7\0\3\11"+ + "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ + "\1\0\3\11\1\344\16\11\17\0"; private static int [] zzUnpackTrans() { - int [] result = new int[9728]; + int [] result = new int[9600]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -518,19 +519,18 @@ class _JetLexer implements FlexLexer { private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\6\0\1\11\16\1\2\11\24\1\1\11\5\1\6\11"+ + "\6\0\1\11\16\1\2\11\22\1\1\11\7\1\6\11"+ "\1\1\1\11\1\1\1\0\2\11\2\1\1\0\1\1"+ "\1\11\2\1\2\11\1\0\1\1\1\0\1\1\1\0"+ "\1\1\1\0\1\11\2\1\1\11\1\1\1\0\5\1"+ - "\5\11\1\1\1\0\7\1\1\11\20\1\1\0\1\11"+ - "\1\0\2\11\1\1\6\11\1\1\1\0\2\11\1\1"+ - "\2\0\1\1\3\11\1\1\1\11\2\0\3\1\1\11"+ - "\4\0\1\11\15\1\1\11\12\1\3\11\2\0\1\11"+ - "\1\1\4\11\1\1\1\0\22\1\1\11\1\0\14\1"+ - "\1\0\7\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\3\11\1\1\1\11"+ + "\2\0\3\1\1\11\4\0\1\11\15\1\1\11\12\1"+ + "\1\11\2\0\1\11\1\1\4\11\1\1\1\0\22\1"+ + "\1\11\1\0\14\1\1\0\7\1"; private static int [] zzUnpackAttribute() { - int [] result = new int[232]; + int [] result = new int[228]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; @@ -884,23 +884,23 @@ class _JetLexer implements FlexLexer { case 3: { return JetTokens.IDENTIFIER; } - case 106: break; + case 104: break; case 12: { pushState(STRING); return JetTokens.OPEN_QUOTE; } - case 107: break; + case 105: break; case 79: { return JetTokens.FOR_KEYWORD ; } - case 108: break; - case 103: + case 106: break; + case 101: { return JetTokens.RETURN_KEYWORD ; } - case 109: break; - case 90: + case 107: break; + case 88: { return JetTokens.NULL_KEYWORD ; } - case 110: break; + case 108: break; case 35: { if (lBraceCount == 0) { popState(); @@ -909,159 +909,155 @@ class _JetLexer implements FlexLexer { lBraceCount--; return JetTokens.RBRACE; } - case 111: break; - case 16: + case 109: break; + case 19: { return JetTokens.LT ; } - case 112: break; + case 110: break; case 54: { return JetTokens.DO_KEYWORD ; } - case 113: break; - case 20: + case 111: break; + case 18: { return JetTokens.PLUS ; } - case 114: break; - case 59: + case 112: break; + case 57: { return JetTokens.PLUSEQ ; } - case 115: break; - case 94: + case 113: break; + case 92: { popState(); return JetTokens.THIS_KEYWORD; } - case 116: break; + case 114: break; case 28: { return JetTokens.COMMA ; } - case 117: break; - case 17: + case 115: break; + case 20: { return JetTokens.GT ; } - case 118: break; + case 116: break; case 4: { return JetTokens.WHITE_SPACE; } - case 119: break; + case 117: break; case 26: { return JetTokens.RPAR ; } - case 120: break; - case 57: + case 118: break; + case 56: { return JetTokens.DOUBLE_ARROW; } - case 121: break; - case 88: + case 119: break; + case 86: { return JetTokens.TRUE_KEYWORD ; } - case 122: break; - case 82: - { return JetTokens.IDE_TEMPLATE_START ; - } - case 123: break; + case 120: break; case 37: { return JetTokens.FIELD_IDENTIFIER; } - case 124: break; + case 121: break; case 61: { return JetTokens.ANDAND ; } - case 125: break; + case 122: break; case 66: { pushState(LONG_TEMPLATE_ENTRY); return JetTokens.LONG_TEMPLATE_ENTRY_START; } - case 126: break; + case 123: break; case 36: { return JetTokens.FLOAT_LITERAL; } - case 127: break; + case 124: break; case 40: { return JetTokens.EOL_COMMENT; } - case 128: break; - case 92: + case 125: break; + case 90: { return JetTokens.WHEN_KEYWORD ; } - case 129: break; + case 126: break; case 75: { pushState(RAW_STRING); return JetTokens.OPEN_QUOTE; } - case 130: break; + case 127: break; case 22: { return JetTokens.COLON ; } - case 131: break; - case 55: + case 128: break; + case 59: { return JetTokens.LTEQ ; } - case 132: break; - case 47: + case 129: break; + case 48: { return JetTokens.ARROW ; } - case 133: break; + case 130: break; case 32: { popState(); return JetTokens.IDENTIFIER; } - case 134: break; + case 131: break; case 23: { return JetTokens.LBRACKET ; } - case 135: break; + case 132: break; case 70: { yypushback(2); return JetTokens.INTEGER_LITERAL; } - case 136: break; + case 133: break; case 11: { return JetTokens.CHARACTER_LITERAL; } - case 137: break; + case 134: break; case 80: { return JetTokens.VAR_KEYWORD ; } - case 138: break; - case 56: + case 135: break; + case 60: { return JetTokens.GTEQ ; } - case 139: break; + case 136: break; case 2: { return JetTokens.INTEGER_LITERAL; } - case 140: break; + case 137: break; case 14: { return JetTokens.RBRACE ; } - case 141: break; - case 98: + case 138: break; + case 96: { return JetTokens.CLASS_KEYWORD ; } - case 142: break; + case 139: break; case 76: { return JetTokens.TRY_KEYWORD ; } - case 143: break; + case 140: break; case 8: { return JetTokens.EXCL ; } - case 144: break; + case 141: break; case 44: { return JetTokens.EXCLEQ ; } - case 145: break; - case 48: + case 142: break; + case 47: { return JetTokens.MINUSEQ ; } - case 146: break; - case 104: + case 143: break; + case 102: { return JetTokens.PACKAGE_KEYWORD ; } - case 147: break; - case 95: + case 144: break; + case 93: { return JetTokens.THROW_KEYWORD ; } - case 148: break; - case 97: + case 145: break; + case 95: { return JetTokens.SUPER_KEYWORD ; } - case 149: break; + case 146: break; case 69: { if (commentDepth > 0) { commentDepth--; @@ -1073,217 +1069,213 @@ class _JetLexer implements FlexLexer { return commentStateToTokenType(state); } } - case 150: break; - case 100: + case 147: break; + case 98: { return JetTokens.WHILE_KEYWORD ; } - case 151: break; + case 148: break; case 46: { return JetTokens.MINUSMINUS; } - case 152: break; - case 105: + case 149: break; + case 103: { return JetTokens.CONTINUE_KEYWORD ; } - case 153: break; + case 150: break; case 73: { return JetTokens.NOT_IN; } - case 154: break; + case 151: break; case 39: { return JetTokens.ATAT ; } - case 155: break; + case 152: break; case 6: { return JetTokens.DIV ; } - case 156: break; - case 83: - { return JetTokens.IDE_TEMPLATE_END ; - } - case 157: break; + case 153: break; case 38: { return JetTokens.LABEL_IDENTIFIER; } - case 158: break; + case 154: break; case 29: { return JetTokens.REGULAR_STRING_PART; } - case 159: break; - case 19: + case 155: break; + case 17: { return JetTokens.QUEST ; } - case 160: break; + case 156: break; case 71: { pushState(DOC_COMMENT); commentDepth = 0; commentStart = getTokenStart(); } - case 161: break; + case 157: break; case 62: { return JetTokens.OROR ; } - case 162: break; + case 158: break; case 21: { return JetTokens.PERC ; } - case 163: break; + case 159: break; case 74: { return JetTokens.EXCLEQEQEQ; } - case 164: break; + case 160: break; case 63: { return JetTokens.PERCEQ ; } - case 165: break; + case 161: break; case 45: { return JetTokens.RANGE ; } - case 166: break; + case 162: break; case 1: { return TokenType.BAD_CHARACTER; } - case 167: break; + case 163: break; case 65: { pushState(SHORT_TEMPLATE_ENTRY); yypushback(yylength() - 1); return JetTokens.SHORT_TEMPLATE_ENTRY_START; } - case 168: break; + case 164: break; case 72: { return JetTokens.NOT_IS; } - case 169: break; + case 165: break; case 15: { return JetTokens.MUL ; } - case 170: break; + case 166: break; case 24: { return JetTokens.RBRACKET ; } - case 171: break; - case 60: + case 167: break; + case 58: { return JetTokens.PLUSPLUS ; } - case 172: break; + case 168: break; case 41: { pushState(BLOCK_COMMENT); commentDepth = 0; commentStart = getTokenStart(); } - case 173: break; - case 87: + case 169: break; + case 85: { return JetTokens.THIS_KEYWORD ; } - case 174: break; + case 170: break; case 9: { return JetTokens.DOT ; } - case 175: break; + case 171: break; case 27: { return JetTokens.SEMICOLON ; } - case 176: break; + case 172: break; case 51: { return JetTokens.IF_KEYWORD ; } - case 177: break; + case 173: break; case 67: { return JetTokens.ESCAPE_SEQUENCE; } - case 178: break; + case 174: break; case 31: { popState(); return JetTokens.CLOSING_QUOTE; } - case 179: break; - case 18: + case 175: break; + case 16: { return JetTokens.EQ ; } - case 180: break; + case 176: break; case 5: { return JetTokens.AT ; } - case 181: break; + case 177: break; case 77: { return JetTokens.AS_SAFE; } - case 182: break; + case 178: break; case 25: { return JetTokens.LPAR ; } - case 183: break; + case 179: break; case 10: { return JetTokens.MINUS ; } - case 184: break; - case 101: + case 180: break; + case 99: { return JetTokens.FALSE_KEYWORD ; } - case 185: break; - case 89: + case 181: break; + case 87: { return JetTokens.TYPE_KEYWORD ; } - case 186: break; + case 182: break; case 68: { commentDepth++; } - case 187: break; + case 183: break; case 78: { return JetTokens.FUN_KEYWORD ; } - case 188: break; + case 184: break; case 49: { return JetTokens.IS_KEYWORD ; } - case 189: break; + case 185: break; case 30: { popState(); yypushback(1); return JetTokens.DANGLING_NEWLINE; } - case 190: break; + case 186: break; case 34: { lBraceCount++; return JetTokens.LBRACE; } - case 191: break; - case 86: + case 187: break; + case 84: { yypushback(3); return JetTokens.EXCL; } - case 192: break; + case 188: break; case 42: { return JetTokens.DIVEQ ; } - case 193: break; - case 91: + case 189: break; + case 89: { return JetTokens.ELSE_KEYWORD ; } - case 194: break; + case 190: break; case 53: { return JetTokens.AS_KEYWORD ; } - case 195: break; + case 191: break; case 50: { return JetTokens.IN_KEYWORD ; } - case 196: break; - case 58: + case 192: break; + case 55: { return JetTokens.EQEQ ; } - case 197: break; - case 84: + case 193: break; + case 82: { return JetTokens.EQEQEQ ; } - case 198: break; + case 194: break; case 81: { return JetTokens.VAL_KEYWORD ; } - case 199: break; - case 93: + case 195: break; + case 91: { return JetTokens.CAPITALIZED_THIS_KEYWORD ; } - case 200: break; + case 196: break; case 52: { return JetTokens.MULTEQ ; } - case 201: break; + case 197: break; case 43: { if (zzCurrentPos == 0) { return JetTokens.SHEBANG_COMMENT; @@ -1293,39 +1285,39 @@ class _JetLexer implements FlexLexer { return JetTokens.HASH; } } - case 202: break; + case 198: break; case 13: { return JetTokens.LBRACE ; } - case 203: break; - case 102: + case 199: break; + case 100: { return JetTokens.OBJECT_KEYWORD ; } - case 204: break; - case 99: + case 200: break; + case 97: { return JetTokens.BREAK_KEYWORD ; } - case 205: break; - case 85: + case 201: break; + case 83: { return JetTokens.BLOCK_COMMENT; } - case 206: break; - case 96: + case 202: break; + case 94: { return JetTokens.TRAIT_KEYWORD ; } - case 207: break; + case 203: break; case 64: { return JetTokens.COLONCOLON; } - case 208: break; + case 204: break; case 33: { } - case 209: break; + case 205: break; case 7: { return JetTokens.HASH ; } - case 210: break; + case 206: break; default: if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { zzAtEOF = true; @@ -1337,14 +1329,14 @@ class _JetLexer implements FlexLexer { zzStartRead = commentStart; return commentStateToTokenType(state); } - case 233: break; + case 229: break; case DOC_COMMENT: { int state = yystate(); popState(); zzStartRead = commentStart; return commentStateToTokenType(state); } - case 234: break; + case 230: break; default: return null; } diff --git a/compiler/testData/cli/ideTemplates.kt b/compiler/testData/cli/ideTemplates.kt deleted file mode 100644 index 16acba9d3f9..00000000000 --- a/compiler/testData/cli/ideTemplates.kt +++ /dev/null @@ -1,41 +0,0 @@ -fun main(args : Array) { - if (<##>) { - <##> - } else { - <##> - } - - fun <##>(<##>) : <##> { - <##> - } - - for (<##> in <##>) { - <##> - } - - when (<##>) { - <##> -> <##> - else -> <##> - } - - var <##> = <##> - - class <##> { - <##> - } - - class <##> { - var <##> : <##> - get() { - <##> - } - set(value) { - <##> - } - - val <##> : <##> - get() { - <##> - } - } -} \ No newline at end of file diff --git a/compiler/testData/cli/ideTemplates.out b/compiler/testData/cli/ideTemplates.out deleted file mode 100644 index 6bb78b0237f..00000000000 --- a/compiler/testData/cli/ideTemplates.out +++ /dev/null @@ -1,27 +0,0 @@ -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (2, 9) Unresolved IDE template: condition -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (3, 9) Unresolved IDE template: block -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (5, 9) Unresolved IDE template: block -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (8, 9) Unresolved IDE template: name -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (8, 20) Unresolved IDE template: params -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (8, 36) Unresolved IDE template: returnType -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (9, 9) Unresolved IDE template: body -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (12, 10) Unresolved IDE template: i -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (12, 21) Unresolved IDE template: elements -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (13, 9) Unresolved IDE template: body -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (16, 11) Unresolved IDE template: expression -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (17, 9) Unresolved IDE template: condition -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (17, 28) Unresolved IDE template: value -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (18, 17) Unresolved IDE template: elseValue -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (21, 9) Unresolved IDE template: name -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (21, 22) Unresolved IDE template: value -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (23, 11) Unresolved IDE template: name -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (24, 9) Unresolved IDE template: body -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (27, 11) Unresolved IDE template: name -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (28, 13) Unresolved IDE template: name -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (28, 26) Unresolved IDE template: varType -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (30, 13) Unresolved IDE template: body -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (33, 13) Unresolved IDE template: body -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (36, 13) Unresolved IDE template: name -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (36, 26) Unresolved IDE template: valType -ERROR: $TESTDATA_DIR$/ideTemplates.kt: (38, 13) Unresolved IDE template: body -COMPILATION_ERROR diff --git a/compiler/testData/psi/IdeTemplates.jet b/compiler/testData/psi/IdeTemplates.jet deleted file mode 100644 index f13e6d27dfb..00000000000 --- a/compiler/testData/psi/IdeTemplates.jet +++ /dev/null @@ -1,42 +0,0 @@ -fun main(args : Array) { - if (<##>) { - <##> - } else { - <##> - } - - fun <##>(<##>) : <##> { - <##> - } - - for (<##> in <##>) { - <##> - } - - when (<##>) { - <##> -> <##> - else -> <##> - } - - var <##> = <##> - - class <##> { - <##> - } - - class <##> { - var <##> : <##> - get() { - <##> - } - set(value) { - <##> - } - - val <##> : <##> - get() { - <##> - } - } -} - diff --git a/compiler/testData/psi/IdeTemplates.txt b/compiler/testData/psi/IdeTemplates.txt deleted file mode 100644 index 20b58e4e611..00000000000 --- a/compiler/testData/psi/IdeTemplates.txt +++ /dev/null @@ -1,294 +0,0 @@ -JetFile: IdeTemplates.jet - NAMESPACE_HEADER - - FUN - PsiElement(fun)('fun') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('main') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - VALUE_PARAMETER - PsiElement(IDENTIFIER)('args') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Array') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_PROJECTION - TYPE_REFERENCE - USER_TYPE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('String') - PsiElement(GT)('>') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - BLOCK - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - IF - PsiElement(if)('if') - PsiWhiteSpace(' ') - PsiElement(LPAR)('(') - CONDITION - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('condition') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - THEN - BLOCK - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('block') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace('\n ') - PsiElement(RBRACE)('}') - PsiWhiteSpace(' ') - PsiElement(else)('else') - PsiWhiteSpace(' ') - ELSE - BLOCK - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('block') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace('\n ') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n\n ') - FUN - PsiElement(fun)('fun') - PsiWhiteSpace(' ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('name') - PsiElement(IDE_TEMPLATE_END)('>#>') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('params') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('returnType') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace(' ') - BLOCK - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('body') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace('\n ') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n\n ') - FOR - PsiElement(for)('for') - PsiWhiteSpace(' ') - PsiElement(LPAR)('(') - LOOP_PARAMETER - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('i') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace(' ') - PsiElement(in)('in') - PsiWhiteSpace(' ') - LOOP_RANGE - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('elements') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - BODY - BLOCK - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('body') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace('\n ') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n\n ') - WHEN - PsiElement(when)('when') - PsiWhiteSpace(' ') - PsiElement(LPAR)('(') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('expression') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - WHEN_ENTRY - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('condition') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace(' ') - PsiElement(ARROW)('->') - PsiWhiteSpace(' ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('value') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace('\n ') - WHEN_ENTRY - PsiElement(else)('else') - PsiWhiteSpace(' ') - PsiElement(ARROW)('->') - PsiWhiteSpace(' ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('elseValue') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace('\n ') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n\n ') - PROPERTY - PsiElement(var)('var') - PsiWhiteSpace(' ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('name') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('value') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace('\n\n ') - CLASS - PsiElement(class)('class') - PsiWhiteSpace(' ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('name') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - CLASS_BODY - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('body') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace('\n ') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n\n ') - CLASS - PsiElement(class)('class') - PsiWhiteSpace(' ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('name') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - CLASS_BODY - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - PROPERTY - PsiElement(var)('var') - PsiWhiteSpace(' ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('name') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('varType') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace('\n ') - PROPERTY_ACCESSOR - PsiElement(get)('get') - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - BLOCK - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('body') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace('\n ') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n ') - PROPERTY_ACCESSOR - PsiElement(set)('set') - PsiElement(LPAR)('(') - VALUE_PARAMETER_LIST - VALUE_PARAMETER - PsiElement(IDENTIFIER)('value') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - BLOCK - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('body') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace('\n ') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n\n ') - PROPERTY - PsiElement(val)('val') - PsiWhiteSpace(' ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('name') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('valType') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace('\n ') - PROPERTY_ACCESSOR - PsiElement(get)('get') - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - BLOCK - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - IDE_TEMPLATE_EXPRESSION - PsiElement(IDE_TEMPLATE_START)('<#<') - PsiElement(IDENTIFIER)('body') - PsiElement(IDE_TEMPLATE_END)('>#>') - PsiWhiteSpace('\n ') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n ') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java index 1b79b2a7169..e4ce5df65ad 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java +++ b/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java @@ -152,11 +152,6 @@ public class CliTest { executeCompilerCompareOutput(new String[]{ "-script", "compiler/testData/cli/script.ktscript", "hi", "there" }); } - @Test - public void ideTemplates() { - executeCompilerCompareOutput(new String[]{ "-src", "compiler/testData/cli/ideTemplates.kt", "-output", tmpdir.getTmpDir().getPath()}); - } - @Test public void wrongArgument() { executeCompilerCompareOutput(new String[] { "-wrongArgument" }); diff --git a/compiler/tests/org/jetbrains/jet/parsing/JetParsingTest.java b/compiler/tests/org/jetbrains/jet/parsing/JetParsingTest.java index c4e8de90ed4..31a2a7fc8ab 100644 --- a/compiler/tests/org/jetbrains/jet/parsing/JetParsingTest.java +++ b/compiler/tests/org/jetbrains/jet/parsing/JetParsingTest.java @@ -31,7 +31,6 @@ import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.lang.parsing.JetParserDefinition; import org.jetbrains.jet.lang.psi.IfNotParsed; import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.psi.JetIdeTemplate; import org.jetbrains.jet.lang.psi.JetVisitorVoid; import java.io.File; @@ -102,11 +101,10 @@ public class JetParsingTest extends ParsingTestCase { if (result == null) { for (Annotation annotation : method.getDeclaredAnnotations()) { if (annotation instanceof IfNotParsed) { - assertTrue( + assertNotNull( "Incomplete operation in parsed OK test, method " + methodName + " in " + declaringClass.getSimpleName() + " returns null. Element text: \n" + elem.getText(), - PsiTreeUtil.findChildOfType(elem, PsiErrorElement.class) == null - || PsiTreeUtil.findChildOfType(elem, JetIdeTemplate.class) == null); + PsiTreeUtil.findChildOfType(elem, PsiErrorElement.class)); } } }