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

Forgotten rename for in *.flex files after jet->kt rename

Browse Source
This commit is contained in:
Nikolay Krasko
2015-11-10 19:56:26 +03:00
parent 0d35033106
commit 2dd2a8dd65
2 changed files with 108 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDoc.flex
-1
View File
@@ -5,7 +5,6 @@ import com.intellij.psi.TokenType;
import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IElementType;
import com.intellij.util.text.CharArrayUtil; import com.intellij.util.text.CharArrayUtil;
import java.lang.Character; import java.lang.Character;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.kdoc.parser.KDocKnownTag; import org.jetbrains.kotlin.kdoc.parser.KDocKnownTag;
%% %%
compiler/frontend/src/org/jetbrains/kotlin/lexer/Kotlin.flex
+108 -108
View File
@@ -6,7 +6,7 @@ import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IElementType;
import com.intellij.util.containers.Stack; import com.intellij.util.containers.Stack;
import org.jetbrains.kotlin.lexer.KotlinLexerException; import org.jetbrains.kotlin.lexer.KotlinLexerException;
import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.lexer.KtTokens;
%% %%
@@ -51,9 +51,9 @@ import org.jetbrains.kotlin.lexer.JetTokens;
private IElementType commentStateToTokenType(int state) { private IElementType commentStateToTokenType(int state) {
switch (state) { switch (state) {
case BLOCK_COMMENT: case BLOCK_COMMENT:
return JetTokens.BLOCK_COMMENT; return KtTokens.BLOCK_COMMENT;
case DOC_COMMENT: case DOC_COMMENT:
return JetTokens.DOC_COMMENT; return KtTokens.DOC_COMMENT;
default: default:
throw new IllegalArgumentException("Unexpected state: " + state); throw new IllegalArgumentException("Unexpected state: " + state);
} }
@@ -121,56 +121,56 @@ LONG_TEMPLATE_ENTRY_START=\$\{
// String templates // String templates
{THREE_QUO} { pushState(RAW_STRING); return JetTokens.OPEN_QUOTE; } {THREE_QUO} { pushState(RAW_STRING); return KtTokens.OPEN_QUOTE; }
<RAW_STRING> \n { return JetTokens.REGULAR_STRING_PART; } <RAW_STRING> \n { return KtTokens.REGULAR_STRING_PART; }
<RAW_STRING> \" { return JetTokens.REGULAR_STRING_PART; } <RAW_STRING> \" { return KtTokens.REGULAR_STRING_PART; }
<RAW_STRING> \\ { return JetTokens.REGULAR_STRING_PART; } <RAW_STRING> \\ { return KtTokens.REGULAR_STRING_PART; }
<RAW_STRING> {THREE_OR_MORE_QUO} { <RAW_STRING> {THREE_OR_MORE_QUO} {
int length = yytext().length(); int length = yytext().length();
if (length <= 3) { // closing """ if (length <= 3) { // closing """
popState(); popState();
return JetTokens.CLOSING_QUOTE; return KtTokens.CLOSING_QUOTE;
} }
else { // some quotes at the end of a string, e.g. """ "foo"""" else { // some quotes at the end of a string, e.g. """ "foo""""
yypushback(3); // return the closing quotes (""") to the stream yypushback(3); // return the closing quotes (""") to the stream
return JetTokens.REGULAR_STRING_PART; return KtTokens.REGULAR_STRING_PART;
} }
} }
\" { pushState(STRING); return JetTokens.OPEN_QUOTE; } \" { pushState(STRING); return KtTokens.OPEN_QUOTE; }
<STRING> \n { popState(); yypushback(1); return JetTokens.DANGLING_NEWLINE; } <STRING> \n { popState(); yypushback(1); return KtTokens.DANGLING_NEWLINE; }
<STRING> \" { popState(); return JetTokens.CLOSING_QUOTE; } <STRING> \" { popState(); return KtTokens.CLOSING_QUOTE; }
<STRING> {ESCAPE_SEQUENCE} { return JetTokens.ESCAPE_SEQUENCE; } <STRING> {ESCAPE_SEQUENCE} { return KtTokens.ESCAPE_SEQUENCE; }
<STRING, RAW_STRING> {REGULAR_STRING_PART} { return JetTokens.REGULAR_STRING_PART; } <STRING, RAW_STRING> {REGULAR_STRING_PART} { return KtTokens.REGULAR_STRING_PART; }
<STRING, RAW_STRING> {SHORT_TEMPLATE_ENTRY} { <STRING, RAW_STRING> {SHORT_TEMPLATE_ENTRY} {
pushState(SHORT_TEMPLATE_ENTRY); pushState(SHORT_TEMPLATE_ENTRY);
yypushback(yylength() - 1); yypushback(yylength() - 1);
return JetTokens.SHORT_TEMPLATE_ENTRY_START; return KtTokens.SHORT_TEMPLATE_ENTRY_START;
} }
// Only *this* keyword is itself an expression valid in this position // Only *this* keyword is itself an expression valid in this position
// *null*, *true* and *false* are also keywords and expression, but it does not make sense to put them // *null*, *true* and *false* are also keywords and expression, but it does not make sense to put them
// in a string template for it'd be easier to just type them in without a dollar // in a string template for it'd be easier to just type them in without a dollar
<SHORT_TEMPLATE_ENTRY> "this" { popState(); return JetTokens.THIS_KEYWORD; } <SHORT_TEMPLATE_ENTRY> "this" { popState(); return KtTokens.THIS_KEYWORD; }
<SHORT_TEMPLATE_ENTRY> {IDENTIFIER} { popState(); return JetTokens.IDENTIFIER; } <SHORT_TEMPLATE_ENTRY> {IDENTIFIER} { popState(); return KtTokens.IDENTIFIER; }
<STRING, RAW_STRING> {LONELY_DOLLAR} { return JetTokens.REGULAR_STRING_PART; } <STRING, RAW_STRING> {LONELY_DOLLAR} { return KtTokens.REGULAR_STRING_PART; }
<STRING, RAW_STRING> {LONG_TEMPLATE_ENTRY_START} { pushState(LONG_TEMPLATE_ENTRY); return JetTokens.LONG_TEMPLATE_ENTRY_START; } <STRING, RAW_STRING> {LONG_TEMPLATE_ENTRY_START} { pushState(LONG_TEMPLATE_ENTRY); return KtTokens.LONG_TEMPLATE_ENTRY_START; }
<LONG_TEMPLATE_ENTRY> "{" { lBraceCount++; return JetTokens.LBRACE; } <LONG_TEMPLATE_ENTRY> "{" { lBraceCount++; return KtTokens.LBRACE; }
<LONG_TEMPLATE_ENTRY> "}" { <LONG_TEMPLATE_ENTRY> "}" {
if (lBraceCount == 0) { if (lBraceCount == 0) {
popState(); popState();
return JetTokens.LONG_TEMPLATE_ENTRY_END; return KtTokens.LONG_TEMPLATE_ENTRY_END;
} }
lBraceCount--; lBraceCount--;
return JetTokens.RBRACE; return KtTokens.RBRACE;
} }
// (Nested) comments // (Nested) comments
"/**/" { "/**/" {
return JetTokens.BLOCK_COMMENT; return KtTokens.BLOCK_COMMENT;
} }
"/**" { "/**" {
@@ -214,105 +214,105 @@ LONG_TEMPLATE_ENTRY_START=\$\{
// Mere mortals // Mere mortals
({WHITE_SPACE_CHAR})+ { return JetTokens.WHITE_SPACE; } ({WHITE_SPACE_CHAR})+ { return KtTokens.WHITE_SPACE; }
{EOL_COMMENT} { return JetTokens.EOL_COMMENT; } {EOL_COMMENT} { return KtTokens.EOL_COMMENT; }
{SHEBANG_COMMENT} { {SHEBANG_COMMENT} {
if (zzCurrentPos == 0) { if (zzCurrentPos == 0) {
return JetTokens.SHEBANG_COMMENT; return KtTokens.SHEBANG_COMMENT;
} }
else { else {
yypushback(yylength() - 1); yypushback(yylength() - 1);
return JetTokens.HASH; return KtTokens.HASH;
} }
} }
{INTEGER_LITERAL}\.\. { yypushback(2); return JetTokens.INTEGER_LITERAL; } {INTEGER_LITERAL}\.\. { yypushback(2); return KtTokens.INTEGER_LITERAL; }
{INTEGER_LITERAL} { return JetTokens.INTEGER_LITERAL; } {INTEGER_LITERAL} { return KtTokens.INTEGER_LITERAL; }
{DOUBLE_LITERAL} { return JetTokens.FLOAT_LITERAL; } {DOUBLE_LITERAL} { return KtTokens.FLOAT_LITERAL; }
{CHARACTER_LITERAL} { return JetTokens.CHARACTER_LITERAL; } {CHARACTER_LITERAL} { return KtTokens.CHARACTER_LITERAL; }
"typealias" { return JetTokens.TYPE_ALIAS_KEYWORD ;} "typealias" { return KtTokens.TYPE_ALIAS_KEYWORD ;}
"interface" { return JetTokens.INTERFACE_KEYWORD ;} "interface" { return KtTokens.INTERFACE_KEYWORD ;}
"continue" { return JetTokens.CONTINUE_KEYWORD ;} "continue" { return KtTokens.CONTINUE_KEYWORD ;}
"package" { return JetTokens.PACKAGE_KEYWORD ;} "package" { return KtTokens.PACKAGE_KEYWORD ;}
"return" { return JetTokens.RETURN_KEYWORD ;} "return" { return KtTokens.RETURN_KEYWORD ;}
"object" { return JetTokens.OBJECT_KEYWORD ;} "object" { return KtTokens.OBJECT_KEYWORD ;}
"while" { return JetTokens.WHILE_KEYWORD ;} "while" { return KtTokens.WHILE_KEYWORD ;}
"break" { return JetTokens.BREAK_KEYWORD ;} "break" { return KtTokens.BREAK_KEYWORD ;}
"class" { return JetTokens.CLASS_KEYWORD ;} "class" { return KtTokens.CLASS_KEYWORD ;}
"throw" { return JetTokens.THROW_KEYWORD ;} "throw" { return KtTokens.THROW_KEYWORD ;}
"false" { return JetTokens.FALSE_KEYWORD ;} "false" { return KtTokens.FALSE_KEYWORD ;}
"super" { return JetTokens.SUPER_KEYWORD ;} "super" { return KtTokens.SUPER_KEYWORD ;}
"when" { return JetTokens.WHEN_KEYWORD ;} "when" { return KtTokens.WHEN_KEYWORD ;}
"true" { return JetTokens.TRUE_KEYWORD ;} "true" { return KtTokens.TRUE_KEYWORD ;}
"this" { return JetTokens.THIS_KEYWORD ;} "this" { return KtTokens.THIS_KEYWORD ;}
"null" { return JetTokens.NULL_KEYWORD ;} "null" { return KtTokens.NULL_KEYWORD ;}
"else" { return JetTokens.ELSE_KEYWORD ;} "else" { return KtTokens.ELSE_KEYWORD ;}
"This" { return JetTokens.CAPITALIZED_THIS_KEYWORD ;} "This" { return KtTokens.CAPITALIZED_THIS_KEYWORD ;}
"try" { return JetTokens.TRY_KEYWORD ;} "try" { return KtTokens.TRY_KEYWORD ;}
"val" { return JetTokens.VAL_KEYWORD ;} "val" { return KtTokens.VAL_KEYWORD ;}
"var" { return JetTokens.VAR_KEYWORD ;} "var" { return KtTokens.VAR_KEYWORD ;}
"fun" { return JetTokens.FUN_KEYWORD ;} "fun" { return KtTokens.FUN_KEYWORD ;}
"for" { return JetTokens.FOR_KEYWORD ;} "for" { return KtTokens.FOR_KEYWORD ;}
"is" { return JetTokens.IS_KEYWORD ;} "is" { return KtTokens.IS_KEYWORD ;}
"in" { return JetTokens.IN_KEYWORD ;} "in" { return KtTokens.IN_KEYWORD ;}
"if" { return JetTokens.IF_KEYWORD ;} "if" { return KtTokens.IF_KEYWORD ;}
"do" { return JetTokens.DO_KEYWORD ;} "do" { return KtTokens.DO_KEYWORD ;}
"as" { return JetTokens.AS_KEYWORD ;} "as" { return KtTokens.AS_KEYWORD ;}
{FIELD_IDENTIFIER} { return JetTokens.FIELD_IDENTIFIER; } {FIELD_IDENTIFIER} { return KtTokens.FIELD_IDENTIFIER; }
{IDENTIFIER} { return JetTokens.IDENTIFIER; } {IDENTIFIER} { return KtTokens.IDENTIFIER; }
\!in{IDENTIFIER_PART} { yypushback(3); return JetTokens.EXCL; } \!in{IDENTIFIER_PART} { yypushback(3); return KtTokens.EXCL; }
\!is{IDENTIFIER_PART} { yypushback(3); return JetTokens.EXCL; } \!is{IDENTIFIER_PART} { yypushback(3); return KtTokens.EXCL; }
"===" { return JetTokens.EQEQEQ ; } "===" { return KtTokens.EQEQEQ ; }
"!==" { return JetTokens.EXCLEQEQEQ; } "!==" { return KtTokens.EXCLEQEQEQ; }
"!in" { return JetTokens.NOT_IN; } "!in" { return KtTokens.NOT_IN; }
"!is" { return JetTokens.NOT_IS; } "!is" { return KtTokens.NOT_IS; }
"as?" { return JetTokens.AS_SAFE; } "as?" { return KtTokens.AS_SAFE; }
"++" { return JetTokens.PLUSPLUS ; } "++" { return KtTokens.PLUSPLUS ; }
"--" { return JetTokens.MINUSMINUS; } "--" { return KtTokens.MINUSMINUS; }
"<=" { return JetTokens.LTEQ ; } "<=" { return KtTokens.LTEQ ; }
">=" { return JetTokens.GTEQ ; } ">=" { return KtTokens.GTEQ ; }
"==" { return JetTokens.EQEQ ; } "==" { return KtTokens.EQEQ ; }
"!=" { return JetTokens.EXCLEQ ; } "!=" { return KtTokens.EXCLEQ ; }
"&&" { return JetTokens.ANDAND ; } "&&" { return KtTokens.ANDAND ; }
"||" { return JetTokens.OROR ; } "||" { return KtTokens.OROR ; }
"*=" { return JetTokens.MULTEQ ; } "*=" { return KtTokens.MULTEQ ; }
"/=" { return JetTokens.DIVEQ ; } "/=" { return KtTokens.DIVEQ ; }
"%=" { return JetTokens.PERCEQ ; } "%=" { return KtTokens.PERCEQ ; }
"+=" { return JetTokens.PLUSEQ ; } "+=" { return KtTokens.PLUSEQ ; }
"-=" { return JetTokens.MINUSEQ ; } "-=" { return KtTokens.MINUSEQ ; }
"->" { return JetTokens.ARROW ; } "->" { return KtTokens.ARROW ; }
"=>" { return JetTokens.DOUBLE_ARROW; } "=>" { return KtTokens.DOUBLE_ARROW; }
".." { return JetTokens.RANGE ; } ".." { return KtTokens.RANGE ; }
"::" { return JetTokens.COLONCOLON; } "::" { return KtTokens.COLONCOLON; }
"[" { return JetTokens.LBRACKET ; } "[" { return KtTokens.LBRACKET ; }
"]" { return JetTokens.RBRACKET ; } "]" { return KtTokens.RBRACKET ; }
"{" { return JetTokens.LBRACE ; } "{" { return KtTokens.LBRACE ; }
"}" { return JetTokens.RBRACE ; } "}" { return KtTokens.RBRACE ; }
"(" { return JetTokens.LPAR ; } "(" { return KtTokens.LPAR ; }
")" { return JetTokens.RPAR ; } ")" { return KtTokens.RPAR ; }
"." { return JetTokens.DOT ; } "." { return KtTokens.DOT ; }
"*" { return JetTokens.MUL ; } "*" { return KtTokens.MUL ; }
"+" { return JetTokens.PLUS ; } "+" { return KtTokens.PLUS ; }
"-" { return JetTokens.MINUS ; } "-" { return KtTokens.MINUS ; }
"!" { return JetTokens.EXCL ; } "!" { return KtTokens.EXCL ; }
"/" { return JetTokens.DIV ; } "/" { return KtTokens.DIV ; }
"%" { return JetTokens.PERC ; } "%" { return KtTokens.PERC ; }
"<" { return JetTokens.LT ; } "<" { return KtTokens.LT ; }
">" { return JetTokens.GT ; } ">" { return KtTokens.GT ; }
"?" { return JetTokens.QUEST ; } "?" { return KtTokens.QUEST ; }
":" { return JetTokens.COLON ; } ":" { return KtTokens.COLON ; }
";;" { return JetTokens.DOUBLE_SEMICOLON;} ";;" { return KtTokens.DOUBLE_SEMICOLON;}
";" { return JetTokens.SEMICOLON ; } ";" { return KtTokens.SEMICOLON ; }
"=" { return JetTokens.EQ ; } "=" { return KtTokens.EQ ; }
"," { return JetTokens.COMMA ; } "," { return KtTokens.COMMA ; }
"#" { return JetTokens.HASH ; } "#" { return KtTokens.HASH ; }
"@" { return JetTokens.AT ; } "@" { return KtTokens.AT ; }
// error fallback // error fallback
. { return TokenType.BAD_CHARACTER; } . { return TokenType.BAD_CHARACTER; }