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

Support quotes at the end of a raw string

Browse Source 
Fix for KT-4650 Can't use double quote at the end of the raw string

#KT-4650 Fixed
This commit is contained in:
Andrey Breslav
2014-03-06 14:27:46 +04:00
parent 3cd1af3ba1
commit 2a0ccb95b1
8 changed files with 538 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/kdoc/lexer/_KDocLexer.java
+4 -3
View File
@@ -1,4 +1,4 @@
/* The following code was generated by JFlex 1.4.3 on 25.05.13 16:39 */
/* The following code was generated by JFlex 1.4.3 on 3/6/14 2:09 PM */
package org.jetbrains.jet.kdoc.lexer;
@@ -6,13 +6,14 @@ import com.intellij.lexer.FlexLexer;
import com.intellij.psi.TokenType;
import com.intellij.psi.tree.IElementType;
import com.intellij.util.text.CharArrayUtil;
import java.lang.Character;
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4.3
* on 25.05.13 16:39 from the specification file
* <tt>/Users/factitious/Documents/kotlin/compiler/frontend/src/org/jetbrains/jet/kdoc/lexer/KDoc.flex</tt>
* on 3/6/14 2:09 PM from the specification file
* <tt>/Users/abreslav/work/kotlin/compiler/frontend/src/org/jetbrains/jet/kdoc/lexer/KDoc.flex</tt>
*/
class _KDocLexer implements FlexLexer {
/** initial size of the lookahead buffer */
compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex
+12 -1
View File
@@ -116,6 +116,7 @@ ESCAPE_SEQUENCE=\\(u{HEX_DIGIT}{HEX_DIGIT}{HEX_DIGIT}{HEX_DIGIT}|[^\n])
// ANY_ESCAPE_SEQUENCE = \\[^]
THREE_QUO = (\"\"\")
THREE_OR_MORE_QUO = ({THREE_QUO}\"*)
ONE_TWO_QUO = (\"[^\"]) | (\"\"[^\"])
QUO_STRING_CHAR = [^\"] | {ONE_TWO_QUO}
RAW_STRING_LITERAL = {THREE_QUO} {QUO_STRING_CHAR}* {THREE_QUO}?
@@ -134,7 +135,17 @@ LONG_TEMPLATE_ENTRY_END=\}
<RAW_STRING> \n { return JetTokens.REGULAR_STRING_PART; }
<RAW_STRING> \" { return JetTokens.REGULAR_STRING_PART; }
<RAW_STRING> \\ { return JetTokens.REGULAR_STRING_PART; }
<RAW_STRING> {THREE_QUO} { popState(); return JetTokens.CLOSING_QUOTE; }
<RAW_STRING> {THREE_OR_MORE_QUO} {
int length = yytext().length();
if (length <= 3) { // closing """
popState();
return JetTokens.CLOSING_QUOTE;
}
else { // some quotes at the end of a string, e.g. """ "foo""""
yypushback(3); // return the closing quotes (""") to the stream
return JetTokens.REGULAR_STRING_PART;
}
}
\" { pushState(STRING); return JetTokens.OPEN_QUOTE; }
<STRING> \n { popState(); yypushback(1); return JetTokens.DANGLING_NEWLINE; }
compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java
+332 -319
View File
@@ -1,4 +1,4 @@
/* The following code was generated by JFlex 1.4.3 on 12/4/13 1:36 PM */
/* The following code was generated by JFlex 1.4.3 on 3/6/14 2:09 PM */
package org.jetbrains.jet.lexer;
@@ -14,8 +14,8 @@ 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 12/4/13 1:36 PM from the specification file
* <tt>C:/Development/kotlin/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex</tt>
* on 3/6/14 2:09 PM from the specification file
* <tt>/Users/abreslav/work/kotlin/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex</tt>
*/
class _JetLexer implements FlexLexer {
/** initial size of the lookahead buffer */
@@ -138,15 +138,15 @@ class _JetLexer implements FlexLexer {
"\1\104\1\105\1\0\1\106\1\44\1\3\2\0\1\107"+
"\1\110\1\111\1\112\1\0\1\2\2\0\1\113\4\3"+
"\1\114\10\3\1\115\4\3\1\116\1\117\2\3\1\120"+
"\1\121\1\122\2\0\2\40\1\45\1\46\1\123\1\124"+
"\2\44\1\0\1\125\1\3\1\126\1\3\1\127\4\3"+
"\1\130\1\131\4\3\1\132\1\3\1\133\1\101\1\0"+
"\1\134\1\135\1\136\1\137\1\3\1\140\3\3\1\141"+
"\1\142\1\143\1\0\1\3\1\144\1\3\1\145\1\3"+
"\1\146\1\147";
"\1\121\1\122\2\0\1\123\2\40\1\45\1\46\1\124"+
"\1\125\2\44\1\0\1\126\1\3\1\127\1\3\1\130"+
"\4\3\1\131\1\132\4\3\1\133\1\3\1\134\1\101"+
"\1\0\1\135\1\136\1\137\1\140\1\3\1\141\3\3"+
"\1\142\1\143\1\144\1\0\1\3\1\145\1\3\1\146"+
"\1\3\1\147\1\150";
private static int [] zzUnpackAction() {
int [] result = new int[232];
int [] result = new int[233];
int offset = 0;
offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
return result;
@@ -193,16 +193,17 @@ class _JetLexer implements FlexLexer {
"\0\u1b96\0\u1bd8\0\u1c1a\0\u018c\0\u1c5c\0\u1c9e\0\u1ce0\0\u1d22"+
"\0\u0210\0\u1d64\0\u1da6\0\u1de8\0\u1e2a\0\u1e6c\0\u1eae\0\u1ef0"+
"\0\u1f32\0\u018c\0\u1f74\0\u1fb6\0\u1ff8\0\u203a\0\u0210\0\u0210"+
"\0\u207c\0\u20be\0\u0210\0\u0210\0\u018c\0\u2100\0\u2142\0\u018c"+
"\0\u2184\0\u018c\0\u018c\0\u018c\0\u018c\0\u21c6\0\u2208\0\u2208"+
"\0\u0210\0\u224a\0\u0210\0\u228c\0\u0210\0\u22ce\0\u2310\0\u2352"+
"\0\u2394\0\u0210\0\u0210\0\u23d6\0\u2418\0\u245a\0\u249c\0\u0210"+
"\0\u24de\0\u0210\0\u018c\0\u2520\0\u0ce4\0\u0210\0\u0210\0\u0210"+
"\0\u2562\0\u0210\0\u25a4\0\u25e6\0\u2628\0\u0210\0\u0210\0\u0210"+
"\0\u266a\0\u26ac\0\u0210\0\u26ee\0\u0210\0\u2730\0\u0210\0\u0210";
"\0\u207c\0\u20be\0\u0210\0\u0210\0\u018c\0\u2100\0\u2142\0\u1902"+
"\0\u018c\0\u2184\0\u018c\0\u018c\0\u018c\0\u018c\0\u21c6\0\u2208"+
"\0\u2208\0\u0210\0\u224a\0\u0210\0\u228c\0\u0210\0\u22ce\0\u2310"+
"\0\u2352\0\u2394\0\u0210\0\u0210\0\u23d6\0\u2418\0\u245a\0\u249c"+
"\0\u0210\0\u24de\0\u0210\0\u018c\0\u2520\0\u0ce4\0\u0210\0\u0210"+
"\0\u0210\0\u2562\0\u0210\0\u25a4\0\u25e6\0\u2628\0\u0210\0\u0210"+
"\0\u0210\0\u266a\0\u26ac\0\u0210\0\u26ee\0\u0210\0\u2730\0\u0210"+
"\0\u0210";
private static int [] zzUnpackRowMap() {
int [] result = new int[232];
int [] result = new int[233];
int offset = 0;
offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
return result;
@@ -376,112 +377,112 @@ class _JetLexer implements FlexLexer {
"\1\0\22\204\17\0\6\266\2\0\72\266\1\0\2\267"+
"\12\0\1\267\1\0\1\267\2\0\2\267\15\0\1\267"+
"\2\0\1\267\1\0\1\267\3\0\1\267\3\0\1\267"+
"\3\0\1\267\47\0\1\74\51\0\6\212\1\270\1\0"+
"\3\0\1\267\47\0\1\270\51\0\6\212\1\271\1\0"+
"\72\212\1\0\2\77\1\0\2\77\7\0\4\77\1\0"+
"\2\77\1\0\1\77\3\0\1\77\2\0\2\77\1\271"+
"\2\77\1\0\1\77\3\0\1\77\2\0\2\77\1\272"+
"\1\77\1\0\22\77\40\0\1\217\61\0\1\220\13\0"+
"\1\220\4\0\1\111\33\0\1\111\23\0\6\222\1\272"+
"\1\0\72\222\6\223\1\273\1\0\72\223\12\0\1\274"+
"\70\0\2\275\1\0\2\275\7\0\4\275\1\0\2\275"+
"\1\0\1\275\3\0\1\275\2\0\4\275\1\0\22\275"+
"\1\220\4\0\1\111\33\0\1\111\23\0\6\222\1\273"+
"\1\0\72\222\6\223\1\274\1\0\72\223\12\0\1\275"+
"\70\0\2\276\1\0\2\276\7\0\4\276\1\0\2\276"+
"\1\0\1\276\3\0\1\276\2\0\4\276\1\0\22\276"+
"\20\0\1\132\13\0\1\132\105\0\1\216\3\0\1\233"+
"\17\0\1\233\35\0\2\276\12\0\1\276\1\0\1\276"+
"\1\0\1\217\2\276\15\0\1\276\2\0\1\276\1\0"+
"\1\276\3\0\1\276\3\0\1\276\3\0\1\276\20\0"+
"\1\277\13\0\1\277\6\0\1\300\40\0\1\300\15\0"+
"\17\0\1\233\35\0\2\277\12\0\1\277\1\0\1\277"+
"\1\0\1\217\2\277\15\0\1\277\2\0\1\277\1\0"+
"\1\277\3\0\1\277\3\0\1\277\3\0\1\277\20\0"+
"\1\300\13\0\1\300\6\0\1\301\40\0\1\301\15\0"+
"\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+
"\1\11\3\0\1\11\2\0\3\11\1\301\1\0\22\11"+
"\1\11\3\0\1\11\2\0\3\11\1\302\1\0\22\11"+
"\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+
"\1\0\1\11\3\0\1\11\2\0\4\11\1\0\1\11"+
"\1\302\20\11\20\0\2\11\1\0\2\11\7\0\4\11"+
"\1\303\20\11\20\0\2\11\1\0\2\11\7\0\4\11"+
"\1\0\2\11\1\0\1\11\3\0\1\11\2\0\4\11"+
"\1\0\3\11\1\303\16\11\20\0\2\11\1\0\2\11"+
"\1\0\3\11\1\304\16\11\20\0\2\11\1\0\2\11"+
"\7\0\4\11\1\0\2\11\1\0\1\11\3\0\1\11"+
"\2\0\2\11\1\304\1\11\1\0\22\11\20\0\2\11"+
"\2\0\2\11\1\305\1\11\1\0\22\11\20\0\2\11"+
"\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+
"\3\0\1\11\2\0\4\11\1\0\3\11\1\305\16\11"+
"\3\0\1\11\2\0\4\11\1\0\3\11\1\306\16\11"+
"\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+
"\1\0\1\11\3\0\1\11\2\0\4\11\1\0\3\11"+
"\1\306\16\11\20\0\2\11\1\0\2\11\7\0\4\11"+
"\1\0\2\11\1\0\1\11\3\0\1\11\2\0\1\307"+
"\1\307\16\11\20\0\2\11\1\0\2\11\7\0\4\11"+
"\1\0\2\11\1\0\1\11\3\0\1\11\2\0\1\310"+
"\3\11\1\0\22\11\20\0\2\11\1\0\2\11\7\0"+
"\4\11\1\0\2\11\1\0\1\11\3\0\1\11\2\0"+
"\3\11\1\310\1\0\22\11\20\0\2\11\1\0\2\11"+
"\3\11\1\311\1\0\22\11\20\0\2\11\1\0\2\11"+
"\7\0\4\11\1\0\2\11\1\0\1\11\3\0\1\11"+
"\2\0\4\11\1\0\3\11\1\311\16\11\20\0\2\11"+
"\2\0\4\11\1\0\3\11\1\312\16\11\20\0\2\11"+
"\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+
"\3\0\1\11\2\0\4\11\1\0\14\11\1\312\5\11"+
"\3\0\1\11\2\0\4\11\1\0\14\11\1\313\5\11"+
"\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+
"\1\0\1\11\3\0\1\11\2\0\4\11\1\0\3\11"+
"\1\313\16\11\20\0\2\11\1\0\2\11\7\0\4\11"+
"\1\314\16\11\20\0\2\11\1\0\2\11\7\0\4\11"+
"\1\0\2\11\1\0\1\11\3\0\1\11\2\0\4\11"+
"\1\0\6\11\1\314\13\11\20\0\2\11\1\0\2\11"+
"\7\0\4\11\1\0\2\11\1\0\1\11\3\0\1\315"+
"\1\0\6\11\1\315\13\11\20\0\2\11\1\0\2\11"+
"\7\0\4\11\1\0\2\11\1\0\1\11\3\0\1\316"+
"\2\0\4\11\1\0\22\11\20\0\2\11\1\0\2\11"+
"\7\0\4\11\1\0\2\11\1\0\1\11\3\0\1\11"+
"\2\0\4\11\1\0\5\11\1\316\14\11\20\0\2\11"+
"\2\0\4\11\1\0\5\11\1\317\14\11\20\0\2\11"+
"\1\0\2\11\7\0\4\11\1\0\2\11\1\0\1\11"+
"\3\0\1\11\2\0\4\11\1\0\14\11\1\317\5\11"+
"\3\0\1\11\2\0\4\11\1\0\14\11\1\320\5\11"+
"\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+
"\1\0\1\11\3\0\1\11\2\0\4\11\1\0\2\11"+
"\1\320\17\11\20\0\2\11\1\0\2\11\7\0\4\11"+
"\1\321\17\11\20\0\2\11\1\0\2\11\7\0\4\11"+
"\1\0\2\11\1\0\1\11\3\0\1\11\2\0\3\11"+
"\1\321\1\0\22\11\20\0\2\11\1\0\2\11\7\0"+
"\1\322\1\0\22\11\20\0\2\11\1\0\2\11\7\0"+
"\4\11\1\0\2\11\1\0\1\11\3\0\1\11\2\0"+
"\3\11\1\322\1\0\22\11\17\0\6\266\1\323\1\0"+
"\72\266\1\0\2\324\12\0\1\324\1\0\1\324\2\0"+
"\2\324\15\0\1\324\2\0\1\324\1\0\1\324\3\0"+
"\1\324\3\0\1\324\3\0\1\324\20\0\2\77\1\0"+
"\3\11\1\323\1\0\22\11\17\0\6\266\1\324\1\0"+
"\72\266\1\0\2\325\12\0\1\325\1\0\1\325\2\0"+
"\2\325\15\0\1\325\2\0\1\325\1\0\1\325\3\0"+
"\1\325\3\0\1\325\3\0\1\325\20\0\2\77\1\0"+
"\2\77\7\0\4\77\1\0\2\77\1\0\1\77\3\0"+
"\1\77\2\0\3\77\1\325\1\0\22\77\20\0\2\276"+
"\12\0\1\276\1\0\1\276\2\0\2\276\1\0\1\233"+
"\13\0\1\276\2\0\1\276\1\233\1\276\3\0\1\276"+
"\3\0\1\276\3\0\1\276\20\0\1\277\13\0\1\277"+
"\1\77\2\0\3\77\1\326\1\0\22\77\20\0\2\277"+
"\12\0\1\277\1\0\1\277\2\0\2\277\1\0\1\233"+
"\13\0\1\277\2\0\1\277\1\233\1\277\3\0\1\277"+
"\3\0\1\277\3\0\1\277\20\0\1\300\13\0\1\300"+
"\65\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+
"\1\0\1\11\3\0\1\11\2\0\4\11\1\0\13\11"+
"\1\326\6\11\20\0\2\11\1\0\2\11\7\0\4\11"+
"\1\0\2\11\1\0\1\11\3\0\1\11\2\0\1\327"+
"\1\327\6\11\20\0\2\11\1\0\2\11\7\0\4\11"+
"\1\0\2\11\1\0\1\11\3\0\1\11\2\0\1\330"+
"\3\11\1\0\22\11\20\0\2\11\1\0\2\11\7\0"+
"\4\11\1\0\2\11\1\0\1\11\3\0\1\11\2\0"+
"\4\11\1\0\10\11\1\330\11\11\20\0\2\11\1\0"+
"\4\11\1\0\10\11\1\331\11\11\20\0\2\11\1\0"+
"\2\11\7\0\4\11\1\0\2\11\1\0\1\11\3\0"+
"\1\11\2\0\2\11\1\331\1\11\1\0\22\11\20\0"+
"\1\11\2\0\2\11\1\332\1\11\1\0\22\11\20\0"+
"\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+
"\1\11\3\0\1\11\2\0\3\11\1\332\1\0\22\11"+
"\1\11\3\0\1\11\2\0\3\11\1\333\1\0\22\11"+
"\20\0\2\11\1\0\2\11\7\0\4\11\1\0\2\11"+
"\1\0\1\11\3\0\1\11\2\0\4\11\1\0\1\333"+
"\1\0\1\11\3\0\1\11\2\0\4\11\1\0\1\334"+
"\21\11\20\0\2\11\1\0\2\11\7\0\4\11\1\0"+
"\2\11\1\0\1\11\3\0\1\11\2\0\4\11\1\0"+
"\5\11\1\334\14\11\20\0\2\11\1\0\2\11\7\0"+
"\5\11\1\335\14\11\20\0\2\11\1\0\2\11\7\0"+
"\4\11\1\0\2\11\1\0\1\11\3\0\1\11\2\0"+
"\4\11\1\0\10\11\1\335\11\11\20\0\2\11\1\0"+
"\4\11\1\0\10\11\1\336\11\11\20\0\2\11\1\0"+
"\2\11\7\0\4\11\1\0\2\11\1\0\1\11\3\0"+
"\1\11\2\0\4\11\1\0\6\11\1\336\13\11\20\0"+
"\1\11\2\0\4\11\1\0\6\11\1\337\13\11\20\0"+
"\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+
"\1\11\3\0\1\11\2\0\4\11\1\0\3\11\1\337"+
"\1\11\3\0\1\11\2\0\4\11\1\0\3\11\1\340"+
"\16\11\20\0\2\11\1\0\2\11\7\0\4\11\1\0"+
"\2\11\1\0\1\11\3\0\1\11\2\0\4\11\1\0"+
"\3\11\1\340\16\11\20\0\2\341\12\0\1\341\1\0"+
"\1\341\2\0\2\341\15\0\1\341\2\0\1\341\1\0"+
"\1\341\3\0\1\341\3\0\1\341\3\0\1\341\20\0"+
"\3\11\1\341\16\11\20\0\2\342\12\0\1\342\1\0"+
"\1\342\2\0\2\342\15\0\1\342\2\0\1\342\1\0"+
"\1\342\3\0\1\342\3\0\1\342\3\0\1\342\20\0"+
"\2\11\1\0\2\11\7\0\4\11\1\0\2\11\1\0"+
"\1\11\3\0\1\11\2\0\4\11\1\0\2\11\1\342"+
"\1\11\3\0\1\11\2\0\4\11\1\0\2\11\1\343"+
"\17\11\20\0\2\11\1\0\2\11\7\0\4\11\1\0"+
"\2\11\1\0\1\11\3\0\1\11\2\0\1\343\3\11"+
"\2\11\1\0\1\11\3\0\1\11\2\0\1\344\3\11"+
"\1\0\22\11\20\0\2\11\1\0\2\11\7\0\4\11"+
"\1\0\2\11\1\0\1\11\3\0\1\11\2\0\4\11"+
"\1\0\7\11\1\344\12\11\20\0\2\11\1\0\2\11"+
"\1\0\7\11\1\345\12\11\20\0\2\11\1\0\2\11"+
"\7\0\4\11\1\0\2\11\1\0\1\11\3\0\1\11"+
"\2\0\4\11\1\0\2\11\1\345\17\11\20\0\2\207"+
"\2\0\4\11\1\0\2\11\1\346\17\11\20\0\2\207"+
"\12\0\1\207\1\0\1\207\2\0\2\207\15\0\1\207"+
"\2\0\1\207\1\0\1\207\3\0\1\207\3\0\1\207"+
"\3\0\1\207\20\0\2\11\1\0\2\11\7\0\4\11"+
"\1\0\2\11\1\0\1\11\3\0\1\346\2\0\4\11"+
"\1\0\2\11\1\0\1\11\3\0\1\347\2\0\4\11"+
"\1\0\22\11\20\0\2\11\1\0\2\11\7\0\4\11"+
"\1\0\2\11\1\0\1\11\3\0\1\11\2\0\4\11"+
"\1\0\3\11\1\347\16\11\20\0\2\11\1\0\2\11"+
"\1\0\3\11\1\350\16\11\20\0\2\11\1\0\2\11"+
"\7\0\4\11\1\0\2\11\1\0\1\11\3\0\1\11"+
"\2\0\4\11\1\0\3\11\1\350\16\11\17\0";
"\2\0\4\11\1\0\3\11\1\351\16\11\17\0";
private static int [] zzUnpackTrans() {
int [] result = new int[10098];
@@ -533,11 +534,11 @@ class _JetLexer implements FlexLexer {
"\11\11\1\1\1\0\2\11\1\1\2\0\1\1\2\11"+
"\1\0\1\11\1\1\1\11\2\0\3\1\1\11\1\0"+
"\1\1\2\0\1\11\15\1\1\11\12\1\1\11\2\0"+
"\1\11\1\1\4\11\2\1\1\0\22\1\1\11\1\0"+
"\14\1\1\0\7\1";
"\1\1\1\11\1\1\4\11\2\1\1\0\22\1\1\11"+
"\1\0\14\1\1\0\7\1";
private static int [] zzUnpackAttribute() {
int [] result = new int[232];
int [] result = new int[233];
int offset = 0;
offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
return result;
@@ -891,319 +892,180 @@ class _JetLexer implements FlexLexer {
case 3:
{ return JetTokens.IDENTIFIER;
}
case 104: break;
case 105: break;
case 12:
{ pushState(STRING); return JetTokens.OPEN_QUOTE;
}
case 105: break;
case 106: break;
case 79:
{ return JetTokens.FOR_KEYWORD ;
}
case 106: break;
case 101:
case 107: break;
case 102:
{ return JetTokens.RETURN_KEYWORD ;
}
case 107: break;
case 88:
case 108: break;
case 89:
{ return JetTokens.NULL_KEYWORD ;
}
case 108: break;
case 109: break;
case 35:
{ if (lBraceCount == 0) {
popState();
return JetTokens.LONG_TEMPLATE_ENTRY_END;
}
lBraceCount--;
return JetTokens.RBRACE;
}
case 110: break;
case 19:
{ return JetTokens.LT ;
}
case 109: break;
case 111: break;
case 54:
{ return JetTokens.DO_KEYWORD ;
}
case 110: break;
case 112: break;
case 18:
{ return JetTokens.PLUS ;
}
case 111: break;
case 113: break;
case 57:
{ return JetTokens.PLUSEQ ;
}
case 112: break;
case 92:
case 114: break;
case 93:
{ popState(); return JetTokens.THIS_KEYWORD;
}
case 113: break;
case 115: break;
case 28:
{ return JetTokens.COMMA ;
}
case 114: break;
case 116: break;
case 20:
{ return JetTokens.GT ;
}
case 115: break;
case 117: break;
case 4:
{ return JetTokens.WHITE_SPACE;
}
case 116: break;
case 118: break;
case 26:
{ return JetTokens.RPAR ;
}
case 117: break;
case 119: break;
case 56:
{ return JetTokens.DOUBLE_ARROW;
}
case 118: break;
case 86:
case 120: break;
case 87:
{ return JetTokens.TRUE_KEYWORD ;
}
case 119: break;
case 121: break;
case 37:
{ return JetTokens.FIELD_IDENTIFIER;
}
case 120: break;
case 122: break;
case 61:
{ return JetTokens.ANDAND ;
}
case 121: break;
case 123: break;
case 66:
{ pushState(LONG_TEMPLATE_ENTRY); return JetTokens.LONG_TEMPLATE_ENTRY_START;
}
case 122: break;
case 124: break;
case 36:
{ return JetTokens.FLOAT_LITERAL;
}
case 123: break;
case 125: break;
case 40:
{ return JetTokens.EOL_COMMENT;
}
case 124: break;
case 90:
case 126: break;
case 91:
{ return JetTokens.WHEN_KEYWORD ;
}
case 125: break;
case 127: break;
case 75:
{ pushState(RAW_STRING); return JetTokens.OPEN_QUOTE;
}
case 126: break;
case 128: break;
case 22:
{ return JetTokens.COLON ;
}
case 127: break;
case 129: break;
case 59:
{ return JetTokens.LTEQ ;
}
case 128: break;
case 130: break;
case 48:
{ return JetTokens.ARROW ;
}
case 129: break;
case 131: break;
case 32:
{ popState(); return JetTokens.IDENTIFIER;
}
case 130: break;
case 132: break;
case 23:
{ return JetTokens.LBRACKET ;
}
case 131: break;
case 133: break;
case 70:
{ yypushback(2); return JetTokens.INTEGER_LITERAL;
}
case 132: break;
case 134: break;
case 11:
{ return JetTokens.CHARACTER_LITERAL;
}
case 133: break;
case 135: break;
case 80:
{ return JetTokens.VAR_KEYWORD ;
}
case 134: break;
case 136: break;
case 60:
{ return JetTokens.GTEQ ;
}
case 135: break;
case 137: break;
case 2:
{ return JetTokens.INTEGER_LITERAL;
}
case 136: break;
case 138: break;
case 14:
{ return JetTokens.RBRACE ;
}
case 137: break;
case 96:
case 139: break;
case 97:
{ return JetTokens.CLASS_KEYWORD ;
}
case 138: break;
case 140: break;
case 76:
{ return JetTokens.TRY_KEYWORD ;
}
case 139: break;
case 141: break;
case 8:
{ return JetTokens.EXCL ;
}
case 140: break;
case 142: break;
case 44:
{ return JetTokens.EXCLEQ ;
}
case 141: break;
case 143: break;
case 47:
{ return JetTokens.MINUSEQ ;
}
case 142: break;
case 102:
case 144: break;
case 103:
{ return JetTokens.PACKAGE_KEYWORD ;
}
case 143: break;
case 93:
case 145: break;
case 94:
{ return JetTokens.THROW_KEYWORD ;
}
case 144: break;
case 95:
case 146: break;
case 96:
{ return JetTokens.SUPER_KEYWORD ;
}
case 145: break;
case 98:
{ return JetTokens.WHILE_KEYWORD ;
}
case 146: break;
case 46:
{ return JetTokens.MINUSMINUS;
}
case 147: break;
case 103:
{ return JetTokens.CONTINUE_KEYWORD ;
}
case 148: break;
case 73:
{ return JetTokens.NOT_IN;
}
case 149: break;
case 39:
{ return JetTokens.ATAT ;
}
case 150: break;
case 71:
{ pushState(DOC_COMMENT);
commentDepth = 0;
commentStart = getTokenStart();
}
case 151: break;
case 6:
{ return JetTokens.DIV ;
}
case 152: break;
case 65:
{ pushState(SHORT_TEMPLATE_ENTRY);
yypushback(yylength() - 1);
return JetTokens.SHORT_TEMPLATE_ENTRY_START;
}
case 153: break;
case 38:
{ return JetTokens.LABEL_IDENTIFIER;
}
case 154: break;
case 29:
{ return JetTokens.REGULAR_STRING_PART;
}
case 155: break;
case 17:
{ return JetTokens.QUEST ;
}
case 156: break;
case 43:
{ if (zzCurrentPos == 0) {
return JetTokens.SHEBANG_COMMENT;
}
else {
yypushback(yylength() - 1);
return JetTokens.HASH;
}
}
case 157: break;
case 62:
{ return JetTokens.OROR ;
}
case 158: break;
case 21:
{ return JetTokens.PERC ;
}
case 159: break;
case 74:
{ return JetTokens.EXCLEQEQEQ;
}
case 160: break;
case 63:
{ return JetTokens.PERCEQ ;
}
case 161: break;
case 45:
{ return JetTokens.RANGE ;
}
case 162: break;
case 1:
{ return TokenType.BAD_CHARACTER;
}
case 163: break;
case 72:
{ return JetTokens.NOT_IS;
}
case 164: break;
case 15:
{ return JetTokens.MUL ;
}
case 165: break;
case 24:
{ return JetTokens.RBRACKET ;
}
case 166: break;
case 58:
{ return JetTokens.PLUSPLUS ;
}
case 167: break;
case 85:
{ return JetTokens.THIS_KEYWORD ;
}
case 168: break;
case 9:
{ return JetTokens.DOT ;
}
case 169: break;
case 27:
{ return JetTokens.SEMICOLON ;
}
case 170: break;
case 51:
{ return JetTokens.IF_KEYWORD ;
}
case 171: break;
case 67:
{ return JetTokens.ESCAPE_SEQUENCE;
}
case 172: break;
case 41:
{ pushState(BLOCK_COMMENT);
commentDepth = 0;
commentStart = getTokenStart();
}
case 173: break;
case 31:
{ popState(); return JetTokens.CLOSING_QUOTE;
}
case 174: break;
case 16:
{ return JetTokens.EQ ;
}
case 175: break;
case 5:
{ return JetTokens.AT ;
}
case 176: break;
case 77:
{ return JetTokens.AS_SAFE;
}
case 177: break;
case 25:
{ return JetTokens.LPAR ;
}
case 178: break;
case 10:
{ return JetTokens.MINUS ;
}
case 179: break;
case 69:
{ if (commentDepth > 0) {
commentDepth--;
@@ -1215,116 +1077,267 @@ class _JetLexer implements FlexLexer {
return commentStateToTokenType(state);
}
}
case 180: break;
case 148: break;
case 99:
{ return JetTokens.FALSE_KEYWORD ;
{ return JetTokens.WHILE_KEYWORD ;
}
case 149: break;
case 46:
{ return JetTokens.MINUSMINUS;
}
case 150: break;
case 104:
{ return JetTokens.CONTINUE_KEYWORD ;
}
case 151: break;
case 73:
{ return JetTokens.NOT_IN;
}
case 152: break;
case 39:
{ return JetTokens.ATAT ;
}
case 153: break;
case 6:
{ return JetTokens.DIV ;
}
case 154: break;
case 83:
{ int length = yytext().length();
if (length <= 3) { // closing """
popState();
return JetTokens.CLOSING_QUOTE;
}
else { // some quotes at the end of a string, e.g. """ "foo""""
yypushback(3); // return the closing quotes (""") to the stream
return JetTokens.REGULAR_STRING_PART;
}
}
case 155: break;
case 38:
{ return JetTokens.LABEL_IDENTIFIER;
}
case 156: break;
case 29:
{ return JetTokens.REGULAR_STRING_PART;
}
case 157: break;
case 17:
{ return JetTokens.QUEST ;
}
case 158: break;
case 71:
{ pushState(DOC_COMMENT);
commentDepth = 0;
commentStart = getTokenStart();
}
case 159: break;
case 62:
{ return JetTokens.OROR ;
}
case 160: break;
case 21:
{ return JetTokens.PERC ;
}
case 161: break;
case 74:
{ return JetTokens.EXCLEQEQEQ;
}
case 162: break;
case 63:
{ return JetTokens.PERCEQ ;
}
case 163: break;
case 45:
{ return JetTokens.RANGE ;
}
case 164: break;
case 1:
{ return TokenType.BAD_CHARACTER;
}
case 165: break;
case 65:
{ pushState(SHORT_TEMPLATE_ENTRY);
yypushback(yylength() - 1);
return JetTokens.SHORT_TEMPLATE_ENTRY_START;
}
case 166: break;
case 72:
{ return JetTokens.NOT_IS;
}
case 167: break;
case 15:
{ return JetTokens.MUL ;
}
case 168: break;
case 24:
{ return JetTokens.RBRACKET ;
}
case 169: break;
case 58:
{ return JetTokens.PLUSPLUS ;
}
case 170: break;
case 41:
{ pushState(BLOCK_COMMENT);
commentDepth = 0;
commentStart = getTokenStart();
}
case 171: break;
case 86:
{ return JetTokens.THIS_KEYWORD ;
}
case 172: break;
case 9:
{ return JetTokens.DOT ;
}
case 173: break;
case 27:
{ return JetTokens.SEMICOLON ;
}
case 174: break;
case 51:
{ return JetTokens.IF_KEYWORD ;
}
case 175: break;
case 67:
{ return JetTokens.ESCAPE_SEQUENCE;
}
case 176: break;
case 31:
{ popState(); return JetTokens.CLOSING_QUOTE;
}
case 177: break;
case 16:
{ return JetTokens.EQ ;
}
case 178: break;
case 5:
{ return JetTokens.AT ;
}
case 179: break;
case 77:
{ return JetTokens.AS_SAFE;
}
case 180: break;
case 25:
{ return JetTokens.LPAR ;
}
case 181: break;
case 87:
{ return JetTokens.TYPE_KEYWORD ;
case 10:
{ return JetTokens.MINUS ;
}
case 182: break;
case 100:
{ return JetTokens.FALSE_KEYWORD ;
}
case 183: break;
case 88:
{ return JetTokens.TYPE_KEYWORD ;
}
case 184: break;
case 68:
{ commentDepth++;
}
case 183: break;
case 185: break;
case 78:
{ return JetTokens.FUN_KEYWORD ;
}
case 184: break;
case 186: break;
case 49:
{ return JetTokens.IS_KEYWORD ;
}
case 185: break;
case 187: break;
case 30:
{ popState(); yypushback(1); return JetTokens.DANGLING_NEWLINE;
}
case 186: break;
case 188: break;
case 34:
{ lBraceCount++; return JetTokens.LBRACE;
}
case 187: break;
case 84:
case 189: break;
case 85:
{ yypushback(3); return JetTokens.EXCL;
}
case 188: break;
case 190: break;
case 42:
{ return JetTokens.DIVEQ ;
}
case 189: break;
case 89:
case 191: break;
case 90:
{ return JetTokens.ELSE_KEYWORD ;
}
case 190: break;
case 192: break;
case 53:
{ return JetTokens.AS_KEYWORD ;
}
case 191: break;
case 193: break;
case 50:
{ return JetTokens.IN_KEYWORD ;
}
case 192: break;
case 194: break;
case 55:
{ return JetTokens.EQEQ ;
}
case 193: break;
case 195: break;
case 82:
{ return JetTokens.EQEQEQ ;
}
case 194: break;
case 196: break;
case 81:
{ return JetTokens.VAL_KEYWORD ;
}
case 195: break;
case 91:
case 197: break;
case 92:
{ return JetTokens.CAPITALIZED_THIS_KEYWORD ;
}
case 196: break;
case 198: break;
case 52:
{ return JetTokens.MULTEQ ;
}
case 197: break;
case 199: break;
case 43:
{ if (zzCurrentPos == 0) {
return JetTokens.SHEBANG_COMMENT;
}
else {
yypushback(yylength() - 1);
return JetTokens.HASH;
}
}
case 200: break;
case 13:
{ return JetTokens.LBRACE ;
}
case 198: break;
case 100:
case 201: break;
case 101:
{ return JetTokens.OBJECT_KEYWORD ;
}
case 199: break;
case 97:
case 202: break;
case 98:
{ return JetTokens.BREAK_KEYWORD ;
}
case 200: break;
case 83:
case 203: break;
case 84:
{ return JetTokens.BLOCK_COMMENT;
}
case 201: break;
case 94:
case 204: break;
case 95:
{ return JetTokens.TRAIT_KEYWORD ;
}
case 202: break;
case 205: break;
case 64:
{ return JetTokens.COLONCOLON;
}
case 203: break;
case 206: break;
case 33:
{
}
case 204: break;
case 35:
{ if (lBraceCount == 0) {
popState();
return JetTokens.LONG_TEMPLATE_ENTRY_END;
}
lBraceCount--;
return JetTokens.RBRACE;
}
case 205: break;
case 207: break;
case 7:
{ return JetTokens.HASH ;
}
case 206: break;
case 208: break;
default:
if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
zzAtEOF = true;
@@ -1336,14 +1349,14 @@ class _JetLexer implements FlexLexer {
zzStartRead = commentStart;
return commentStateToTokenType(state);
}
case 233: break;
case 234: break;
case DOC_COMMENT: {
int state = yystate();
popState();
zzStartRead = commentStart;
return commentStateToTokenType(state);
}
case 234: break;
case 235: break;
default:
return null;
}
compiler/testData/codegen/box/strings/rawStringsWithManyQuotes.kt
+28
View File
@@ -0,0 +1,28 @@
class P(val actual: String, val expected: String)
fun array(vararg s: P) = s
fun box() : String {
val data = array(
P("""""", ""),
P(""""""", "\""),
P("""""""", "\"\""),
P(""""""""", "\"\"\""),
P("""""""""", "\"\"\"\""),
P("""" """, "\" "),
P(""""" """, "\"\" "),
P(""" """", " \""),
P(""" """"", " \"\""),
P(""" """""", " \"\"\""),
P(""" """"""", " \"\"\"\""),
P(""" """""""", " \"\"\"\"\""),
P("""" """", "\" \""),
P(""""" """"", "\"\" \"\"")
)
for (i in 0..data.size-1) {
val p = data[i]
if (p.actual != p.expected) return "Fail at #$i. actual='${p.actual}', expected='${p.expected}'"
}
return "OK"
}
compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.kt
+19
View File
@@ -0,0 +1,19 @@
fun foo() {
""""""
"""""""
""""""""
"""""""""
""""""""""
"""" """
""""" """
""" """"
""" """""
""" """"""
""" """""""
""" """"""""
"""" """"
""""" """""
}
compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.txt
+123
View File
@@ -0,0 +1,123 @@
JetFile: RawStringsWithManyQuotes.kt
PACKAGE_DIRECTIVE
<empty list>
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('"')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('""')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('"""')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('""""')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('"')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)(' ')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('"')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('"')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)(' ')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)(' ')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('"')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)(' ')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('""')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)(' ')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('"""')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)(' ')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('""""')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)(' ')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('"""""')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('"')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)(' ')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('"')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n ')
STRING_TEMPLATE
PsiElement(OPEN_QUOTE)('"""')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('"')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('"')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)(' ')
LITERAL_STRING_TEMPLATE_ENTRY
PsiElement(REGULAR_STRING_PART)('""')
PsiElement(CLOSING_QUOTE)('"""')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
+5
View File
@@ -4811,6 +4811,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest("compiler/testData/codegen/box/strings/rawStrings.kt");
}
@TestMetadata("rawStringsWithManyQuotes.kt")
public void testRawStringsWithManyQuotes() throws Exception {
doTest("compiler/testData/codegen/box/strings/rawStringsWithManyQuotes.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/super")
compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java
+15 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.jet.parsing.AbstractJetParsingTest;
/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/psi")
@InnerTestClasses({JetParsingTestGenerated.Examples.class, JetParsingTestGenerated.FunctionReceivers.class, JetParsingTestGenerated.GreatSyntacticShift.class, JetParsingTestGenerated.Kdoc.class, JetParsingTestGenerated.PropertyDelegate.class, JetParsingTestGenerated.Recovery.class})
@InnerTestClasses({JetParsingTestGenerated.Examples.class, JetParsingTestGenerated.FunctionReceivers.class, JetParsingTestGenerated.GreatSyntacticShift.class, JetParsingTestGenerated.Kdoc.class, JetParsingTestGenerated.PropertyDelegate.class, JetParsingTestGenerated.Recovery.class, JetParsingTestGenerated.StringTemplates.class})
public class JetParsingTestGenerated extends AbstractJetParsingTest {
public void testAllFilesPresentInPsi() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/psi"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -925,6 +925,19 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
}
@TestMetadata("compiler/testData/psi/stringTemplates")
public static class StringTemplates extends AbstractJetParsingTest {
public void testAllFilesPresentInStringTemplates() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/psi/stringTemplates"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("RawStringsWithManyQuotes.kt")
public void testRawStringsWithManyQuotes() throws Exception {
doParsingTest("compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.kt");
}
}
public static Test suite() {
TestSuite suite = new TestSuite("JetParsingTestGenerated");
suite.addTestSuite(JetParsingTestGenerated.class);
@@ -934,6 +947,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
suite.addTestSuite(Kdoc.class);
suite.addTestSuite(PropertyDelegate.class);
suite.addTestSuite(Recovery.class);
suite.addTestSuite(StringTemplates.class);
return suite;
}
}