diff --git a/xml/xml-psi-impl/gen/com/intellij/lexer/__XmlLexer.java b/xml/xml-psi-impl/gen/com/intellij/lexer/__XmlLexer.java
index 6fb8b5cbd447..cf1934b1b445 100644
--- a/xml/xml-psi-impl/gen/com/intellij/lexer/__XmlLexer.java
+++ b/xml/xml-psi-impl/gen/com/intellij/lexer/__XmlLexer.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.1 on 27.10.09 1:12 */
+/* The following code was generated by JFlex 1.4.3 on 6/3/15 7:45 PM */
/* It's an automatically generated code. Do not modify it. */
package com.intellij.lexer;
@@ -10,31 +10,42 @@ import com.intellij.psi.xml.XmlTokenType;
/**
* This class is a scanner generated by
- * JFlex 1.4.1
- * on 27.10.09 1:12 from the specification file
- * C:/IDEA/tools/lexer/_XmlLexer.flex
+ * JFlex 1.4.3
+ * on 6/3/15 7:45 PM from the specification file
+ * /Users/denofevil/Code/IDEA/tools/lexer/../../community/xml/xml-psi-impl/src/com/intellij/lexer/_XmlLexer.flex
*/
public class __XmlLexer implements FlexLexer {
/** initial size of the lookahead buffer */
private static final int ZZ_BUFFERSIZE = 16384;
/** lexical states */
- public static final int PROCESSING_INSTRUCTION = 2;
- public static final int ATTR_LIST = 6;
- public static final int END_TAG = 4;
- public static final int ATTR_VALUE_DQ = 9;
- public static final int C_COMMENT_END = 14;
- public static final int DTD_MARKUP = 8;
- public static final int CDATA = 12;
- public static final int ATTR = 7;
- public static final int TAG = 1;
- public static final int PI_ANY = 3;
- public static final int ATTR_VALUE_START = 8;
+ public static final int PROCESSING_INSTRUCTION = 4;
+ public static final int ATTR_LIST = 12;
+ public static final int END_TAG = 8;
+ public static final int ATTR_VALUE_DQ = 18;
+ public static final int C_COMMENT_END = 30;
+ public static final int DTD_MARKUP = 22;
+ public static final int CDATA = 26;
+ public static final int ATTR = 14;
+ public static final int TAG = 2;
+ public static final int PI_ANY = 6;
+ public static final int ATTR_VALUE_START = 16;
public static final int YYINITIAL = 0;
- public static final int COMMENT = 5;
- public static final int DOCTYPE = 11;
- public static final int C_COMMENT_START = 13;
- public static final int ATTR_VALUE_SQ = 10;
+ public static final int COMMENT = 10;
+ public static final int DOCTYPE = 24;
+ public static final int C_COMMENT_START = 28;
+ public static final int ATTR_VALUE_SQ = 20;
+
+ /**
+ * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
+ * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
+ * at the beginning of a line
+ * l is of the form l = 2*k, k a non negative integer
+ */
+ private static final int ZZ_LEXSTATE[] = {
+ 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7,
+ 8, 8, 9, 9, 10, 10, 8, 8, 11, 11, 12, 12, 13, 13, 14, 14
+ };
/**
* Translates characters to character classes
@@ -48,61 +59,80 @@ public class __XmlLexer implements FlexLexer {
"\1\25\1\0\1\7\1\0\1\32\1\41\4\44\1\31\4\1\1\26"+
"\1\42\1\40\1\34\1\33\1\36\1\1\1\35\1\27\1\37\2\1"+
"\1\43\2\1\1\5\1\14\1\62\54\0\1\1\12\0\1\1\4\0"+
- "\1\1\5\0\27\1\1\0\37\1\1\0\u013f\1\31\0\162\1\4\0"+
- "\14\1\16\0\5\1\11\0\1\1\213\0\1\1\13\0\1\1\1\0"+
- "\3\1\1\0\1\1\1\0\24\1\1\0\54\1\1\0\46\1\1\0"+
- "\5\1\4\0\202\1\10\0\105\1\1\0\46\1\2\0\2\1\6\0"+
- "\20\1\41\0\46\1\2\0\1\1\7\0\47\1\110\0\33\1\5\0"+
- "\3\1\56\0\32\1\5\0\13\1\43\0\2\1\1\0\143\1\1\0"+
- "\1\1\17\0\2\1\7\0\2\1\12\0\3\1\2\0\1\1\20\0"+
- "\1\1\1\0\36\1\35\0\3\1\60\0\46\1\13\0\1\1\u0152\0"+
- "\66\1\3\0\1\1\22\0\1\1\7\0\12\1\43\0\10\1\2\0"+
- "\2\1\2\0\26\1\1\0\7\1\1\0\1\1\3\0\4\1\3\0"+
- "\1\1\36\0\2\1\1\0\3\1\16\0\2\1\23\0\6\1\4\0"+
- "\2\1\2\0\26\1\1\0\7\1\1\0\2\1\1\0\2\1\1\0"+
- "\2\1\37\0\4\1\1\0\1\1\23\0\3\1\20\0\11\1\1\0"+
- "\3\1\1\0\26\1\1\0\7\1\1\0\2\1\1\0\5\1\3\0"+
- "\1\1\22\0\1\1\17\0\2\1\43\0\10\1\2\0\2\1\2\0"+
- "\26\1\1\0\7\1\1\0\2\1\1\0\5\1\3\0\1\1\36\0"+
- "\2\1\1\0\3\1\17\0\1\1\21\0\1\1\1\0\6\1\3\0"+
- "\3\1\1\0\4\1\3\0\2\1\1\0\1\1\1\0\2\1\3\0"+
- "\2\1\3\0\3\1\3\0\10\1\1\0\3\1\113\0\10\1\1\0"+
- "\3\1\1\0\27\1\1\0\12\1\1\0\5\1\46\0\2\1\43\0"+
+ "\1\1\5\0\27\1\1\0\37\1\1\0\u01ca\1\4\0\14\1\16\0"+
+ "\5\1\7\0\1\1\1\0\1\1\201\0\5\1\1\0\2\1\2\0"+
+ "\4\1\10\0\1\1\1\0\3\1\1\0\1\1\1\0\24\1\1\0"+
+ "\123\1\1\0\213\1\10\0\236\1\11\0\46\1\2\0\1\1\7\0"+
+ "\47\1\110\0\33\1\5\0\3\1\55\0\53\1\43\0\2\1\1\0"+
+ "\143\1\1\0\1\1\17\0\2\1\7\0\2\1\12\0\3\1\2\0"+
+ "\1\1\20\0\1\1\1\0\36\1\35\0\131\1\13\0\1\1\30\0"+
+ "\41\1\11\0\2\1\4\0\1\1\5\0\26\1\4\0\1\1\11\0"+
+ "\1\1\3\0\1\1\27\0\31\1\107\0\1\1\1\0\13\1\127\0"+
+ "\66\1\3\0\1\1\22\0\1\1\7\0\12\1\17\0\7\1\1\0"+
+ "\7\1\5\0\10\1\2\0\2\1\2\0\26\1\1\0\7\1\1\0"+
+ "\1\1\3\0\4\1\3\0\1\1\20\0\1\1\15\0\2\1\1\0"+
+ "\3\1\16\0\2\1\23\0\6\1\4\0\2\1\2\0\26\1\1\0"+
+ "\7\1\1\0\2\1\1\0\2\1\1\0\2\1\37\0\4\1\1\0"+
+ "\1\1\23\0\3\1\20\0\11\1\1\0\3\1\1\0\26\1\1\0"+
+ "\7\1\1\0\2\1\1\0\5\1\3\0\1\1\22\0\1\1\17\0"+
+ "\2\1\43\0\10\1\2\0\2\1\2\0\26\1\1\0\7\1\1\0"+
+ "\2\1\1\0\5\1\3\0\1\1\36\0\2\1\1\0\3\1\17\0"+
+ "\1\1\21\0\1\1\1\0\6\1\3\0\3\1\1\0\4\1\3\0"+
+ "\2\1\1\0\1\1\1\0\2\1\3\0\2\1\3\0\3\1\3\0"+
+ "\14\1\26\0\1\1\64\0\10\1\1\0\3\1\1\0\27\1\1\0"+
+ "\12\1\1\0\5\1\3\0\1\1\32\0\2\1\6\0\2\1\43\0"+
"\10\1\1\0\3\1\1\0\27\1\1\0\12\1\1\0\5\1\3\0"+
- "\1\1\40\0\1\1\1\0\2\1\43\0\10\1\1\0\3\1\1\0"+
- "\27\1\1\0\20\1\46\0\2\1\43\0\22\1\3\0\30\1\1\0"+
- "\11\1\1\0\1\1\2\0\7\1\72\0\60\1\1\0\2\1\14\0"+
- "\7\1\72\0\2\1\1\0\1\1\2\0\2\1\1\0\1\1\2\0"+
- "\1\1\6\0\4\1\1\0\7\1\1\0\3\1\1\0\1\1\1\0"+
- "\1\1\2\0\2\1\1\0\4\1\1\0\2\1\11\0\1\1\2\0"+
- "\5\1\1\0\1\1\25\0\2\1\42\0\1\1\77\0\10\1\1\0"+
- "\42\1\35\0\4\1\164\0\42\1\1\0\5\1\1\0\2\1\45\0"+
- "\6\1\112\0\46\1\12\0\51\1\7\0\132\1\5\0\104\1\5\0"+
- "\122\1\6\0\7\1\1\0\77\1\1\0\1\1\1\0\4\1\2\0"+
- "\7\1\1\0\1\1\1\0\4\1\2\0\47\1\1\0\1\1\1\0"+
- "\4\1\2\0\37\1\1\0\1\1\1\0\4\1\2\0\7\1\1\0"+
- "\1\1\1\0\4\1\2\0\7\1\1\0\7\1\1\0\27\1\1\0"+
- "\37\1\1\0\1\1\1\0\4\1\2\0\7\1\1\0\47\1\1\0"+
- "\23\1\105\0\125\1\14\0\u026c\1\2\0\10\1\12\0\32\1\5\0"+
- "\113\1\25\0\15\1\1\0\4\1\16\0\22\1\16\0\22\1\16\0"+
- "\15\1\1\0\3\1\17\0\64\1\43\0\1\1\4\0\1\1\103\0"+
- "\130\1\10\0\51\1\127\0\35\1\63\0\36\1\2\0\5\1\u038b\0"+
- "\154\1\224\0\234\1\4\0\132\1\6\0\26\1\2\0\6\1\2\0"+
+ "\1\1\40\0\1\1\1\0\2\1\17\0\2\1\22\0\10\1\1\0"+
+ "\3\1\1\0\51\1\2\0\1\1\20\0\1\1\21\0\2\1\30\0"+
+ "\6\1\5\0\22\1\3\0\30\1\1\0\11\1\1\0\1\1\2\0"+
+ "\7\1\72\0\60\1\1\0\2\1\14\0\7\1\72\0\2\1\1\0"+
+ "\1\1\2\0\2\1\1\0\1\1\2\0\1\1\6\0\4\1\1\0"+
+ "\7\1\1\0\3\1\1\0\1\1\1\0\1\1\2\0\2\1\1\0"+
+ "\4\1\1\0\2\1\11\0\1\1\2\0\5\1\1\0\1\1\25\0"+
+ "\4\1\40\0\1\1\77\0\10\1\1\0\44\1\33\0\5\1\163\0"+
+ "\53\1\24\0\1\1\20\0\6\1\4\0\4\1\3\0\1\1\3\0"+
+ "\2\1\7\0\3\1\4\0\15\1\14\0\1\1\21\0\46\1\1\0"+
+ "\1\1\5\0\1\1\2\0\53\1\1\0\u014d\1\1\0\4\1\2\0"+
+ "\7\1\1\0\1\1\1\0\4\1\2\0\51\1\1\0\4\1\2\0"+
+ "\41\1\1\0\4\1\2\0\7\1\1\0\1\1\1\0\4\1\2\0"+
+ "\17\1\1\0\71\1\1\0\4\1\2\0\103\1\45\0\20\1\20\0"+
+ "\125\1\14\0\u026c\1\2\0\21\1\1\0\32\1\5\0\113\1\25\0"+
+ "\15\1\1\0\4\1\16\0\22\1\16\0\22\1\16\0\15\1\1\0"+
+ "\3\1\17\0\64\1\43\0\1\1\4\0\1\1\103\0\130\1\10\0"+
+ "\51\1\1\0\1\1\5\0\106\1\12\0\35\1\63\0\36\1\2\0"+
+ "\5\1\13\0\54\1\25\0\7\1\70\0\27\1\11\0\65\1\122\0"+
+ "\1\1\135\0\57\1\21\0\7\1\67\0\36\1\15\0\2\1\12\0"+
+ "\54\1\32\0\44\1\51\0\3\1\12\0\44\1\153\0\4\1\1\0"+
+ "\4\1\3\0\2\1\11\0\300\1\100\0\u0116\1\2\0\6\1\2\0"+
"\46\1\2\0\6\1\2\0\10\1\1\0\1\1\1\0\1\1\1\0"+
"\1\1\1\0\37\1\2\0\65\1\1\0\7\1\1\0\1\1\3\0"+
"\3\1\1\0\7\1\3\0\4\1\2\0\6\1\4\0\15\1\5\0"+
- "\3\1\1\0\7\1\164\0\1\1\15\0\1\1\202\0\1\1\4\0"+
- "\1\1\2\0\12\1\1\0\1\1\3\0\5\1\6\0\1\1\1\0"+
- "\1\1\1\0\1\1\1\0\4\1\1\0\3\1\1\0\7\1\3\0"+
- "\3\1\5\0\5\1\u0ebb\0\2\1\52\0\5\1\5\0\2\1\4\0"+
- "\126\1\6\0\3\1\1\0\132\1\1\0\4\1\5\0\50\1\4\0"+
- "\136\1\21\0\30\1\70\0\20\1\u0200\0\u19b6\1\112\0\u51a6\1\132\0"+
- "\u048d\1\u0773\0\u2ba4\1\u215c\0\u012e\1\2\0\73\1\225\0\7\1\14\0"+
- "\5\1\5\0\1\1\1\0\12\1\1\0\15\1\1\0\5\1\1\0"+
- "\1\1\1\0\2\1\1\0\2\1\1\0\154\1\41\0\u016b\1\22\0"+
- "\100\1\2\0\66\1\50\0\14\1\164\0\5\1\1\0\207\1\44\0"+
- "\32\1\6\0\32\1\13\0\131\1\3\0\6\1\2\0\6\1\2\0"+
- "\6\1\2\0\3\1\43\0";
+ "\3\1\1\0\7\1\164\0\1\1\15\0\1\1\20\0\15\1\145\0"+
+ "\1\1\4\0\1\1\2\0\12\1\1\0\1\1\3\0\5\1\6\0"+
+ "\1\1\1\0\1\1\1\0\1\1\1\0\4\1\1\0\13\1\2\0"+
+ "\4\1\5\0\5\1\4\0\1\1\64\0\2\1\u0a7b\0\57\1\1\0"+
+ "\57\1\1\0\205\1\6\0\4\1\3\0\2\1\14\0\46\1\1\0"+
+ "\1\1\5\0\1\1\2\0\70\1\7\0\1\1\20\0\27\1\11\0"+
+ "\7\1\1\0\7\1\1\0\7\1\1\0\7\1\1\0\7\1\1\0"+
+ "\7\1\1\0\7\1\1\0\7\1\120\0\1\1\u01d5\0\2\1\52\0"+
+ "\5\1\5\0\2\1\4\0\126\1\6\0\3\1\1\0\132\1\1\0"+
+ "\4\1\5\0\51\1\3\0\136\1\21\0\33\1\65\0\20\1\u0200\0"+
+ "\u19b6\1\112\0\u51cd\1\63\0\u048d\1\103\0\56\1\2\0\u010d\1\3\0"+
+ "\20\1\12\0\2\1\24\0\57\1\20\0\31\1\10\0\106\1\61\0"+
+ "\11\1\2\0\147\1\2\0\4\1\1\0\4\1\14\0\13\1\115\0"+
+ "\12\1\1\0\3\1\1\0\4\1\1\0\27\1\35\0\64\1\16\0"+
+ "\62\1\76\0\6\1\3\0\1\1\16\0\34\1\12\0\27\1\31\0"+
+ "\35\1\7\0\57\1\34\0\1\1\60\0\51\1\27\0\3\1\1\0"+
+ "\10\1\24\0\27\1\3\0\1\1\5\0\60\1\1\0\1\1\3\0"+
+ "\2\1\2\0\5\1\2\0\1\1\1\0\1\1\30\0\3\1\2\0"+
+ "\13\1\7\0\3\1\14\0\6\1\2\0\6\1\2\0\6\1\11\0"+
+ "\7\1\1\0\7\1\221\0\43\1\35\0\u2ba4\1\14\0\27\1\4\0"+
+ "\61\1\u2104\0\u016e\1\2\0\152\1\46\0\7\1\14\0\5\1\5\0"+
+ "\1\1\1\0\12\1\1\0\15\1\1\0\5\1\1\0\1\1\1\0"+
+ "\2\1\1\0\2\1\1\0\154\1\41\0\u016b\1\22\0\100\1\2\0"+
+ "\66\1\50\0\14\1\164\0\5\1\1\0\207\1\44\0\32\1\6\0"+
+ "\32\1\13\0\131\1\3\0\6\1\2\0\6\1\2\0\6\1\2\0"+
+ "\3\1\43\0";
/**
* Translates characters to character classes
@@ -403,9 +433,6 @@ public class __XmlLexer implements FlexLexer {
/** zzAtEOF == true <=> the scanner is at the EOF */
private boolean zzAtEOF;
- /** denotes if the user-EOF-code has already been executed */
- private boolean zzEOFDone;
-
/* user code: */
private IElementType elTokenType = XmlTokenType.XML_DATA_CHARACTERS;
private IElementType elTokenType2 = XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN;
@@ -442,19 +469,15 @@ public class __XmlLexer implements FlexLexer {
}
+ /**
+ * Creates a new scanner
+ *
+ * @param in the java.io.Reader to read input from.
+ */
public __XmlLexer(java.io.Reader in) {
this.zzReader = in;
}
- /**
- * Creates a new scanner.
- * There is also java.io.Reader version of this constructor.
- *
- * @param in the java.io.Inputstream to read input from.
- */
- public __XmlLexer(java.io.InputStream in) {
- this(new java.io.InputStreamReader(in));
- }
/**
* Unpacks the compressed character translation table.
@@ -466,7 +489,7 @@ public class __XmlLexer implements FlexLexer {
char [] map = new char[0x10000];
int i = 0; /* index in packed string */
int j = 0; /* index in unpacked array */
- while (i < 1248) {
+ while (i < 1624) {
int count = packed.charAt(i++);
char value = packed.charAt(i++);
do map[j++] = value; while (--count > 0);
@@ -598,18 +621,6 @@ public class __XmlLexer implements FlexLexer {
}
- /**
- * Contains user EOF-code, which will be executed exactly once,
- * when the end of file is reached
- */
- private void zzDoEOF() {
- if (!zzEOFDone) {
- zzEOFDone = true;
-
- }
- }
-
-
/**
* Resumes scanning until the next regular expression is matched,
* the end of input is encountered or an I/O-Error occurs.
@@ -640,14 +651,14 @@ public class __XmlLexer implements FlexLexer {
zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
- zzState = zzLexicalState;
+ zzState = ZZ_LEXSTATE[zzLexicalState];
zzForAction: {
while (true) {
if (zzCurrentPosL < zzEndReadL)
- zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++]:zzBufferL.charAt(zzCurrentPosL++);
+ zzInput = (zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++));
else if (zzAtEOF) {
zzInput = YYEOF;
break zzForAction;
@@ -667,7 +678,7 @@ public class __XmlLexer implements FlexLexer {
break zzForAction;
}
else {
- zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++]:zzBufferL.charAt(zzCurrentPosL++);
+ zzInput = (zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++));
}
}
int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
@@ -720,138 +731,138 @@ public class __XmlLexer implements FlexLexer {
{ yybegin(END_TAG); return XmlTokenType.XML_END_TAG_START;
}
case 51: break;
- case 30:
- { return elTokenType;
- }
- case 52: break;
- case 10:
- { return XmlTokenType.XML_NAME;
- }
- case 53: break;
- case 40:
- { return XmlTokenType.XML_DOCTYPE_PUBLIC;
- }
- case 54: break;
- case 39:
- { yybegin(COMMENT); return XmlTokenType.XML_COMMENT_START;
- }
- case 55: break;
- case 13:
- { if (myConditionalCommentsSupport) {
- yybegin(C_COMMENT_START);
- return XmlTokenType.XML_CONDITIONAL_COMMENT_START;
- } else return XmlTokenType.XML_COMMENT_CHARACTERS;
- }
- case 56: break;
- case 36:
- { return javaEmbeddedTokenType;
- }
- case 57: break;
- case 28:
- { return XmlElementType.XML_MARKUP_DECL;
- }
- case 58: break;
- case 32:
- { yybegin(ATTR_LIST); pushState(PROCESSING_INSTRUCTION); return XmlTokenType.XML_NAME;
- }
- case 59: break;
- case 2:
- { return XmlTokenType.XML_REAL_WHITE_SPACE;
- }
- case 60: break;
- case 1:
- { return XmlTokenType.XML_DATA_CHARACTERS;
- }
- case 61: break;
- case 23:
- { yybegin(COMMENT); return XmlTokenType.XML_CONDITIONAL_COMMENT_END;
- }
- case 62: break;
- case 12:
- { return XmlTokenType.XML_BAD_CHARACTER;
- }
- case 63: break;
- case 7:
- { yybegin(YYINITIAL); return XmlTokenType.XML_TAG_END;
- }
- case 64: break;
- case 29:
- { yybegin(COMMENT); return XmlTokenType.XML_CONDITIONAL_COMMENT_START_END;
- }
- case 65: break;
- case 3:
- { if(yystate() == YYINITIAL){
- return XmlTokenType.XML_BAD_CHARACTER;
- }
- else yybegin(popState()); yypushback(yylength());
- }
- case 66: break;
- case 33:
- { yybegin(YYINITIAL); return XmlTokenType.XML_COMMENT_END;
- }
- case 67: break;
- case 4:
- { yybegin(TAG); return XmlTokenType.XML_START_TAG_START;
- }
- case 68: break;
case 34:
{ if (myConditionalCommentsSupport) {
yybegin(C_COMMENT_END);
return XmlTokenType.XML_CONDITIONAL_COMMENT_END_START;
} else return XmlTokenType.XML_COMMENT_CHARACTERS;
}
- case 69: break;
+ case 52: break;
+ case 30:
+ { return elTokenType;
+ }
+ case 53: break;
+ case 10:
+ { return XmlTokenType.XML_NAME;
+ }
+ case 54: break;
+ case 40:
+ { return XmlTokenType.XML_DOCTYPE_PUBLIC;
+ }
+ case 55: break;
+ case 39:
+ { yybegin(COMMENT); return XmlTokenType.XML_COMMENT_START;
+ }
+ case 56: break;
+ case 36:
+ { return javaEmbeddedTokenType;
+ }
+ case 57: break;
+ case 32:
+ { yybegin(ATTR_LIST); pushState(PROCESSING_INSTRUCTION); return XmlTokenType.XML_NAME;
+ }
+ case 58: break;
+ case 2:
+ { return XmlTokenType.XML_REAL_WHITE_SPACE;
+ }
+ case 59: break;
+ case 1:
+ { return XmlTokenType.XML_DATA_CHARACTERS;
+ }
+ case 60: break;
+ case 23:
+ { yybegin(COMMENT); return XmlTokenType.XML_CONDITIONAL_COMMENT_END;
+ }
+ case 61: break;
+ case 12:
+ { return XmlTokenType.XML_BAD_CHARACTER;
+ }
+ case 62: break;
+ case 7:
+ { yybegin(YYINITIAL); return XmlTokenType.XML_TAG_END;
+ }
+ case 63: break;
+ case 29:
+ { yybegin(COMMENT); return XmlTokenType.XML_CONDITIONAL_COMMENT_START_END;
+ }
+ case 64: break;
+ case 33:
+ { yybegin(YYINITIAL); return XmlTokenType.XML_COMMENT_END;
+ }
+ case 65: break;
+ case 4:
+ { yybegin(TAG); return XmlTokenType.XML_START_TAG_START;
+ }
+ case 66: break;
case 26:
{ yybegin(YYINITIAL); return XmlTokenType.XML_EMPTY_ELEMENT_END;
}
- case 70: break;
+ case 67: break;
case 24:
{ yybegin(PROCESSING_INSTRUCTION); return XmlTokenType.XML_PI_START;
}
- case 71: break;
+ case 68: break;
case 8:
{ yybegin(PI_ANY); return XmlTokenType.XML_NAME;
}
- case 72: break;
+ case 69: break;
+ case 13:
+ { if (myConditionalCommentsSupport) {
+ yybegin(C_COMMENT_START);
+ return XmlTokenType.XML_CONDITIONAL_COMMENT_START;
+ } else return XmlTokenType.XML_COMMENT_CHARACTERS;
+ }
+ case 70: break;
case 14:
{ yybegin(ATTR); return XmlTokenType.XML_NAME;
}
- case 73: break;
+ case 71: break;
case 15:
{ yybegin(ATTR_LIST); yypushback(yylength());
}
- case 74: break;
+ case 72: break;
case 21:
{ yybegin(YYINITIAL); return XmlTokenType.XML_DOCTYPE_END;
}
- case 75: break;
+ case 73: break;
case 38:
{ return XmlTokenType.XML_CHAR_ENTITY_REF;
}
- case 76: break;
+ case 74: break;
case 6:
{ return XmlTokenType.XML_WHITE_SPACE;
}
- case 77: break;
+ case 75: break;
+ case 28:
+ { return XmlElementType.XML_MARKUP_DECL;
+ }
+ case 76: break;
case 31:
{ return XmlTokenType.XML_ENTITY_REF_TOKEN;
}
- case 78: break;
+ case 77: break;
case 16:
{ yybegin(ATTR_VALUE_DQ); return XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER;
}
- case 79: break;
+ case 78: break;
case 17:
{ yybegin(ATTR_VALUE_SQ); return XmlTokenType.XML_ATTRIBUTE_VALUE_START_DELIMITER;
}
- case 80: break;
+ case 79: break;
case 22:
{ yybegin(COMMENT); return XmlTokenType.XML_COMMENT_CHARACTERS;
}
- case 81: break;
+ case 80: break;
case 37:
{ yybegin(YYINITIAL); return XmlTokenType.XML_CDATA_END;
}
+ case 81: break;
+ case 3:
+ { if(yystate() == YYINITIAL){
+ return XmlTokenType.XML_BAD_CHARACTER;
+ }
+ else yybegin(popState()); yypushback(yylength());
+ }
case 82: break;
case 35:
{ return elTokenType2;
@@ -872,7 +883,6 @@ public class __XmlLexer implements FlexLexer {
default:
if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
zzAtEOF = true;
- zzDoEOF();
return null;
}
else {
diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/_XmlLexer.flex b/xml/xml-psi-impl/src/com/intellij/lexer/_XmlLexer.flex
index 7715b9675800..b0d3b81a073e 100644
--- a/xml/xml-psi-impl/src/com/intellij/lexer/_XmlLexer.flex
+++ b/xml/xml-psi-impl/src/com/intellij/lexer/_XmlLexer.flex
@@ -49,8 +49,6 @@ import com.intellij.psi.xml.*;
%implements FlexLexer
%function advance
%type IElementType
-%eof{ return;
-%eof}
%state TAG
%state PROCESSING_INSTRUCTION