From fa060ffa333151e3d70630f5a2313e414663f128 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 12 Jan 2011 19:29:57 +0300 Subject: [PATCH] Decomposers removed --- grammar/src/class_members.grm | 5 - grammar/src/lexical.grm | 1 - grammar/src/match.grm | 2 +- grammar/src/toplevel.grm | 1 - idea/src/org/jetbrains/jet/JetNodeTypes.java | 2 - .../lang/parsing/JetExpressionParsing.java | 9 +- .../jet/lang/parsing/JetParsing.java | 80 +- .../jetbrains/jet/lang/psi/JetDecomposer.java | 35 - .../lang/psi/JetDecomposerPropertyList.java | 26 - .../jetbrains/jet/lang/psi/JetVisitor.java | 8 - idea/src/org/jetbrains/jet/lexer/Jet.flex | 1 - .../org/jetbrains/jet/lexer/JetTokens.java | 3 +- .../org/jetbrains/jet/lexer/_JetLexer.java | 755 +++++++++--------- idea/testData/psi/Decomposers.jet | 6 - idea/testData/psi/Decomposers.txt | 106 --- idea/testData/psi/Decomposers_ERR.jet | 13 - idea/testData/psi/Decomposers_ERR.txt | 198 ----- idea/testData/psi/EOLsOnRollback.jet | 2 - idea/testData/psi/EOLsOnRollback.txt | 9 - idea/testData/psi/LocalDeclarations.jet | 2 - idea/testData/psi/LocalDeclarations.txt | 15 - idea/testData/psi/SimpleClassMembers.jet | 6 - idea/testData/psi/SimpleClassMembers.txt | 51 -- idea/testData/psi/SimpleClassMembers_ERR.jet | 2 - idea/testData/psi/SimpleClassMembers_ERR.txt | 97 +-- 25 files changed, 415 insertions(+), 1020 deletions(-) delete mode 100644 idea/src/org/jetbrains/jet/lang/psi/JetDecomposer.java delete mode 100644 idea/src/org/jetbrains/jet/lang/psi/JetDecomposerPropertyList.java delete mode 100644 idea/testData/psi/Decomposers.jet delete mode 100644 idea/testData/psi/Decomposers.txt delete mode 100644 idea/testData/psi/Decomposers_ERR.jet delete mode 100644 idea/testData/psi/Decomposers_ERR.txt diff --git a/grammar/src/class_members.grm b/grammar/src/class_members.grm index 09b33830e62..3b45fea8ea0 100644 --- a/grammar/src/class_members.grm +++ b/grammar/src/class_members.grm @@ -33,7 +33,6 @@ class Example(a : Foo, i : Int) : Bar(i), Some { memberDeclaration : classObject : constructor - : decomposer : function : property : class @@ -71,10 +70,6 @@ block : "{" expressions "}" ; -decomposer // TODO: consider other names - : modifiers "decomposer" (type ".")? SimpleName? "(" (attributes SimpleName){","}? ")" SEMI? // Public properties only - ; - function : modifiers "fun" (type ".")? attributes/*for receiver type*/ typeParameters? functionParameters (":" type)? functionBody? ; diff --git a/grammar/src/lexical.grm b/grammar/src/lexical.grm index 89a53eba2f2..d2b8f52add6 100644 --- a/grammar/src/lexical.grm +++ b/grammar/src/lexical.grm @@ -38,7 +38,6 @@ this val var fun -decomposer -- may be soft extension for null diff --git a/grammar/src/match.grm b/grammar/src/match.grm index bb72f1b941a..eac906a3ed3 100644 --- a/grammar/src/match.grm +++ b/grammar/src/match.grm @@ -7,7 +7,7 @@ pattern : SimpleName // variable from the context : tuplePattern : bindingPattern // we allow non-linear patterns - : decomposerPattern // labeled components are allowed + : decomposerPattern // TODO: labeled components are allowed? ; constantPattern diff --git a/grammar/src/toplevel.grm b/grammar/src/toplevel.grm index ca6ee518d7c..88c02fdcd6b 100644 --- a/grammar/src/toplevel.grm +++ b/grammar/src/toplevel.grm @@ -25,7 +25,6 @@ toplevelObject : function : property : typedef - : decomposer ; namespace diff --git a/idea/src/org/jetbrains/jet/JetNodeTypes.java b/idea/src/org/jetbrains/jet/JetNodeTypes.java index 052dec313e7..3c7ca197ac7 100644 --- a/idea/src/org/jetbrains/jet/JetNodeTypes.java +++ b/idea/src/org/jetbrains/jet/JetNodeTypes.java @@ -16,7 +16,6 @@ public interface JetNodeTypes { JetNodeType FUN = new JetNodeType("FUN", JetFunction.class); JetNodeType EXTENSION = new JetNodeType("EXTENSION", JetExtension.class); JetNodeType TYPEDEF = new JetNodeType("TYPEDEF", JetTypedef.class); - JetNodeType DECOMPOSER = new JetNodeType("DECOMPOSER", JetDecomposer.class); JetNodeType CLASS_OBJECT = new JetNodeType("CLASS_OBJECT", JetClassObject.class); JetNodeType CONSTRUCTOR = new JetNodeType("CONSTRUCTOR", JetConstructor.class); @@ -53,7 +52,6 @@ public interface JetNodeTypes { JetNodeType FUNCTION_TYPE = new JetNodeType("FUNCTION_TYPE", JetFunctionType.class); JetNodeType SELF_TYPE = new JetNodeType("SELF_TYPE", JetSelfType.class); - JetNodeType DECOMPOSER_PROPERTY_LIST = new JetNodeType("DECOMPOSER_PROPERTY_LIST", JetDecomposerPropertyList.class); // TODO: review JetNodeType RECEIVER_TYPE_ATTRIBUTES = new JetNodeType("RECEIVER_TYPE_ATTRIBUTES"); JetNodeType PROPERTY_ACCESSOR = new JetNodeType("PROPERTY_ACCESSOR", JetPropertyAccessor.class); diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java index 9e6d92075da..f89a47f9b64 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java @@ -17,7 +17,7 @@ public class JetExpressionParsing extends AbstractJetParsing { private static final TokenSet TYPE_ARGUMENT_LIST_STOPPERS = TokenSet.create( INTEGER_LITERAL, LONG_LITERAL, FLOAT_LITERAL, CHARACTER_LITERAL, STRING_LITERAL, RAW_STRING_LITERAL, NAMESPACE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, CLASS_KEYWORD, THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, - FUN_KEYWORD, DECOMPOSER_KEYWORD, EXTENSION_KEYWORD, FOR_KEYWORD, NULL_KEYWORD, TYPEOF_KEYWORD, + FUN_KEYWORD, EXTENSION_KEYWORD, FOR_KEYWORD, NULL_KEYWORD, TYPEOF_KEYWORD, NEW_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, MATCH_KEYWORD, RBRACKET, RBRACE, RPAR, PLUSPLUS, MINUSMINUS, MUL, PLUS, MINUS, EXCL, DIV, PERC, LTEQ, @@ -342,7 +342,7 @@ public class JetExpressionParsing extends AbstractJetParsing { parseDoWhile(); } else if (atSet(CLASS_KEYWORD, EXTENSION_KEYWORD, FUN_KEYWORD, VAL_KEYWORD, - VAR_KEYWORD, TYPE_KEYWORD, DECOMPOSER_KEYWORD)) { + VAR_KEYWORD, TYPE_KEYWORD)) { parseLocalDeclaration(); } else if (at(FIELD_IDENTIFIER)) { @@ -459,7 +459,7 @@ public class JetExpressionParsing extends AbstractJetParsing { * : variablePattern // variable from the context * : tuplePattern * : bindingPattern // we allow non-linear patterns - * : decomposerPattern // labeled components are allowed + * : decomposerPattern // TODO: labeled components are allowed? * ; */ private void parsePattern() { @@ -766,9 +766,6 @@ public class JetExpressionParsing extends AbstractJetParsing { else if (keywordToken == TYPE_KEYWORD) { declType = myJetParsing.parseTypeDef(); } - else if (keywordToken == DECOMPOSER_KEYWORD) { - declType = myJetParsing.parseDecomposer(); - } return declType; } diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java index c8c9ab095dd..14daf154fba 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java @@ -29,9 +29,9 @@ public class JetParsing extends AbstractJetParsing { } private static final TokenSet TOPLEVEL_OBJECT_FIRST = TokenSet.create(TYPE_KEYWORD, CLASS_KEYWORD, - EXTENSION_KEYWORD, FUN_KEYWORD, VAL_KEYWORD, NAMESPACE_KEYWORD, DECOMPOSER_KEYWORD); + EXTENSION_KEYWORD, FUN_KEYWORD, VAL_KEYWORD, NAMESPACE_KEYWORD); private static final TokenSet ENUM_MEMBER_FIRST = TokenSet.create(TYPE_KEYWORD, CLASS_KEYWORD, - EXTENSION_KEYWORD, FUN_KEYWORD, VAL_KEYWORD, DECOMPOSER_KEYWORD, IDENTIFIER); + EXTENSION_KEYWORD, FUN_KEYWORD, VAL_KEYWORD, IDENTIFIER); private static final TokenSet CLASS_NAME_RECOVERY_SET = TokenSet.orSet(TokenSet.create(LT, WRAPS_KEYWORD, LPAR, COLON, LBRACE), TOPLEVEL_OBJECT_FIRST); private static final TokenSet TYPE_PARAMETER_GT_RECOVERY_SET = TokenSet.create(WHERE_KEYWORD, WRAPS_KEYWORD, LPAR, COLON, LBRACE, GT); @@ -225,9 +225,6 @@ public class JetParsing extends AbstractJetParsing { else if (keywordToken == TYPE_KEYWORD) { declType = parseTypeDef(); } - else if (keywordToken == DECOMPOSER_KEYWORD) { - declType = parseDecomposer(); - } if (declType == null) { errorAndAdvance("Expecting namespace or top level declaration"); @@ -238,75 +235,6 @@ public class JetParsing extends AbstractJetParsing { } } - /* - * decomposer - * : modifiers "decomposer" (type ".")? SimpleName? "(" (attributes SimpleName){","}? ")" // Public properties only - * ; - */ - public JetNodeType parseDecomposer() { - assert _at(DECOMPOSER_KEYWORD); - advance(); // DECOMPOSER_KEYWORD - - boolean extenstion; - if (!at(LPAR)) { - extenstion = true; - if (TYPE_REF_FIRST.contains(tt()) - && !(at(IDENTIFIER) && lookahead(1) == LPAR)) { - // TODO: if this type is annotated with an attribute, and it is a single identifier, it is an error (decomposer [a] foo()) - parseTypeRef(); - // The decomposer name may appear as the last section of the type - if (at(DOT)) { - advance(); // DOT - expect(IDENTIFIER, "Expecting decomposer name", TokenSet.create(LPAR)); - } - } - else { - consumeIf(IDENTIFIER); - } - } else { - extenstion = false; - } - - PsiBuilder.Marker properties = mark(); - - myBuilder.disableNewlines(); - expect(LPAR, "Expecting a property list in parentheses '( ... )'"); - - // Property list - if (!at(RPAR)) { - while (true) { - parseAttributeList(); - if (at(IDENTIFIER)) { - myExpressionParsing.parseSimpleNameExpression(); - } - else { - errorWithRecovery("Expecting a property name", TokenSet.create(COMMA, RPAR)); - skipUntil(TokenSet.create(COMMA, RPAR, EOL_OR_SEMICOLON)); - } - if (!at(COMMA)) { - if (at(RPAR)) break; - error("Expecting ',' or a closing ')'"); - skipUntil(TokenSet.create(COMMA, RPAR, EOL_OR_SEMICOLON)); - } - if (!at(COMMA)) break; - advance(); // COMMA - } - } - - expect(RPAR, "Expecting ')' to close a property list"); - myBuilder.restoreNewlinesState(); - - consumeIf(SEMICOLON); - - properties.done(DECOMPOSER_PROPERTY_LIST); - - if (at(DOT) && !extenstion) { - error("Cannot define an extension decomposer on a tuple"); - } - - return DECOMPOSER; - } - /* * (modifier | attribute)* */ @@ -572,7 +500,6 @@ public class JetParsing extends AbstractJetParsing { * memberDeclaration' * : classObject * : constructor - * : decomposer * : function * : property * : class @@ -621,9 +548,6 @@ public class JetParsing extends AbstractJetParsing { else if (keywordToken == TYPE_KEYWORD) { declType = parseTypeDef(); } - else if (keywordToken == DECOMPOSER_KEYWORD) { - declType = parseDecomposer(); - } else if (keywordToken == THIS_KEYWORD) { declType = parseConstructor(); } else if (keywordToken == LBRACE) { diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDecomposer.java b/idea/src/org/jetbrains/jet/lang/psi/JetDecomposer.java deleted file mode 100644 index 1bea6ac6912..00000000000 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDecomposer.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.jetbrains.jet.lang.psi; - -import com.intellij.lang.ASTNode; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; - -import java.util.Collections; -import java.util.List; - -/** - * @author max - */ -public class JetDecomposer extends JetNamedDeclaration { - public JetDecomposer(@NotNull ASTNode node) { - super(node); - } - - @Override - public void accept(@NotNull JetVisitor visitor) { - visitor.visitDecomposer(this); - } - - @Nullable @IfNotParsed - public JetDecomposerPropertyList getPropertyList() { - return (JetDecomposerPropertyList) findChildByType(JetNodeTypes.DECOMPOSER_PROPERTY_LIST); - } - - @NotNull - public List getPropertyReferences() { - JetDecomposerPropertyList list = getPropertyList(); - - return list != null ? list.getPropertyReferences() : Collections.emptyList(); - } -} diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDecomposerPropertyList.java b/idea/src/org/jetbrains/jet/lang/psi/JetDecomposerPropertyList.java deleted file mode 100644 index 28a4aa13698..00000000000 --- a/idea/src/org/jetbrains/jet/lang/psi/JetDecomposerPropertyList.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.jetbrains.jet.lang.psi; - -import com.intellij.lang.ASTNode; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetNodeTypes; - -import java.util.List; - -/** - * @author max - */ -public class JetDecomposerPropertyList extends JetNamedDeclaration { - public JetDecomposerPropertyList(@NotNull ASTNode node) { - super(node); - } - - @Override - public void accept(@NotNull JetVisitor visitor) { - visitor.visitDecomposerPropertyList(this); - } - - @NotNull - public List getPropertyReferences() { - return findChildrenByType(JetNodeTypes.REFERENCE_EXPRESSION); - } -} diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java b/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java index 76fe7a5afe3..415423cb5c7 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java @@ -30,14 +30,6 @@ public class JetVisitor extends PsiElementVisitor { visitDeclaration(constructor); } - public void visitDecomposer(JetDecomposer decomposer) { - visitDeclaration(decomposer); - } - - public void visitDecomposerPropertyList(JetDecomposerPropertyList propertyList) { - visitJetElement(propertyList); - } - public void visitExtension(JetExtension extension) { visitDeclaration(extension); } diff --git a/idea/src/org/jetbrains/jet/lexer/Jet.flex b/idea/src/org/jetbrains/jet/lexer/Jet.flex index cb0b264889d..60ca96c4b32 100644 --- a/idea/src/org/jetbrains/jet/lexer/Jet.flex +++ b/idea/src/org/jetbrains/jet/lexer/Jet.flex @@ -87,7 +87,6 @@ RAW_STRING_LITERAL = {THREE_QUO} {QUO_STRING_CHAR}* {THREE_QUO}? // TODO: Decide what to do with """ ... """" {RAW_STRING_LITERAL} { return JetTokens.RAW_STRING_LITERAL; } - "decomposer" { return JetTokens.DECOMPOSER_KEYWORD ;} "namespace" { return JetTokens.NAMESPACE_KEYWORD ;} "extension" { return JetTokens.EXTENSION_KEYWORD ;} "continue" { return JetTokens.CONTINUE_KEYWORD ;} diff --git a/idea/src/org/jetbrains/jet/lexer/JetTokens.java b/idea/src/org/jetbrains/jet/lexer/JetTokens.java index 2e2e59bafd1..7b52ff17da4 100644 --- a/idea/src/org/jetbrains/jet/lexer/JetTokens.java +++ b/idea/src/org/jetbrains/jet/lexer/JetTokens.java @@ -31,7 +31,6 @@ public interface JetTokens { JetKeywordToken VAL_KEYWORD = JetKeywordToken.keyword("val"); JetKeywordToken VAR_KEYWORD = JetKeywordToken.keyword("var"); JetKeywordToken FUN_KEYWORD = JetKeywordToken.keyword("fun"); - JetKeywordToken DECOMPOSER_KEYWORD = JetKeywordToken.keyword("decomposer"); JetKeywordToken EXTENSION_KEYWORD = JetKeywordToken.keyword("extension"); JetKeywordToken FOR_KEYWORD = JetKeywordToken.keyword("for"); JetKeywordToken NULL_KEYWORD = JetKeywordToken.keyword("null"); @@ -134,7 +133,7 @@ public interface JetTokens { JetKeywordToken FINALLY_KEYWORD = JetKeywordToken.softKeyword("finally"); TokenSet KEYWORDS = TokenSet.create(NAMESPACE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, CLASS_KEYWORD, - THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, FUN_KEYWORD, DECOMPOSER_KEYWORD, EXTENSION_KEYWORD, FOR_KEYWORD, + THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, FUN_KEYWORD, EXTENSION_KEYWORD, FOR_KEYWORD, NULL_KEYWORD, TYPEOF_KEYWORD, NEW_KEYWORD, TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD, IN_KEYWORD, THROW_KEYWORD, RETURN_KEYWORD, BREAK_KEYWORD, CONTINUE_KEYWORD, OBJECT_KEYWORD, IF_KEYWORD, ELSE_KEYWORD, WHILE_KEYWORD, DO_KEYWORD, MATCH_KEYWORD, TRY_KEYWORD, CASE_KEYWORD, diff --git a/idea/src/org/jetbrains/jet/lexer/_JetLexer.java b/idea/src/org/jetbrains/jet/lexer/_JetLexer.java index 84a3a0d4b4e..374f83e8050 100644 --- a/idea/src/org/jetbrains/jet/lexer/_JetLexer.java +++ b/idea/src/org/jetbrains/jet/lexer/_JetLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 1/5/11 11:00 PM */ +/* The following code was generated by JFlex 1.4.3 on 1/12/11 7:24 PM */ /* It's an automatically generated code. Do not modify it. */ package org.jetbrains.jet.lexer; @@ -13,8 +13,8 @@ import org.jetbrains.jet.lexer.JetTokens; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 1/5/11 11:00 PM from the specification file - * /home/abreslav/work/jet/idea/src/org/jetbrains/jet/lexer/Jet.flex + * on 1/12/11 7:24 PM from the specification file + * /home/user/work/jet/idea/src/org/jetbrains/jet/lexer/Jet.flex */ class _JetLexer implements FlexLexer { /** initial size of the lookahead buffer */ @@ -41,10 +41,10 @@ class _JetLexer implements FlexLexer { "\1\26\1\101\1\7\1\70\1\64\1\24\1\75\1\76\1\11\1\61"+ "\1\100\1\22\1\20\1\10\1\13\11\1\1\67\1\77\1\62\1\57"+ "\1\63\1\66\1\0\1\2\1\15\1\2\1\17\1\21\1\17\5\4"+ - "\1\16\3\4\1\23\3\4\1\55\3\4\1\14\2\4\1\71\1\25"+ - "\1\72\1\0\1\4\1\6\1\40\1\47\1\31\1\27\1\30\1\46"+ - "\1\4\1\52\1\43\1\50\1\54\1\53\1\33\1\37\1\32\1\34"+ - "\1\4\1\36\1\35\1\42\1\44\1\56\1\51\1\41\1\45\1\4"+ + "\1\16\3\4\1\23\3\4\1\54\3\4\1\14\2\4\1\71\1\25"+ + "\1\72\1\0\1\4\1\6\1\30\1\46\1\35\1\56\1\32\1\45"+ + "\1\4\1\51\1\40\1\47\1\53\1\52\1\31\1\27\1\41\1\34"+ + "\1\4\1\43\1\33\1\37\1\42\1\55\1\50\1\36\1\44\1\4"+ "\1\73\1\65\1\74\1\0\41\5\2\0\4\4\4\0\1\4\2\0"+ "\1\5\7\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\21\0"+ @@ -145,22 +145,21 @@ class _JetLexer implements FlexLexer { "\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32"+ "\1\33\1\34\3\35\1\0\1\36\1\0\1\37\1\40"+ "\1\41\1\42\1\0\2\2\1\35\1\43\1\44\1\45"+ - "\1\46\1\47\1\50\2\11\3\12\1\3\1\51\14\3"+ - "\1\52\3\3\1\53\1\54\1\55\7\3\1\56\1\57"+ - "\1\0\1\60\1\61\1\62\1\63\1\64\1\65\1\66"+ - "\1\67\1\70\1\71\1\72\1\35\1\3\1\0\1\40"+ - "\1\73\1\0\1\34\3\0\1\12\1\74\6\3\1\75"+ - "\3\3\1\76\1\77\3\3\1\100\3\3\1\101\1\3"+ - "\1\102\3\3\1\103\1\104\1\105\1\106\1\107\1\110"+ - "\1\36\1\0\2\73\1\0\1\35\2\0\2\3\1\111"+ - "\1\3\1\112\5\3\1\113\1\114\1\115\1\3\1\116"+ - "\3\3\1\117\1\40\1\0\1\35\1\0\3\3\1\120"+ - "\1\3\1\121\3\3\1\122\1\123\1\124\1\125\1\74"+ - "\3\3\1\126\1\127\1\3\1\130\6\3\1\131\2\3"+ - "\1\132\1\133\1\134"; + "\1\46\1\47\1\50\2\11\3\12\3\3\1\51\11\3"+ + "\1\52\1\53\1\54\12\3\1\55\1\56\1\57\1\0"+ + "\1\60\1\61\1\62\1\63\1\64\1\65\1\66\1\67"+ + "\1\70\1\71\1\72\1\35\1\3\1\0\1\40\1\73"+ + "\1\0\1\34\3\0\1\12\1\74\1\3\1\75\10\3"+ + "\1\76\3\3\1\77\2\3\1\100\1\3\1\101\1\102"+ + "\3\3\1\103\1\104\1\105\1\106\1\107\1\110\1\36"+ + "\1\0\2\73\1\0\1\35\2\0\1\3\1\111\2\3"+ + "\1\112\1\113\2\3\1\114\1\115\1\116\6\3\1\117"+ + "\1\40\1\0\1\35\1\0\1\3\1\120\2\3\1\121"+ + "\1\3\1\122\2\3\1\123\1\124\1\125\1\74\3\3"+ + "\1\126\1\127\1\130\5\3\1\131\1\132\1\133"; private static int [] zzUnpackAction() { - int [] result = new int[223]; + int [] result = new int[214]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -194,28 +193,27 @@ class _JetLexer implements FlexLexer { "\0\102\0\102\0\u09cc\0\u0a0e\0\u0a50\0\u0a92\0\u0ad4\0\u0b16"+ "\0\u0b58\0\102\0\102\0\u0b9a\0\u0bdc\0\u0c1e\0\u0c60\0\102"+ "\0\102\0\102\0\102\0\102\0\102\0\102\0\u0ca2\0\u0ce4"+ - "\0\u0d26\0\u0d68\0\u0daa\0\306\0\u0dec\0\u0e2e\0\u0e70\0\u0eb2"+ - "\0\u0ef4\0\u0f36\0\u0f78\0\u0fba\0\u0ffc\0\u103e\0\u1080\0\u10c2"+ - "\0\306\0\u1104\0\u1146\0\u1188\0\306\0\306\0\306\0\u11ca"+ - "\0\u120c\0\u124e\0\u1290\0\u12d2\0\u1314\0\u1356\0\u1398\0\102"+ - "\0\u13da\0\u141c\0\102\0\102\0\102\0\102\0\102\0\102"+ - "\0\102\0\102\0\102\0\102\0\u145e\0\102\0\u14a0\0\u14e2"+ - "\0\u1524\0\u1566\0\u1566\0\u15a8\0\u15ea\0\u162c\0\102\0\u166e"+ - "\0\u16b0\0\u16f2\0\u1734\0\u1776\0\u17b8\0\u17fa\0\306\0\u183c"+ - "\0\u187e\0\u18c0\0\306\0\306\0\u1902\0\u1944\0\u1986\0\306"+ - "\0\u19c8\0\u1a0a\0\u1a4c\0\306\0\u1a8e\0\306\0\u1ad0\0\u1b12"+ - "\0\u1b54\0\306\0\306\0\102\0\102\0\102\0\102\0\102"+ - "\0\u1b96\0\u1bd8\0\102\0\u1c1a\0\u1c5c\0\u1c9e\0\u1ce0\0\u1d22"+ - "\0\u1d64\0\306\0\u1da6\0\306\0\u1de8\0\u1e2a\0\u1e6c\0\u1eae"+ - "\0\u1ef0\0\306\0\306\0\u1f32\0\u1f74\0\306\0\u1fb6\0\u1ff8"+ - "\0\u203a\0\306\0\102\0\u207c\0\u1566\0\u20be\0\u2100\0\u2142"+ - "\0\u2184\0\306\0\u21c6\0\306\0\u2208\0\u224a\0\u228c\0\306"+ - "\0\306\0\306\0\306\0\102\0\u22ce\0\u2310\0\u2352\0\306"+ - "\0\306\0\u2394\0\306\0\u23d6\0\u2418\0\u245a\0\u249c\0\u24de"+ - "\0\u2520\0\306\0\u2562\0\u25a4\0\306\0\306\0\306"; + "\0\u0d26\0\u0d68\0\u0daa\0\u0dec\0\u0e2e\0\306\0\u0e70\0\u0eb2"+ + "\0\u0ef4\0\u0f36\0\u0f78\0\u0fba\0\u0ffc\0\u103e\0\u1080\0\306"+ + "\0\306\0\306\0\u10c2\0\u1104\0\u1146\0\u1188\0\u11ca\0\u120c"+ + "\0\u124e\0\u1290\0\u12d2\0\u1314\0\306\0\u1356\0\102\0\u1398"+ + "\0\u13da\0\102\0\102\0\102\0\102\0\102\0\102\0\102"+ + "\0\102\0\102\0\102\0\u141c\0\102\0\u145e\0\u14a0\0\u14e2"+ + "\0\u1524\0\u1524\0\u1566\0\u15a8\0\u15ea\0\102\0\u162c\0\u166e"+ + "\0\306\0\u16b0\0\u16f2\0\u1734\0\u1776\0\u17b8\0\u17fa\0\u183c"+ + "\0\u187e\0\306\0\u18c0\0\u1902\0\u1944\0\306\0\u1986\0\u19c8"+ + "\0\306\0\u1a0a\0\306\0\306\0\u1a4c\0\u1a8e\0\u1ad0\0\306"+ + "\0\306\0\102\0\102\0\102\0\102\0\102\0\u1b12\0\u1b54"+ + "\0\102\0\u1b96\0\u1bd8\0\u1c1a\0\u1c5c\0\u1c9e\0\306\0\u1ce0"+ + "\0\u1d22\0\306\0\306\0\u1d64\0\u1da6\0\306\0\u1de8\0\306"+ + "\0\u1e2a\0\u1e6c\0\u1eae\0\u1ef0\0\u1f32\0\u1f74\0\306\0\102"+ + "\0\u1fb6\0\u1524\0\u1ff8\0\u203a\0\306\0\u207c\0\u20be\0\306"+ + "\0\u2100\0\306\0\u2142\0\u2184\0\306\0\306\0\306\0\102"+ + "\0\u21c6\0\u2208\0\u224a\0\306\0\306\0\306\0\u228c\0\u22ce"+ + "\0\u2310\0\u2352\0\u2394\0\306\0\306\0\306"; private static int [] zzUnpackRowMap() { - int [] result = new int[223]; + int [] result = new int[214]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -241,254 +239,239 @@ class _JetLexer implements FlexLexer { "\1\2\1\3\1\4\1\5\1\4\1\2\1\6\1\7"+ "\1\10\1\11\1\5\1\12\4\4\1\13\1\4\1\14"+ "\1\4\1\15\1\2\1\16\1\17\1\20\1\21\1\22"+ - "\1\23\2\4\1\24\1\25\1\26\1\4\1\27\1\30"+ - "\2\4\1\31\1\32\1\4\1\33\3\4\1\34\1\35"+ - "\1\36\1\37\1\40\1\41\1\42\1\43\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\103\0\1\3\11\0\1\3\2\0"+ - "\1\61\1\62\1\63\1\64\5\0\1\62\1\64\15\0"+ - "\1\62\4\0\1\61\27\0\2\4\1\0\2\4\1\0"+ + "\2\4\1\23\1\4\1\24\1\25\1\26\1\4\1\27"+ + "\1\4\1\30\1\31\1\4\1\32\3\4\1\33\1\34"+ + "\1\35\1\36\1\37\1\40\1\41\1\42\1\43\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\103\0\1\3\11\0\1\3"+ + "\2\0\1\61\1\62\1\63\1\64\10\0\1\64\12\0"+ + "\1\62\4\0\1\61\3\0\1\62\24\0\2\4\1\0"+ + "\2\4\1\0\1\4\3\0\5\4\1\0\1\4\1\0"+ + "\1\4\3\0\30\4\26\0\1\5\6\0\1\5\71\0"+ + "\1\65\1\0\1\65\2\0\1\65\4\0\4\65\1\0"+ + "\1\65\1\0\1\65\3\0\30\65\24\0\1\4\1\66"+ + "\1\0\1\66\1\4\1\67\1\66\3\0\1\4\4\66"+ + "\1\0\1\66\1\0\1\66\3\0\30\66\33\0\1\70"+ + "\1\71\45\0\1\72\101\0\1\73\23\0\1\74\11\0"+ + "\1\74\1\75\1\76\1\61\1\62\1\63\1\64\10\0"+ + "\1\64\3\0\1\75\6\0\1\62\1\76\3\0\1\61"+ + "\3\0\1\62\24\0\1\77\7\0\1\100\1\0\1\77"+ + "\4\0\1\101\45\0\1\102\35\0\1\103\34\0\1\104"+ + "\3\0\1\105\16\0\12\15\1\0\11\15\1\106\1\107"+ + "\54\15\12\110\1\0\12\110\1\111\1\112\53\110\1\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\1\4\1\113\1\4\1\114"+ + "\7\4\1\115\14\4\24\0\2\4\1\0\2\4\1\0"+ "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\30\4\26\0\1\5\6\0\1\5\71\0\1\65\1\0"+ - "\1\65\2\0\1\65\4\0\4\65\1\0\1\65\1\0"+ - "\1\65\3\0\30\65\24\0\1\4\1\66\1\0\1\66"+ - "\1\4\1\67\1\66\3\0\1\4\4\66\1\0\1\66"+ - "\1\0\1\66\3\0\30\66\33\0\1\70\1\71\45\0"+ - "\1\72\101\0\1\73\23\0\1\74\11\0\1\74\1\75"+ - "\1\76\1\61\1\62\1\63\1\64\5\0\1\62\1\64"+ - "\10\0\1\75\4\0\1\62\1\76\3\0\1\61\27\0"+ - "\1\77\7\0\1\100\1\0\1\77\4\0\1\101\45\0"+ - "\1\102\35\0\1\103\34\0\1\104\3\0\1\105\16\0"+ - "\12\15\1\0\11\15\1\106\1\107\54\15\12\110\1\0"+ - "\12\110\1\111\1\112\53\110\1\0\2\4\1\0\2\4"+ + "\4\4\1\116\23\4\24\0\2\4\1\0\2\4\1\0"+ + "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ + "\1\4\1\117\26\4\24\0\2\4\1\0\2\4\1\0"+ + "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ + "\7\4\1\120\13\4\1\121\4\4\24\0\2\4\1\0"+ + "\2\4\1\0\1\4\3\0\5\4\1\0\1\4\1\0"+ + "\1\4\3\0\1\4\1\122\10\4\1\123\10\4\1\124"+ + "\4\4\24\0\2\4\1\0\2\4\1\0\1\4\3\0"+ + "\5\4\1\0\1\4\1\0\1\4\3\0\14\4\1\125"+ + "\1\126\4\4\1\127\5\4\24\0\2\4\1\0\2\4"+ "\1\0\1\4\3\0\5\4\1\0\1\4\1\0\1\4"+ - "\3\0\1\4\1\113\1\4\1\114\24\4\24\0\2\4"+ - "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ - "\1\0\1\4\3\0\12\4\1\115\11\4\1\116\3\4"+ - "\24\0\2\4\1\0\2\4\1\0\1\4\3\0\5\4"+ - "\1\0\1\4\1\0\1\4\3\0\3\4\1\117\5\4"+ - "\1\120\12\4\1\121\3\4\24\0\2\4\1\0\2\4"+ - "\1\0\1\4\3\0\5\4\1\0\1\4\1\0\1\4"+ - "\3\0\15\4\1\122\2\4\1\123\7\4\24\0\2\4"+ - "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ - "\1\0\1\4\3\0\11\4\1\124\16\4\24\0\2\4"+ - "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ - "\1\0\1\4\3\0\1\4\1\125\26\4\24\0\2\4"+ - "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ - "\1\0\1\4\3\0\1\4\1\126\7\4\1\127\3\4"+ - "\1\130\12\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\6\4"+ - "\1\131\21\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\7\4"+ - "\1\132\6\4\1\133\4\4\1\134\4\4\24\0\2\4"+ - "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ - "\1\0\1\4\3\0\6\4\1\135\1\4\1\136\6\4"+ - "\1\137\10\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\3\4"+ - "\1\140\5\4\1\141\3\4\1\142\12\4\24\0\2\4"+ - "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ - "\1\0\1\4\3\0\7\4\1\143\20\4\24\0\2\4"+ - "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ - "\1\0\1\4\3\0\23\4\1\144\4\4\24\0\2\4"+ - "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ - "\1\0\1\4\3\0\23\4\1\145\4\4\24\0\2\4"+ - "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ - "\1\0\1\4\3\0\11\4\1\146\16\4\102\0\1\147"+ - "\3\0\1\150\61\0\1\151\13\0\1\152\101\0\1\153"+ - "\1\0\1\154\77\0\1\155\101\0\1\156\106\0\1\157"+ - "\102\0\1\160\34\0\1\161\46\0\1\162\71\0\1\163"+ - "\23\0\1\77\11\0\1\77\3\0\1\62\1\164\1\64"+ - "\5\0\1\62\1\64\15\0\1\62\34\0\1\165\11\0"+ - "\1\165\3\0\1\62\2\0\1\165\4\0\1\62\16\0"+ - "\1\62\12\0\1\165\21\0\2\65\1\0\2\65\1\166"+ - "\1\65\3\0\5\65\1\0\1\65\1\0\1\65\3\0"+ - "\30\65\24\0\2\66\1\0\2\66\1\0\1\66\3\0"+ - "\5\66\1\0\1\66\1\0\1\66\3\0\30\66\25\0"+ - "\1\167\1\0\1\167\2\0\1\167\4\0\4\167\1\0"+ - "\1\167\1\0\1\167\3\0\30\167\23\0\12\70\1\0"+ - "\67\70\11\170\1\171\70\170\1\0\1\74\11\0\1\74"+ - "\3\0\1\62\1\77\1\64\5\0\1\62\1\64\15\0"+ - "\1\62\33\0\1\172\2\75\7\172\1\0\1\75\1\172"+ - "\1\75\1\173\1\75\1\174\1\75\1\172\1\175\3\172"+ - "\3\75\2\172\1\175\3\172\1\75\5\172\2\75\3\172"+ - "\1\173\26\172\1\0\1\76\11\0\1\76\2\0\1\61"+ - "\1\0\1\176\32\0\1\61\27\0\1\77\11\0\1\77"+ - "\3\0\1\62\1\0\1\64\5\0\1\62\1\64\15\0"+ - "\1\62\33\0\12\15\1\0\67\15\12\110\1\0\12\110"+ - "\1\111\1\177\65\110\1\0\67\110\26\0\1\200\54\0"+ + "\3\0\1\130\3\4\1\131\11\4\1\132\11\4\24\0"+ "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ - "\1\4\1\0\1\4\3\0\2\4\1\201\25\4\24\0"+ - "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ - "\1\4\1\0\1\4\3\0\13\4\1\202\14\4\24\0"+ - "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ - "\1\4\1\0\1\4\3\0\6\4\1\203\21\4\24\0"+ - "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ - "\1\4\1\0\1\4\3\0\10\4\1\204\17\4\24\0"+ - "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ - "\1\4\1\0\1\4\3\0\6\4\1\205\21\4\24\0"+ - "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ - "\1\4\1\0\1\4\3\0\11\4\1\206\16\4\24\0"+ - "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ - "\1\4\1\0\1\4\3\0\13\4\1\207\14\4\24\0"+ - "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ - "\1\4\1\0\1\4\3\0\21\4\1\210\6\4\24\0"+ - "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ - "\1\4\1\0\1\4\3\0\13\4\1\211\14\4\24\0"+ - "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ - "\1\4\1\0\1\4\3\0\13\4\1\212\3\4\1\213"+ + "\1\4\1\0\1\4\3\0\13\4\1\133\3\4\1\134"+ "\10\4\24\0\2\4\1\0\2\4\1\0\1\4\3\0"+ - "\5\4\1\0\1\4\1\0\1\4\3\0\22\4\1\214"+ - "\5\4\24\0\2\4\1\0\2\4\1\0\1\4\3\0"+ - "\5\4\1\0\1\4\1\0\1\4\3\0\4\4\1\215"+ - "\23\4\24\0\2\4\1\0\2\4\1\0\1\4\3\0"+ - "\5\4\1\0\1\4\1\0\1\4\3\0\24\4\1\216"+ - "\3\4\24\0\2\4\1\0\2\4\1\0\1\4\3\0"+ - "\5\4\1\0\1\4\1\0\1\4\3\0\15\4\1\217"+ - "\1\220\11\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\5\4"+ - "\1\221\22\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\7\4"+ - "\1\222\4\4\1\223\13\4\24\0\2\4\1\0\2\4"+ + "\5\4\1\0\1\4\1\0\1\4\3\0\3\4\1\135"+ + "\24\4\24\0\2\4\1\0\2\4\1\0\1\4\3\0"+ + "\5\4\1\0\1\4\1\0\1\4\3\0\1\4\1\136"+ + "\10\4\1\137\1\140\14\4\24\0\2\4\1\0\2\4"+ "\1\0\1\4\3\0\5\4\1\0\1\4\1\0\1\4"+ - "\3\0\7\4\1\224\20\4\24\0\2\4\1\0\2\4"+ + "\3\0\14\4\1\141\13\4\24\0\2\4\1\0\2\4"+ "\1\0\1\4\3\0\5\4\1\0\1\4\1\0\1\4"+ - "\3\0\24\4\1\225\3\4\24\0\2\4\1\0\2\4"+ + "\3\0\22\4\1\142\5\4\24\0\2\4\1\0\2\4"+ "\1\0\1\4\3\0\5\4\1\0\1\4\1\0\1\4"+ - "\3\0\10\4\1\226\17\4\24\0\2\4\1\0\2\4"+ + "\3\0\22\4\1\143\5\4\24\0\2\4\1\0\2\4"+ "\1\0\1\4\3\0\5\4\1\0\1\4\1\0\1\4"+ - "\3\0\1\4\1\227\26\4\24\0\2\4\1\0\2\4"+ + "\3\0\1\4\1\144\26\4\24\0\2\4\1\0\2\4"+ "\1\0\1\4\3\0\5\4\1\0\1\4\1\0\1\4"+ - "\3\0\14\4\1\230\13\4\24\0\2\4\1\0\2\4"+ - "\1\0\1\4\3\0\5\4\1\0\1\4\1\0\1\4"+ - "\3\0\14\4\1\231\13\4\24\0\2\4\1\0\2\4"+ - "\1\0\1\4\3\0\5\4\1\0\1\4\1\0\1\4"+ - "\3\0\7\4\1\232\14\4\1\233\3\4\102\0\1\234"+ - "\57\0\1\235\1\0\1\236\121\0\1\237\23\0\1\165"+ - "\11\0\1\165\3\0\1\62\7\0\1\62\16\0\1\62"+ - "\34\0\2\167\1\0\2\167\1\240\1\167\3\0\5\167"+ - "\1\0\1\167\1\0\1\167\3\0\30\167\23\0\11\170"+ - "\1\241\70\170\10\242\1\243\1\171\70\242\1\0\2\172"+ - "\10\0\1\172\1\0\1\172\1\0\1\172\1\0\1\172"+ - "\1\0\1\244\3\0\3\172\2\0\1\244\3\0\1\172"+ - "\5\0\2\172\33\0\2\172\10\0\1\172\1\0\1\172"+ - "\1\0\1\172\1\164\1\172\1\0\1\244\3\0\3\172"+ - "\2\0\1\244\3\0\1\172\5\0\2\172\33\0\1\245"+ - "\1\172\10\0\1\245\1\0\1\172\1\0\1\172\1\0"+ - "\1\172\1\246\1\244\3\0\3\172\2\0\1\244\3\0"+ - "\1\172\5\0\2\172\11\0\1\246\40\0\1\164\61\0"+ - "\26\200\1\247\53\200\1\0\2\4\1\0\2\4\1\0"+ + "\3\0\12\4\1\145\15\4\102\0\1\146\3\0\1\147"+ + "\56\0\1\150\16\0\1\151\101\0\1\152\1\0\1\153"+ + "\77\0\1\154\101\0\1\155\106\0\1\156\102\0\1\157"+ + "\34\0\1\160\46\0\1\161\71\0\1\162\23\0\1\77"+ + "\11\0\1\77\3\0\1\62\1\163\1\64\10\0\1\64"+ + "\12\0\1\62\10\0\1\62\24\0\1\164\11\0\1\164"+ + "\3\0\1\62\2\0\1\164\22\0\1\62\10\0\1\62"+ + "\2\0\1\164\21\0\2\65\1\0\2\65\1\165\1\65"+ + "\3\0\5\65\1\0\1\65\1\0\1\65\3\0\30\65"+ + "\24\0\2\66\1\0\2\66\1\0\1\66\3\0\5\66"+ + "\1\0\1\66\1\0\1\66\3\0\30\66\25\0\1\166"+ + "\1\0\1\166\2\0\1\166\4\0\4\166\1\0\1\166"+ + "\1\0\1\166\3\0\30\166\23\0\12\70\1\0\67\70"+ + "\11\167\1\170\70\167\1\0\1\74\11\0\1\74\3\0"+ + "\1\62\1\77\1\64\10\0\1\64\12\0\1\62\10\0"+ + "\1\62\23\0\1\171\2\75\7\171\1\0\1\75\1\171"+ + "\1\75\1\172\1\75\1\173\1\75\1\171\1\174\4\171"+ + "\1\75\1\171\1\75\1\171\1\174\1\75\7\171\2\75"+ + "\3\171\1\172\3\171\1\75\23\171\1\0\1\76\11\0"+ + "\1\76\2\0\1\61\1\0\1\175\31\0\1\61\30\0"+ + "\1\77\11\0\1\77\3\0\1\62\1\0\1\64\10\0"+ + "\1\64\12\0\1\62\10\0\1\62\23\0\12\15\1\0"+ + "\67\15\12\110\1\0\12\110\1\111\1\176\65\110\1\0"+ + "\67\110\26\0\1\177\54\0\2\4\1\0\2\4\1\0"+ "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\3\4\1\250\24\4\24\0\2\4\1\0\2\4\1\0"+ + "\2\4\1\200\25\4\24\0\2\4\1\0\2\4\1\0"+ "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\1\4\1\251\26\4\24\0\2\4\1\0\2\4\1\0"+ + "\21\4\1\201\6\4\24\0\2\4\1\0\2\4\1\0"+ "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\1\4\1\252\26\4\24\0\2\4\1\0\2\4\1\0"+ + "\23\4\1\202\4\4\24\0\2\4\1\0\2\4\1\0"+ "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\13\4\1\253\14\4\24\0\2\4\1\0\2\4\1\0"+ + "\10\4\1\203\17\4\24\0\2\4\1\0\2\4\1\0"+ "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\1\4\1\254\26\4\24\0\2\4\1\0\2\4\1\0"+ + "\10\4\1\204\17\4\24\0\2\4\1\0\2\4\1\0"+ "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\6\4\1\255\21\4\24\0\2\4\1\0\2\4\1\0"+ + "\4\4\1\205\23\4\24\0\2\4\1\0\2\4\1\0"+ "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\1\4\1\256\26\4\24\0\2\4\1\0\2\4\1\0"+ + "\4\4\1\206\23\4\24\0\2\4\1\0\2\4\1\0"+ "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\2\4\1\257\25\4\24\0\2\4\1\0\2\4\1\0"+ - "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\15\4\1\260\12\4\24\0\2\4\1\0\2\4\1\0"+ - "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\1\4\1\261\26\4\24\0\2\4\1\0\2\4\1\0"+ - "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\24\4\1\262\3\4\24\0\2\4\1\0\2\4\1\0"+ - "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\1\4\1\263\26\4\24\0\2\4\1\0\2\4\1\0"+ - "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\1\4\1\264\26\4\24\0\2\4\1\0\2\4\1\0"+ - "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\3\4\1\265\24\4\24\0\2\4\1\0\2\4\1\0"+ - "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\6\4\1\266\21\4\24\0\2\4\1\0\2\4\1\0"+ - "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\6\4\1\267\21\4\24\0\2\4\1\0\2\4\1\0"+ - "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\11\4\1\270\16\4\24\0\2\4\1\0\2\4\1\0"+ - "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\24\4\1\271\3\4\24\0\2\4\1\0\2\4\1\0"+ - "\1\4\3\0\5\4\1\0\1\4\1\0\1\4\3\0"+ - "\6\4\1\272\21\4\23\0\10\170\1\273\1\241\70\170"+ - "\11\242\1\274\70\242\1\0\1\165\11\0\1\165\6\0"+ - "\1\246\36\0\1\246\21\0\1\245\1\172\10\0\1\245"+ - "\1\0\1\172\1\0\1\275\1\0\1\172\1\0\1\244"+ - "\3\0\1\275\2\172\2\0\1\244\3\0\1\172\5\0"+ - "\1\275\1\172\33\0\1\165\11\0\1\165\66\0\26\200"+ - "\1\276\53\200\1\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\4\4"+ - "\1\277\23\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\10\4"+ - "\1\300\17\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\14\4"+ - "\1\301\13\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\6\4"+ - "\1\302\21\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\2\4"+ - "\1\303\25\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\23\4"+ - "\1\304\4\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\7\4"+ - "\1\305\20\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\6\4"+ - "\1\306\21\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\3\4"+ - "\1\307\24\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\22\4"+ - "\1\310\5\4\24\0\2\4\1\0\2\4\1\0\1\4"+ + "\1\207\27\4\24\0\2\4\1\0\2\4\1\0\1\4"+ "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\1\4"+ - "\1\311\26\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\25\4"+ - "\1\312\2\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\1\4"+ - "\1\313\26\4\23\0\10\242\1\243\1\274\70\242\26\200"+ - "\1\314\53\200\1\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\5\4"+ - "\1\315\22\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\6\4"+ - "\1\316\21\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\10\4"+ - "\1\317\17\4\24\0\2\4\1\0\2\4\1\0\1\4"+ + "\1\210\26\4\24\0\2\4\1\0\2\4\1\0\1\4"+ "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\13\4"+ - "\1\320\14\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\10\4"+ - "\1\321\17\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\5\4"+ - "\1\322\22\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\17\4"+ - "\1\323\10\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\3\4"+ - "\1\324\24\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\14\4"+ - "\1\325\13\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\15\4"+ - "\1\326\12\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\11\4"+ - "\1\327\16\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\6\4"+ - "\1\330\21\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\3\4"+ - "\1\331\24\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\1\4"+ - "\1\332\26\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\2\4"+ - "\1\333\25\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\1\4"+ - "\1\334\26\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\10\4"+ - "\1\335\17\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\1\4"+ - "\1\336\26\4\24\0\2\4\1\0\2\4\1\0\1\4"+ - "\3\0\5\4\1\0\1\4\1\0\1\4\3\0\7\4"+ - "\1\337\20\4\23\0"; + "\1\211\1\4\1\212\12\4\24\0\2\4\1\0\2\4"+ + "\1\0\1\4\3\0\5\4\1\0\1\4\1\0\1\4"+ + "\3\0\5\4\1\213\22\4\24\0\2\4\1\0\2\4"+ + "\1\0\1\4\3\0\5\4\1\0\1\4\1\0\1\4"+ + "\3\0\11\4\1\214\2\4\1\215\13\4\24\0\2\4"+ + "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ + "\1\0\1\4\3\0\10\4\1\216\17\4\24\0\2\4"+ + "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ + "\1\0\1\4\3\0\20\4\1\217\7\4\24\0\2\4"+ + "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ + "\1\0\1\4\3\0\10\4\1\220\5\4\1\221\11\4"+ + "\24\0\2\4\1\0\2\4\1\0\1\4\3\0\5\4"+ + "\1\0\1\4\1\0\1\4\3\0\23\4\1\222\4\4"+ + "\24\0\2\4\1\0\2\4\1\0\1\4\3\0\5\4"+ + "\1\0\1\4\1\0\1\4\3\0\14\4\1\223\13\4"+ + "\24\0\2\4\1\0\2\4\1\0\1\4\3\0\5\4"+ + "\1\0\1\4\1\0\1\4\3\0\1\224\27\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\3\4\1\225\24\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\11\4\1\226\16\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\11\4\1\227\16\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\14\4\1\230\6\4\1\231"+ + "\4\4\102\0\1\232\51\0\1\233\3\0\1\234\125\0"+ + "\1\235\23\0\1\164\11\0\1\164\3\0\1\62\25\0"+ + "\1\62\10\0\1\62\24\0\2\166\1\0\2\166\1\236"+ + "\1\166\3\0\5\166\1\0\1\166\1\0\1\166\3\0"+ + "\30\166\23\0\11\167\1\237\70\167\10\240\1\241\1\170"+ + "\70\240\1\0\2\171\10\0\1\171\1\0\1\171\1\0"+ + "\1\171\1\0\1\171\1\0\1\242\4\0\1\171\1\0"+ + "\1\171\1\0\1\242\1\171\7\0\2\171\7\0\1\171"+ + "\24\0\2\171\10\0\1\171\1\0\1\171\1\0\1\171"+ + "\1\163\1\171\1\0\1\242\4\0\1\171\1\0\1\171"+ + "\1\0\1\242\1\171\7\0\2\171\7\0\1\171\24\0"+ + "\1\243\1\171\10\0\1\243\1\0\1\171\1\0\1\171"+ + "\1\0\1\171\1\244\1\242\4\0\1\171\1\0\1\171"+ + "\1\0\1\242\1\171\7\0\2\171\7\0\1\171\2\0"+ + "\1\244\40\0\1\163\61\0\26\177\1\245\53\177\1\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\3\4\1\246\24\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\23\4\1\247\4\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\6\4\1\250\21\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\3\4\1\251\24\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\3\4\1\252\24\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\3\4\1\253\24\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\10\4\1\254\17\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\4\4\1\255\23\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\3\4\1\256\24\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\3\4\1\257\24\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\4\4\1\260\23\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\12\4\1\261\15\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\3\4\1\262\24\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\13\4\1\263\14\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\4\4\1\264\23\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\1\4\1\265\26\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\23\4\1\266\4\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\4\4\1\267\23\4\23\0"+ + "\10\167\1\270\1\237\70\167\11\240\1\271\70\240\1\0"+ + "\1\164\11\0\1\164\6\0\1\244\36\0\1\244\21\0"+ + "\1\243\1\171\10\0\1\243\1\0\1\171\1\0\1\272"+ + "\1\0\1\171\1\0\1\242\4\0\1\171\1\0\1\171"+ + "\1\0\1\242\1\171\7\0\1\272\1\171\7\0\1\272"+ + "\24\0\1\164\11\0\1\164\66\0\26\177\1\273\53\177"+ + "\1\0\2\4\1\0\2\4\1\0\1\4\3\0\5\4"+ + "\1\0\1\4\1\0\1\4\3\0\4\4\1\274\23\4"+ + "\24\0\2\4\1\0\2\4\1\0\1\4\3\0\5\4"+ + "\1\0\1\4\1\0\1\4\3\0\22\4\1\275\5\4"+ + "\24\0\2\4\1\0\2\4\1\0\1\4\3\0\5\4"+ + "\1\0\1\4\1\0\1\4\3\0\1\276\27\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\11\4\1\277\16\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\4\4\1\300\23\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\12\4\1\301\15\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\21\4\1\302\6\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\6\4\1\303\21\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\14\4\1\304\13\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\3\4\1\305\24\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\24\4\1\306\3\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\3\4\1\307\24\4\23\0"+ + "\10\240\1\241\1\271\70\240\26\177\1\310\53\177\1\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\5\4\1\311\22\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\4\4\1\312\23\4\24\0"+ + "\2\4\1\0\2\4\1\0\1\4\3\0\5\4\1\0"+ + "\1\4\1\0\1\4\3\0\1\313\27\4\24\0\2\4"+ + "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ + "\1\0\1\4\3\0\16\4\1\314\11\4\24\0\2\4"+ + "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ + "\1\0\1\4\3\0\10\4\1\315\17\4\24\0\2\4"+ + "\1\0\2\4\1\0\1\4\3\0\5\4\1\0\1\4"+ + "\1\0\1\4\3\0\1\316\27\4\24\0\2\4\1\0"+ + "\2\4\1\0\1\4\3\0\5\4\1\0\1\4\1\0"+ + "\1\4\3\0\1\4\1\317\26\4\24\0\2\4\1\0"+ + "\2\4\1\0\1\4\3\0\5\4\1\0\1\4\1\0"+ + "\1\4\3\0\11\4\1\320\16\4\24\0\2\4\1\0"+ + "\2\4\1\0\1\4\3\0\5\4\1\0\1\4\1\0"+ + "\1\4\3\0\13\4\1\321\14\4\24\0\2\4\1\0"+ + "\2\4\1\0\1\4\3\0\5\4\1\0\1\4\1\0"+ + "\1\4\3\0\6\4\1\322\21\4\24\0\2\4\1\0"+ + "\2\4\1\0\1\4\3\0\5\4\1\0\1\4\1\0"+ + "\1\4\3\0\12\4\1\323\15\4\24\0\2\4\1\0"+ + "\2\4\1\0\1\4\3\0\5\4\1\0\1\4\1\0"+ + "\1\4\3\0\3\4\1\324\24\4\24\0\2\4\1\0"+ + "\2\4\1\0\1\4\3\0\5\4\1\0\1\4\1\0"+ + "\1\4\3\0\3\4\1\325\24\4\24\0\2\4\1\0"+ + "\2\4\1\0\1\4\3\0\5\4\1\0\1\4\1\0"+ + "\1\4\3\0\1\326\27\4\23\0"; private static int [] zzUnpackTrans() { - int [] result = new int[9702]; + int [] result = new int[9174]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -530,14 +513,14 @@ class _JetLexer implements FlexLexer { private static final String ZZ_ATTRIBUTE_PACKED_0 = "\1\0\1\11\43\1\1\11\1\1\13\11\2\1\1\0"+ - "\1\1\1\0\2\1\2\11\1\0\3\1\7\11\41\1"+ + "\1\1\1\0\2\1\2\11\1\0\3\1\7\11\40\1"+ "\1\11\1\0\1\1\12\11\1\1\1\11\1\0\2\1"+ - "\1\0\1\1\3\0\1\11\34\1\5\11\1\0\1\1"+ - "\1\11\1\0\1\1\2\0\23\1\1\11\1\0\1\1"+ - "\1\0\15\1\1\11\23\1"; + "\1\0\1\1\3\0\1\11\33\1\5\11\1\0\1\1"+ + "\1\11\1\0\1\1\2\0\22\1\1\11\1\0\1\1"+ + "\1\0\14\1\1\11\16\1"; private static int [] zzUnpackAttribute() { - int [] result = new int[223]; + int [] result = new int[214]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; @@ -845,371 +828,367 @@ class _JetLexer implements FlexLexer { case 3: { return JetTokens.IDENTIFIER; } - case 93: break; + case 92: break; case 65: { return JetTokens.FOR_KEYWORD ; } - case 94: break; - case 61: + case 93: break; + case 63: { return JetTokens.OUT_KEYWORD ; } - case 95: break; - case 87: + case 94: break; + case 88: { return JetTokens.RETURN_KEYWORD ; } - case 96: break; - case 75: + case 95: break; + case 73: { return JetTokens.NULL_KEYWORD ; } - case 97: break; + case 96: break; case 14: { return JetTokens.LT ; } - case 98: break; - case 41: + case 97: break; + case 45: { return JetTokens.DO_KEYWORD ; } - case 99: break; + case 98: break; case 13: { return JetTokens.PLUS ; } - case 100: break; + case 99: break; case 28: { return JetTokens.LONG_LITERAL; } - case 101: break; + case 100: break; case 60: { return JetTokens.RAW_STRING_LITERAL; } - case 102: break; + case 101: break; case 49: { return JetTokens.PLUSEQ ; } - case 103: break; - case 81: + case 102: break; + case 80: { return JetTokens.MATCH_KEYWORD ; } - case 104: break; + case 103: break; case 26: { return JetTokens.COMMA ; } - case 105: break; + case 104: break; case 15: { return JetTokens.GT ; } - case 106: break; + case 105: break; case 4: { return JetTokens.WHITE_SPACE; } - case 107: break; - case 88: + case 106: break; + case 86: { return JetTokens.TYPEOF_KEYWORD ; } - case 108: break; + case 107: break; case 24: { return JetTokens.RPAR ; } - case 109: break; + case 108: break; case 47: { return JetTokens.DOUBLE_ARROW; } - case 110: break; + case 109: break; case 76: { return JetTokens.TRUE_KEYWORD ; } - case 111: break; + case 110: break; case 30: { return JetTokens.FIELD_IDENTIFIER; } - case 112: break; + case 111: break; case 53: { return JetTokens.ANDAND ; } - case 113: break; + case 112: break; case 59: { return JetTokens.DOC_COMMENT; } - case 114: break; + case 113: break; case 29: { return JetTokens.FLOAT_LITERAL; } - case 115: break; + case 114: break; case 31: { return JetTokens.EOL_COMMENT; } - case 116: break; + case 115: break; case 17: { return JetTokens.COLON ; } - case 117: break; + case 116: break; case 51: { return JetTokens.LTEQ ; } - case 118: break; + case 117: break; case 40: { return JetTokens.ARROW ; } - case 119: break; + case 118: break; case 19: { return JetTokens.LBRACKET ; } - case 120: break; + case 119: break; case 58: { yypushback(2); return JetTokens.INTEGER_LITERAL; } - case 121: break; + case 120: break; case 9: { return JetTokens.CHARACTER_LITERAL; } - case 122: break; + case 121: break; case 67: { return JetTokens.VAR_KEYWORD ; } - case 123: break; + case 122: break; case 52: { return JetTokens.GTEQ ; } - case 124: break; + case 123: break; case 2: { return JetTokens.INTEGER_LITERAL; } - case 125: break; + case 124: break; case 22: { return JetTokens.RBRACE ; } - case 126: break; - case 80: + case 125: break; + case 81: { return JetTokens.CLASS_KEYWORD ; } - case 127: break; + case 126: break; case 12: { return JetTokens.EXCL ; } - case 128: break; - case 64: + case 127: break; + case 62: { return JetTokens.TRY_KEYWORD ; } - case 129: break; + case 128: break; case 48: { return JetTokens.EXCLEQ ; } - case 130: break; + case 129: break; case 39: { return JetTokens.MINUSEQ ; } - case 131: break; + case 130: break; case 82: { return JetTokens.THROW_KEYWORD ; } - case 132: break; + case 131: break; case 85: { return JetTokens.WHILE_KEYWORD ; } - case 133: break; + case 132: break; case 38: { return JetTokens.MINUSMINUS; } - case 134: break; + case 133: break; case 89: { return JetTokens.CONTINUE_KEYWORD ; } - case 135: break; - case 71: + case 134: break; + case 70: { return JetTokens.NOT_IN; } - case 136: break; + case 135: break; case 5: { return JetTokens.DIV ; } - case 137: break; + case 136: break; case 56: { return JetTokens.ELVIS ; } - case 138: break; + case 137: break; case 16: { return JetTokens.QUEST ; } - case 139: break; + case 138: break; case 54: { return JetTokens.OROR ; } - case 140: break; + case 139: break; case 18: { return JetTokens.PERC ; } - case 141: break; + case 140: break; case 72: { return JetTokens.EXCLEQEQEQ; } - case 142: break; + case 141: break; case 57: { return JetTokens.PERCEQ ; } - case 143: break; + case 142: break; case 36: { return JetTokens.RANGE ; } - case 144: break; + case 143: break; case 1: { return TokenType.BAD_CHARACTER; } - case 145: break; + case 144: break; case 55: { return JetTokens.SAFE_ACCESS; } - case 146: break; - case 91: + case 145: break; + case 90: { return JetTokens.NAMESPACE_KEYWORD ; } - case 147: break; - case 92: - { return JetTokens.DECOMPOSER_KEYWORD ; - } - case 148: break; - case 70: + case 146: break; + case 71: { return JetTokens.NOT_IS; } - case 149: break; + case 147: break; case 6: { return JetTokens.MUL ; } - case 150: break; + case 148: break; case 20: { return JetTokens.RBRACKET ; } - case 151: break; + case 149: break; case 50: { return JetTokens.PLUSPLUS ; } - case 152: break; + case 150: break; case 78: { return JetTokens.THIS_KEYWORD ; } - case 153: break; - case 74: + case 151: break; + case 75: { return JetTokens.CASE_KEYWORD ; } - case 154: break; + case 152: break; case 7: { return JetTokens.DOT ; } - case 155: break; + case 153: break; case 25: { return JetTokens.SEMICOLON ; } - case 156: break; - case 45: + case 154: break; + case 44: { return JetTokens.IF_KEYWORD ; } - case 157: break; + case 155: break; case 11: { return JetTokens.EQ ; } - case 158: break; + case 156: break; case 23: { return JetTokens.LPAR ; } - case 159: break; + case 157: break; case 8: { return JetTokens.MINUS ; } - case 160: break; + case 158: break; case 83: { return JetTokens.FALSE_KEYWORD ; } - case 161: break; + case 159: break; case 77: { return JetTokens.TYPE_KEYWORD ; } - case 162: break; - case 62: + case 160: break; + case 64: { return JetTokens.REF_KEYWORD ; } - case 163: break; + case 161: break; case 66: { return JetTokens.FUN_KEYWORD ; } - case 164: break; + case 162: break; case 43: { return JetTokens.IS_KEYWORD ; } - case 165: break; + case 163: break; case 33: { return JetTokens.DIVEQ ; } - case 166: break; - case 90: + case 164: break; + case 91: { return JetTokens.EXTENSION_KEYWORD ; } - case 167: break; - case 73: + case 165: break; + case 74: { return JetTokens.ELSE_KEYWORD ; } - case 168: break; - case 42: + case 166: break; + case 41: { return JetTokens.AS_KEYWORD ; } - case 169: break; - case 44: + case 167: break; + case 42: { return JetTokens.IN_KEYWORD ; } - case 170: break; + case 168: break; case 46: { return JetTokens.EQEQ ; } - case 171: break; + case 169: break; case 68: { return JetTokens.VAL_KEYWORD ; } - case 172: break; + case 170: break; case 69: { return JetTokens.EQEQEQ ; } - case 173: break; + case 171: break; case 79: { return JetTokens.CAPITALIZED_THIS_KEYWORD ; } - case 174: break; - case 63: + case 172: break; + case 61: { return JetTokens.NEW_KEYWORD ; } - case 175: break; + case 173: break; case 34: { return JetTokens.MULTEQ ; } - case 176: break; + case 174: break; case 10: { return JetTokens.STRING_LITERAL; } - case 177: break; + case 175: break; case 21: { return JetTokens.LBRACE ; } - case 178: break; - case 86: + case 176: break; + case 87: { return JetTokens.OBJECT_KEYWORD ; } - case 179: break; + case 177: break; case 84: { return JetTokens.BREAK_KEYWORD ; } - case 180: break; + case 178: break; case 32: { return JetTokens.BLOCK_COMMENT; } - case 181: break; + case 179: break; case 37: { return JetTokens.FILTER ; } - case 182: break; + case 180: break; case 27: { return JetTokens.HASH ; } - case 183: break; + case 181: break; case 35: { return JetTokens.MAP ; } - case 184: break; + case 182: break; default: if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { zzAtEOF = true; diff --git a/idea/testData/psi/Decomposers.jet b/idea/testData/psi/Decomposers.jet deleted file mode 100644 index 9ca4f0f4114..00000000000 --- a/idea/testData/psi/Decomposers.jet +++ /dev/null @@ -1,6 +0,0 @@ -decomposer (a, a) -decomposer () -decomposer {foo.() : ()}.bar(a, a) -decomposer a.foobar() -[a] decomposer foobar([a] s) -decomposer foobar() diff --git a/idea/testData/psi/Decomposers.txt b/idea/testData/psi/Decomposers.txt deleted file mode 100644 index 7319314fe1f..00000000000 --- a/idea/testData/psi/Decomposers.txt +++ /dev/null @@ -1,106 +0,0 @@ -JetFile: Decomposers.jet - NAMESPACE - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('foobar') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n') - DECOMPOSER - MODIFIER_LIST - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foobar') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('s') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foobar') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') \ No newline at end of file diff --git a/idea/testData/psi/Decomposers_ERR.jet b/idea/testData/psi/Decomposers_ERR.jet deleted file mode 100644 index 00c44953f46..00000000000 --- a/idea/testData/psi/Decomposers_ERR.jet +++ /dev/null @@ -1,13 +0,0 @@ -decomposer (a a) -decomposer {foo.() : ()}.bar(, a) -decomposer a.foobar) -[a] decomposer foobar([a] s, ) -decomposer foobar([a]) - - -decomposer (a, a). -decomposer (). -decomposer {foo.() : ()}.bar(a, a). - - -decomposer foo.bar.-() diff --git a/idea/testData/psi/Decomposers_ERR.txt b/idea/testData/psi/Decomposers_ERR.txt deleted file mode 100644 index 0f9201981d1..00000000000 --- a/idea/testData/psi/Decomposers_ERR.txt +++ /dev/null @@ -1,198 +0,0 @@ -JetFile: Decomposers_ERR.jet - NAMESPACE - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiErrorElement:Expecting ',' or a closing ')' - - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('a') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - PsiErrorElement:Expecting a property name - - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('foobar') - DECOMPOSER_PROPERTY_LIST - PsiErrorElement:Expecting a property list in parentheses '( ... )' - - PsiElement(RPAR)(')') - PsiWhiteSpace('\n') - DECOMPOSER - MODIFIER_LIST - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foobar') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('s') - PsiElement(COMMA)(',') - PsiErrorElement:Expecting a property name - - PsiWhiteSpace(' ') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foobar') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiErrorElement:Expecting a property name - - PsiElement(RPAR)(')') - PsiWhiteSpace('\n\n\n') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(RPAR)(')') - PsiErrorElement:Cannot define an extension decomposer on a tuple - - PsiErrorElement:Expecting namespace or top level declaration - PsiElement(DOT)('.') - PsiWhiteSpace('\n') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiErrorElement:Cannot define an extension decomposer on a tuple - - PsiErrorElement:Expecting namespace or top level declaration - PsiElement(DOT)('.') - PsiWhiteSpace('\n') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(RPAR)(')') - PsiErrorElement:Expecting namespace or top level declaration - PsiElement(DOT)('.') - PsiWhiteSpace('\n\n\n') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - USER_TYPE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') - PsiElement(DOT)('.') - PsiErrorElement:Type name expected - PsiElement(MINUS)('-') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') \ No newline at end of file diff --git a/idea/testData/psi/EOLsOnRollback.jet b/idea/testData/psi/EOLsOnRollback.jet index bf88512c006..67fc2c3eb34 100644 --- a/idea/testData/psi/EOLsOnRollback.jet +++ b/idea/testData/psi/EOLsOnRollback.jet @@ -4,8 +4,6 @@ fun foo() { extension foo for boo type x = t - decomposer (df) - var r [a] var foo = 4 diff --git a/idea/testData/psi/EOLsOnRollback.txt b/idea/testData/psi/EOLsOnRollback.txt index 6d8bd9bc36e..5bc25ae0092 100644 --- a/idea/testData/psi/EOLsOnRollback.txt +++ b/idea/testData/psi/EOLsOnRollback.txt @@ -56,15 +56,6 @@ JetFile: EOLsOnRollback.jet USER_TYPE PsiElement(IDENTIFIER)('t') PsiWhiteSpace('\n ') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('df') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n\n ') PROPERTY PsiElement(var)('var') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/LocalDeclarations.jet b/idea/testData/psi/LocalDeclarations.jet index 5365c22249b..2a423643000 100644 --- a/idea/testData/psi/LocalDeclarations.jet +++ b/idea/testData/psi/LocalDeclarations.jet @@ -11,6 +11,4 @@ fun foo() { virtual extension foo for bar { } - - decomposer T.foo(bar) } diff --git a/idea/testData/psi/LocalDeclarations.txt b/idea/testData/psi/LocalDeclarations.txt index 94e3f752563..5e2be23fb39 100644 --- a/idea/testData/psi/LocalDeclarations.txt +++ b/idea/testData/psi/LocalDeclarations.txt @@ -140,20 +140,5 @@ JetFile: LocalDeclarations.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n\n ') PsiElement(RBRACE)('}') - PsiWhiteSpace('\n\n ') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('foo') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') - PsiElement(RPAR)(')') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/SimpleClassMembers.jet b/idea/testData/psi/SimpleClassMembers.jet index 1e7fbfc78c3..59ed6a8ae48 100644 --- a/idea/testData/psi/SimpleClassMembers.jet +++ b/idea/testData/psi/SimpleClassMembers.jet @@ -15,8 +15,6 @@ class foo { type foo = bar - decomposer (a, b, c) - this() : this(a, b, c), Foo(bar) } @@ -51,8 +49,6 @@ class foo { type foo = bar - decomposer (a, b, c) - this() : this(a, b, c), Foo(bar) } @@ -64,8 +60,6 @@ class foo { type foo = bar - decomposer (a, b, c) - this() : this(a, b, c), Foo(bar) this() : this(a, b, c), Foo(bar) { diff --git a/idea/testData/psi/SimpleClassMembers.txt b/idea/testData/psi/SimpleClassMembers.txt index 8541fd0bab4..afebff063e5 100644 --- a/idea/testData/psi/SimpleClassMembers.txt +++ b/idea/testData/psi/SimpleClassMembers.txt @@ -88,23 +88,6 @@ JetFile: SimpleClassMembers.jet USER_TYPE PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n ') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('c') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n\n ') CONSTRUCTOR PsiElement(this)('this') VALUE_PARAMETER_LIST @@ -336,23 +319,6 @@ JetFile: SimpleClassMembers.jet USER_TYPE PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n ') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('c') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n\n ') CONSTRUCTOR PsiElement(this)('this') VALUE_PARAMETER_LIST @@ -434,23 +400,6 @@ JetFile: SimpleClassMembers.jet USER_TYPE PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n ') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('c') - PsiElement(RPAR)(')') - PsiWhiteSpace('\n\n ') CONSTRUCTOR PsiElement(this)('this') VALUE_PARAMETER_LIST diff --git a/idea/testData/psi/SimpleClassMembers_ERR.jet b/idea/testData/psi/SimpleClassMembers_ERR.jet index 258089e8257..618218aeae6 100644 --- a/idea/testData/psi/SimpleClassMembers_ERR.jet +++ b/idea/testData/psi/SimpleClassMembers_ERR.jet @@ -14,8 +14,6 @@ class foo { type foo = ; - decomposer (a, b, c - this() : this(a, b, c), Foo(bar) { diff --git a/idea/testData/psi/SimpleClassMembers_ERR.txt b/idea/testData/psi/SimpleClassMembers_ERR.txt index 77e4f8f8e40..792fe089ac8 100644 --- a/idea/testData/psi/SimpleClassMembers_ERR.txt +++ b/idea/testData/psi/SimpleClassMembers_ERR.txt @@ -80,67 +80,52 @@ JetFile: SimpleClassMembers_ERR.jet PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n\n ') - DECOMPOSER - PsiElement(decomposer)('decomposer') - PsiWhiteSpace(' ') - DECOMPOSER_PROPERTY_LIST - PsiElement(LPAR)('(') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('c') - PsiErrorElement:Expecting ',' or a closing ')' - - PsiWhiteSpace('\n\n ') - PsiElement(this)('this') - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiErrorElement:Expecting member declaration - PsiElement(COLON)(':') - PsiWhiteSpace(' ') CONSTRUCTOR PsiElement(this)('this') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') - VALUE_PARAMETER - PsiElement(IDENTIFIER)('a') - PsiErrorElement:Parameters must have type annotation - - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - VALUE_PARAMETER - PsiElement(IDENTIFIER)('b') - PsiErrorElement:Parameters must have type annotation - - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - VALUE_PARAMETER - PsiElement(IDENTIFIER)('c') - PsiErrorElement:Parameters must have type annotation - PsiElement(RPAR)(')') - PsiErrorElement:Expecting member declaration - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - PsiErrorElement:Expecting member declaration - PsiElement(IDENTIFIER)('Foo') - PsiErrorElement:Expecting member declaration - PsiElement(LT)('<') - PsiErrorElement:Expecting member declaration - PsiElement(IDENTIFIER)('T') - PsiErrorElement:Expecting member declaration - PsiElement(LPAR)('(') - PsiErrorElement:Expecting member declaration - PsiElement(IDENTIFIER)('bar') - PsiErrorElement:Expecting member declaration - PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + INITIALIZER_LIST + THIS_CALL + PsiElement(this)('this') + VALUE_ARGUMENT_LIST + PsiElement(LPAR)('(') + VALUE_ARGUMENT + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + VALUE_ARGUMENT + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + VALUE_ARGUMENT + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') + PsiElement(RPAR)(')') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + DELEGATOR_SUPER_CALL + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiErrorElement:Expecting a '>' + + VALUE_ARGUMENT_LIST + PsiElement(LPAR)('(') + VALUE_ARGUMENT + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') + PsiElement(RPAR)(')') PsiWhiteSpace('\n\n ') CONSTRUCTOR PsiElement(this)('this')