azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-165 Make 'Select word' work correctly on ?. in a receiver type

Browse Source 
Spliiting-Joining of complex tokens (?. and ?:) added
This commit is contained in:
Andrey Breslav
2011-09-14 11:37:21 +04:00
parent aab4a6b437
commit b973b596b8
13 changed files with 458 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/buildLexer.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<project name="Lexer" default="lexer"> <project name="JetLexer" default="lexer">
<property name="home" value="${basedir}"/> <property name="home" value="${basedir}"/>
<property file="${home}/idea.properties"/> <property file="${home}/idea.properties"/>
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParser.java
+1
View File
@@ -10,6 +10,7 @@ import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class JetParser implements PsiParser { public class JetParser implements PsiParser {
@Override
@NotNull @NotNull
public ASTNode parse(IElementType iElementType, PsiBuilder psiBuilder) { public ASTNode parse(IElementType iElementType, PsiBuilder psiBuilder) {
JetParsing.createForTopLevel(new SemanticWhitespaceAwarePsiBuilderImpl(psiBuilder)).parseFile(); JetParsing.createForTopLevel(new SemanticWhitespaceAwarePsiBuilderImpl(psiBuilder)).parseFile();
compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+10 -17
View File
@@ -801,6 +801,8 @@ public class JetParsing extends AbstractJetParsing {
TokenSet propertyNameFollow = TokenSet.create(COLON, EQ, LBRACE, SEMICOLON); TokenSet propertyNameFollow = TokenSet.create(COLON, EQ, LBRACE, SEMICOLON);
myBuilder.disableJoiningComplexTokens();
// TODO: extract constant // TODO: extract constant
int lastDot = matchTokenStreamPredicate(new FirstBefore( int lastDot = matchTokenStreamPredicate(new FirstBefore(
new AtSet(DOT, SAFE_ACCESS), new AtSet(DOT, SAFE_ACCESS),
@@ -810,7 +812,7 @@ public class JetParsing extends AbstractJetParsing {
if (topLevel && (at(EQ) || at(COLON))) return true; if (topLevel && (at(EQ) || at(COLON))) return true;
if (topLevel && at(IDENTIFIER)) { if (topLevel && at(IDENTIFIER)) {
IElementType lookahead = lookahead(1); IElementType lookahead = lookahead(1);
return lookahead != LT && lookahead != DOT && lookahead != SAFE_ACCESS; return lookahead != LT && lookahead != DOT && lookahead != SAFE_ACCESS && lookahead != QUEST;
} }
return false; return false;
} }
@@ -818,6 +820,8 @@ public class JetParsing extends AbstractJetParsing {
parseReceiverType("property", propertyNameFollow, lastDot); parseReceiverType("property", propertyNameFollow, lastDot);
myBuilder.enableJoiningComplexTokens();
if (at(COLON)) { if (at(COLON)) {
advance(); // COLON advance(); // COLON
parseTypeRef(); parseTypeRef();
@@ -951,8 +955,10 @@ public class JetParsing extends AbstractJetParsing {
typeParameterListOccurred = true; typeParameterListOccurred = true;
} }
myBuilder.disableJoiningComplexTokens();
int lastDot = findLastBefore(RECEIVER_TYPE_TERMINATORS, TokenSet.create(LPAR), true); int lastDot = findLastBefore(RECEIVER_TYPE_TERMINATORS, TokenSet.create(LPAR), true);
parseReceiverType("function", TokenSet.create(LT, LPAR, COLON, EQ), lastDot); parseReceiverType("function", TokenSet.create(LT, LPAR, COLON, EQ), lastDot);
myBuilder.enableJoiningComplexTokens();
TokenSet valueParametersFollow = TokenSet.create(COLON, EQ, LBRACE, SEMICOLON, RPAR); TokenSet valueParametersFollow = TokenSet.create(COLON, EQ, LBRACE, SEMICOLON, RPAR);
@@ -993,21 +999,11 @@ public class JetParsing extends AbstractJetParsing {
* (type "." | attributes)? * (type "." | attributes)?
*/ */
private void parseReceiverType(String title, TokenSet nameFollow, int lastDot) { private void parseReceiverType(String title, TokenSet nameFollow, int lastDot) {
if (lastDot == -1) { // There's no explicit receiver type specified if (lastDot == -1) { // There's no explicit receiver type specified
parseAnnotations(false); parseAnnotations(false);
expect(IDENTIFIER, "Expecting " + title + " name or receiver type", nameFollow); expect(IDENTIFIER, "Expecting " + title + " name or receiver type", nameFollow);
} else { } else {
PsiBuilder.Marker typeRefMarker = mark(); createTruncatedBuilder(lastDot).parseTypeRef();
PsiBuilder.Marker nullableType = mark();
typeRefMarker = createTruncatedBuilder(lastDot).parseTypeRefContents(typeRefMarker);
if (at(SAFE_ACCESS)) {
nullableType.done(NULLABLE_TYPE);
}
else {
nullableType.drop();
}
typeRefMarker.done(TYPE_REFERENCE);
if (atSet(RECEIVER_TYPE_TERMINATORS)) { if (atSet(RECEIVER_TYPE_TERMINATORS)) {
advance(); // expectation advance(); // expectation
@@ -1258,10 +1254,7 @@ public class JetParsing extends AbstractJetParsing {
* : typeDescriptor "?" * : typeDescriptor "?"
*/ */
public void parseTypeRef() { public void parseTypeRef() {
parseTypeRefContents(mark()).done(TYPE_REFERENCE); PsiBuilder.Marker typeRefMarker = mark();
}
private PsiBuilder.Marker parseTypeRefContents(PsiBuilder.Marker typeRefMarker) {
parseAnnotations(false); parseAnnotations(false);
if (at(IDENTIFIER) || at(NAMESPACE_KEYWORD)) { if (at(IDENTIFIER) || at(NAMESPACE_KEYWORD)) {
@@ -1290,7 +1283,7 @@ public class JetParsing extends AbstractJetParsing {
typeRefMarker = precede; typeRefMarker = precede;
} }
return typeRefMarker; typeRefMarker.done(TYPE_REFERENCE);
} }
/* /*
compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilder.java
+3
View File
@@ -12,4 +12,7 @@ public interface SemanticWhitespaceAwarePsiBuilder extends PsiBuilder {
void disableNewlines(); void disableNewlines();
void enableNewlines(); void enableNewlines();
void restoreNewlinesState(); void restoreNewlinesState();
void enableJoiningComplexTokens();
void disableJoiningComplexTokens();
} }
compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderAdapter.java
+9
View File
@@ -35,4 +35,13 @@ public class SemanticWhitespaceAwarePsiBuilderAdapter extends PsiBuilderAdapter
myBuilder.restoreNewlinesState(); myBuilder.restoreNewlinesState();
} }
@Override
public void enableJoiningComplexTokens() {
myBuilder.enableJoiningComplexTokens();
}
@Override
public void disableJoiningComplexTokens() {
myBuilder.disableJoiningComplexTokens();
}
} }
compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderImpl.java
+69
View File
@@ -5,10 +5,13 @@ import com.intellij.lang.PsiBuilder;
import com.intellij.lang.impl.PsiBuilderAdapter; import com.intellij.lang.impl.PsiBuilderAdapter;
import com.intellij.psi.TokenType; import com.intellij.psi.TokenType;
import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.lexer.JetTokens;
import java.util.Stack; import java.util.Stack;
import static org.jetbrains.jet.lexer.JetTokens.*;
/** /**
* @author abreslav * @author abreslav
*/ */
@@ -62,4 +65,70 @@ public class SemanticWhitespaceAwarePsiBuilderImpl extends PsiBuilderAdapter imp
newlinesEnabled.pop(); newlinesEnabled.pop();
} }
private final TokenSet complexTokens = TokenSet.create(SAFE_ACCESS, ELVIS);
private boolean joinComplexTokens = true;
@Override
public void enableJoiningComplexTokens() {
joinComplexTokens = true;
}
@Override
public void disableJoiningComplexTokens() {
joinComplexTokens = false;
}
@Override
public IElementType getTokenType() {
if (!joinComplexTokens) return super.getTokenType();
return getJoinedTokenType(super.getTokenType(), 1);
}
private IElementType getJoinedTokenType(IElementType rawTokenType, int rawLookupSteps) {
if (rawTokenType == QUEST) {
IElementType nextRawToken = rawLookup(rawLookupSteps);
if (nextRawToken == DOT) return SAFE_ACCESS;
if (nextRawToken == COLON) return ELVIS;
}
return rawTokenType;
}
@Override
public void advanceLexer() {
if (!joinComplexTokens) {
super.advanceLexer();
return;
}
IElementType tokenType = getTokenType();
if (complexTokens.contains(tokenType)) {
Marker mark = mark();
super.advanceLexer();
super.advanceLexer();
mark.collapse(tokenType);
}
else {
super.advanceLexer();
}
}
@Override
public String getTokenText() {
if (!joinComplexTokens) return super.getTokenText();
IElementType tokenType = getTokenType();
if (complexTokens.contains(tokenType)) {
if (tokenType == ELVIS) return "?:";
if (tokenType == SAFE_ACCESS) return "?.";
}
return super.getTokenText();
}
@Override
public IElementType lookAhead(int steps) {
if (!joinComplexTokens) return super.lookAhead(steps);
if (complexTokens.contains(getTokenType())) {
return super.lookAhead(steps + 1);
}
return getJoinedTokenType(super.lookAhead(steps), 2);
}
} }
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNullableType.java
+1 -2
View File
@@ -2,7 +2,6 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode; import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.lexer.JetTokens;
import java.util.List; import java.util.List;
@@ -15,7 +14,7 @@ public class JetNullableType extends JetTypeElement {
super(node); super(node);
} }
@Nullable @NotNull
public ASTNode getQuestionMarkNode() { public ASTNode getQuestionMarkNode() {
return getNode().findChildByType(JetTokens.QUEST); return getNode().findChildByType(JetTokens.QUEST);
} }
compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex
+2 -2
View File
@@ -203,8 +203,8 @@ LONG_TEMPLATE_ENTRY_END=\}
"!=" { return JetTokens.EXCLEQ ; } "!=" { return JetTokens.EXCLEQ ; }
"&&" { return JetTokens.ANDAND ; } "&&" { return JetTokens.ANDAND ; }
"||" { return JetTokens.OROR ; } "||" { return JetTokens.OROR ; }
"?." { return JetTokens.SAFE_ACCESS;} //"?." { return JetTokens.SAFE_ACCESS;}
"?:" { return JetTokens.ELVIS ; } //"?:" { return JetTokens.ELVIS ; }
//".*" { return JetTokens.MAP ; } //".*" { return JetTokens.MAP ; }
//".?" { return JetTokens.FILTER ; } //".?" { return JetTokens.FILTER ; }
"*=" { return JetTokens.MULTEQ ; } "*=" { return JetTokens.MULTEQ ; }
compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java
+309 -319
View File
@@ -1,21 +1,20 @@
/* The following code was generated by JFlex 1.4.3 on 9/9/11 9:32 PM */ /* The following code was generated by JFlex 1.4.3 on 9/13/11 8:32 PM */
/* It's an automatically generated code. Do not modify it. */ /* It's an automatically generated code. Do not modify it. */
package org.jetbrains.jet.lexer; package org.jetbrains.jet.lexer;
import java.util.*; import com.intellij.lexer.FlexLexer;
import com.intellij.lexer.*; import com.intellij.psi.TokenType;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IElementType;
import org.jetbrains.jet.lexer.JetTokens; import java.util.Stack;
/** /**
* This class is a scanner generated by * This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4.3 * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
* on 9/9/11 9:32 PM from the specification file * on 9/13/11 8:32 PM from the specification file
* <tt>/Users/abreslav/work/jet/frontend/src/org/jetbrains/jet/lexer/Jet.flex</tt> * <tt>/Users/abreslav/work/jet/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex</tt>
*/ */
class _JetLexer implements FlexLexer { class _JetLexer implements FlexLexer {
/** initial size of the lookahead buffer */ /** initial size of the lookahead buffer */
@@ -42,10 +41,10 @@ class _JetLexer implements FlexLexer {
*/ */
private static final String ZZ_CMAP_PACKED = private static final String ZZ_CMAP_PACKED =
"\11\0\1\3\1\13\1\0\1\3\23\0\1\3\1\60\1\25\1\77"+ "\11\0\1\3\1\13\1\0\1\3\23\0\1\3\1\60\1\25\1\77"+
"\1\7\1\70\1\65\1\23\1\73\1\74\1\12\1\62\1\76\1\21"+ "\1\7\1\67\1\65\1\23\1\72\1\73\1\12\1\62\1\76\1\21"+
"\1\17\1\11\1\14\11\1\1\67\1\75\1\63\1\57\1\64\1\61"+ "\1\17\1\11\1\14\11\1\1\74\1\75\1\63\1\57\1\64\1\61"+
"\1\10\1\2\1\16\2\2\1\20\1\2\11\4\1\22\3\4\1\54"+ "\1\10\1\2\1\16\2\2\1\20\1\2\11\4\1\22\3\4\1\54"+
"\3\4\1\15\2\4\1\71\1\24\1\72\1\0\1\4\1\6\1\31"+ "\3\4\1\15\2\4\1\70\1\24\1\71\1\0\1\4\1\6\1\31"+
"\1\44\1\36\1\56\1\33\1\52\1\4\1\47\1\41\1\45\1\51"+ "\1\44\1\36\1\56\1\33\1\52\1\4\1\47\1\41\1\45\1\51"+
"\1\50\1\32\1\30\1\37\1\35\1\4\1\43\1\34\1\40\1\42"+ "\1\50\1\32\1\30\1\37\1\35\1\4\1\43\1\34\1\40\1\42"+
"\1\55\1\46\1\15\1\53\1\4\1\26\1\66\1\27\54\0\1\4"+ "\1\55\1\46\1\15\1\53\1\4\1\26\1\66\1\27\54\0\1\4"+
@@ -130,18 +129,18 @@ class _JetLexer implements FlexLexer {
"\1\53\1\54\1\55\1\56\2\12\1\0\2\3\1\57"+ "\1\53\1\54\1\55\1\56\2\12\1\0\2\3\1\57"+
"\7\3\1\60\1\61\1\62\10\3\1\63\1\64\1\65"+ "\7\3\1\60\1\61\1\62\10\3\1\63\1\64\1\65"+
"\1\0\1\66\1\67\1\70\1\71\1\72\1\73\1\74"+ "\1\0\1\66\1\67\1\70\1\71\1\72\1\73\1\74"+
"\1\75\1\76\1\77\1\100\1\0\1\101\1\102\1\0"+ "\1\75\1\76\1\0\1\77\1\100\1\0\1\101\1\43"+
"\1\103\1\43\1\3\2\0\1\50\1\104\4\0\1\105"+ "\1\3\2\0\1\50\1\102\4\0\1\103\2\3\1\104"+
"\2\3\1\106\6\3\1\107\10\3\1\110\1\111\1\3"+ "\6\3\1\105\10\3\1\106\1\107\1\3\1\110\1\111"+
"\1\112\1\113\1\114\1\115\1\116\1\117\1\0\1\40"+ "\1\112\1\113\1\114\1\115\1\0\1\40\1\44\1\45"+
"\1\44\1\45\1\0\2\104\1\43\2\0\1\3\1\120"+ "\1\0\2\102\1\43\2\0\1\3\1\116\1\117\4\3"+
"\1\121\4\3\1\122\1\123\1\3\1\124\2\3\1\125"+ "\1\120\1\121\1\3\1\122\2\3\1\123\2\3\1\124"+
"\2\3\1\126\1\100\1\50\2\0\2\3\1\127\1\3"+ "\1\76\1\50\2\0\2\3\1\125\1\3\1\126\1\127"+
"\1\130\1\131\1\3\1\132\1\133\1\134\1\105\2\3"+ "\1\3\1\130\1\131\1\132\1\103\2\3\1\133\1\134"+
"\1\135\1\136\3\3\1\137\1\140"; "\3\3\1\135\1\136";
private static int [] zzUnpackAction() { private static int [] zzUnpackAction() {
int [] result = new int[213]; int [] result = new int[211];
int offset = 0; int offset = 0;
offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
return result; return result;
@@ -170,32 +169,32 @@ class _JetLexer implements FlexLexer {
"\0\u0200\0\u0240\0\u0280\0\u02c0\0\u0300\0\u0340\0\u0380\0\u03c0"+ "\0\u0200\0\u0240\0\u0280\0\u02c0\0\u0300\0\u0340\0\u0380\0\u03c0"+
"\0\u0400\0\u0440\0\u0100\0\u0100\0\u0480\0\u04c0\0\u0500\0\u0540"+ "\0\u0400\0\u0440\0\u0100\0\u0100\0\u0480\0\u04c0\0\u0500\0\u0540"+
"\0\u0580\0\u05c0\0\u0600\0\u0640\0\u0680\0\u06c0\0\u0700\0\u0740"+ "\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\u0780\0\u07c0\0\u0800\0\u0840\0\u0100\0\u0880\0\u08c0\0\u0900"+
"\0\u0980\0\u09c0\0\u0100\0\u0a00\0\u0100\0\u0100\0\u0100\0\u0100"+ "\0\u0940\0\u0980\0\u09c0\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100"+
"\0\u0100\0\u0100\0\u0100\0\u0a40\0\u0a80\0\u0100\0\u0ac0\0\u0100"+ "\0\u0100\0\u0100\0\u0100\0\u0a00\0\u0a40\0\u0100\0\u0a80\0\u0100"+
"\0\u0b00\0\u0b40\0\u0100\0\u0100\0\u0b80\0\u0bc0\0\u0c00\0\u0c40"+ "\0\u0ac0\0\u0b00\0\u0100\0\u0100\0\u0b40\0\u0b80\0\u0bc0\0\u0c00"+
"\0\u0c80\0\u0cc0\0\u0d00\0\u0100\0\u0d40\0\u0d80\0\u0100\0\u0100"+ "\0\u0c40\0\u0c80\0\u0cc0\0\u0100\0\u0d00\0\u0d40\0\u0100\0\u0100"+
"\0\u0dc0\0\u0e00\0\u0e40\0\u0e80\0\u0100\0\u0100\0\u0100\0\u0100"+ "\0\u0d80\0\u0dc0\0\u0e00\0\u0e40\0\u0100\0\u0100\0\u0100\0\u0100"+
"\0\u0100\0\u0ec0\0\u0f00\0\u0f40\0\u0f80\0\u0fc0\0\u1000\0\u1040"+ "\0\u0100\0\u0e80\0\u0ec0\0\u0f00\0\u0f40\0\u0f80\0\u0fc0\0\u1000"+
"\0\u1080\0\u10c0\0\u1100\0\u1140\0\u1180\0\u0180\0\u0180\0\u0180"+ "\0\u1040\0\u1080\0\u10c0\0\u1100\0\u1140\0\u0180\0\u0180\0\u0180"+
"\0\u11c0\0\u1200\0\u1240\0\u1280\0\u12c0\0\u1300\0\u1340\0\u1380"+ "\0\u1180\0\u11c0\0\u1200\0\u1240\0\u1280\0\u12c0\0\u1300\0\u1340"+
"\0\u0180\0\u13c0\0\u0100\0\u1400\0\u1440\0\u0100\0\u0100\0\u0100"+ "\0\u0180\0\u1380\0\u0100\0\u13c0\0\u1400\0\u0100\0\u0100\0\u0100"+
"\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100\0\u1480\0\u14c0"+ "\0\u0100\0\u0100\0\u0100\0\u0100\0\u1440\0\u1480\0\u0100\0\u0100"+
"\0\u0100\0\u0100\0\u1500\0\u0100\0\u1540\0\u0100\0\u1580\0\u15c0"+ "\0\u14c0\0\u0100\0\u1500\0\u0100\0\u1540\0\u1580\0\u15c0\0\u1600"+
"\0\u1600\0\u1640\0\u1680\0\u16c0\0\u1700\0\u1740\0\u1780\0\u17c0"+ "\0\u1640\0\u1680\0\u16c0\0\u1700\0\u1740\0\u1780\0\u17c0\0\u0100"+
"\0\u1800\0\u0100\0\u1840\0\u1880\0\u18c0\0\u1900\0\u1940\0\u1980"+ "\0\u1800\0\u1840\0\u1880\0\u18c0\0\u1900\0\u1940\0\u0180\0\u1980"+
"\0\u0180\0\u19c0\0\u1a00\0\u1a40\0\u1a80\0\u1ac0\0\u1b00\0\u1b40"+ "\0\u19c0\0\u1a00\0\u1a40\0\u1a80\0\u1ac0\0\u1b00\0\u1b40\0\u0180"+
"\0\u1b80\0\u0180\0\u0180\0\u1bc0\0\u0180\0\u0180\0\u0100\0\u0100"+ "\0\u0180\0\u1b80\0\u0180\0\u0180\0\u0100\0\u0100\0\u0100\0\u0100"+
"\0\u0100\0\u0100\0\u1c00\0\u0100\0\u0100\0\u0100\0\u1c40\0\u1c80"+ "\0\u1bc0\0\u0100\0\u0100\0\u0100\0\u1c00\0\u1c40\0\u0100\0\u1c80"+
"\0\u0100\0\u1cc0\0\u1540\0\u1d00\0\u1d40\0\u0180\0\u0180\0\u1d80"+ "\0\u1500\0\u1cc0\0\u1d00\0\u0180\0\u0180\0\u1d40\0\u1d80\0\u1dc0"+
"\0\u1dc0\0\u1e00\0\u1e40\0\u0180\0\u0180\0\u1e80\0\u0180\0\u1ec0"+ "\0\u1e00\0\u0180\0\u0180\0\u1e40\0\u0180\0\u1e80\0\u1ec0\0\u0180"+
"\0\u1f00\0\u0180\0\u1f40\0\u1f80\0\u0180\0\u0100\0\u0100\0\u1fc0"+ "\0\u1f00\0\u1f40\0\u0180\0\u0100\0\u0100\0\u1f80\0\u1fc0\0\u2000"+
"\0\u2000\0\u2040\0\u2080\0\u0180\0\u20c0\0\u0180\0\u0180\0\u2100"+ "\0\u2040\0\u0180\0\u2080\0\u0180\0\u0180\0\u20c0\0\u0180\0\u0180"+
"\0\u0180\0\u0180\0\u0180\0\u0100\0\u2140\0\u2180\0\u0180\0\u0180"+ "\0\u0180\0\u0100\0\u2100\0\u2140\0\u0180\0\u0180\0\u2180\0\u21c0"+
"\0\u21c0\0\u2200\0\u2240\0\u0180\0\u0180"; "\0\u2200\0\u0180\0\u0180";
private static int [] zzUnpackRowMap() { private static int [] zzUnpackRowMap() {
int [] result = new int[213]; int [] result = new int[211];
int offset = 0; int offset = 0;
offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
return result; return result;
@@ -276,153 +275,152 @@ class _JetLexer implements FlexLexer {
"\1\7\1\0\1\7\5\0\1\7\1\150\25\7\22\0"+ "\1\7\1\0\1\7\5\0\1\7\1\150\25\7\22\0"+
"\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+ "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
"\1\7\5\0\7\7\1\151\17\7\100\0\1\152\4\0"+ "\1\7\5\0\7\7\1\151\17\7\100\0\1\152\4\0"+
"\1\153\54\0\1\154\15\0\1\155\37\0\1\156\47\0"+ "\1\153\54\0\1\154\15\0\1\155\77\0\1\156\2\0"+
"\1\157\67\0\1\160\2\0\1\161\74\0\1\162\77\0"+ "\1\157\74\0\1\160\77\0\1\161\105\0\1\162\100\0"+
"\1\163\105\0\1\164\100\0\1\165\70\0\1\166\20\0"+ "\1\163\70\0\1\164\20\0\7\64\1\0\3\64\1\0"+
"\7\64\1\0\3\64\1\0\10\64\2\0\52\64\2\0"+ "\10\64\2\0\52\64\2\0\1\165\1\0\1\165\1\0"+
"\1\167\1\0\1\167\1\0\1\170\6\0\2\167\1\0"+ "\1\166\6\0\2\165\1\0\1\165\1\0\1\165\3\0"+
"\1\167\1\0\1\167\3\0\1\171\1\0\27\167\21\0"+ "\1\167\1\0\27\165\21\0\13\170\1\0\64\170\1\0"+
"\13\172\1\0\64\172\1\0\2\71\1\0\2\71\6\0"+ "\2\71\1\0\2\71\6\0\3\71\1\0\1\71\1\0"+
"\3\71\1\0\1\71\1\0\1\71\5\0\27\71\23\0"+ "\1\71\5\0\27\71\23\0\1\171\1\0\1\171\10\0"+
"\1\173\1\0\1\173\10\0\2\173\1\0\1\173\1\0"+ "\2\171\1\0\1\171\1\0\1\171\5\0\27\171\22\0"+
"\1\173\5\0\27\173\22\0\1\114\12\0\1\114\2\0"+ "\1\114\12\0\1\114\2\0\1\172\61\0\1\173\12\0"+
"\1\174\61\0\1\175\12\0\1\175\4\0\1\175\40\0"+ "\1\173\4\0\1\173\40\0\1\173\16\0\2\77\1\0"+
"\1\175\16\0\2\77\1\0\2\77\1\176\5\0\3\77"+ "\2\77\1\174\5\0\3\77\1\0\1\77\1\0\1\77"+
"\1\0\1\77\1\0\1\77\5\0\27\77\22\0\2\100"+ "\5\0\27\77\22\0\2\100\1\0\2\100\6\0\3\100"+
"\1\0\2\100\6\0\3\100\1\0\1\100\1\0\1\100"+ "\1\0\1\100\1\0\1\100\5\0\27\100\23\0\1\175"+
"\5\0\27\100\23\0\1\177\1\0\1\177\10\0\2\177"+ "\1\0\1\175\10\0\2\175\1\0\1\175\1\0\1\175"+
"\1\0\1\177\1\0\1\177\5\0\27\177\22\0\2\102"+ "\5\0\27\175\22\0\2\102\1\0\2\102\6\0\3\102"+
"\1\0\2\102\6\0\3\102\1\0\1\102\1\0\1\102"+ "\1\0\1\102\1\0\1\102\5\0\27\102\23\0\1\176"+
"\5\0\27\102\23\0\1\200\1\0\1\200\10\0\2\200"+ "\1\0\1\176\10\0\2\176\1\0\1\176\1\0\1\176"+
"\1\0\1\200\1\0\1\200\5\0\27\200\21\0\13\105"+ "\5\0\27\176\21\0\13\105\1\0\64\105\12\177\1\200"+
"\1\0\64\105\12\201\1\202\65\201\1\0\1\111\12\0"+ "\65\177\1\0\1\111\12\0\1\111\2\0\1\201\1\76"+
"\1\111\2\0\1\203\1\76\12\0\1\76\45\0\2\112"+ "\12\0\1\76\45\0\2\112\11\0\1\112\1\0\1\112"+
"\11\0\1\112\1\0\1\112\1\204\1\112\1\0\1\205"+ "\1\202\1\112\1\0\1\203\6\0\1\112\1\0\1\112"+
"\6\0\1\112\1\0\1\112\1\0\1\205\1\112\5\0"+ "\1\0\1\203\1\112\5\0\1\112\5\0\1\112\3\0"+
"\1\112\5\0\1\112\3\0\1\112\22\0\1\113\12\0"+ "\1\112\22\0\1\113\12\0\1\113\2\0\1\204\61\0"+
"\1\113\2\0\1\206\61\0\1\114\12\0\1\114\3\0"+ "\1\114\12\0\1\114\3\0\1\76\12\0\1\76\44\0"+
"\1\76\12\0\1\76\44\0\13\21\1\0\64\21\25\0"+ "\13\21\1\0\64\21\25\0\1\205\53\0\2\7\1\0"+
"\1\207\53\0\2\7\1\0\2\7\6\0\3\7\1\0"+
"\1\7\1\0\1\7\5\0\2\7\1\210\24\7\22\0"+
"\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
"\1\7\5\0\20\7\1\211\6\7\22\0\2\7\1\0"+
"\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+ "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
"\27\7\2\0\1\212\17\0\2\7\1\0\2\7\6\0"+ "\2\7\1\206\24\7\22\0\2\7\1\0\2\7\6\0"+
"\3\7\1\0\1\7\1\0\1\7\5\0\4\7\1\213"+ "\3\7\1\0\1\7\1\0\1\7\5\0\20\7\1\207"+
"\22\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+ "\6\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
"\1\7\1\0\1\7\5\0\1\214\26\7\22\0\2\7"+ "\1\7\1\0\1\7\5\0\27\7\2\0\1\210\17\0"+
"\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+ "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
"\5\0\1\7\1\215\25\7\22\0\2\7\1\0\2\7"+ "\1\7\5\0\4\7\1\211\22\7\22\0\2\7\1\0"+
"\6\0\3\7\1\0\1\7\1\0\1\7\5\0\15\7"+ "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
"\1\216\11\7\22\0\2\7\1\0\2\7\6\0\3\7"+ "\1\212\26\7\22\0\2\7\1\0\2\7\6\0\3\7"+
"\1\0\1\7\1\0\1\7\5\0\1\7\1\217\10\7"+ "\1\0\1\7\1\0\1\7\5\0\1\7\1\213\25\7"+
"\1\220\10\7\1\221\3\7\22\0\2\7\1\0\2\7"+
"\6\0\3\7\1\0\1\7\1\0\1\7\5\0\11\7"+
"\1\222\1\7\1\223\13\7\22\0\2\7\1\0\2\7"+
"\6\0\3\7\1\0\1\7\1\0\1\7\5\0\5\7"+
"\1\224\21\7\22\0\2\7\1\0\2\7\6\0\3\7"+
"\1\0\1\7\1\0\1\7\5\0\10\7\1\225\16\7"+
"\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+ "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
"\1\0\1\7\5\0\3\7\1\226\23\7\22\0\2\7"+ "\1\0\1\7\5\0\15\7\1\214\11\7\22\0\2\7"+
"\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+ "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
"\5\0\3\7\1\227\5\7\1\230\15\7\22\0\2\7"+ "\5\0\1\7\1\215\10\7\1\216\10\7\1\217\3\7"+
"\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
"\1\0\1\7\5\0\11\7\1\220\1\7\1\221\13\7"+
"\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
"\1\0\1\7\5\0\5\7\1\222\21\7\22\0\2\7"+
"\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+ "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
"\5\0\20\7\1\231\6\7\22\0\2\7\1\0\2\7"+ "\5\0\10\7\1\223\16\7\22\0\2\7\1\0\2\7"+
"\6\0\3\7\1\0\1\7\1\0\1\7\5\0\13\7"+ "\6\0\3\7\1\0\1\7\1\0\1\7\5\0\3\7"+
"\1\232\13\7\22\0\2\7\1\0\2\7\6\0\3\7"+ "\1\224\23\7\22\0\2\7\1\0\2\7\6\0\3\7"+
"\1\0\1\7\1\0\1\7\5\0\1\233\26\7\22\0"+ "\1\0\1\7\1\0\1\7\5\0\3\7\1\225\5\7"+
"\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+ "\1\226\15\7\22\0\2\7\1\0\2\7\6\0\3\7"+
"\1\7\5\0\11\7\1\234\15\7\22\0\2\7\1\0"+ "\1\0\1\7\1\0\1\7\5\0\20\7\1\227\6\7"+
"\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+ "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
"\13\7\1\235\4\7\1\236\6\7\100\0\1\237\50\0"+ "\1\0\1\7\5\0\13\7\1\230\13\7\22\0\2\7"+
"\1\240\3\0\1\241\122\0\1\242\21\0\2\167\1\0"+ "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
"\2\167\6\0\3\167\1\0\1\167\1\0\1\167\5\0"+ "\5\0\1\231\26\7\22\0\2\7\1\0\2\7\6\0"+
"\27\167\23\0\1\243\1\0\1\243\10\0\2\243\1\0"+ "\3\7\1\0\1\7\1\0\1\7\5\0\11\7\1\232"+
"\1\243\1\0\1\243\5\0\27\243\22\0\2\173\1\0"+ "\15\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
"\2\173\1\244\5\0\3\173\1\0\1\173\1\0\1\173"+ "\1\7\1\0\1\7\5\0\13\7\1\233\4\7\1\234"+
"\5\0\27\173\22\0\1\175\12\0\1\175\64\0\2\177"+ "\6\7\100\0\1\235\50\0\1\236\3\0\1\237\122\0"+
"\1\0\2\177\1\245\5\0\3\177\1\0\1\177\1\0"+ "\1\240\21\0\2\165\1\0\2\165\6\0\3\165\1\0"+
"\1\177\5\0\27\177\22\0\2\200\1\0\2\200\1\246"+ "\1\165\1\0\1\165\5\0\27\165\23\0\1\241\1\0"+
"\5\0\3\200\1\0\1\200\1\0\1\200\5\0\27\200"+ "\1\241\10\0\2\241\1\0\1\241\1\0\1\241\5\0"+
"\21\0\12\201\1\247\65\201\11\250\1\251\1\202\65\250"+ "\27\241\22\0\2\171\1\0\2\171\1\242\5\0\3\171"+
"\1\0\1\114\12\0\1\114\64\0\2\252\11\0\1\252"+ "\1\0\1\171\1\0\1\171\5\0\27\171\22\0\1\173"+
"\1\0\1\252\1\174\1\252\10\0\1\252\1\0\1\252"+ "\12\0\1\173\64\0\2\175\1\0\2\175\1\243\5\0"+
"\2\0\1\252\5\0\1\252\5\0\1\252\3\0\1\252"+ "\3\175\1\0\1\175\1\0\1\175\5\0\27\175\22\0"+
"\22\0\1\175\12\0\1\175\4\0\1\253\40\0\1\253"+ "\2\176\1\0\2\176\1\244\5\0\3\176\1\0\1\176"+
"\34\0\1\174\60\0\25\207\1\254\52\207\1\0\2\7"+ "\1\0\1\176\5\0\27\176\21\0\12\177\1\245\65\177"+
"\11\246\1\247\1\200\65\246\1\0\1\114\12\0\1\114"+
"\64\0\2\250\11\0\1\250\1\0\1\250\1\172\1\250"+
"\10\0\1\250\1\0\1\250\2\0\1\250\5\0\1\250"+
"\5\0\1\250\3\0\1\250\22\0\1\173\12\0\1\173"+
"\4\0\1\251\40\0\1\251\34\0\1\172\60\0\25\205"+
"\1\252\52\205\1\0\2\7\1\0\2\7\6\0\3\7"+
"\1\0\1\7\1\0\1\7\5\0\3\7\1\253\23\7"+
"\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
"\1\0\1\7\5\0\20\7\1\254\6\7\22\0\2\7"+
"\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+ "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
"\5\0\3\7\1\255\23\7\22\0\2\7\1\0\2\7"+ "\5\0\3\7\1\255\23\7\22\0\2\7\1\0\2\7"+
"\6\0\3\7\1\0\1\7\1\0\1\7\5\0\20\7"+ "\6\0\3\7\1\0\1\7\1\0\1\7\5\0\10\7"+
"\1\256\6\7\22\0\2\7\1\0\2\7\6\0\3\7"+ "\1\256\16\7\22\0\2\7\1\0\2\7\6\0\3\7"+
"\1\0\1\7\1\0\1\7\5\0\3\7\1\257\23\7"+ "\1\0\1\7\1\0\1\7\5\0\4\7\1\257\22\7"+
"\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+ "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
"\1\0\1\7\5\0\10\7\1\260\16\7\22\0\2\7"+ "\1\0\1\7\5\0\3\7\1\260\23\7\22\0\2\7"+
"\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+ "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
"\5\0\4\7\1\261\22\7\22\0\2\7\1\0\2\7"+ "\5\0\11\7\1\261\15\7\22\0\2\7\1\0\2\7"+
"\6\0\3\7\1\0\1\7\1\0\1\7\5\0\3\7"+ "\6\0\3\7\1\0\1\7\1\0\1\7\5\0\3\7"+
"\1\262\23\7\22\0\2\7\1\0\2\7\6\0\3\7"+ "\1\262\23\7\22\0\2\7\1\0\2\7\6\0\3\7"+
"\1\0\1\7\1\0\1\7\5\0\11\7\1\263\15\7"+ "\1\0\1\7\1\0\1\7\5\0\4\7\1\263\22\7"+
"\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+ "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
"\1\0\1\7\5\0\3\7\1\264\23\7\22\0\2\7"+ "\1\0\1\7\5\0\7\7\1\264\17\7\22\0\2\7"+
"\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+ "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
"\5\0\4\7\1\265\22\7\22\0\2\7\1\0\2\7"+ "\5\0\3\7\1\265\23\7\22\0\2\7\1\0\2\7"+
"\6\0\3\7\1\0\1\7\1\0\1\7\5\0\7\7"+ "\6\0\3\7\1\0\1\7\1\0\1\7\5\0\12\7"+
"\1\266\17\7\22\0\2\7\1\0\2\7\6\0\3\7"+ "\1\266\14\7\22\0\2\7\1\0\2\7\6\0\3\7"+
"\1\0\1\7\1\0\1\7\5\0\3\7\1\267\23\7"+ "\1\0\1\7\1\0\1\7\5\0\1\7\1\267\25\7"+
"\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+ "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
"\1\0\1\7\5\0\12\7\1\270\14\7\22\0\2\7"+ "\1\0\1\7\5\0\1\270\26\7\22\0\2\7\1\0"+
"\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
"\5\0\1\7\1\271\25\7\22\0\2\7\1\0\2\7"+
"\6\0\3\7\1\0\1\7\1\0\1\7\5\0\1\272"+
"\26\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
"\1\7\1\0\1\7\5\0\20\7\1\273\6\7\22\0"+
"\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
"\1\7\5\0\4\7\1\274\22\7\22\0\2\7\1\0"+
"\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+ "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
"\4\7\1\275\22\7\22\0\2\243\1\0\2\243\1\276"+ "\20\7\1\271\6\7\22\0\2\7\1\0\2\7\6\0"+
"\5\0\3\243\1\0\1\243\1\0\1\243\5\0\27\243"+ "\3\7\1\0\1\7\1\0\1\7\5\0\4\7\1\272"+
"\21\0\11\201\1\277\1\247\65\201\12\250\1\300\65\250"+ "\22\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
"\1\0\2\252\11\0\1\252\1\0\1\252\1\0\1\252"+ "\1\7\1\0\1\7\5\0\4\7\1\273\22\7\22\0"+
"\1\0\1\205\6\0\1\252\1\0\1\252\1\0\1\205"+ "\2\241\1\0\2\241\1\274\5\0\3\241\1\0\1\241"+
"\1\252\5\0\1\252\5\0\1\252\3\0\1\252\21\0"+ "\1\0\1\241\5\0\27\241\21\0\11\177\1\275\1\245"+
"\25\207\1\301\52\207\1\0\2\7\1\0\2\7\6\0"+ "\65\177\12\246\1\276\65\246\1\0\2\250\11\0\1\250"+
"\1\0\1\250\1\0\1\250\1\0\1\203\6\0\1\250"+
"\1\0\1\250\1\0\1\203\1\250\5\0\1\250\5\0"+
"\1\250\3\0\1\250\21\0\25\205\1\277\52\205\1\0"+
"\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
"\1\7\5\0\4\7\1\300\22\7\22\0\2\7\1\0"+
"\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
"\11\7\1\301\15\7\22\0\2\7\1\0\2\7\6\0"+
"\3\7\1\0\1\7\1\0\1\7\5\0\4\7\1\302"+ "\3\7\1\0\1\7\1\0\1\7\5\0\4\7\1\302"+
"\22\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+ "\22\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
"\1\7\1\0\1\7\5\0\11\7\1\303\15\7\22\0"+ "\1\7\1\0\1\7\5\0\6\7\1\303\20\7\22\0"+
"\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+ "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
"\1\7\5\0\4\7\1\304\22\7\22\0\2\7\1\0"+ "\1\7\5\0\10\7\1\304\16\7\22\0\2\7\1\0"+
"\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+ "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
"\6\7\1\305\20\7\22\0\2\7\1\0\2\7\6\0"+ "\16\7\1\305\10\7\22\0\2\7\1\0\2\7\6\0"+
"\3\7\1\0\1\7\1\0\1\7\5\0\10\7\1\306"+ "\3\7\1\0\1\7\1\0\1\7\5\0\13\7\1\306"+
"\16\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+ "\13\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
"\1\7\1\0\1\7\5\0\16\7\1\307\10\7\22\0"+ "\1\7\1\0\1\7\5\0\21\7\1\307\5\7\22\0"+
"\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+ "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
"\1\7\5\0\13\7\1\310\13\7\22\0\2\7\1\0"+ "\1\7\5\0\3\7\1\310\23\7\22\0\2\7\1\0"+
"\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+ "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
"\21\7\1\311\5\7\22\0\2\7\1\0\2\7\6\0"+ "\3\7\1\311\23\7\21\0\11\246\1\247\1\276\65\246"+
"\3\7\1\0\1\7\1\0\1\7\5\0\3\7\1\312"+ "\25\205\1\312\52\205\1\0\2\7\1\0\2\7\6\0"+
"\3\7\1\0\1\7\1\0\1\7\5\0\5\7\1\313"+
"\21\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
"\1\7\1\0\1\7\5\0\1\314\26\7\22\0\2\7"+
"\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
"\5\0\10\7\1\315\16\7\22\0\2\7\1\0\2\7"+
"\6\0\3\7\1\0\1\7\1\0\1\7\5\0\1\316"+
"\26\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
"\1\7\1\0\1\7\5\0\1\7\1\317\25\7\22\0"+
"\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
"\1\7\5\0\12\7\1\320\14\7\22\0\2\7\1\0"+
"\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
"\6\7\1\321\20\7\22\0\2\7\1\0\2\7\6\0"+
"\3\7\1\0\1\7\1\0\1\7\5\0\3\7\1\322"+
"\23\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+ "\23\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
"\1\7\1\0\1\7\5\0\3\7\1\313\23\7\21\0"+ "\1\7\1\0\1\7\5\0\3\7\1\323\23\7\21\0";
"\11\250\1\251\1\300\65\250\25\207\1\314\52\207\1\0"+
"\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
"\1\7\5\0\5\7\1\315\21\7\22\0\2\7\1\0"+
"\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
"\1\316\26\7\22\0\2\7\1\0\2\7\6\0\3\7"+
"\1\0\1\7\1\0\1\7\5\0\10\7\1\317\16\7"+
"\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
"\1\0\1\7\5\0\1\320\26\7\22\0\2\7\1\0"+
"\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
"\1\7\1\321\25\7\22\0\2\7\1\0\2\7\6\0"+
"\3\7\1\0\1\7\1\0\1\7\5\0\12\7\1\322"+
"\14\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
"\1\7\1\0\1\7\5\0\6\7\1\323\20\7\22\0"+
"\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
"\1\7\5\0\3\7\1\324\23\7\22\0\2\7\1\0"+
"\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
"\3\7\1\325\23\7\21\0";
private static int [] zzUnpackTrans() { private static int [] zzUnpackTrans() {
int [] result = new int[8832]; int [] result = new int[8768];
int offset = 0; int offset = 0;
offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
return result; return result;
@@ -463,17 +461,17 @@ class _JetLexer implements FlexLexer {
private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
private static final String ZZ_ATTRIBUTE_PACKED_0 = private static final String ZZ_ATTRIBUTE_PACKED_0 =
"\4\0\1\11\15\1\2\11\26\1\1\11\1\1\7\11"+ "\4\0\1\11\15\1\2\11\20\1\1\11\6\1\10\11"+
"\2\1\1\11\1\0\1\11\1\1\1\0\2\11\1\0"+ "\2\1\1\11\1\0\1\11\1\1\1\0\2\11\1\0"+
"\1\1\1\0\1\1\1\0\1\1\1\0\1\11\2\1"+ "\1\1\1\0\1\1\1\0\1\1\1\0\1\11\2\1"+
"\2\11\4\1\5\11\1\1\1\0\27\1\1\11\1\0"+ "\2\11\4\1\5\11\1\1\1\0\27\1\1\11\1\0"+
"\1\1\11\11\1\1\1\0\2\11\1\0\1\11\1\1"+ "\1\1\7\11\1\1\1\0\2\11\1\0\1\11\1\1"+
"\1\11\2\0\2\1\4\0\3\1\1\11\24\1\4\11"+ "\1\11\2\0\2\1\4\0\3\1\1\11\24\1\4\11"+
"\1\0\3\11\1\0\1\1\1\11\1\1\2\0\21\1"+ "\1\0\3\11\1\0\1\1\1\11\1\1\2\0\21\1"+
"\2\11\2\0\12\1\1\11\11\1"; "\2\11\2\0\12\1\1\11\11\1";
private static int [] zzUnpackAttribute() { private static int [] zzUnpackAttribute() {
int [] result = new int[213]; int [] result = new int[211];
int offset = 0; int offset = 0;
offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
return result; return result;
@@ -807,23 +805,23 @@ class _JetLexer implements FlexLexer {
case 3: case 3:
{ return JetTokens.IDENTIFIER; { return JetTokens.IDENTIFIER;
} }
case 97: break; case 95: break;
case 11: case 11:
{ pushState(STRING); return JetTokens.OPEN_QUOTE; { pushState(STRING); return JetTokens.OPEN_QUOTE;
} }
case 98: break; case 96: break;
case 72: case 70:
{ return JetTokens.FOR_KEYWORD ; { return JetTokens.FOR_KEYWORD ;
} }
case 99: break; case 97: break;
case 94: case 92:
{ return JetTokens.RETURN_KEYWORD ; { return JetTokens.RETURN_KEYWORD ;
} }
case 100: break; case 98: break;
case 80: case 78:
{ return JetTokens.NULL_KEYWORD ; { return JetTokens.NULL_KEYWORD ;
} }
case 101: break; case 99: break;
case 34: case 34:
{ if (lBraceCount == 0) { { if (lBraceCount == 0) {
popState(); popState();
@@ -832,369 +830,361 @@ class _JetLexer implements FlexLexer {
lBraceCount--; lBraceCount--;
return JetTokens.RBRACE; return JetTokens.RBRACE;
} }
case 102: break; case 100: break;
case 18: case 18:
{ return JetTokens.LT ; { return JetTokens.LT ;
} }
case 103: break; case 101: break;
case 51: case 51:
{ return JetTokens.DO_KEYWORD ; { return JetTokens.DO_KEYWORD ;
} }
case 104: break; case 102: break;
case 17: case 17:
{ return JetTokens.PLUS ; { return JetTokens.PLUS ;
} }
case 105: break; case 103: break;
case 69: case 67:
{ return JetTokens.RAW_STRING_LITERAL; { return JetTokens.RAW_STRING_LITERAL;
} }
case 106: break; case 104: break;
case 57: case 55:
{ return JetTokens.PLUSEQ ; { return JetTokens.PLUSEQ ;
} }
case 107: break; case 105: break;
case 27: case 27:
{ return JetTokens.COMMA ; { return JetTokens.COMMA ;
} }
case 108: break; case 106: break;
case 19: case 19:
{ return JetTokens.GT ; { return JetTokens.GT ;
} }
case 109: break; case 107: break;
case 4: case 4:
{ return JetTokens.WHITE_SPACE; { return JetTokens.WHITE_SPACE;
} }
case 110: break; case 108: break;
case 25: case 24:
{ return JetTokens.RPAR ; { return JetTokens.RPAR ;
} }
case 111: break; case 109: break;
case 53: case 53:
{ return JetTokens.DOUBLE_ARROW; { return JetTokens.DOUBLE_ARROW;
} }
case 112: break; case 110: break;
case 82: case 80:
{ return JetTokens.TRUE_KEYWORD ; { return JetTokens.TRUE_KEYWORD ;
} }
case 113: break; case 111: break;
case 36: case 36:
{ return JetTokens.FIELD_IDENTIFIER; { return JetTokens.FIELD_IDENTIFIER;
} }
case 114: break; case 112: break;
case 61: case 59:
{ return JetTokens.ANDAND ; { return JetTokens.ANDAND ;
} }
case 115: break; case 113: break;
case 65: case 63:
{ pushState(LONG_TEMPLATE_ENTRY); return JetTokens.LONG_TEMPLATE_ENTRY_START; { pushState(LONG_TEMPLATE_ENTRY); return JetTokens.LONG_TEMPLATE_ENTRY_START;
} }
case 116: break; case 114: break;
case 68: case 66:
{ return JetTokens.DOC_COMMENT; { return JetTokens.DOC_COMMENT;
} }
case 117: break; case 115: break;
case 35: case 35:
{ return JetTokens.FLOAT_LITERAL; { return JetTokens.FLOAT_LITERAL;
} }
case 118: break; case 116: break;
case 39: case 39:
{ return JetTokens.EOL_COMMENT; { return JetTokens.EOL_COMMENT;
} }
case 119: break; case 117: break;
case 85: case 83:
{ return JetTokens.WHEN_KEYWORD ; { return JetTokens.WHEN_KEYWORD ;
} }
case 120: break; case 118: break;
case 20: case 25:
{ return JetTokens.COLON ; { return JetTokens.COLON ;
} }
case 121: break; case 119: break;
case 59: case 57:
{ return JetTokens.LTEQ ; { return JetTokens.LTEQ ;
} }
case 122: break; case 120: break;
case 46: case 46:
{ return JetTokens.ARROW ; { return JetTokens.ARROW ;
} }
case 123: break; case 121: break;
case 32: case 32:
{ popState(); return JetTokens.IDENTIFIER; { popState(); return JetTokens.IDENTIFIER;
} }
case 124: break; case 122: break;
case 22: case 21:
{ return JetTokens.LBRACKET ; { return JetTokens.LBRACKET ;
} }
case 125: break; case 123: break;
case 67: case 65:
{ yypushback(2); return JetTokens.INTEGER_LITERAL; { yypushback(2); return JetTokens.INTEGER_LITERAL;
} }
case 126: break; case 124: break;
case 10: case 10:
{ return JetTokens.CHARACTER_LITERAL; { return JetTokens.CHARACTER_LITERAL;
} }
case 127: break; case 125: break;
case 74: case 72:
{ return JetTokens.VAR_KEYWORD ; { return JetTokens.VAR_KEYWORD ;
} }
case 128: break; case 126: break;
case 60: case 58:
{ return JetTokens.GTEQ ; { return JetTokens.GTEQ ;
} }
case 129: break; case 127: break;
case 2: case 2:
{ return JetTokens.INTEGER_LITERAL; { return JetTokens.INTEGER_LITERAL;
} }
case 130: break; case 128: break;
case 13: case 13:
{ return JetTokens.RBRACE ; { return JetTokens.RBRACE ;
} }
case 131: break; case 129: break;
case 87: case 85:
{ return JetTokens.CLASS_KEYWORD ; { return JetTokens.CLASS_KEYWORD ;
} }
case 132: break; case 130: break;
case 15: case 15:
{ return JetTokens.EXCL ; { return JetTokens.EXCL ;
} }
case 133: break; case 131: break;
case 71: case 69:
{ return JetTokens.TRY_KEYWORD ; { return JetTokens.TRY_KEYWORD ;
} }
case 134: break; case 132: break;
case 54: case 54:
{ return JetTokens.EXCLEQ ; { return JetTokens.EXCLEQ ;
} }
case 135: break; case 133: break;
case 45: case 45:
{ return JetTokens.MINUSEQ ; { return JetTokens.MINUSEQ ;
} }
case 136: break; case 134: break;
case 89: case 87:
{ return JetTokens.THROW_KEYWORD ; { return JetTokens.THROW_KEYWORD ;
} }
case 137: break; case 135: break;
case 91: case 89:
{ return JetTokens.WHILE_KEYWORD ; { return JetTokens.WHILE_KEYWORD ;
} }
case 138: break; case 136: break;
case 44: case 44:
{ return JetTokens.MINUSMINUS; { return JetTokens.MINUSMINUS;
} }
case 139: break; case 137: break;
case 95: case 93:
{ return JetTokens.CONTINUE_KEYWORD ; { return JetTokens.CONTINUE_KEYWORD ;
} }
case 140: break; case 138: break;
case 77: case 75:
{ return JetTokens.NOT_IN; { return JetTokens.NOT_IN;
} }
case 141: break; case 139: break;
case 38: case 38:
{ return JetTokens.ATAT ; { return JetTokens.ATAT ;
} }
case 142: break; case 140: break;
case 6: case 6:
{ return JetTokens.DIV ; { return JetTokens.DIV ;
} }
case 143: break; case 141: break;
case 56:
{ return JetTokens.ELVIS ;
}
case 144: break;
case 37: case 37:
{ return JetTokens.LABEL_IDENTIFIER; { return JetTokens.LABEL_IDENTIFIER;
} }
case 145: break; case 142: break;
case 29: case 29:
{ return JetTokens.REGULAR_STRING_PART; { return JetTokens.REGULAR_STRING_PART;
} }
case 146: break; case 143: break;
case 16: case 16:
{ return JetTokens.QUEST ; { return JetTokens.QUEST ;
} }
case 147: break; case 144: break;
case 62: case 60:
{ return JetTokens.OROR ; { return JetTokens.OROR ;
} }
case 148: break; case 145: break;
case 21: case 20:
{ return JetTokens.PERC ; { return JetTokens.PERC ;
} }
case 149: break; case 146: break;
case 79: case 77:
{ return JetTokens.EXCLEQEQEQ; { return JetTokens.EXCLEQEQEQ;
} }
case 150: break; case 147: break;
case 63: case 61:
{ return JetTokens.PERCEQ ; { return JetTokens.PERCEQ ;
} }
case 151: break; case 148: break;
case 43: case 43:
{ return JetTokens.RANGE ; { return JetTokens.RANGE ;
} }
case 152: break; case 149: break;
case 1: case 1:
{ return TokenType.BAD_CHARACTER; { return TokenType.BAD_CHARACTER;
} }
case 153: break; case 150: break;
case 55: case 94:
{ return JetTokens.SAFE_ACCESS;
}
case 154: break;
case 96:
{ return JetTokens.NAMESPACE_KEYWORD ; { return JetTokens.NAMESPACE_KEYWORD ;
} }
case 155: break; case 151: break;
case 78: case 76:
{ return JetTokens.NOT_IS; { return JetTokens.NOT_IS;
} }
case 156: break; case 152: break;
case 7: case 7:
{ return JetTokens.MUL ; { return JetTokens.MUL ;
} }
case 157: break; case 153: break;
case 23: case 22:
{ return JetTokens.RBRACKET ; { return JetTokens.RBRACKET ;
} }
case 158: break; case 154: break;
case 58: case 56:
{ return JetTokens.PLUSPLUS ; { return JetTokens.PLUSPLUS ;
} }
case 159: break; case 155: break;
case 83: case 81:
{ return JetTokens.THIS_KEYWORD ; { return JetTokens.THIS_KEYWORD ;
} }
case 160: break; case 156: break;
case 8: case 8:
{ return JetTokens.DOT ; { return JetTokens.DOT ;
} }
case 161: break; case 157: break;
case 26: case 26:
{ return JetTokens.SEMICOLON ; { return JetTokens.SEMICOLON ;
} }
case 162: break; case 158: break;
case 50: case 50:
{ return JetTokens.IF_KEYWORD ; { return JetTokens.IF_KEYWORD ;
} }
case 163: break; case 159: break;
case 66: case 64:
{ return JetTokens.ESCAPE_SEQUENCE; { return JetTokens.ESCAPE_SEQUENCE;
} }
case 164: break; case 160: break;
case 31: case 31:
{ popState(); return JetTokens.CLOSING_QUOTE; { popState(); return JetTokens.CLOSING_QUOTE;
} }
case 165: break; case 161: break;
case 14: case 14:
{ return JetTokens.EQ ; { return JetTokens.EQ ;
} }
case 166: break; case 162: break;
case 5: case 5:
{ return JetTokens.AT ; { return JetTokens.AT ;
} }
case 167: break; case 163: break;
case 70: case 68:
{ return JetTokens.AS_SAFE; { return JetTokens.AS_SAFE;
} }
case 168: break; case 164: break;
case 24: case 23:
{ return JetTokens.LPAR ; { return JetTokens.LPAR ;
} }
case 169: break; case 165: break;
case 9: case 9:
{ return JetTokens.MINUS ; { return JetTokens.MINUS ;
} }
case 170: break; case 166: break;
case 92: case 90:
{ return JetTokens.FALSE_KEYWORD ; { return JetTokens.FALSE_KEYWORD ;
} }
case 171: break; case 167: break;
case 84: case 82:
{ return JetTokens.TYPE_KEYWORD ; { return JetTokens.TYPE_KEYWORD ;
} }
case 172: break; case 168: break;
case 73: case 71:
{ return JetTokens.FUN_KEYWORD ; { return JetTokens.FUN_KEYWORD ;
} }
case 173: break; case 169: break;
case 49: case 49:
{ return JetTokens.IS_KEYWORD ; { return JetTokens.IS_KEYWORD ;
} }
case 174: break; case 170: break;
case 30: case 30:
{ popState(); yypushback(1); return JetTokens.DANGLING_NEWLINE; { popState(); yypushback(1); return JetTokens.DANGLING_NEWLINE;
} }
case 175: break; case 171: break;
case 33: case 33:
{ lBraceCount++; return JetTokens.LBRACE; { lBraceCount++; return JetTokens.LBRACE;
} }
case 176: break; case 172: break;
case 41: case 41:
{ return JetTokens.DIVEQ ; { return JetTokens.DIVEQ ;
} }
case 177: break; case 173: break;
case 81: case 79:
{ return JetTokens.ELSE_KEYWORD ; { return JetTokens.ELSE_KEYWORD ;
} }
case 178: break; case 174: break;
case 47: case 47:
{ return JetTokens.AS_KEYWORD ; { return JetTokens.AS_KEYWORD ;
} }
case 179: break; case 175: break;
case 48: case 48:
{ return JetTokens.IN_KEYWORD ; { return JetTokens.IN_KEYWORD ;
} }
case 180: break; case 176: break;
case 52: case 52:
{ return JetTokens.EQEQ ; { return JetTokens.EQEQ ;
} }
case 181: break; case 177: break;
case 76: case 74:
{ return JetTokens.EQEQEQ ; { return JetTokens.EQEQEQ ;
} }
case 182: break; case 178: break;
case 75: case 73:
{ return JetTokens.VAL_KEYWORD ; { return JetTokens.VAL_KEYWORD ;
} }
case 183: break; case 179: break;
case 86: case 84:
{ return JetTokens.CAPITALIZED_THIS_KEYWORD ; { return JetTokens.CAPITALIZED_THIS_KEYWORD ;
} }
case 184: break; case 180: break;
case 42: case 42:
{ return JetTokens.MULTEQ ; { return JetTokens.MULTEQ ;
} }
case 185: break; case 181: break;
case 64: case 62:
{ pushState(SHORT_TEMPLATE_ENTRY); { pushState(SHORT_TEMPLATE_ENTRY);
yypushback(yylength() - 1); yypushback(yylength() - 1);
return JetTokens.SHORT_TEMPLATE_ENTRY_START; return JetTokens.SHORT_TEMPLATE_ENTRY_START;
} }
case 186: break; case 182: break;
case 12: case 12:
{ return JetTokens.LBRACE ; { return JetTokens.LBRACE ;
} }
case 187: break; case 183: break;
case 93: case 91:
{ return JetTokens.OBJECT_KEYWORD ; { return JetTokens.OBJECT_KEYWORD ;
} }
case 188: break; case 184: break;
case 90: case 88:
{ return JetTokens.BREAK_KEYWORD ; { return JetTokens.BREAK_KEYWORD ;
} }
case 189: break; case 185: break;
case 40: case 40:
{ return JetTokens.BLOCK_COMMENT; { return JetTokens.BLOCK_COMMENT;
} }
case 190: break; case 186: break;
case 88: case 86:
{ return JetTokens.TRAIT_KEYWORD ; { return JetTokens.TRAIT_KEYWORD ;
} }
case 191: break; case 187: break;
case 28: case 28:
{ return JetTokens.HASH ; { return JetTokens.HASH ;
} }
case 192: break; case 188: break;
default: default:
if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
zzAtEOF = true; zzAtEOF = true;
idea/testData/psi/Functions.jet
+1
View File
@@ -19,3 +19,4 @@ fun [a()] T.foo<T : fun (a) : b>(a : foo) : bar {}
fun [a()] T.foo<T : [a] fun (a) : b>(a : foo) : bar {} fun [a()] T.foo<T : [a] fun (a) : b>(a : foo) : bar {}
fun A?.foo() : bar? fun A?.foo() : bar?
fun A? .foo() : bar?
idea/testData/psi/Functions.txt
+27 -1
View File
@@ -587,7 +587,33 @@ JetFile: Functions.jet
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('A') PsiElement(IDENTIFIER)('A')
PsiElement(SAFE_ACCESS)('?.') PsiElement(QUEST)('?')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('foo')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
NULLABLE_TYPE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(QUEST)('?')
PsiWhiteSpace('\n')
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
NULLABLE_TYPE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('A')
PsiElement(QUEST)('?')
PsiWhiteSpace(' ')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
idea/testData/psi/Properties.jet
+1
View File
@@ -51,3 +51,4 @@ val IList<T>.lastIndex : Int
get() = this.size - 1 get() = this.size - 1
val Int?.opt : Int val Int?.opt : Int
val Int? .opt : Int
idea/testData/psi/Properties.txt
+22 -1
View File
@@ -415,7 +415,28 @@ JetFile: Properties.jet
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int') PsiElement(IDENTIFIER)('Int')
PsiElement(SAFE_ACCESS)('?.') PsiElement(QUEST)('?')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('opt')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace('\n')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
TYPE_REFERENCE
NULLABLE_TYPE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiElement(QUEST)('?')
PsiWhiteSpace(' ')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('opt') PsiElement(IDENTIFIER)('opt')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(COLON)(':') PsiElement(COLON)(':')