KT-84 Lexer processes "!isFunction" code incorrectly
This commit is contained in:
@@ -25,6 +25,8 @@ public class LabelResolver {
|
||||
|
||||
private final Map<String, Stack<JetElement>> labeledElements = new HashMap<String, Stack<JetElement>>();
|
||||
|
||||
public LabelResolver() {}
|
||||
|
||||
public void enterLabeledElement(@NotNull String labelName, @NotNull JetExpression labeledExpression) {
|
||||
JetExpression deparenthesized = JetPsiUtil.deparenthesize(labeledExpression);
|
||||
if (deparenthesized != null) {
|
||||
|
||||
@@ -55,7 +55,8 @@ WHITE_SPACE_CHAR=[\ \n\t\f]
|
||||
|
||||
// TODO: prohibit '$' in identifiers?
|
||||
LETTER = [:letter:]|_
|
||||
PLAIN_IDENTIFIER={LETTER} ([:digit:]|{LETTER})*
|
||||
IDENTIFIER_PART=[:digit:]|{LETTER}
|
||||
PLAIN_IDENTIFIER={LETTER} {IDENTIFIER_PART}*
|
||||
// TODO: this one MUST allow everything accepted by the runtime
|
||||
// TODO: Replace backticks by one backslash in the begining
|
||||
ESCAPED_IDENTIFIER = `{PLAIN_IDENTIFIER}`
|
||||
@@ -189,6 +190,8 @@ LONG_TEMPLATE_ENTRY_END=\}
|
||||
{FIELD_IDENTIFIER} { return JetTokens.FIELD_IDENTIFIER; }
|
||||
{IDENTIFIER} { return JetTokens.IDENTIFIER; }
|
||||
{LABEL_IDENTIFIER} { return JetTokens.LABEL_IDENTIFIER; }
|
||||
\!in{IDENTIFIER_PART} { yypushback(3); return JetTokens.EXCL; }
|
||||
\!is{IDENTIFIER_PART} { yypushback(3); return JetTokens.EXCL; }
|
||||
|
||||
"===" { return JetTokens.EQEQEQ ; }
|
||||
"!==" { return JetTokens.EXCLEQEQEQ; }
|
||||
|
||||
@@ -1,19 +1,20 @@
|
||||
/* The following code was generated by JFlex 1.4.3 on 9/13/11 8:32 PM */
|
||||
/* The following code was generated by JFlex 1.4.3 on 10/17/11 7:35 PM */
|
||||
|
||||
/* It's an automatically generated code. Do not modify it. */
|
||||
package org.jetbrains.jet.lexer;
|
||||
|
||||
import com.intellij.lexer.FlexLexer;
|
||||
import com.intellij.psi.TokenType;
|
||||
import java.util.*;
|
||||
import com.intellij.lexer.*;
|
||||
import com.intellij.psi.*;
|
||||
import com.intellij.psi.tree.IElementType;
|
||||
|
||||
import java.util.Stack;
|
||||
import org.jetbrains.jet.lexer.JetTokens;
|
||||
|
||||
|
||||
/**
|
||||
* This class is a scanner generated by
|
||||
* <a href="http://www.jflex.de/">JFlex</a> 1.4.3
|
||||
* on 9/13/11 8:32 PM from the specification file
|
||||
* on 10/17/11 7:35 PM from the specification file
|
||||
* <tt>/Users/abreslav/work/jet/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex</tt>
|
||||
*/
|
||||
class _JetLexer implements FlexLexer {
|
||||
@@ -40,9 +41,9 @@ class _JetLexer implements FlexLexer {
|
||||
* Translates characters to character classes
|
||||
*/
|
||||
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\57\1\25\1\77"+
|
||||
"\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\74\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\60\1\64\1\61"+
|
||||
"\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\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"+
|
||||
@@ -127,20 +128,20 @@ class _JetLexer implements FlexLexer {
|
||||
"\1\42\1\0\1\43\1\0\1\44\1\0\1\45\1\0"+
|
||||
"\1\46\1\47\1\50\1\51\1\52\1\43\2\2\1\43"+
|
||||
"\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"+
|
||||
"\1\0\1\66\1\67\1\70\1\71\1\72\1\73\1\74"+
|
||||
"\7\3\1\60\1\61\1\62\10\3\1\63\1\0\1\64"+
|
||||
"\1\65\1\66\1\67\1\70\1\71\1\72\1\73\1\74"+
|
||||
"\1\75\1\76\1\0\1\77\1\100\1\0\1\101\1\43"+
|
||||
"\1\3\2\0\1\50\1\102\4\0\1\103\2\3\1\104"+
|
||||
"\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\0\1\40\1\44\1\45"+
|
||||
"\1\0\2\102\1\43\2\0\1\3\1\116\1\117\4\3"+
|
||||
"\1\120\1\121\1\3\1\122\2\3\1\123\2\3\1\124"+
|
||||
"\1\76\1\50\2\0\2\3\1\125\1\3\1\126\1\127"+
|
||||
"\1\3\1\130\1\131\1\132\1\103\2\3\1\133\1\134"+
|
||||
"\3\3\1\135\1\136";
|
||||
"\1\125\1\76\1\50\2\0\2\3\1\126\1\3\1\127"+
|
||||
"\1\130\1\3\1\131\1\132\1\133\1\103\2\3\1\134"+
|
||||
"\1\135\3\3\1\136\1\137";
|
||||
|
||||
private static int [] zzUnpackAction() {
|
||||
int [] result = new int[211];
|
||||
int [] result = new int[212];
|
||||
int offset = 0;
|
||||
offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
|
||||
return result;
|
||||
@@ -178,23 +179,23 @@ class _JetLexer implements FlexLexer {
|
||||
"\0\u0100\0\u0e80\0\u0ec0\0\u0f00\0\u0f40\0\u0f80\0\u0fc0\0\u1000"+
|
||||
"\0\u1040\0\u1080\0\u10c0\0\u1100\0\u1140\0\u0180\0\u0180\0\u0180"+
|
||||
"\0\u1180\0\u11c0\0\u1200\0\u1240\0\u1280\0\u12c0\0\u1300\0\u1340"+
|
||||
"\0\u0180\0\u1380\0\u0100\0\u13c0\0\u1400\0\u0100\0\u0100\0\u0100"+
|
||||
"\0\u0180\0\u1380\0\u13c0\0\u1400\0\u0100\0\u0100\0\u0100\0\u0100"+
|
||||
"\0\u0100\0\u0100\0\u0100\0\u0100\0\u1440\0\u1480\0\u0100\0\u0100"+
|
||||
"\0\u14c0\0\u0100\0\u1500\0\u0100\0\u1540\0\u1580\0\u15c0\0\u1600"+
|
||||
"\0\u1640\0\u1680\0\u16c0\0\u1700\0\u1740\0\u1780\0\u17c0\0\u0100"+
|
||||
"\0\u1800\0\u1840\0\u1880\0\u18c0\0\u1900\0\u1940\0\u0180\0\u1980"+
|
||||
"\0\u19c0\0\u1a00\0\u1a40\0\u1a80\0\u1ac0\0\u1b00\0\u1b40\0\u0180"+
|
||||
"\0\u0180\0\u1b80\0\u0180\0\u0180\0\u0100\0\u0100\0\u0100\0\u0100"+
|
||||
"\0\u1bc0\0\u0100\0\u0100\0\u0100\0\u1c00\0\u1c40\0\u0100\0\u1c80"+
|
||||
"\0\u1500\0\u1cc0\0\u1d00\0\u0180\0\u0180\0\u1d40\0\u1d80\0\u1dc0"+
|
||||
"\0\u1e00\0\u0180\0\u0180\0\u1e40\0\u0180\0\u1e80\0\u1ec0\0\u0180"+
|
||||
"\0\u1f00\0\u1f40\0\u0180\0\u0100\0\u0100\0\u1f80\0\u1fc0\0\u2000"+
|
||||
"\0\u2040\0\u0180\0\u2080\0\u0180\0\u0180\0\u20c0\0\u0180\0\u0180"+
|
||||
"\0\u0180\0\u0100\0\u2100\0\u2140\0\u0180\0\u0180\0\u2180\0\u21c0"+
|
||||
"\0\u2200\0\u0180\0\u0180";
|
||||
"\0\u0180\0\u1b80\0\u0180\0\u0180\0\u1bc0\0\u1bc0\0\u0100\0\u0100"+
|
||||
"\0\u1c00\0\u0100\0\u0100\0\u0100\0\u1c40\0\u1c80\0\u0100\0\u1cc0"+
|
||||
"\0\u1500\0\u1d00\0\u1d40\0\u0180\0\u0180\0\u1d80\0\u1dc0\0\u1e00"+
|
||||
"\0\u1e40\0\u0180\0\u0180\0\u1e80\0\u0180\0\u1ec0\0\u1f00\0\u0180"+
|
||||
"\0\u1f40\0\u1f80\0\u0180\0\u0100\0\u0100\0\u0100\0\u1fc0\0\u2000"+
|
||||
"\0\u2040\0\u2080\0\u0180\0\u20c0\0\u0180\0\u0180\0\u2100\0\u0180"+
|
||||
"\0\u0180\0\u0180\0\u0100\0\u2140\0\u2180\0\u0180\0\u0180\0\u21c0"+
|
||||
"\0\u2200\0\u2240\0\u0180\0\u0180";
|
||||
|
||||
private static int [] zzUnpackRowMap() {
|
||||
int [] result = new int[211];
|
||||
int [] result = new int[212];
|
||||
int offset = 0;
|
||||
offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
|
||||
return result;
|
||||
@@ -243,10 +244,10 @@ class _JetLexer implements FlexLexer {
|
||||
"\1\0\1\101\6\0\2\100\1\0\1\100\1\0\1\100"+
|
||||
"\5\0\27\100\23\0\1\102\1\0\1\102\1\0\1\103"+
|
||||
"\1\0\1\104\4\0\2\102\1\0\1\102\1\0\1\102"+
|
||||
"\5\0\27\102\32\0\1\105\1\106\44\0\1\107\77\0"+
|
||||
"\1\110\21\0\1\111\12\0\1\111\1\112\1\113\1\75"+
|
||||
"\5\0\27\102\32\0\1\105\1\106\45\0\1\107\77\0"+
|
||||
"\1\110\20\0\1\111\12\0\1\111\1\112\1\113\1\75"+
|
||||
"\1\76\12\0\1\76\10\0\1\113\34\0\1\114\12\0"+
|
||||
"\1\114\2\0\1\115\101\0\1\116\35\0\1\117\4\0"+
|
||||
"\1\114\2\0\1\115\101\0\1\116\36\0\1\117\3\0"+
|
||||
"\1\120\13\0\13\21\1\0\7\21\1\121\1\122\53\21"+
|
||||
"\25\0\1\123\53\0\2\7\1\0\2\7\6\0\3\7"+
|
||||
"\1\0\1\7\1\0\1\7\5\0\1\7\1\124\10\7"+
|
||||
@@ -274,10 +275,10 @@ class _JetLexer implements FlexLexer {
|
||||
"\7\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\150\25\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\1\151\17\7\100\0\1\152\4\0"+
|
||||
"\1\153\54\0\1\154\15\0\1\155\77\0\1\156\2\0"+
|
||||
"\1\157\74\0\1\160\77\0\1\161\105\0\1\162\100\0"+
|
||||
"\1\163\70\0\1\164\20\0\7\64\1\0\3\64\1\0"+
|
||||
"\1\7\5\0\7\7\1\151\17\7\62\0\1\152\16\0"+
|
||||
"\1\153\77\0\1\154\3\0\1\155\73\0\1\156\1\0"+
|
||||
"\1\157\75\0\1\160\77\0\1\161\104\0\1\162\100\0"+
|
||||
"\1\163\71\0\1\164\17\0\7\64\1\0\3\64\1\0"+
|
||||
"\10\64\2\0\52\64\2\0\1\165\1\0\1\165\1\0"+
|
||||
"\1\166\6\0\2\165\1\0\1\165\1\0\1\165\3\0"+
|
||||
"\1\167\1\0\27\165\21\0\13\170\1\0\64\170\1\0"+
|
||||
@@ -333,8 +334,8 @@ class _JetLexer implements FlexLexer {
|
||||
"\3\7\1\0\1\7\1\0\1\7\5\0\11\7\1\232"+
|
||||
"\15\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\1\233\4\7\1\234"+
|
||||
"\6\7\100\0\1\235\50\0\1\236\3\0\1\237\122\0"+
|
||||
"\1\240\21\0\2\165\1\0\2\165\6\0\3\165\1\0"+
|
||||
"\6\7\51\0\1\235\3\0\1\236\123\0\1\237\77\0"+
|
||||
"\1\240\20\0\2\165\1\0\2\165\6\0\3\165\1\0"+
|
||||
"\1\165\1\0\1\165\5\0\27\165\23\0\1\241\1\0"+
|
||||
"\1\241\10\0\2\241\1\0\1\241\1\0\1\241\5\0"+
|
||||
"\27\241\22\0\2\171\1\0\2\171\1\242\5\0\3\171"+
|
||||
@@ -378,49 +379,51 @@ class _JetLexer implements FlexLexer {
|
||||
"\3\7\1\0\1\7\1\0\1\7\5\0\4\7\1\272"+
|
||||
"\22\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\273\22\7\22\0"+
|
||||
"\2\241\1\0\2\241\1\274\5\0\3\241\1\0\1\241"+
|
||||
"\1\0\1\241\5\0\27\241\21\0\11\177\1\275\1\245"+
|
||||
"\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"+
|
||||
"\2\274\1\0\2\274\6\0\3\274\1\0\1\274\1\0"+
|
||||
"\1\274\5\0\27\274\22\0\2\241\1\0\2\241\1\275"+
|
||||
"\5\0\3\241\1\0\1\241\1\0\1\241\5\0\27\241"+
|
||||
"\21\0\11\177\1\276\1\245\65\177\12\246\1\277\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\300\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\301"+
|
||||
"\22\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\303\20\7\22\0"+
|
||||
"\1\7\1\0\1\7\5\0\11\7\1\302\15\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\304\16\7\22\0\2\7\1\0"+
|
||||
"\1\7\5\0\4\7\1\303\22\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\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\13\7\1\306"+
|
||||
"\13\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
|
||||
"\1\7\1\0\1\7\5\0\21\7\1\307\5\7\22\0"+
|
||||
"\6\7\1\304\20\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\305"+
|
||||
"\16\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\306\10\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\310\23\7\22\0\2\7\1\0"+
|
||||
"\1\7\5\0\13\7\1\307\13\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\311\23\7\21\0\11\246\1\247\1\276\65\246"+
|
||||
"\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"+
|
||||
"\21\7\1\310\5\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\311"+
|
||||
"\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\323\23\7\21\0";
|
||||
"\1\7\1\0\1\7\5\0\3\7\1\312\23\7\21\0"+
|
||||
"\11\246\1\247\1\277\65\246\25\205\1\313\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\314\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\315\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\316\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\317\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\320\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\321"+
|
||||
"\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\322\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\323\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\324\23\7\21\0";
|
||||
|
||||
private static int [] zzUnpackTrans() {
|
||||
int [] result = new int[8768];
|
||||
int [] result = new int[8832];
|
||||
int offset = 0;
|
||||
offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
|
||||
return result;
|
||||
@@ -464,14 +467,14 @@ class _JetLexer implements FlexLexer {
|
||||
"\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"+
|
||||
"\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"+
|
||||
"\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\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\4\1\5\11\1\1\1\0\26\1\1\0\2\1"+
|
||||
"\10\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\26\1\2\11\1\0"+
|
||||
"\3\11\1\0\1\1\1\11\1\1\2\0\21\1\3\11"+
|
||||
"\2\0\12\1\1\11\11\1";
|
||||
|
||||
private static int [] zzUnpackAttribute() {
|
||||
int [] result = new int[211];
|
||||
int [] result = new int[212];
|
||||
int offset = 0;
|
||||
offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
|
||||
return result;
|
||||
@@ -805,23 +808,23 @@ class _JetLexer implements FlexLexer {
|
||||
case 3:
|
||||
{ return JetTokens.IDENTIFIER;
|
||||
}
|
||||
case 95: break;
|
||||
case 96: break;
|
||||
case 11:
|
||||
{ pushState(STRING); return JetTokens.OPEN_QUOTE;
|
||||
}
|
||||
case 96: break;
|
||||
case 97: break;
|
||||
case 70:
|
||||
{ return JetTokens.FOR_KEYWORD ;
|
||||
}
|
||||
case 97: break;
|
||||
case 92:
|
||||
case 98: break;
|
||||
case 93:
|
||||
{ return JetTokens.RETURN_KEYWORD ;
|
||||
}
|
||||
case 98: break;
|
||||
case 99: break;
|
||||
case 78:
|
||||
{ return JetTokens.NULL_KEYWORD ;
|
||||
}
|
||||
case 99: break;
|
||||
case 100: break;
|
||||
case 34:
|
||||
{ if (lBraceCount == 0) {
|
||||
popState();
|
||||
@@ -830,361 +833,365 @@ class _JetLexer implements FlexLexer {
|
||||
lBraceCount--;
|
||||
return JetTokens.RBRACE;
|
||||
}
|
||||
case 100: break;
|
||||
case 101: break;
|
||||
case 18:
|
||||
{ return JetTokens.LT ;
|
||||
}
|
||||
case 101: break;
|
||||
case 102: break;
|
||||
case 51:
|
||||
{ return JetTokens.DO_KEYWORD ;
|
||||
}
|
||||
case 102: break;
|
||||
case 103: break;
|
||||
case 17:
|
||||
{ return JetTokens.PLUS ;
|
||||
}
|
||||
case 103: break;
|
||||
case 104: break;
|
||||
case 67:
|
||||
{ return JetTokens.RAW_STRING_LITERAL;
|
||||
}
|
||||
case 104: break;
|
||||
case 105: break;
|
||||
case 55:
|
||||
{ return JetTokens.PLUSEQ ;
|
||||
}
|
||||
case 105: break;
|
||||
case 106: break;
|
||||
case 27:
|
||||
{ return JetTokens.COMMA ;
|
||||
}
|
||||
case 106: break;
|
||||
case 107: break;
|
||||
case 19:
|
||||
{ return JetTokens.GT ;
|
||||
}
|
||||
case 107: break;
|
||||
case 108: break;
|
||||
case 4:
|
||||
{ return JetTokens.WHITE_SPACE;
|
||||
}
|
||||
case 108: break;
|
||||
case 109: break;
|
||||
case 24:
|
||||
{ return JetTokens.RPAR ;
|
||||
}
|
||||
case 109: break;
|
||||
case 53:
|
||||
case 110: break;
|
||||
case 54:
|
||||
{ return JetTokens.DOUBLE_ARROW;
|
||||
}
|
||||
case 110: break;
|
||||
case 111: break;
|
||||
case 80:
|
||||
{ return JetTokens.TRUE_KEYWORD ;
|
||||
}
|
||||
case 111: break;
|
||||
case 112: break;
|
||||
case 36:
|
||||
{ return JetTokens.FIELD_IDENTIFIER;
|
||||
}
|
||||
case 112: break;
|
||||
case 113: break;
|
||||
case 59:
|
||||
{ return JetTokens.ANDAND ;
|
||||
}
|
||||
case 113: break;
|
||||
case 114: break;
|
||||
case 63:
|
||||
{ pushState(LONG_TEMPLATE_ENTRY); return JetTokens.LONG_TEMPLATE_ENTRY_START;
|
||||
}
|
||||
case 114: break;
|
||||
case 115: break;
|
||||
case 66:
|
||||
{ return JetTokens.DOC_COMMENT;
|
||||
}
|
||||
case 115: break;
|
||||
case 116: break;
|
||||
case 35:
|
||||
{ return JetTokens.FLOAT_LITERAL;
|
||||
}
|
||||
case 116: break;
|
||||
case 117: break;
|
||||
case 39:
|
||||
{ return JetTokens.EOL_COMMENT;
|
||||
}
|
||||
case 117: break;
|
||||
case 118: break;
|
||||
case 83:
|
||||
{ return JetTokens.WHEN_KEYWORD ;
|
||||
}
|
||||
case 118: break;
|
||||
case 119: break;
|
||||
case 25:
|
||||
{ return JetTokens.COLON ;
|
||||
}
|
||||
case 119: break;
|
||||
case 120: break;
|
||||
case 57:
|
||||
{ return JetTokens.LTEQ ;
|
||||
}
|
||||
case 120: break;
|
||||
case 121: break;
|
||||
case 46:
|
||||
{ return JetTokens.ARROW ;
|
||||
}
|
||||
case 121: break;
|
||||
case 122: break;
|
||||
case 32:
|
||||
{ popState(); return JetTokens.IDENTIFIER;
|
||||
}
|
||||
case 122: break;
|
||||
case 123: break;
|
||||
case 21:
|
||||
{ return JetTokens.LBRACKET ;
|
||||
}
|
||||
case 123: break;
|
||||
case 124: break;
|
||||
case 65:
|
||||
{ yypushback(2); return JetTokens.INTEGER_LITERAL;
|
||||
}
|
||||
case 124: break;
|
||||
case 125: break;
|
||||
case 10:
|
||||
{ return JetTokens.CHARACTER_LITERAL;
|
||||
}
|
||||
case 125: break;
|
||||
case 126: break;
|
||||
case 72:
|
||||
{ return JetTokens.VAR_KEYWORD ;
|
||||
}
|
||||
case 126: break;
|
||||
case 127: break;
|
||||
case 58:
|
||||
{ return JetTokens.GTEQ ;
|
||||
}
|
||||
case 127: break;
|
||||
case 128: break;
|
||||
case 2:
|
||||
{ return JetTokens.INTEGER_LITERAL;
|
||||
}
|
||||
case 128: break;
|
||||
case 129: break;
|
||||
case 13:
|
||||
{ return JetTokens.RBRACE ;
|
||||
}
|
||||
case 129: break;
|
||||
case 85:
|
||||
case 130: break;
|
||||
case 86:
|
||||
{ return JetTokens.CLASS_KEYWORD ;
|
||||
}
|
||||
case 130: break;
|
||||
case 15:
|
||||
case 131: break;
|
||||
case 14:
|
||||
{ return JetTokens.EXCL ;
|
||||
}
|
||||
case 131: break;
|
||||
case 132: break;
|
||||
case 69:
|
||||
{ return JetTokens.TRY_KEYWORD ;
|
||||
}
|
||||
case 132: break;
|
||||
case 54:
|
||||
case 133: break;
|
||||
case 52:
|
||||
{ return JetTokens.EXCLEQ ;
|
||||
}
|
||||
case 133: break;
|
||||
case 134: break;
|
||||
case 45:
|
||||
{ return JetTokens.MINUSEQ ;
|
||||
}
|
||||
case 134: break;
|
||||
case 87:
|
||||
case 135: break;
|
||||
case 88:
|
||||
{ return JetTokens.THROW_KEYWORD ;
|
||||
}
|
||||
case 135: break;
|
||||
case 89:
|
||||
case 136: break;
|
||||
case 90:
|
||||
{ return JetTokens.WHILE_KEYWORD ;
|
||||
}
|
||||
case 136: break;
|
||||
case 137: break;
|
||||
case 44:
|
||||
{ return JetTokens.MINUSMINUS;
|
||||
}
|
||||
case 137: break;
|
||||
case 93:
|
||||
case 138: break;
|
||||
case 94:
|
||||
{ return JetTokens.CONTINUE_KEYWORD ;
|
||||
}
|
||||
case 138: break;
|
||||
case 75:
|
||||
case 139: break;
|
||||
case 74:
|
||||
{ return JetTokens.NOT_IN;
|
||||
}
|
||||
case 139: break;
|
||||
case 140: break;
|
||||
case 38:
|
||||
{ return JetTokens.ATAT ;
|
||||
}
|
||||
case 140: break;
|
||||
case 141: break;
|
||||
case 6:
|
||||
{ return JetTokens.DIV ;
|
||||
}
|
||||
case 141: break;
|
||||
case 142: break;
|
||||
case 37:
|
||||
{ return JetTokens.LABEL_IDENTIFIER;
|
||||
}
|
||||
case 142: break;
|
||||
case 143: break;
|
||||
case 29:
|
||||
{ return JetTokens.REGULAR_STRING_PART;
|
||||
}
|
||||
case 143: break;
|
||||
case 144: break;
|
||||
case 16:
|
||||
{ return JetTokens.QUEST ;
|
||||
}
|
||||
case 144: break;
|
||||
case 145: break;
|
||||
case 60:
|
||||
{ return JetTokens.OROR ;
|
||||
}
|
||||
case 145: break;
|
||||
case 146: break;
|
||||
case 20:
|
||||
{ return JetTokens.PERC ;
|
||||
}
|
||||
case 146: break;
|
||||
case 77:
|
||||
case 147: break;
|
||||
case 76:
|
||||
{ return JetTokens.EXCLEQEQEQ;
|
||||
}
|
||||
case 147: break;
|
||||
case 148: break;
|
||||
case 61:
|
||||
{ return JetTokens.PERCEQ ;
|
||||
}
|
||||
case 148: break;
|
||||
case 149: break;
|
||||
case 43:
|
||||
{ return JetTokens.RANGE ;
|
||||
}
|
||||
case 149: break;
|
||||
case 150: break;
|
||||
case 1:
|
||||
{ return TokenType.BAD_CHARACTER;
|
||||
}
|
||||
case 150: break;
|
||||
case 94:
|
||||
case 151: break;
|
||||
case 95:
|
||||
{ return JetTokens.NAMESPACE_KEYWORD ;
|
||||
}
|
||||
case 151: break;
|
||||
case 76:
|
||||
case 152: break;
|
||||
case 75:
|
||||
{ return JetTokens.NOT_IS;
|
||||
}
|
||||
case 152: break;
|
||||
case 153: break;
|
||||
case 7:
|
||||
{ return JetTokens.MUL ;
|
||||
}
|
||||
case 153: break;
|
||||
case 154: break;
|
||||
case 22:
|
||||
{ return JetTokens.RBRACKET ;
|
||||
}
|
||||
case 154: break;
|
||||
case 155: break;
|
||||
case 56:
|
||||
{ return JetTokens.PLUSPLUS ;
|
||||
}
|
||||
case 155: break;
|
||||
case 156: break;
|
||||
case 81:
|
||||
{ return JetTokens.THIS_KEYWORD ;
|
||||
}
|
||||
case 156: break;
|
||||
case 157: break;
|
||||
case 8:
|
||||
{ return JetTokens.DOT ;
|
||||
}
|
||||
case 157: break;
|
||||
case 158: break;
|
||||
case 26:
|
||||
{ return JetTokens.SEMICOLON ;
|
||||
}
|
||||
case 158: break;
|
||||
case 159: break;
|
||||
case 50:
|
||||
{ return JetTokens.IF_KEYWORD ;
|
||||
}
|
||||
case 159: break;
|
||||
case 160: break;
|
||||
case 64:
|
||||
{ return JetTokens.ESCAPE_SEQUENCE;
|
||||
}
|
||||
case 160: break;
|
||||
case 161: break;
|
||||
case 31:
|
||||
{ popState(); return JetTokens.CLOSING_QUOTE;
|
||||
}
|
||||
case 161: break;
|
||||
case 14:
|
||||
case 162: break;
|
||||
case 15:
|
||||
{ return JetTokens.EQ ;
|
||||
}
|
||||
case 162: break;
|
||||
case 163: break;
|
||||
case 5:
|
||||
{ return JetTokens.AT ;
|
||||
}
|
||||
case 163: break;
|
||||
case 164: break;
|
||||
case 68:
|
||||
{ return JetTokens.AS_SAFE;
|
||||
}
|
||||
case 164: break;
|
||||
case 165: break;
|
||||
case 23:
|
||||
{ return JetTokens.LPAR ;
|
||||
}
|
||||
case 165: break;
|
||||
case 166: break;
|
||||
case 9:
|
||||
{ return JetTokens.MINUS ;
|
||||
}
|
||||
case 166: break;
|
||||
case 90:
|
||||
case 167: break;
|
||||
case 91:
|
||||
{ return JetTokens.FALSE_KEYWORD ;
|
||||
}
|
||||
case 167: break;
|
||||
case 168: break;
|
||||
case 82:
|
||||
{ return JetTokens.TYPE_KEYWORD ;
|
||||
}
|
||||
case 168: break;
|
||||
case 169: break;
|
||||
case 71:
|
||||
{ return JetTokens.FUN_KEYWORD ;
|
||||
}
|
||||
case 169: break;
|
||||
case 170: break;
|
||||
case 49:
|
||||
{ return JetTokens.IS_KEYWORD ;
|
||||
}
|
||||
case 170: break;
|
||||
case 171: break;
|
||||
case 30:
|
||||
{ popState(); yypushback(1); return JetTokens.DANGLING_NEWLINE;
|
||||
}
|
||||
case 171: break;
|
||||
case 172: break;
|
||||
case 33:
|
||||
{ lBraceCount++; return JetTokens.LBRACE;
|
||||
}
|
||||
case 172: break;
|
||||
case 173: break;
|
||||
case 85:
|
||||
{ yypushback(3); return JetTokens.EXCL;
|
||||
}
|
||||
case 174: break;
|
||||
case 41:
|
||||
{ return JetTokens.DIVEQ ;
|
||||
}
|
||||
case 173: break;
|
||||
case 175: break;
|
||||
case 79:
|
||||
{ return JetTokens.ELSE_KEYWORD ;
|
||||
}
|
||||
case 174: break;
|
||||
case 176: break;
|
||||
case 47:
|
||||
{ return JetTokens.AS_KEYWORD ;
|
||||
}
|
||||
case 175: break;
|
||||
case 177: break;
|
||||
case 48:
|
||||
{ return JetTokens.IN_KEYWORD ;
|
||||
}
|
||||
case 176: break;
|
||||
case 52:
|
||||
case 178: break;
|
||||
case 53:
|
||||
{ return JetTokens.EQEQ ;
|
||||
}
|
||||
case 177: break;
|
||||
case 74:
|
||||
case 179: break;
|
||||
case 77:
|
||||
{ return JetTokens.EQEQEQ ;
|
||||
}
|
||||
case 178: break;
|
||||
case 180: break;
|
||||
case 73:
|
||||
{ return JetTokens.VAL_KEYWORD ;
|
||||
}
|
||||
case 179: break;
|
||||
case 181: break;
|
||||
case 84:
|
||||
{ return JetTokens.CAPITALIZED_THIS_KEYWORD ;
|
||||
}
|
||||
case 180: break;
|
||||
case 182: break;
|
||||
case 42:
|
||||
{ return JetTokens.MULTEQ ;
|
||||
}
|
||||
case 181: break;
|
||||
case 183: break;
|
||||
case 62:
|
||||
{ pushState(SHORT_TEMPLATE_ENTRY);
|
||||
yypushback(yylength() - 1);
|
||||
return JetTokens.SHORT_TEMPLATE_ENTRY_START;
|
||||
}
|
||||
case 182: break;
|
||||
case 184: break;
|
||||
case 12:
|
||||
{ return JetTokens.LBRACE ;
|
||||
}
|
||||
case 183: break;
|
||||
case 91:
|
||||
case 185: break;
|
||||
case 92:
|
||||
{ return JetTokens.OBJECT_KEYWORD ;
|
||||
}
|
||||
case 184: break;
|
||||
case 88:
|
||||
case 186: break;
|
||||
case 89:
|
||||
{ return JetTokens.BREAK_KEYWORD ;
|
||||
}
|
||||
case 185: break;
|
||||
case 187: break;
|
||||
case 40:
|
||||
{ return JetTokens.BLOCK_COMMENT;
|
||||
}
|
||||
case 186: break;
|
||||
case 86:
|
||||
case 188: break;
|
||||
case 87:
|
||||
{ return JetTokens.TRAIT_KEYWORD ;
|
||||
}
|
||||
case 187: break;
|
||||
case 189: break;
|
||||
case 28:
|
||||
{ return JetTokens.HASH ;
|
||||
}
|
||||
case 188: break;
|
||||
case 190: break;
|
||||
default:
|
||||
if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
|
||||
zzAtEOF = true;
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
fun test() {
|
||||
a !is B
|
||||
a !in B
|
||||
!isBoolean(a)
|
||||
!inRange(a)
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
JetFile: NotIsAndNotIn.jet
|
||||
NAMESPACE
|
||||
FUN
|
||||
PsiElement(fun)('fun')
|
||||
PsiWhiteSpace(' ')
|
||||
PsiElement(IDENTIFIER)('test')
|
||||
VALUE_PARAMETER_LIST
|
||||
PsiElement(LPAR)('(')
|
||||
PsiElement(RPAR)(')')
|
||||
PsiWhiteSpace(' ')
|
||||
BLOCK
|
||||
PsiElement(LBRACE)('{')
|
||||
PsiWhiteSpace('\n ')
|
||||
BINARY_WITH_PATTERN
|
||||
REFERENCE_EXPRESSION
|
||||
PsiElement(IDENTIFIER)('a')
|
||||
PsiWhiteSpace(' ')
|
||||
OPERATION_REFERENCE
|
||||
PsiElement(NOT_IS)('!is')
|
||||
PsiWhiteSpace(' ')
|
||||
TYPE_PATTERN
|
||||
TYPE_REFERENCE
|
||||
USER_TYPE
|
||||
REFERENCE_EXPRESSION
|
||||
PsiElement(IDENTIFIER)('B')
|
||||
PsiWhiteSpace('\n ')
|
||||
BINARY_EXPRESSION
|
||||
REFERENCE_EXPRESSION
|
||||
PsiElement(IDENTIFIER)('a')
|
||||
PsiWhiteSpace(' ')
|
||||
OPERATION_REFERENCE
|
||||
PsiElement(NOT_IN)('!in')
|
||||
PsiWhiteSpace(' ')
|
||||
REFERENCE_EXPRESSION
|
||||
PsiElement(IDENTIFIER)('B')
|
||||
PsiWhiteSpace('\n ')
|
||||
PREFIX_EXPRESSION
|
||||
OPERATION_REFERENCE
|
||||
PsiElement(EXCL)('!')
|
||||
CALL_EXPRESSION
|
||||
REFERENCE_EXPRESSION
|
||||
PsiElement(IDENTIFIER)('isBoolean')
|
||||
VALUE_ARGUMENT_LIST
|
||||
PsiElement(LPAR)('(')
|
||||
VALUE_ARGUMENT
|
||||
REFERENCE_EXPRESSION
|
||||
PsiElement(IDENTIFIER)('a')
|
||||
PsiElement(RPAR)(')')
|
||||
PsiWhiteSpace('\n ')
|
||||
PREFIX_EXPRESSION
|
||||
OPERATION_REFERENCE
|
||||
PsiElement(EXCL)('!')
|
||||
CALL_EXPRESSION
|
||||
REFERENCE_EXPRESSION
|
||||
PsiElement(IDENTIFIER)('inRange')
|
||||
VALUE_ARGUMENT_LIST
|
||||
PsiElement(LPAR)('(')
|
||||
VALUE_ARGUMENT
|
||||
REFERENCE_EXPRESSION
|
||||
PsiElement(IDENTIFIER)('a')
|
||||
PsiElement(RPAR)(')')
|
||||
PsiWhiteSpace('\n')
|
||||
PsiElement(RBRACE)('}')
|
||||
Reference in New Issue
Block a user