diff --git a/gen/com/tang/intellij/lua/comment/lexer/_LuaDocLexer.java b/gen/com/tang/intellij/lua/comment/lexer/_LuaDocLexer.java index 855835081..702741529 100644 --- a/gen/com/tang/intellij/lua/comment/lexer/_LuaDocLexer.java +++ b/gen/com/tang/intellij/lua/comment/lexer/_LuaDocLexer.java @@ -27,16 +27,17 @@ public class _LuaDocLexer implements FlexLexer, LuaDocTypes { public static final int xTAG_NAME = 6; public static final int xCOMMENT_STRING = 8; public static final int xPARAM = 10; - public static final int xTYPE_REF = 12; - public static final int xCLASS = 14; - public static final int xCLASS_EXTEND = 16; - public static final int xFIELD = 18; - public static final int xFIELD_ID = 20; - public static final int xGENERIC = 22; - public static final int xALIAS = 24; - public static final int xSUPPRESS = 26; - public static final int xDOUBLE_QUOTED_STRING = 28; - public static final int xSINGLE_QUOTED_STRING = 30; + public static final int xGLOBALPARAM = 12; + public static final int xTYPE_REF = 14; + public static final int xCLASS = 16; + public static final int xCLASS_EXTEND = 18; + public static final int xFIELD = 20; + public static final int xFIELD_ID = 22; + public static final int xGENERIC = 24; + public static final int xALIAS = 26; + public static final int xSUPPRESS = 28; + public static final int xDOUBLE_QUOTED_STRING = 30; + public static final int xSINGLE_QUOTED_STRING = 32; /** * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l @@ -46,13 +47,14 @@ public class _LuaDocLexer implements FlexLexer, LuaDocTypes { */ 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, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15 + 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 6, 6, 13, 13, 14, 14, + 15, 15 }; /** * Translates characters to character classes * Chosen bits are [12, 6, 3] - * Total runtime size is 14912 bytes + * Total runtime size is 18512 bytes */ public static int ZZ_CMAP(int ch) { return ZZ_CMAP_A[(ZZ_CMAP_Y[(ZZ_CMAP_Z[ch>>9]<<6)|((ch>>3)&0x3f)]<<3)|(ch&0x7)]; @@ -62,125 +64,160 @@ public static int ZZ_CMAP(int ch) { static final char ZZ_CMAP_Z[] = zzUnpackCMap( "\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16\1\17\1"+ "\20\5\21\1\22\1\23\1\24\1\21\14\25\1\26\50\25\1\27\2\25\1\30\1\31\1\32\1\33"+ - "\25\25\1\34\20\21\1\35\1\36\1\37\1\40\1\41\1\42\1\43\1\21\1\44\1\45\1\46\1"+ - "\21\1\47\2\21\1\50\4\21\1\25\1\51\1\52\5\21\2\25\1\53\31\21\1\25\1\54\1\21"+ - "\1\55\40\21\1\56\17\21\1\57\1\60\1\61\1\62\13\21\1\63\10\21\123\25\1\64\7"+ - "\25\1\65\1\66\37\21\1\25\1\66\u0582\21\1\67\u017f\21"); - - /* The ZZ_CMAP_Y table has 3584 entries */ + "\25\25\1\34\20\21\1\35\1\36\1\37\1\40\1\41\1\42\1\43\1\44\1\45\1\46\1\47\1"+ + "\50\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1\60\1\25\1\61\1\62\5\21\2\25\1\63"+ + "\7\21\1\25\1\64\20\21\1\25\1\65\1\21\1\66\13\25\1\67\2\25\1\70\21\21\1\71"+ + "\1\72\4\21\1\73\11\21\1\74\1\75\1\76\1\77\1\21\1\100\2\21\1\101\1\102\2\21"+ + "\1\103\1\21\1\104\1\105\5\21\1\106\2\21\123\25\1\107\7\25\1\110\1\111\12\25"+ + "\1\112\15\25\1\113\6\21\1\25\1\114\2\21\11\25\1\115\u0576\21\1\116\u017f\21"); + + /* The ZZ_CMAP_Y table has 5056 entries */ static final char ZZ_CMAP_Y[] = zzUnpackCMap( "\1\0\1\1\1\0\1\2\1\3\1\4\1\0\1\5\1\6\2\7\1\10\1\11\1\12\1\13\1\14\1\15\3\0"+ "\1\16\1\17\1\20\1\21\2\7\1\22\3\7\1\22\71\7\1\23\1\7\1\24\1\25\1\26\1\27\2"+ - "\25\16\0\1\30\1\31\1\32\1\33\2\7\1\34\11\7\1\35\21\7\1\36\1\37\23\7\1\25\1"+ - "\40\3\7\1\22\1\41\1\40\4\7\1\42\1\43\4\0\1\44\1\45\1\25\3\7\2\46\1\25\1\47"+ - "\1\50\1\0\1\51\5\7\1\52\3\0\1\53\1\54\13\7\1\55\1\44\1\56\1\57\1\0\1\60\1"+ - "\25\1\61\1\62\3\7\3\0\1\63\12\7\1\64\1\0\1\65\1\25\1\0\1\66\3\7\1\52\1\67"+ - "\1\21\2\7\1\64\1\70\1\71\1\72\2\25\3\7\1\73\10\25\1\74\1\26\6\25\1\75\2\0"+ - "\1\76\1\77\6\7\1\100\2\0\1\101\1\7\1\102\1\0\2\40\1\103\1\104\1\105\2\7\1"+ - "\74\1\106\1\107\1\110\1\111\1\61\1\112\1\102\1\0\1\113\1\50\1\103\1\114\1"+ - "\105\2\7\1\74\1\115\1\116\1\117\1\120\1\121\1\122\1\123\1\0\1\124\1\25\1\103"+ - "\1\35\1\34\2\7\1\74\1\125\1\107\1\44\1\126\1\127\1\25\1\102\1\0\1\41\1\25"+ - "\1\103\1\104\1\105\2\7\1\74\1\125\1\107\1\110\1\120\1\123\1\112\1\102\1\0"+ - "\1\41\1\25\1\130\1\131\1\132\1\133\1\134\1\131\1\7\1\135\1\136\1\137\1\140"+ - "\1\25\1\123\1\0\1\25\1\41\1\103\1\30\1\74\2\7\1\74\1\141\1\142\1\143\1\137"+ - "\1\144\1\24\1\102\1\0\2\25\1\145\1\30\1\74\2\7\1\74\1\141\1\107\1\143\1\137"+ - "\1\144\1\32\1\102\1\0\1\146\1\25\1\145\1\30\1\74\4\7\1\147\1\143\1\150\1\61"+ - "\1\25\1\102\1\0\1\25\1\37\1\145\1\7\1\22\1\37\2\7\1\34\1\151\1\22\1\152\1"+ - "\153\1\0\2\25\1\154\1\25\1\40\5\7\1\155\1\156\1\157\1\76\1\0\1\160\4\25\1"+ - "\161\1\162\1\163\1\40\1\164\1\165\1\155\1\166\1\167\1\170\1\0\1\171\4\25\1"+ - "\127\2\25\1\160\1\0\1\160\1\172\1\173\1\7\1\40\3\7\1\26\1\43\1\0\1\143\1\174"+ - "\1\0\1\43\3\0\1\47\1\175\7\25\5\7\1\52\1\0\1\176\1\0\1\160\1\64\1\177\1\200"+ - "\1\201\1\202\1\7\1\203\1\204\1\0\1\170\4\7\1\35\1\20\5\7\1\205\51\7\1\132"+ - "\1\22\1\132\5\7\1\132\4\7\1\132\1\22\1\132\1\7\1\22\7\7\1\132\10\7\1\206\4"+ - "\25\2\7\2\25\12\7\1\26\1\25\1\40\114\7\1\104\2\7\1\207\2\7\1\46\11\7\1\131"+ - "\1\127\1\25\1\7\1\30\1\210\1\25\2\7\1\210\1\25\2\7\1\211\1\25\1\7\1\30\1\212"+ - "\1\25\6\7\1\213\3\0\1\214\1\215\1\0\1\160\3\25\1\216\1\0\1\160\13\7\1\25\5"+ - "\7\1\217\10\7\1\220\1\25\3\7\1\26\1\0\1\2\1\0\1\2\1\123\1\0\3\7\1\220\1\26"+ - "\1\25\5\7\1\113\2\0\1\54\1\160\1\0\1\160\4\25\2\7\1\157\1\2\6\7\1\174\1\76"+ - "\3\0\1\110\1\0\1\160\1\0\1\160\1\42\13\25\1\221\5\7\1\213\1\0\1\221\1\113"+ - "\1\0\1\160\1\25\1\222\1\2\1\25\1\223\3\7\1\101\1\201\1\0\1\66\4\7\1\64\1\0"+ - "\1\2\1\25\4\7\1\213\2\0\1\25\1\0\1\224\1\0\1\66\3\7\1\220\12\25\1\225\2\0"+ - "\1\226\1\227\1\25\30\7\4\0\1\76\2\25\1\75\42\7\2\220\4\7\2\220\1\7\1\230\3"+ - "\7\1\220\6\7\1\30\1\167\1\231\1\26\1\232\1\113\1\7\1\26\1\231\1\26\1\233\1"+ - "\234\3\25\1\235\1\25\1\42\1\127\1\25\1\236\1\237\1\47\1\240\1\41\1\42\2\25"+ - "\1\7\1\26\3\7\1\46\2\25\1\0\1\47\1\241\1\0\1\242\1\25\1\243\1\37\1\151\1\244"+ - "\1\27\1\245\1\7\1\246\1\247\1\250\2\25\5\7\1\127\116\25\5\7\1\22\5\7\1\22"+ - "\20\7\1\26\1\251\1\252\1\25\4\7\1\35\1\20\7\7\1\42\1\25\1\61\2\7\1\22\1\25"+ - "\10\22\4\0\5\25\1\42\72\25\1\253\3\25\1\40\1\203\1\244\1\26\1\40\11\7\1\22"+ - "\1\254\1\40\12\7\1\205\1\247\4\7\1\220\1\40\12\7\1\22\2\25\3\7\1\46\6\25\170"+ - "\7\1\220\11\25\71\7\1\26\6\25\21\7\1\26\10\25\5\7\1\220\41\7\1\26\2\7\1\0"+ - "\1\252\2\25\5\7\1\157\1\75\1\255\3\7\1\61\12\7\1\160\3\25\1\42\1\7\1\37\14"+ - "\7\1\256\1\113\1\25\1\7\1\46\11\25\1\7\1\257\1\260\2\7\1\52\2\25\1\127\6\7"+ - "\1\113\1\25\1\66\5\7\1\213\1\0\1\47\1\25\1\0\1\160\2\0\1\66\1\50\1\0\1\66"+ - "\2\7\1\64\1\170\2\7\1\157\1\0\1\2\1\25\3\7\1\26\1\77\5\7\1\52\1\0\1\242\1"+ - "\42\1\0\1\160\4\25\5\7\1\101\1\76\1\25\1\260\1\261\1\0\1\160\2\7\1\22\1\262"+ - "\6\7\1\200\1\263\1\217\2\25\1\264\1\7\1\52\1\265\1\25\3\266\1\25\2\22\22\25"+ - "\4\7\1\52\1\267\1\0\1\160\64\7\1\113\1\25\2\7\1\22\1\270\5\7\1\113\40\25\55"+ - "\7\1\220\15\7\1\24\4\25\1\22\1\25\1\270\1\271\1\7\1\74\1\22\1\167\1\272\15"+ - "\7\1\24\3\25\1\270\54\7\1\220\2\25\10\7\1\37\6\7\5\25\1\7\1\26\2\0\2\25\1"+ - "\76\1\25\1\134\2\25\1\247\3\25\1\41\1\30\20\7\1\273\1\236\1\25\1\0\1\160\1"+ - "\40\2\7\1\114\1\40\2\7\1\46\1\274\12\7\1\22\3\37\1\275\1\276\2\25\1\277\1"+ - "\7\1\141\2\7\1\22\2\7\1\300\1\7\1\220\1\7\1\220\4\25\17\7\1\46\10\25\6\7\1"+ - "\26\20\25\1\301\20\25\3\7\1\26\6\7\1\127\5\25\3\7\1\22\2\25\3\7\1\46\6\25"+ - "\3\7\1\220\4\7\1\113\1\7\1\244\5\25\23\7\1\220\1\0\1\160\52\25\1\220\1\74"+ - "\4\7\1\35\1\302\2\7\1\220\25\25\2\7\1\220\1\25\3\7\1\24\10\25\7\7\1\274\10"+ - "\25\1\303\1\75\1\141\1\40\2\7\1\113\1\117\4\25\3\7\1\26\20\25\6\7\1\220\1"+ - "\25\2\7\1\220\1\25\2\7\1\46\21\25\11\7\1\127\66\25\1\223\6\7\1\0\1\76\3\25"+ - "\1\123\1\0\2\25\1\223\5\7\1\0\1\304\2\25\3\7\1\127\1\0\1\160\1\223\3\7\1\157"+ - "\1\0\1\143\1\0\10\25\1\223\5\7\1\52\1\0\1\305\1\25\1\0\1\160\24\25\5\7\1\52"+ - "\1\0\1\25\1\0\1\160\46\25\55\7\1\22\22\25\14\7\1\46\63\25\5\7\1\22\72\25\7"+ - "\7\1\127\130\25\10\7\1\26\1\25\1\101\4\0\1\76\1\25\1\61\1\223\1\7\14\25\1"+ - "\24\153\25\1\306\1\307\2\0\1\310\1\2\3\25\1\311\22\25\1\312\67\25\12\7\1\30"+ - "\10\7\1\30\1\313\1\314\1\7\1\315\1\141\7\7\1\35\1\316\2\30\3\7\1\317\1\167"+ - "\1\37\1\74\51\7\1\220\3\7\1\74\2\7\1\205\3\7\1\205\2\7\1\30\3\7\1\30\2\7\1"+ - "\22\3\7\1\22\3\7\1\74\3\7\1\74\2\7\1\205\1\320\6\0\1\141\3\7\1\161\1\40\1"+ - "\205\1\321\1\243\1\322\1\161\1\230\1\161\2\205\1\122\1\7\1\34\1\7\1\113\1"+ - "\323\1\34\1\7\1\113\50\25\32\7\1\22\5\25\106\7\1\26\1\25\33\7\1\220\74\25"+ - "\1\121\3\25\14\0\20\25\36\0\2\25"); - - /* The ZZ_CMAP_A table has 1696 entries */ + "\25\16\0\1\30\1\31\1\32\1\33\2\7\1\34\11\7\1\35\21\7\1\36\1\37\24\7\1\40\3"+ + "\7\1\22\1\41\5\7\1\42\1\43\4\0\1\44\1\45\1\25\3\7\1\46\1\47\1\25\1\50\1\51"+ + "\1\0\1\52\5\7\1\53\3\0\1\54\1\55\13\7\1\56\1\44\1\57\1\60\1\0\1\61\1\25\1"+ + "\62\1\63\3\7\3\0\1\64\12\7\1\65\1\0\1\66\1\25\1\0\1\67\3\7\1\53\1\70\1\71"+ + "\2\7\1\65\1\72\1\73\1\74\2\25\3\7\1\75\1\7\1\47\6\25\2\7\1\30\2\7\1\25\1\76"+ + "\5\0\1\77\6\7\1\100\2\0\1\101\1\7\1\102\1\0\1\40\1\7\1\103\1\104\1\105\2\7"+ + "\1\106\1\107\1\110\1\111\1\112\1\62\1\113\1\102\1\0\1\114\1\115\1\116\1\46"+ + "\1\105\2\7\1\106\1\117\1\120\1\121\1\122\1\123\1\124\1\125\1\0\1\126\1\25"+ + "\1\116\1\35\1\34\2\7\1\106\1\127\1\110\1\44\1\130\1\131\1\25\1\102\1\0\1\41"+ + "\1\132\1\116\1\104\1\105\2\7\1\106\1\127\1\110\1\111\1\122\1\133\1\113\1\102"+ + "\1\0\1\41\1\25\1\134\1\135\1\136\1\137\1\140\1\135\1\7\1\141\1\142\1\143\1"+ + "\144\1\25\1\125\1\0\1\25\1\41\1\145\1\30\1\106\2\7\1\106\1\7\1\146\1\147\1"+ + "\143\1\150\1\47\1\102\1\0\2\25\1\103\1\30\1\106\2\7\1\106\1\151\1\110\1\147"+ + "\1\143\1\150\1\32\1\102\1\0\1\152\1\25\1\77\1\30\1\106\4\7\1\153\1\147\1\154"+ + "\1\155\1\156\1\102\1\0\1\25\1\37\1\116\1\7\1\22\1\37\2\7\1\34\1\157\1\22\1"+ + "\160\1\161\1\0\1\125\1\0\1\162\1\25\1\40\5\7\1\163\1\164\1\165\1\166\1\0\1"+ + "\167\4\25\1\137\1\170\2\7\1\171\1\7\1\163\1\172\1\173\1\50\1\0\1\174\4\25"+ + "\1\131\2\25\1\167\1\0\1\167\1\175\1\176\1\7\1\40\3\7\1\26\1\43\1\0\1\147\1"+ + "\177\1\0\1\43\3\0\1\200\1\201\7\25\5\7\1\53\1\0\1\202\1\0\1\167\1\65\1\203"+ + "\1\204\1\205\1\206\1\7\1\207\1\210\1\0\1\50\4\7\1\35\1\20\5\7\1\170\51\7\1"+ + "\136\1\22\1\136\5\7\1\136\4\7\1\136\1\22\1\136\1\7\1\22\7\7\1\136\10\7\1\211"+ + "\4\25\2\7\2\25\12\7\2\212\1\40\114\7\1\104\2\7\1\213\2\7\1\47\11\7\1\135\1"+ + "\7\1\131\1\7\1\30\1\214\1\25\2\7\1\214\1\25\2\7\1\215\1\25\1\7\1\30\1\216"+ + "\1\25\6\7\1\217\3\0\1\220\1\221\1\0\1\167\3\25\1\222\1\0\1\167\13\7\1\131"+ + "\1\223\4\7\1\224\10\7\1\212\1\25\3\7\1\22\1\0\1\2\1\0\1\2\1\125\1\0\3\7\1"+ + "\212\1\26\1\25\5\7\1\114\3\7\1\24\1\0\1\167\4\25\2\7\1\165\1\2\6\7\1\177\1"+ + "\166\3\0\1\111\1\0\1\167\1\0\1\167\1\156\1\25\1\0\1\44\1\225\7\25\1\145\5"+ + "\7\1\217\1\0\1\145\1\114\1\0\1\167\1\25\1\76\1\2\1\25\1\226\3\7\1\101\1\205"+ + "\1\0\1\67\4\7\1\65\1\0\1\2\1\25\4\7\1\217\2\0\1\25\1\0\1\227\1\0\1\67\3\7"+ + "\1\212\1\7\1\131\5\7\1\230\2\25\1\231\2\0\1\232\1\233\1\234\30\7\7\0\1\235"+ + "\42\7\2\212\4\7\2\212\1\7\1\236\3\7\1\212\6\7\1\30\1\173\1\237\1\26\1\240"+ + "\1\114\1\7\1\26\1\237\1\26\1\241\1\242\3\25\1\243\1\25\1\156\1\131\1\25\1"+ + "\244\1\245\1\147\1\0\1\41\1\156\2\25\1\7\1\26\4\7\2\25\1\0\1\200\1\246\1\0"+ + "\1\225\1\25\1\247\1\37\1\157\1\250\1\27\1\251\1\7\1\252\1\253\1\254\2\25\5"+ + "\7\1\131\116\25\5\7\1\22\5\7\1\22\20\7\1\26\1\255\1\256\1\25\4\7\1\35\1\20"+ + "\7\7\1\156\1\25\1\62\2\7\1\22\1\25\10\22\4\0\5\25\1\156\72\25\1\257\3\25\1"+ + "\40\1\207\1\250\1\26\1\40\11\7\1\22\1\260\1\40\12\7\1\170\1\253\5\7\1\40\12"+ + "\7\1\22\2\25\4\7\6\25\172\7\10\25\77\7\1\26\21\7\1\26\10\25\5\7\1\212\41\7"+ + "\1\26\2\7\1\0\1\256\2\25\5\7\1\165\1\261\1\262\3\7\1\65\12\7\1\167\3\25\1"+ + "\156\1\7\1\37\14\7\1\105\6\7\1\37\1\47\4\25\1\253\1\7\1\263\1\264\2\7\1\53"+ + "\1\265\1\25\1\131\6\7\1\114\1\25\1\67\5\7\1\217\1\0\1\50\1\25\1\0\1\167\2"+ + "\0\1\67\1\266\1\0\1\67\2\7\1\65\1\50\2\7\1\165\1\0\1\2\1\25\3\7\1\26\1\77"+ + "\5\7\1\53\1\0\1\225\1\156\1\0\1\167\1\267\1\7\1\0\1\270\5\7\1\101\1\166\1"+ + "\25\1\264\1\271\1\0\1\167\2\7\1\22\1\272\6\7\1\204\1\273\1\224\2\25\1\274"+ + "\1\7\1\53\1\275\1\25\3\276\1\25\2\22\5\7\1\170\1\7\1\24\16\7\1\53\1\277\1"+ + "\0\1\167\64\7\1\114\1\25\2\7\1\22\1\300\5\7\1\114\40\25\55\7\1\212\15\7\1"+ + "\24\4\25\1\22\1\25\1\300\1\301\1\7\1\106\1\22\1\173\1\302\15\7\1\24\3\25\1"+ + "\300\54\7\1\212\2\25\10\7\1\37\6\7\5\25\1\7\1\26\2\0\2\25\2\0\1\140\2\25\1"+ + "\253\3\25\1\41\1\30\20\7\1\303\1\244\1\25\1\0\1\167\1\40\2\7\1\46\1\40\2\7"+ + "\1\47\1\304\12\7\1\22\3\37\1\305\1\306\2\25\1\307\1\7\1\151\2\7\1\22\2\7\1"+ + "\310\1\7\1\212\1\7\1\212\4\25\17\7\1\47\10\25\6\7\1\26\20\25\1\311\20\25\3"+ + "\7\1\26\6\7\1\131\1\25\1\225\3\25\4\7\1\25\1\253\3\7\1\47\4\7\1\65\1\312\3"+ + "\7\1\212\4\7\1\114\1\7\1\250\5\25\23\7\1\212\1\0\1\167\4\7\1\114\4\7\1\114"+ + "\5\7\1\25\6\7\1\114\23\25\46\7\1\22\1\25\2\7\1\212\1\25\1\7\23\25\1\212\1"+ + "\106\4\7\1\35\1\313\2\7\1\212\1\25\2\7\1\22\1\25\3\7\1\22\10\25\2\7\1\314"+ + "\1\25\2\7\1\212\1\25\3\7\1\24\10\25\7\7\1\304\10\25\1\315\1\261\1\151\1\40"+ + "\2\7\1\212\1\121\4\25\3\7\1\26\3\7\1\26\4\25\1\7\1\40\2\7\1\316\3\25\6\7\1"+ + "\212\1\25\2\7\1\212\1\25\2\7\1\47\1\25\2\7\1\24\15\25\11\7\1\131\6\25\6\7"+ + "\1\47\1\25\6\7\1\47\1\25\4\7\1\217\1\25\1\0\1\167\50\25\5\7\1\317\1\24\11"+ + "\25\3\7\1\26\1\156\1\25\2\7\1\65\1\0\1\225\13\25\2\7\1\26\3\25\2\7\1\22\1"+ + "\25\1\226\6\7\1\0\1\166\3\25\1\125\1\0\1\25\1\62\1\226\5\7\1\0\1\320\1\25"+ + "\1\311\3\7\1\131\1\0\1\167\1\226\3\7\1\165\1\0\1\147\1\0\1\321\1\25\4\7\1"+ + "\322\1\25\1\226\5\7\1\53\1\0\1\323\1\324\1\0\1\325\4\25\2\7\1\34\2\7\1\217"+ + "\1\0\1\201\10\25\1\22\1\251\1\7\1\35\1\7\1\131\5\7\1\165\1\0\1\312\1\0\1\167"+ + "\1\326\1\104\1\105\2\7\1\106\1\127\1\327\1\111\1\122\1\144\1\253\1\102\2\200"+ + "\21\25\6\7\1\177\1\0\1\202\1\47\1\0\1\330\1\24\3\25\6\7\2\0\1\331\1\25\1\0"+ + "\1\167\24\25\5\7\1\165\1\50\1\0\1\225\2\25\1\271\4\25\6\7\2\0\1\332\1\25\1"+ + "\0\1\167\4\25\5\7\1\53\1\0\1\131\1\0\1\167\6\25\3\7\1\211\1\0\1\2\1\0\1\167"+ + "\30\25\5\7\1\217\1\0\1\312\14\25\10\7\1\0\1\167\1\25\1\156\1\22\1\333\1\334"+ + "\3\7\1\44\1\335\1\336\1\25\1\0\1\167\10\25\1\7\1\37\4\7\1\101\1\337\1\340"+ + "\3\25\1\101\1\226\4\7\1\53\1\341\1\62\1\25\1\101\1\77\5\7\1\207\1\0\1\342"+ + "\4\25\7\7\1\131\40\25\1\7\1\106\3\7\1\165\1\166\1\0\1\131\1\25\1\0\1\167\2"+ + "\25\1\37\3\7\1\337\2\0\1\43\1\166\11\25\1\22\1\34\4\7\1\343\1\344\1\210\1"+ + "\25\1\0\1\167\1\35\1\106\3\7\1\345\1\235\1\131\1\0\1\167\46\25\2\7\1\346\27"+ + "\25\1\131\4\25\1\253\1\131\3\25\63\7\1\24\14\25\15\7\1\22\2\25\30\7\1\114"+ + "\27\25\5\7\1\22\1\0\1\225\70\25\10\7\1\22\67\25\7\7\1\131\3\7\1\22\1\0\1\167"+ + "\14\25\3\7\1\212\1\200\1\25\6\7\1\166\1\25\1\114\1\25\1\0\1\167\1\300\2\7"+ + "\1\253\2\7\26\25\10\7\20\25\11\7\1\347\1\101\6\0\1\62\1\226\1\7\10\25\1\350"+ + "\1\25\1\167\1\25\77\7\1\25\32\7\1\212\5\25\1\7\1\131\36\25\43\7\1\22\6\25"+ + "\1\47\1\25\1\351\1\25\61\7\1\114\40\25\15\7\1\47\1\7\1\26\1\7\1\131\1\7\1"+ + "\352\1\2\127\25\1\133\1\353\2\0\1\354\1\2\3\25\1\355\22\25\1\356\67\25\12"+ + "\7\1\30\10\7\1\30\1\357\1\360\1\7\1\361\1\151\7\7\1\35\1\230\2\30\3\7\1\362"+ + "\1\173\1\37\1\106\51\7\1\212\3\7\1\106\2\7\1\170\3\7\1\170\2\7\1\30\3\7\1"+ + "\30\2\7\1\22\3\7\1\22\3\7\1\106\3\7\1\106\2\7\1\170\1\363\14\0\1\166\1\76"+ + "\5\0\1\200\1\311\1\25\1\265\2\25\1\76\1\43\1\0\52\25\1\166\2\0\1\364\1\365"+ + "\1\312\32\25\5\7\1\26\1\202\1\212\1\0\1\366\56\25\5\7\1\217\1\0\1\367\40\25"+ + "\30\7\1\26\1\25\1\166\5\25\10\7\1\217\1\370\1\0\1\167\52\25\1\131\51\25\1"+ + "\151\3\7\1\371\1\40\1\170\1\372\1\247\1\373\1\371\1\236\1\371\2\170\1\124"+ + "\1\7\1\34\1\7\1\114\1\374\1\34\1\7\1\114\146\25\1\0\1\167\33\7\1\212\4\25"+ + "\106\7\1\26\1\25\33\7\1\212\120\7\1\24\1\25\146\7\1\131\3\25\3\7\1\212\74"+ + "\25\51\7\1\47\26\25\1\123\3\25\14\0\20\25\36\0\2\25"); + + /* The ZZ_CMAP_A table has 2024 entries */ static final char ZZ_CMAP_A[] = zzUnpackCMap( "\11\15\1\4\1\2\1\17\1\4\1\1\6\15\4\14\1\3\1\14\1\12\1\56\1\5\2\14\1\16\1\50"+ "\1\51\2\14\1\43\1\11\1\7\1\14\2\15\1\44\1\14\1\46\1\14\1\47\1\14\1\10\22\5"+ - "\1\54\1\13\1\55\1\14\1\5\1\14\1\26\1\42\1\33\1\24\1\22\1\20\1\32\1\5\1\21"+ - "\2\5\1\23\1\30\1\40\1\35\1\25\1\5\1\27\1\34\1\37\1\36\1\31\2\5\1\41\1\5\1"+ + "\1\54\1\13\1\55\1\14\1\5\1\14\1\26\1\34\1\35\1\24\1\22\1\20\1\32\1\5\1\21"+ + "\2\5\1\23\1\30\1\41\1\33\1\25\1\5\1\27\1\36\1\40\1\37\1\31\2\5\1\42\1\5\1"+ "\52\1\45\1\53\1\14\6\15\1\6\2\15\1\0\1\14\4\5\4\14\1\5\2\14\1\15\7\14\1\5"+ "\4\14\1\5\5\14\7\5\1\14\2\5\4\14\4\5\16\14\5\5\7\14\1\5\1\14\1\5\1\14\5\5"+ - "\1\14\2\5\2\14\4\5\10\14\1\5\1\14\3\5\1\14\1\5\1\14\4\5\1\14\13\5\1\14\3\5"+ - "\1\14\5\15\2\14\6\5\1\14\7\5\1\14\1\5\15\14\1\5\1\14\15\15\1\14\1\15\1\14"+ - "\2\15\1\14\2\15\1\14\1\15\3\5\5\14\5\15\6\14\1\5\4\14\3\15\5\14\3\5\7\15\4"+ - "\14\2\5\1\15\13\5\1\14\1\5\7\15\2\5\2\15\1\14\4\15\2\5\2\15\3\5\2\14\1\5\7"+ - "\14\1\15\1\5\1\15\6\5\3\15\2\14\11\5\3\15\1\5\6\14\2\15\6\5\4\15\2\5\2\14"+ - "\2\15\1\5\11\15\1\5\3\15\1\5\5\15\2\14\1\5\3\15\4\14\1\5\1\14\6\5\4\14\13"+ - "\15\1\14\4\15\6\5\3\15\1\5\2\15\1\5\7\15\2\5\2\15\2\14\2\15\1\14\3\15\1\14"+ - "\10\5\2\14\2\5\2\14\6\5\1\14\1\5\3\14\4\5\2\14\1\15\1\5\7\15\2\14\2\15\2\14"+ - "\3\15\1\5\5\14\2\5\1\14\5\5\4\14\3\5\4\14\2\5\1\14\2\5\1\14\2\5\1\14\2\5\2"+ - "\14\1\15\1\14\5\15\4\14\2\15\2\14\3\15\3\14\1\15\7\14\4\5\1\14\1\5\7\14\4"+ - "\15\3\5\1\15\2\14\1\5\1\14\2\5\1\14\3\5\2\15\1\14\3\15\2\14\1\5\11\14\1\15"+ - "\1\5\1\14\6\5\3\14\3\5\1\14\4\5\3\14\2\5\1\14\1\5\1\14\2\5\3\14\2\5\3\14\2"+ - "\5\4\14\5\15\3\14\3\15\1\14\4\15\2\14\1\5\6\14\1\15\4\5\1\14\5\5\3\14\1\5"+ - "\7\15\1\14\2\15\5\14\2\15\3\14\2\15\1\14\3\5\1\14\2\5\5\14\3\5\2\14\1\5\3"+ - "\15\1\14\4\15\1\5\1\14\4\5\1\14\1\5\4\14\1\15\4\14\6\15\1\14\1\15\3\14\2\15"+ - "\4\14\1\5\1\15\2\5\7\15\4\14\10\5\3\15\7\14\2\5\1\14\1\5\2\14\2\5\1\14\1\5"+ - "\2\14\1\5\6\14\4\5\1\14\3\5\1\14\1\5\1\14\1\5\2\14\2\5\1\14\3\5\2\15\1\14"+ - "\2\15\1\5\2\14\5\5\1\14\1\5\1\14\6\15\2\14\2\15\2\14\4\5\5\14\1\15\1\14\1"+ - "\15\1\14\1\15\4\14\2\15\5\5\3\15\6\14\1\15\1\14\7\15\1\5\2\15\4\5\3\15\1\5"+ - "\3\15\2\5\7\15\3\5\4\15\5\5\14\15\1\5\1\15\3\5\1\14\7\5\2\14\3\15\1\0\11\5"+ - "\3\15\3\14\2\5\2\15\4\14\1\5\1\14\2\15\4\14\4\5\10\15\3\14\1\5\3\14\2\5\1"+ - "\15\5\14\3\15\2\14\1\5\1\15\1\5\5\14\6\5\2\14\5\15\3\5\3\14\10\15\5\5\2\15"+ - "\3\14\3\5\3\15\1\14\5\15\4\5\1\15\4\5\3\15\2\5\2\14\1\5\1\14\1\5\1\14\1\5"+ - "\1\14\1\5\2\14\3\5\1\14\6\5\2\14\2\5\13\0\5\15\2\17\5\15\1\0\4\14\1\5\12\14"+ - "\1\0\2\14\6\15\1\14\1\15\3\14\4\15\11\14\1\5\4\14\1\5\1\14\5\5\2\14\1\5\1"+ - "\14\4\5\1\14\3\5\2\14\4\5\5\14\5\5\4\14\1\5\4\14\4\5\3\15\2\5\4\14\1\0\4\14"+ - "\3\5\1\14\2\15\2\14\3\5\6\15\1\14\2\5\2\14\4\5\1\14\2\5\1\15\3\5\1\15\4\5"+ - "\1\15\10\5\2\15\4\14\1\5\1\15\4\14\1\15\5\5\2\15\3\14\3\5\4\14\3\5\2\15\2"+ - "\14\6\5\1\14\3\15\1\14\2\15\5\14\5\5\5\14\1\5\1\15\3\5\1\14\2\5\1\14\7\5\2"+ - "\14\1\15\6\14\2\5\2\14\3\5\3\14\2\5\3\14\2\5\2\14\3\15\4\14\3\5\1\14\2\5\1"+ - "\14\1\5\5\14\1\15\2\14\1\5\3\14\1\5\2\14\2\5\3\15\1\14\2\15\1\14\3\15\2\14"+ - "\1\15\2\14\1\15\4\5\10\14\5\15\3\14\6\15\2\14\3\15\2\14\4\15\4\14\3\15\5\14"+ - "\1\5\2\14\2\5\2\14\4\5\1\14\4\5\1\14\1\5\1\14\6\5\2\14\5\5\1\14\4\5\1\14\4"+ - "\5\2\14\2\15\1\14\1\5\1\14\1\5\5\14\1\5\1\14\1\5\1\14\3\5\1\14\3\5\1\14\3"+ - "\5"); + "\1\14\2\5\2\14\4\5\1\14\1\5\6\14\1\5\1\14\3\5\1\14\1\5\1\14\4\5\1\14\13\5"+ + "\1\14\3\5\1\14\5\15\2\14\6\5\1\14\7\5\1\14\1\5\6\14\1\5\6\14\1\5\1\14\15\15"+ + "\1\14\1\15\1\14\2\15\1\14\2\15\1\14\1\15\3\5\4\14\4\5\5\14\6\15\5\14\1\5\4"+ + "\14\3\15\1\14\1\15\3\14\3\5\7\15\4\14\2\5\1\15\13\5\1\14\1\5\7\15\2\5\2\15"+ + "\1\14\4\15\2\5\2\15\3\5\2\14\1\5\7\14\1\15\1\5\1\15\6\5\3\15\2\14\11\5\3\15"+ + "\1\5\6\14\2\15\6\5\4\15\2\5\4\14\1\5\2\14\1\15\2\5\2\15\1\5\11\15\1\5\3\15"+ + "\1\5\5\15\2\14\1\5\3\15\7\14\11\15\6\5\3\15\1\5\2\15\1\5\7\15\2\5\2\15\2\14"+ + "\2\15\1\5\3\15\1\14\10\5\2\14\2\5\2\14\6\5\1\14\7\5\1\14\1\5\3\14\4\5\2\14"+ + "\1\15\1\5\7\15\2\14\2\15\2\14\3\15\1\5\5\14\2\5\1\14\5\5\7\14\2\5\1\14\1\15"+ + "\2\14\3\15\1\14\4\5\1\14\2\5\1\14\2\5\1\14\2\5\2\14\1\15\1\14\5\15\4\14\2"+ + "\15\2\14\3\15\3\14\1\15\7\14\4\5\1\14\1\5\7\14\4\15\3\5\1\15\2\14\1\5\1\14"+ + "\2\5\1\14\3\5\2\15\1\14\3\15\2\14\1\5\10\14\1\5\6\15\5\14\3\15\2\14\1\15\1"+ + "\5\1\14\6\5\3\14\3\5\1\14\4\5\3\14\2\5\1\14\1\5\1\14\2\5\3\14\2\5\3\14\2\5"+ + "\4\14\5\15\3\14\3\15\1\14\4\15\2\14\1\5\6\14\6\15\5\5\3\14\1\5\7\15\1\14\2"+ + "\15\5\14\2\15\1\14\4\5\1\14\3\5\1\14\2\5\5\14\3\5\2\15\1\5\3\15\1\14\4\15"+ + "\1\5\5\14\3\5\1\15\7\14\5\5\1\14\1\5\4\14\1\15\4\14\6\15\1\14\1\15\3\14\2"+ + "\15\4\14\1\5\1\15\2\5\7\15\4\14\10\5\10\15\1\14\2\15\6\14\3\5\1\14\10\5\1"+ + "\14\1\5\1\14\1\5\5\15\1\5\2\14\5\5\1\14\1\5\1\14\2\15\2\14\4\5\5\14\1\15\1"+ + "\14\1\15\1\14\1\15\4\14\2\15\5\5\10\15\11\14\1\15\1\14\7\15\1\5\2\15\4\5\3"+ + "\15\1\5\3\15\2\5\7\15\3\5\4\15\5\5\14\15\1\5\1\15\3\5\2\14\3\15\6\5\2\14\1"+ + "\0\11\5\3\15\3\14\2\5\2\15\4\14\1\5\1\14\2\15\4\14\4\5\10\15\3\14\1\5\3\14"+ + "\2\5\1\15\5\14\4\15\1\14\5\5\2\15\2\5\1\15\1\5\5\14\1\15\7\14\3\15\5\5\2\15"+ + "\3\14\6\5\2\14\3\5\3\15\1\14\5\15\4\5\1\15\6\5\1\15\2\5\3\15\1\5\5\14\2\15"+ + "\1\14\5\15\1\14\1\5\1\14\1\5\1\14\1\5\1\14\1\5\2\14\3\5\1\14\6\5\2\14\2\5"+ + "\13\0\5\15\2\17\5\15\1\0\4\14\1\5\12\14\1\0\1\14\1\15\3\14\3\15\2\14\1\5\4"+ + "\14\1\5\1\14\5\5\2\14\1\5\1\14\4\5\1\14\3\5\2\14\4\5\5\14\5\5\4\14\1\5\4\14"+ + "\4\5\3\15\2\5\4\14\1\0\4\14\3\5\1\14\2\15\2\14\3\5\4\14\12\15\1\14\3\5\1\15"+ + "\3\5\1\15\4\5\1\15\4\5\4\14\1\15\6\14\1\5\1\14\2\5\1\15\5\5\1\15\2\5\2\15"+ + "\5\5\1\14\4\5\2\15\4\14\1\5\3\15\2\5\1\15\5\5\2\15\3\14\3\5\4\14\3\5\2\15"+ + "\2\14\6\5\1\14\3\15\1\14\2\15\5\14\5\5\5\14\1\5\1\15\3\5\1\14\2\5\1\14\7\5"+ + "\2\14\1\15\6\14\2\5\2\14\3\5\3\14\2\5\3\14\2\5\2\14\3\15\4\14\3\5\1\14\2\5"+ + "\1\14\1\5\5\14\1\15\2\14\3\15\5\14\1\5\3\14\1\5\2\14\4\5\1\14\2\5\2\14\1\5"+ + "\3\15\1\14\2\15\1\14\5\5\2\15\1\14\2\5\1\14\2\15\3\14\3\15\2\14\1\15\6\14"+ + "\1\5\2\15\4\5\1\15\2\14\1\5\1\14\1\15\4\5\4\14\4\15\1\14\4\15\1\5\1\14\1\5"+ + "\3\14\4\15\1\14\5\5\1\14\2\15\1\5\4\15\4\14\1\15\1\5\4\15\2\5\1\14\1\5\1\15"+ + "\3\14\1\5\4\14\1\5\2\14\10\5\1\14\2\5\1\14\1\15\2\14\4\15\1\5\1\15\1\5\2\15"+ + "\6\14\7\15\1\5\1\14\1\5\1\15\3\14\2\15\1\5\4\15\1\14\2\15\3\14\1\5\2\14\1"+ + "\5\6\15\3\14\1\15\1\14\2\15\1\14\1\15\2\5\5\15\1\14\3\5\4\15\1\14\3\5\4\14"+ + "\1\15\2\5\1\14\1\5\1\15\7\14\6\5\3\14\2\15\1\14\2\15\3\14\6\15\2\14\3\15\2"+ + "\14\4\15\4\14\3\15\5\14\1\5\2\14\2\5\2\14\4\5\1\14\4\5\1\14\1\5\1\14\5\5\1"+ + "\14\4\5\1\14\4\5\2\14\3\15\2\14\7\15\1\14\2\15\1\14\4\15\4\14\1\5\1\14\2\15"+ + "\5\14\1\5\3\15\1\5\5\14\2\5\1\14\1\5\2\14\1\5\1\14\1\5\1\14\1\5\5\14\1\5\1"+ + "\14\1\5\1\14\3\5\1\14\3\5\1\14\3\5"); /** * Translates DFA states to action switch labels. @@ -190,19 +227,20 @@ public static int ZZ_CMAP(int ch) { private static final String ZZ_ACTION_PACKED_0 = "\4\0\1\1\13\0\1\2\2\3\1\4\1\5\1\6"+ "\1\2\2\7\1\10\1\11\1\12\1\13\15\14\1\1"+ - "\1\4\1\15\1\5\1\16\1\5\1\17\1\20\2\16"+ - "\1\21\1\22\1\23\1\24\1\25\1\26\1\27\1\30"+ - "\1\31\1\5\1\32\1\33\1\15\1\34\1\35\1\36"+ - "\2\37\1\40\17\14\2\0\2\16\1\41\2\15\1\37"+ - "\2\0\14\14\1\42\3\14\1\15\1\16\1\43\1\16"+ - "\3\15\16\14\1\44\1\16\3\15\1\45\1\14\1\46"+ - "\3\14\1\47\4\14\1\50\2\14\1\16\3\15\3\14"+ - "\1\51\1\52\1\53\1\54\3\14\1\55\2\15\1\56"+ - "\1\14\1\57\1\14\1\60\2\14\1\61\1\15\1\62"+ - "\1\14\1\63\1\64\1\15\1\65\1\66"; + "\1\4\1\15\1\5\1\16\1\17\1\5\1\20\1\21"+ + "\2\17\1\22\1\23\1\24\1\25\1\26\1\27\1\30"+ + "\1\31\1\32\1\5\1\33\1\34\1\15\1\35\1\36"+ + "\2\37\1\40\20\14\2\0\2\17\1\41\2\15\1\37"+ + "\2\0\16\14\1\42\2\14\1\15\1\17\1\43\1\17"+ + "\3\15\17\14\1\44\1\17\3\15\1\45\1\14\1\46"+ + "\3\14\1\47\6\14\1\50\1\14\1\17\3\15\3\14"+ + "\1\51\1\52\1\53\1\54\4\14\1\55\2\15\1\56"+ + "\1\14\1\57\1\14\1\60\3\14\1\61\1\15\1\62"+ + "\2\14\1\63\1\64\1\15\1\65\1\14\1\66\1\14"+ + "\1\67"; private static int [] zzUnpackAction() { - int [] result = new int[185]; + int [] result = new int[195]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -232,28 +270,29 @@ private static int zzUnpackAction(String packed, int offset, int [] result) { "\0\u02f0\0\u031f\0\u02f0\0\u034e\0\u02f0\0\u02f0\0\u037d\0\u03ac"+ "\0\u02f0\0\u03db\0\u02f0\0\u02f0\0\u040a\0\u0439\0\u0468\0\u0497"+ "\0\u04c6\0\u04f5\0\u0524\0\u0553\0\u0582\0\u05b1\0\u05e0\0\u060f"+ - "\0\u063e\0\u066d\0\u069c\0\u06cb\0\u06fa\0\u0729\0\u0758\0\u0787"+ - "\0\u02f0\0\u02f0\0\u07b6\0\u07e5\0\u02f0\0\u02f0\0\u02f0\0\u02f0"+ - "\0\u02f0\0\u02f0\0\u02f0\0\u02f0\0\u02f0\0\u0814\0\u0843\0\u02f0"+ - "\0\u0872\0\u02f0\0\u02f0\0\u02f0\0\u08a1\0\u08d0\0\u037d\0\u08ff"+ + "\0\u063e\0\u066d\0\u069c\0\u06cb\0\u06fa\0\u0729\0\u02f0\0\u0758"+ + "\0\u0787\0\u02f0\0\u02f0\0\u07b6\0\u07e5\0\u02f0\0\u02f0\0\u02f0"+ + "\0\u02f0\0\u02f0\0\u02f0\0\u02f0\0\u02f0\0\u02f0\0\u0814\0\u0843"+ + "\0\u02f0\0\u0872\0\u02f0\0\u02f0\0\u08a1\0\u08d0\0\u037d\0\u08ff"+ "\0\u092e\0\u095d\0\u098c\0\u09bb\0\u09ea\0\u0a19\0\u0a48\0\u0a77"+ "\0\u0aa6\0\u0ad5\0\u0b04\0\u0b33\0\u0b62\0\u0b91\0\u0bc0\0\u0bef"+ - "\0\u0c1e\0\u0c4d\0\u02f0\0\u0c7c\0\u0cab\0\u02f0\0\u0cda\0\u0d09"+ + "\0\u0c1e\0\u0c4d\0\u0c7c\0\u02f0\0\u0cab\0\u0cda\0\u02f0\0\u0d09"+ "\0\u0d38\0\u0d67\0\u0d96\0\u0dc5\0\u0df4\0\u0e23\0\u0e52\0\u0e81"+ - "\0\u0eb0\0\u0edf\0\u0f0e\0\u0f3d\0\u0439\0\u0f6c\0\u0f9b\0\u0fca"+ - "\0\u02f0\0\u02f0\0\u0758\0\u0ff9\0\u1028\0\u1057\0\u1086\0\u10b5"+ + "\0\u0eb0\0\u0edf\0\u0f0e\0\u0f3d\0\u0f6c\0\u0f9b\0\u0fca\0\u0439"+ + "\0\u0ff9\0\u1028\0\u02f0\0\u02f0\0\u0758\0\u1057\0\u1086\0\u10b5"+ "\0\u10e4\0\u1113\0\u1142\0\u1171\0\u11a0\0\u11cf\0\u11fe\0\u122d"+ - "\0\u125c\0\u128b\0\u12ba\0\u12e9\0\u1318\0\u0439\0\u1347\0\u1376"+ - "\0\u13a5\0\u13d4\0\u0439\0\u1403\0\u0439\0\u1432\0\u1461\0\u1490"+ - "\0\u0439\0\u14bf\0\u14ee\0\u151d\0\u154c\0\u0439\0\u157b\0\u15aa"+ - "\0\u15d9\0\u1608\0\u1637\0\u1666\0\u1695\0\u16c4\0\u16f3\0\u0439"+ - "\0\u0439\0\u0439\0\u0439\0\u1722\0\u1751\0\u1780\0\u0758\0\u17af"+ - "\0\u17de\0\u06fa\0\u180d\0\u0439\0\u183c\0\u0439\0\u186b\0\u189a"+ - "\0\u06fa\0\u18c9\0\u0439\0\u18f8\0\u0439\0\u0439\0\u1927\0\u0439"+ - "\0\u06fa"; + "\0\u125c\0\u128b\0\u12ba\0\u12e9\0\u1318\0\u1347\0\u1376\0\u13a5"+ + "\0\u0439\0\u13d4\0\u1403\0\u1432\0\u1461\0\u0439\0\u1490\0\u0439"+ + "\0\u14bf\0\u14ee\0\u151d\0\u0439\0\u154c\0\u157b\0\u15aa\0\u15d9"+ + "\0\u1608\0\u1637\0\u0439\0\u1666\0\u1695\0\u16c4\0\u16f3\0\u1722"+ + "\0\u1751\0\u1780\0\u17af\0\u0439\0\u0439\0\u0439\0\u0439\0\u17de"+ + "\0\u180d\0\u183c\0\u186b\0\u0758\0\u189a\0\u18c9\0\u06fa\0\u18f8"+ + "\0\u0439\0\u1927\0\u0439\0\u1956\0\u1985\0\u19b4\0\u06fa\0\u19e3"+ + "\0\u0439\0\u1a12\0\u1a41\0\u0439\0\u0439\0\u1a70\0\u0439\0\u1a9f"+ + "\0\u06fa\0\u1ace\0\u0439"; private static int [] zzUnpackRowMap() { - int [] result = new int[185]; + int [] result = new int[195]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -281,137 +320,146 @@ private static int zzUnpackRowMap(String packed, int offset, int [] result) { "\1\32\2\25\1\33\7\25\23\32\13\25\1\34\1\25"+ "\1\30\1\31\2\24\1\35\12\25\23\35\15\25\1\30"+ "\1\31\2\24\1\36\12\25\1\37\2\36\1\40\1\36"+ - "\1\41\1\42\1\43\1\44\1\45\1\46\1\47\1\50"+ - "\1\51\1\36\1\52\3\36\14\25\1\53\1\30\1\31"+ - "\1\54\1\24\52\53\1\25\1\30\1\31\2\24\1\55"+ - "\1\25\1\56\10\25\23\55\15\25\1\30\1\31\2\24"+ - "\1\57\1\25\1\60\1\33\1\25\1\61\3\25\1\62"+ - "\1\25\1\63\10\57\1\64\11\57\1\65\1\66\1\67"+ - "\1\70\1\71\1\72\1\73\1\74\1\75\1\76\3\25"+ - "\1\30\1\31\2\24\1\77\12\25\23\77\14\25\1\21"+ - "\1\30\1\31\2\24\37\21\1\100\12\21\1\25\1\30"+ - "\1\31\2\24\1\55\12\25\5\55\1\101\15\55\15\25"+ - "\1\30\1\31\2\24\1\55\12\25\23\55\14\25\1\102"+ - "\1\30\1\31\2\24\1\32\12\102\23\32\1\103\1\104"+ - "\13\102\1\30\1\31\2\24\1\55\12\102\23\55\15\102"+ - "\1\30\1\31\2\24\1\32\12\102\23\32\1\103\13\102"+ - "\12\25\1\105\62\25\1\106\40\25\61\0\1\23\57\0"+ - "\2\24\63\0\1\107\47\0\1\31\61\0\3\32\5\0"+ - "\1\32\2\0\23\32\21\0\3\35\5\0\1\35\2\0"+ - "\23\35\21\0\3\36\5\0\1\36\2\0\23\36\21\0"+ - "\3\36\5\0\1\36\2\0\1\36\1\110\21\36\21\0"+ - "\3\36\5\0\1\36\2\0\6\36\1\111\14\36\21\0"+ - "\3\36\5\0\1\36\2\0\6\36\1\112\1\113\6\36"+ - "\1\114\4\36\21\0\3\36\5\0\1\36\2\0\3\36"+ - "\1\115\17\36\21\0\3\36\5\0\1\36\2\0\2\36"+ - "\1\116\20\36\21\0\3\36\5\0\1\36\2\0\15\36"+ - "\1\117\5\36\21\0\3\36\5\0\1\36\2\0\6\36"+ - "\1\120\14\36\21\0\3\36\5\0\1\36\2\0\2\36"+ - "\1\121\20\36\21\0\3\36\5\0\1\36\2\0\3\36"+ - "\1\122\17\36\21\0\3\36\5\0\1\36\2\0\2\36"+ - "\1\123\13\36\1\124\4\36\21\0\3\36\5\0\1\36"+ - "\2\0\11\36\1\125\11\36\21\0\3\36\5\0\1\36"+ - "\2\0\21\36\1\126\1\36\14\0\1\53\2\0\1\53"+ - "\1\0\53\53\2\0\1\54\1\24\52\53\5\0\3\55"+ - "\5\0\1\55\2\0\23\55\23\0\1\127\54\0\3\57"+ - "\5\0\1\57\2\0\23\57\23\0\1\130\54\0\3\57"+ - "\5\0\1\57\2\0\16\57\1\131\4\57\21\0\3\57"+ - "\5\0\1\57\2\0\6\57\1\132\14\57\71\0\1\133"+ - "\6\0\3\77\5\0\1\77\2\0\23\77\21\0\3\55"+ - "\5\0\1\55\2\0\7\55\1\134\6\55\1\135\4\55"+ - "\14\0\12\105\1\136\1\137\43\105\13\106\1\140\2\106"+ - "\1\136\40\106\5\0\3\36\5\0\1\36\2\0\2\36"+ - "\1\141\20\36\21\0\3\36\5\0\1\36\2\0\20\36"+ - "\1\142\2\36\21\0\3\36\5\0\1\36\2\0\7\36"+ - "\1\143\13\36\21\0\3\36\5\0\1\36\2\0\1\36"+ - "\1\144\13\36\1\145\5\36\21\0\3\36\5\0\1\36"+ - "\2\0\22\36\1\146\21\0\3\36\5\0\1\36\2\0"+ - "\1\36\1\147\21\36\21\0\3\36\5\0\1\36\2\0"+ - "\17\36\1\150\3\36\21\0\3\36\5\0\1\36\2\0"+ - "\4\36\1\151\16\36\21\0\3\36\5\0\1\36\2\0"+ - "\7\36\1\152\13\36\21\0\3\36\5\0\1\36\2\0"+ - "\20\36\1\153\2\36\21\0\3\36\5\0\1\36\2\0"+ - "\6\36\1\154\14\36\21\0\3\36\5\0\1\36\2\0"+ - "\2\36\1\155\20\36\21\0\3\36\5\0\1\36\2\0"+ - "\5\36\1\156\15\36\21\0\3\36\5\0\1\36\2\0"+ - "\2\36\1\157\20\36\21\0\3\36\5\0\1\36\2\0"+ - "\5\36\1\160\15\36\23\0\1\161\56\0\1\162\54\0"+ - "\3\57\5\0\1\57\2\0\20\57\1\163\2\57\21\0"+ - "\3\57\5\0\1\57\2\0\7\57\1\164\13\57\21\0"+ - "\3\55\5\0\1\55\2\0\1\55\1\165\13\55\1\166"+ - "\5\55\21\0\3\55\5\0\1\55\2\0\22\55\1\167"+ - "\15\0\2\105\2\0\1\105\1\0\10\105\1\0\37\105"+ - "\1\0\2\106\2\0\1\106\1\0\10\106\1\0\37\106"+ - "\5\0\3\36\5\0\1\36\2\0\3\36\1\170\17\36"+ - "\21\0\3\36\5\0\1\36\2\0\12\36\1\171\10\36"+ - "\21\0\3\36\5\0\1\36\2\0\6\36\1\172\14\36"+ - "\21\0\3\36\5\0\1\36\2\0\11\36\1\173\11\36"+ - "\21\0\3\36\5\0\1\36\2\0\17\36\1\174\3\36"+ - "\21\0\3\36\5\0\1\36\2\0\3\36\1\175\17\36"+ - "\21\0\3\36\5\0\1\36\2\0\6\36\1\176\14\36"+ - "\21\0\3\36\5\0\1\36\2\0\16\36\1\177\4\36"+ - "\21\0\3\36\5\0\1\36\2\0\16\36\1\200\4\36"+ - "\21\0\3\36\5\0\1\36\2\0\6\36\1\201\14\36"+ - "\21\0\3\36\5\0\1\36\2\0\2\36\1\202\20\36"+ - "\21\0\3\36\5\0\1\36\2\0\14\36\1\203\6\36"+ - "\21\0\3\36\5\0\1\36\2\0\5\36\1\204\15\36"+ - "\21\0\3\36\5\0\1\36\2\0\7\36\1\205\13\36"+ - "\21\0\3\36\5\0\1\36\2\0\2\36\1\206\20\36"+ - "\21\0\3\57\5\0\1\57\2\0\6\57\1\207\14\57"+ - "\21\0\3\55\5\0\1\55\2\0\11\55\1\210\11\55"+ - "\21\0\3\55\5\0\1\55\2\0\17\55\1\211\3\55"+ - "\21\0\3\55\5\0\1\55\2\0\3\55\1\212\17\55"+ - "\21\0\3\36\5\0\1\36\2\0\4\36\1\213\16\36"+ - "\21\0\3\36\5\0\1\36\2\0\16\36\1\214\4\36"+ - "\21\0\3\36\5\0\1\36\2\0\10\36\1\215\12\36"+ - "\21\0\3\36\5\0\1\36\2\0\6\36\1\216\14\36"+ - "\21\0\3\36\5\0\1\36\2\0\2\36\1\217\20\36"+ - "\21\0\3\36\5\0\1\36\2\0\1\36\1\220\21\36"+ - "\21\0\3\36\5\0\1\36\2\0\14\36\1\221\6\36"+ - "\21\0\3\36\5\0\1\36\2\0\7\36\1\222\13\36"+ - "\21\0\3\36\5\0\1\36\2\0\3\36\1\223\17\36"+ - "\21\0\3\36\5\0\1\36\2\0\7\36\1\224\13\36"+ - "\21\0\3\36\5\0\1\36\2\0\7\36\1\225\13\36"+ - "\21\0\3\36\5\0\1\36\2\0\14\36\1\226\6\36"+ - "\21\0\3\36\5\0\1\36\2\0\7\36\1\227\13\36"+ - "\21\0\3\36\5\0\1\36\2\0\3\36\1\230\17\36"+ - "\21\0\3\57\5\0\1\57\2\0\7\57\1\231\13\57"+ - "\21\0\3\55\5\0\1\55\2\0\6\55\1\232\14\55"+ - "\21\0\3\55\5\0\1\55\2\0\2\55\1\233\20\55"+ - "\21\0\3\55\5\0\1\55\2\0\1\55\1\234\21\55"+ - "\21\0\3\36\5\0\1\36\2\0\6\36\1\235\14\36"+ - "\21\0\3\36\5\0\1\36\2\0\17\36\1\236\3\36"+ - "\21\0\3\36\5\0\1\36\2\0\13\36\1\237\7\36"+ - "\21\0\3\36\5\0\1\36\2\0\13\36\1\240\7\36"+ - "\21\0\3\36\5\0\1\36\2\0\20\36\1\241\2\36"+ - "\21\0\3\36\5\0\1\36\2\0\2\36\1\242\20\36"+ - "\21\0\3\36\5\0\1\36\2\0\12\36\1\243\10\36"+ - "\21\0\3\36\5\0\1\36\2\0\1\36\1\244\21\36"+ - "\21\0\3\36\5\0\1\36\2\0\2\36\1\245\20\36"+ - "\21\0\3\36\5\0\1\36\2\0\15\36\1\246\5\36"+ - "\21\0\3\57\5\0\1\57\2\0\12\57\1\247\10\57"+ - "\21\0\3\55\5\0\1\55\2\0\17\55\1\250\3\55"+ - "\21\0\3\55\5\0\1\55\2\0\13\55\1\251\7\55"+ - "\21\0\3\55\5\0\1\55\2\0\13\55\1\252\7\55"+ - "\21\0\3\36\5\0\1\36\2\0\12\36\1\253\10\36"+ - "\21\0\3\36\5\0\1\36\2\0\2\36\1\254\20\36"+ - "\21\0\3\36\5\0\1\36\2\0\17\36\1\255\3\36"+ - "\21\0\3\36\5\0\1\36\2\0\13\36\1\256\7\36"+ - "\21\0\3\36\5\0\1\36\2\0\14\36\1\257\6\36"+ - "\21\0\3\36\5\0\1\36\2\0\6\36\1\260\14\36"+ - "\21\0\3\55\5\0\1\55\2\0\2\55\1\261\20\55"+ - "\21\0\3\55\5\0\1\55\2\0\17\55\1\262\3\55"+ - "\21\0\3\36\5\0\1\36\2\0\2\36\1\263\20\36"+ - "\21\0\3\36\5\0\1\36\2\0\2\36\1\264\20\36"+ - "\21\0\3\36\5\0\1\36\2\0\14\36\1\265\6\36"+ - "\21\0\3\36\5\0\1\36\2\0\4\36\1\266\16\36"+ - "\21\0\3\55\5\0\1\55\2\0\2\55\1\267\20\55"+ - "\21\0\3\36\5\0\1\36\2\0\4\36\1\270\16\36"+ - "\21\0\3\55\5\0\1\55\2\0\4\55\1\271\16\55"+ - "\14\0"; + "\1\41\1\42\1\43\1\44\1\45\1\46\1\47\1\36"+ + "\1\50\1\51\1\36\1\52\2\36\14\25\1\53\1\30"+ + "\1\31\1\54\1\24\52\53\1\25\1\30\1\31\2\24"+ + "\1\55\1\25\1\56\10\25\23\55\14\25\1\57\1\30"+ + "\1\31\2\24\1\55\12\57\23\55\14\57\1\25\1\30"+ + "\1\31\2\24\1\60\1\25\1\61\1\33\1\25\1\62"+ + "\3\25\1\63\1\25\1\64\10\60\1\65\11\60\1\66"+ + "\1\67\1\70\1\71\1\72\1\73\1\74\1\75\1\76"+ + "\1\77\3\25\1\30\1\31\2\24\1\100\12\25\23\100"+ + "\14\25\1\21\1\30\1\31\2\24\37\21\1\101\12\21"+ + "\1\25\1\30\1\31\2\24\1\55\12\25\5\55\1\102"+ + "\15\55\15\25\1\30\1\31\2\24\1\55\12\25\23\55"+ + "\14\25\1\57\1\30\1\31\2\24\1\32\12\57\23\32"+ + "\1\103\1\104\13\57\1\30\1\31\2\24\1\32\12\57"+ + "\23\32\1\103\13\57\12\25\1\105\62\25\1\106\40\25"+ + "\61\0\1\23\57\0\2\24\63\0\1\107\47\0\1\31"+ + "\61\0\3\32\5\0\1\32\2\0\23\32\21\0\3\35"+ + "\5\0\1\35\2\0\23\35\21\0\3\36\5\0\1\36"+ + "\2\0\23\36\21\0\3\36\5\0\1\36\2\0\1\36"+ + "\1\110\21\36\21\0\3\36\5\0\1\36\2\0\6\36"+ + "\1\111\14\36\21\0\3\36\5\0\1\36\2\0\6\36"+ + "\1\112\1\113\7\36\1\114\3\36\21\0\3\36\5\0"+ + "\1\36\2\0\3\36\1\115\17\36\21\0\3\36\5\0"+ + "\1\36\2\0\2\36\1\116\20\36\21\0\3\36\5\0"+ + "\1\36\2\0\13\36\1\117\7\36\21\0\3\36\5\0"+ + "\1\36\2\0\6\36\1\120\14\36\21\0\3\36\5\0"+ + "\1\36\2\0\2\36\1\121\1\122\17\36\21\0\3\36"+ + "\5\0\1\36\2\0\11\36\1\123\11\36\21\0\3\36"+ + "\5\0\1\36\2\0\3\36\1\124\17\36\21\0\3\36"+ + "\5\0\1\36\2\0\2\36\1\125\14\36\1\126\3\36"+ + "\21\0\3\36\5\0\1\36\2\0\22\36\1\127\14\0"+ + "\1\53\2\0\1\53\1\0\53\53\2\0\1\54\1\24"+ + "\52\53\5\0\3\55\5\0\1\55\2\0\23\55\23\0"+ + "\1\130\54\0\3\60\5\0\1\60\2\0\23\60\23\0"+ + "\1\131\54\0\3\60\5\0\1\60\2\0\17\60\1\132"+ + "\3\60\21\0\3\60\5\0\1\60\2\0\6\60\1\133"+ + "\14\60\71\0\1\134\6\0\3\100\5\0\1\100\2\0"+ + "\23\100\21\0\3\55\5\0\1\55\2\0\7\55\1\135"+ + "\7\55\1\136\3\55\14\0\12\105\1\137\1\140\43\105"+ + "\13\106\1\141\2\106\1\137\40\106\5\0\3\36\5\0"+ + "\1\36\2\0\2\36\1\142\20\36\21\0\3\36\5\0"+ + "\1\36\2\0\21\36\1\143\1\36\21\0\3\36\5\0"+ + "\1\36\2\0\7\36\1\144\13\36\21\0\3\36\5\0"+ + "\1\36\2\0\1\36\1\145\11\36\1\146\7\36\21\0"+ + "\3\36\5\0\1\36\2\0\14\36\1\147\6\36\21\0"+ + "\3\36\5\0\1\36\2\0\1\36\1\150\21\36\21\0"+ + "\3\36\5\0\1\36\2\0\20\36\1\151\2\36\21\0"+ + "\3\36\5\0\1\36\2\0\4\36\1\152\16\36\21\0"+ + "\3\36\5\0\1\36\2\0\7\36\1\153\13\36\21\0"+ + "\3\36\5\0\1\36\2\0\21\36\1\154\1\36\21\0"+ + "\3\36\5\0\1\36\2\0\13\36\1\155\7\36\21\0"+ + "\3\36\5\0\1\36\2\0\2\36\1\156\20\36\21\0"+ + "\3\36\5\0\1\36\2\0\6\36\1\157\14\36\21\0"+ + "\3\36\5\0\1\36\2\0\2\36\1\160\20\36\21\0"+ + "\3\36\5\0\1\36\2\0\5\36\1\161\15\36\21\0"+ + "\3\36\5\0\1\36\2\0\5\36\1\162\15\36\23\0"+ + "\1\163\56\0\1\164\54\0\3\60\5\0\1\60\2\0"+ + "\21\60\1\165\1\60\21\0\3\60\5\0\1\60\2\0"+ + "\7\60\1\166\13\60\21\0\3\55\5\0\1\55\2\0"+ + "\1\55\1\167\11\55\1\170\7\55\21\0\3\55\5\0"+ + "\1\55\2\0\14\55\1\171\6\55\15\0\2\105\2\0"+ + "\1\105\1\0\10\105\1\0\37\105\1\0\2\106\2\0"+ + "\1\106\1\0\10\106\1\0\37\106\5\0\3\36\5\0"+ + "\1\36\2\0\3\36\1\172\17\36\21\0\3\36\5\0"+ + "\1\36\2\0\12\36\1\173\10\36\21\0\3\36\5\0"+ + "\1\36\2\0\6\36\1\174\14\36\21\0\3\36\5\0"+ + "\1\36\2\0\11\36\1\175\11\36\21\0\3\36\5\0"+ + "\1\36\2\0\20\36\1\176\2\36\21\0\3\36\5\0"+ + "\1\36\2\0\3\36\1\177\17\36\21\0\3\36\5\0"+ + "\1\36\2\0\6\36\1\200\14\36\21\0\3\36\5\0"+ + "\1\36\2\0\17\36\1\201\3\36\21\0\3\36\5\0"+ + "\1\36\2\0\17\36\1\202\3\36\21\0\3\36\5\0"+ + "\1\36\2\0\6\36\1\203\14\36\21\0\3\36\5\0"+ + "\1\36\2\0\2\36\1\204\20\36\21\0\3\36\5\0"+ + "\1\36\2\0\14\36\1\205\6\36\21\0\3\36\5\0"+ + "\1\36\2\0\7\36\1\206\13\36\21\0\3\36\5\0"+ + "\1\36\2\0\16\36\1\207\4\36\21\0\3\36\5\0"+ + "\1\36\2\0\5\36\1\210\15\36\21\0\3\36\5\0"+ + "\1\36\2\0\2\36\1\211\20\36\21\0\3\60\5\0"+ + "\1\60\2\0\6\60\1\212\14\60\21\0\3\55\5\0"+ + "\1\55\2\0\11\55\1\213\11\55\21\0\3\55\5\0"+ + "\1\55\2\0\20\55\1\214\2\55\21\0\3\55\5\0"+ + "\1\55\2\0\3\55\1\215\17\55\21\0\3\36\5\0"+ + "\1\36\2\0\4\36\1\216\16\36\21\0\3\36\5\0"+ + "\1\36\2\0\17\36\1\217\3\36\21\0\3\36\5\0"+ + "\1\36\2\0\10\36\1\220\12\36\21\0\3\36\5\0"+ + "\1\36\2\0\6\36\1\221\14\36\21\0\3\36\5\0"+ + "\1\36\2\0\2\36\1\222\20\36\21\0\3\36\5\0"+ + "\1\36\2\0\1\36\1\223\21\36\21\0\3\36\5\0"+ + "\1\36\2\0\16\36\1\224\4\36\21\0\3\36\5\0"+ + "\1\36\2\0\7\36\1\225\13\36\21\0\3\36\5\0"+ + "\1\36\2\0\3\36\1\226\17\36\21\0\3\36\5\0"+ + "\1\36\2\0\7\36\1\227\13\36\21\0\3\36\5\0"+ + "\1\36\2\0\7\36\1\230\13\36\21\0\3\36\5\0"+ + "\1\36\2\0\6\36\1\231\14\36\21\0\3\36\5\0"+ + "\1\36\2\0\3\36\1\232\17\36\21\0\3\36\5\0"+ + "\1\36\2\0\16\36\1\233\4\36\21\0\3\36\5\0"+ + "\1\36\2\0\7\36\1\234\13\36\21\0\3\60\5\0"+ + "\1\60\2\0\7\60\1\235\13\60\21\0\3\55\5\0"+ + "\1\55\2\0\6\55\1\236\14\55\21\0\3\55\5\0"+ + "\1\55\2\0\2\55\1\237\20\55\21\0\3\55\5\0"+ + "\1\55\2\0\1\55\1\240\21\55\21\0\3\36\5\0"+ + "\1\36\2\0\6\36\1\241\14\36\21\0\3\36\5\0"+ + "\1\36\2\0\20\36\1\242\2\36\21\0\3\36\5\0"+ + "\1\36\2\0\15\36\1\243\5\36\21\0\3\36\5\0"+ + "\1\36\2\0\15\36\1\244\5\36\21\0\3\36\5\0"+ + "\1\36\2\0\21\36\1\245\1\36\21\0\3\36\5\0"+ + "\1\36\2\0\2\36\1\246\20\36\21\0\3\36\5\0"+ + "\1\36\2\0\12\36\1\247\10\36\21\0\3\36\5\0"+ + "\1\36\2\0\1\36\1\250\21\36\21\0\3\36\5\0"+ + "\1\36\2\0\3\36\1\251\17\36\21\0\3\36\5\0"+ + "\1\36\2\0\13\36\1\252\7\36\21\0\3\36\5\0"+ + "\1\36\2\0\2\36\1\253\20\36\21\0\3\60\5\0"+ + "\1\60\2\0\12\60\1\254\10\60\21\0\3\55\5\0"+ + "\1\55\2\0\20\55\1\255\2\55\21\0\3\55\5\0"+ + "\1\55\2\0\15\55\1\256\5\55\21\0\3\55\5\0"+ + "\1\55\2\0\15\55\1\257\5\55\21\0\3\36\5\0"+ + "\1\36\2\0\12\36\1\260\10\36\21\0\3\36\5\0"+ + "\1\36\2\0\2\36\1\261\20\36\21\0\3\36\5\0"+ + "\1\36\2\0\20\36\1\262\2\36\21\0\3\36\5\0"+ + "\1\36\2\0\15\36\1\263\5\36\21\0\3\36\5\0"+ + "\1\36\2\0\5\36\1\264\15\36\21\0\3\36\5\0"+ + "\1\36\2\0\6\36\1\265\14\36\21\0\3\36\5\0"+ + "\1\36\2\0\16\36\1\266\4\36\21\0\3\55\5\0"+ + "\1\55\2\0\2\55\1\267\20\55\21\0\3\55\5\0"+ + "\1\55\2\0\20\55\1\270\2\55\21\0\3\36\5\0"+ + "\1\36\2\0\2\36\1\271\20\36\21\0\3\36\5\0"+ + "\1\36\2\0\2\36\1\272\20\36\21\0\3\36\5\0"+ + "\1\36\2\0\6\36\1\273\14\36\21\0\3\36\5\0"+ + "\1\36\2\0\4\36\1\274\16\36\21\0\3\36\5\0"+ + "\1\36\2\0\16\36\1\275\4\36\21\0\3\55\5\0"+ + "\1\55\2\0\2\55\1\276\20\55\21\0\3\36\5\0"+ + "\1\36\2\0\4\36\1\277\16\36\21\0\3\36\5\0"+ + "\1\36\2\0\7\36\1\300\13\36\21\0\3\55\5\0"+ + "\1\55\2\0\4\55\1\301\16\55\21\0\3\36\5\0"+ + "\1\36\2\0\6\36\1\302\14\36\21\0\3\36\5\0"+ + "\1\36\2\0\10\36\1\303\12\36\14\0"; private static int [] zzUnpackTrans() { - int [] result = new int[6486]; + int [] result = new int[6909]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -450,12 +498,12 @@ private static int zzUnpackTrans(String packed, int offset, int [] result) { private static final String ZZ_ATTRIBUTE_PACKED_0 = "\4\0\1\1\13\0\1\11\1\1\1\11\1\1\2\11"+ - "\2\1\1\11\1\1\2\11\24\1\2\11\2\1\11\11"+ - "\2\1\1\11\1\1\3\11\22\1\2\0\2\1\1\11"+ - "\2\1\1\11\2\0\20\1\2\11\107\1"; + "\2\1\1\11\1\1\2\11\22\1\1\11\2\1\2\11"+ + "\2\1\11\11\2\1\1\11\1\1\2\11\23\1\2\0"+ + "\2\1\1\11\2\1\1\11\2\0\21\1\2\11\117\1"; private static int [] zzUnpackAttribute() { - int [] result = new int[185]; + int [] result = new int[195]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; @@ -785,272 +833,277 @@ else if (zzAtEOF) { { yybegin(YYINITIAL); return STRING; } // fall through - case 55: break; + case 56: break; case 2: { yybegin(xCOMMENT_STRING); yypushback(yylength()); } // fall through - case 56: break; + case 57: break; case 3: { yybegin(YYINITIAL); return com.intellij.psi.TokenType.WHITE_SPACE; } // fall through - case 57: break; + case 58: break; case 4: { return com.intellij.psi.TokenType.WHITE_SPACE; } // fall through - case 58: break; + case 59: break; case 5: { return com.intellij.psi.TokenType.BAD_CHARACTER; } // fall through - case 59: break; + case 60: break; case 6: { yybegin(xTAG_NAME); return AT; } // fall through - case 60: break; + case 61: break; case 7: { yybegin(YYINITIAL);return com.intellij.psi.TokenType.WHITE_SPACE; } // fall through - case 61: break; + case 62: break; case 8: { return ID; } // fall through - case 62: break; + case 63: break; case 9: { yybegin(xCOMMENT_STRING); return STRING_BEGIN; } // fall through - case 63: break; + case 64: break; case 10: { return SHARP; } // fall through - case 64: break; + case 65: break; case 11: { yybegin(xCOMMENT_STRING); return ID; } // fall through - case 65: break; + case 66: break; case 12: { yybegin(xCOMMENT_STRING); return TAG_NAME; } // fall through - case 66: break; + case 67: break; case 13: { beginType(); return ID; } // fall through - case 67: break; + case 68: break; case 14: - { if (_typeReq || _typeLevel > 0) { _typeReq = false; return ID; } else { yybegin(xCOMMENT_STRING); yypushback(yylength()); } + { yybegin(YYINITIAL); yypushback(yylength()); } // fall through - case 68: break; + case 69: break; case 15: - { yybegin(xDOUBLE_QUOTED_STRING); yypushback(yylength()); + { if (_typeReq || _typeLevel > 0) { _typeReq = false; return ID; } else { yybegin(xCOMMENT_STRING); yypushback(yylength()); } } // fall through - case 69: break; + case 70: break; case 16: - { yybegin(xSINGLE_QUOTED_STRING); yypushback(yylength()); + { yybegin(xDOUBLE_QUOTED_STRING); yypushback(yylength()); } // fall through - case 70: break; + case 71: break; case 17: - { _typeReq = true; return COMMA; + { yybegin(xSINGLE_QUOTED_STRING); yypushback(yylength()); } // fall through - case 71: break; + case 72: break; case 18: - { _typeReq = true; return EXTENDS; + { _typeReq = true; return COMMA; } // fall through - case 72: break; + case 73: break; case 19: - { _typeReq = true; return OR; + { _typeReq = true; return EXTENDS; } // fall through - case 73: break; + case 74: break; case 20: - { _typeLevel++; return LT; + { _typeReq = true; return OR; } // fall through - case 74: break; + case 75: break; case 21: - { _typeLevel--; _typeReq = false; return GT; + { _typeLevel++; return LT; } // fall through - case 75: break; + case 76: break; case 22: - { _typeLevel++; return LPAREN; + { _typeLevel--; _typeReq = false; return GT; } // fall through - case 76: break; + case 77: break; case 23: - { _typeLevel--; _typeReq = false; return RPAREN; + { _typeLevel++; return LPAREN; } // fall through - case 77: break; + case 78: break; case 24: - { _typeLevel++; return LCURLY; + { _typeLevel--; _typeReq = false; return RPAREN; } // fall through - case 78: break; + case 79: break; case 25: - { _typeLevel--; _typeReq = false; return RCURLY; + { _typeLevel++; return LCURLY; } // fall through - case 79: break; + case 80: break; case 26: - { yybegin(xCLASS_EXTEND); return ID; + { _typeLevel--; _typeReq = false; return RCURLY; } // fall through - case 80: break; + case 81: break; case 27: - { beginType(); return EXTENDS; + { yybegin(xCLASS_EXTEND); return ID; } // fall through - case 81: break; + case 82: break; case 28: - { yybegin(YYINITIAL); yypushback(yylength()); + { beginType(); return EXTENDS; } // fall through - case 82: break; + case 83: break; case 29: { return COMMA; } // fall through - case 83: break; + case 84: break; case 30: { return EXTENDS; } // fall through - case 84: break; + case 85: break; case 31: { yybegin(xTYPE_REF); return STRING_LITERAL; } // fall through - case 85: break; + case 86: break; case 32: { return DASHES; } // fall through - case 86: break; + case 87: break; case 33: { _typeReq = false; return ARR; } // fall through - case 87: break; + case 88: break; case 34: { yybegin(xTAG); return TAG_NAME_SEE; } // fall through - case 88: break; + case 89: break; case 35: { return FUN; } // fall through - case 89: break; + case 90: break; case 36: { beginType(); return TAG_NAME_TYPE; } // fall through - case 90: break; + case 91: break; case 37: { yybegin(xFIELD); return TAG_NAME_FIELD; } // fall through - case 91: break; + case 92: break; case 38: { yybegin(xPARAM); return TAG_NAME_PARAM; } // fall through - case 92: break; + case 93: break; case 39: { yybegin(xALIAS); return TAG_NAME_ALIAS; } // fall through - case 93: break; + case 94: break; case 40: { yybegin(xCLASS); return TAG_NAME_CLASS; } // fall through - case 94: break; + case 95: break; case 41: { return TAG_NAME_PUBLIC; } // fall through - case 95: break; + case 96: break; case 42: { beginType(); return TAG_NAME_RETURN; } // fall through - case 96: break; + case 97: break; case 43: { yybegin(xCLASS); return TAG_NAME_MODULE; } // fall through - case 97: break; + case 98: break; case 44: { yybegin(xPARAM); return TAG_NAME_VARARG; } // fall through - case 98: break; + case 99: break; case 45: { _typeReq = true; return VARARG; } // fall through - case 99: break; + case 100: break; case 46: { yybegin(xFIELD_ID); return PUBLIC; } // fall through - case 100: break; + case 101: break; case 47: { return TAG_NAME_PRIVATE; } // fall through - case 101: break; + case 102: break; case 48: { yybegin(xGENERIC); return TAG_NAME_GENERIC; } // fall through - case 102: break; + case 103: break; case 49: { yybegin(xFIELD_ID); return PRIVATE; } // fall through - case 103: break; + case 104: break; case 50: { yybegin(xTAG_WITH_ID); return TAG_NAME_LANGUAGE; } // fall through - case 104: break; + case 105: break; case 51: - { yybegin(xSUPPRESS); return TAG_NAME_SUPPRESS; + { beginType(); return TAG_NAME_OVERLOAD; } // fall through - case 105: break; + case 106: break; case 52: - { beginType(); return TAG_NAME_OVERLOAD; + { yybegin(xSUPPRESS); return TAG_NAME_SUPPRESS; } // fall through - case 106: break; + case 107: break; case 53: { return TAG_NAME_PROTECTED; } // fall through - case 107: break; + case 108: break; case 54: { yybegin(xFIELD_ID); return PROTECTED; } // fall through - case 108: break; + case 109: break; + case 55: + { yybegin(xGLOBALPARAM); return TAG_NAME_GLOBALPARAM; + } + // fall through + case 110: break; default: zzScanError(ZZ_NO_MATCH); } diff --git a/gen/com/tang/intellij/lua/comment/parser/LuaDocParser.java b/gen/com/tang/intellij/lua/comment/parser/LuaDocParser.java index 0522f1aec..08bcdf0ba 100644 --- a/gen/com/tang/intellij/lua/comment/parser/LuaDocParser.java +++ b/gen/com/tang/intellij/lua/comment/parser/LuaDocParser.java @@ -65,7 +65,7 @@ static boolean after_dash(PsiBuilder b, int l) { Marker m = enter_section_(b, l, _NONE_); r = doc_item(b, l + 1); if (!r) r = consumeToken(b, STRING); - exit_section_(b, l, m, r, false, after_dash_recover_parser_); + exit_section_(b, l, m, r, false, LuaDocParser::after_dash_recover); return r; } @@ -150,6 +150,7 @@ private static boolean doc_0_1(PsiBuilder b, int l) { /* ********************************************************** */ // '@' (tag_param + // | tag_globalparam // | tag_alias // | tag_suppress // | tag_vararg @@ -175,6 +176,7 @@ static boolean doc_item(PsiBuilder b, int l) { } // tag_param + // | tag_globalparam // | tag_alias // | tag_suppress // | tag_vararg @@ -192,6 +194,7 @@ private static boolean doc_item_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "doc_item_1")) return false; boolean r; r = tag_param(b, l + 1); + if (!r) r = tag_globalparam(b, l + 1); if (!r) r = tag_alias(b, l + 1); if (!r) r = tag_suppress(b, l + 1); if (!r) r = tag_vararg(b, l + 1); @@ -683,6 +686,20 @@ private static boolean tag_generic_list_2_0(PsiBuilder b, int l) { return r; } + /* ********************************************************** */ + // TAG_NAME_GLOBALPARAM ID ty + public static boolean tag_globalparam(PsiBuilder b, int l) { + if (!recursion_guard_(b, l, "tag_globalparam")) return false; + if (!nextTokenIs(b, TAG_NAME_GLOBALPARAM)) return false; + boolean r, p; + Marker m = enter_section_(b, l, _NONE_, TAG_GLOBALPARAM, null); + r = consumeTokens(b, 1, TAG_NAME_GLOBALPARAM, ID); + p = r; // pin = 1 + r = r && ty(b, l + 1, -1); + exit_section_(b, l, m, r, p, null); + return r || p; + } + /* ********************************************************** */ // TAG_NAME_LANGUAGE ID comment_string? public static boolean tag_lan(PsiBuilder b, int l) { @@ -1078,9 +1095,4 @@ public static boolean string_literal_ty(PsiBuilder b, int l) { return r; } - static final Parser after_dash_recover_parser_ = new Parser() { - public boolean parse(PsiBuilder b, int l) { - return after_dash_recover(b, l + 1); - } - }; } diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagGlobalparam.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagGlobalparam.java new file mode 100644 index 000000000..7bb5c45a4 --- /dev/null +++ b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagGlobalparam.java @@ -0,0 +1,32 @@ +// This is a generated file. Not intended for manual editing. +package com.tang.intellij.lua.comment.psi; + +import java.util.List; +import org.jetbrains.annotations.*; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiNameIdentifierOwner; +import com.intellij.psi.StubBasedPsiElement; +import com.tang.intellij.lua.stubs.LuaDocTagGlobalparamStub; +import com.tang.intellij.lua.ty.ITy; + +public interface LuaDocTagGlobalparam extends LuaDocPsiElement, PsiNameIdentifierOwner, LuaDocTag, StubBasedPsiElement { + + @Nullable + LuaDocTy getTy(); + + @Nullable + PsiElement getId(); + + @NotNull + ITy getType(); + + @Nullable + PsiElement getNameIdentifier(); + + @NotNull + PsiElement setName(@NotNull String newName); + + @Nullable + String getName(); + +} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTypes.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTypes.java index d7b2a984e..ad7fa6580 100644 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTypes.java +++ b/gen/com/tang/intellij/lua/comment/psi/LuaDocTypes.java @@ -29,6 +29,7 @@ public interface LuaDocTypes { IElementType TAG_DEF = LuaParserDefinitionKt.createDocType("TAG_DEF"); IElementType TAG_FIELD = LuaParserDefinitionKt.createDocType("TAG_FIELD"); IElementType TAG_GENERIC_LIST = LuaParserDefinitionKt.createDocType("TAG_GENERIC_LIST"); + IElementType TAG_GLOBALPARAM = LuaParserDefinitionKt.createDocType("TAG_GLOBALPARAM"); IElementType TAG_LAN = LuaParserDefinitionKt.createDocType("TAG_LAN"); IElementType TAG_OVERLOAD = LuaParserDefinitionKt.createDocType("TAG_OVERLOAD"); IElementType TAG_PARAM = LuaParserDefinitionKt.createDocType("TAG_PARAM"); @@ -69,6 +70,7 @@ public interface LuaDocTypes { IElementType TAG_NAME_CLASS = new LuaDocTokenType("class"); IElementType TAG_NAME_FIELD = new LuaDocTokenType("field"); IElementType TAG_NAME_GENERIC = new LuaDocTokenType("generic"); + IElementType TAG_NAME_GLOBALPARAM = new LuaDocTokenType("globalparam"); IElementType TAG_NAME_LANGUAGE = new LuaDocTokenType("language"); IElementType TAG_NAME_MODULE = new LuaDocTokenType("module"); IElementType TAG_NAME_NAME = new LuaDocTokenType("TAG_NAME_NAME"); @@ -147,6 +149,9 @@ else if (type == TAG_FIELD) { else if (type == TAG_GENERIC_LIST) { return new LuaDocTagGenericListImpl(node); } + else if (type == TAG_GLOBALPARAM) { + return new LuaDocTagGlobalparamImpl(node); + } else if (type == TAG_LAN) { return new LuaDocTagLanImpl(node); } diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocVisitor.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocVisitor.java index 6090d5fa3..2a6fbe9df 100644 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocVisitor.java +++ b/gen/com/tang/intellij/lua/comment/psi/LuaDocVisitor.java @@ -99,6 +99,12 @@ public void visitTagGenericList(@NotNull LuaDocTagGenericList o) { visitTag(o); } + public void visitTagGlobalparam(@NotNull LuaDocTagGlobalparam o) { + visitPsiElement(o); + // visitPsiNameIdentifierOwner(o); +// visitTag(o); + } + public void visitTagLan(@NotNull LuaDocTagLan o) { visitTag(o); } @@ -147,7 +153,7 @@ public void visitVarargParam(@NotNull LuaDocVarargParam o) { visitPsiElement(o); } - public void visitLuaClassField(@NotNull LuaClassField o) { + public void visitPsiNameIdentifierOwner(@NotNull PsiNameIdentifierOwner o) { visitElement(o); } @@ -159,11 +165,11 @@ public void visitType(@NotNull LuaDocType o) { visitPsiElement(o); } - public void visitLuaTypeAlias(@NotNull LuaTypeAlias o) { + public void visitLuaClassField(@NotNull LuaClassField o) { visitElement(o); } - public void visitPsiNameIdentifierOwner(@NotNull PsiNameIdentifierOwner o) { + public void visitLuaTypeAlias(@NotNull LuaTypeAlias o) { visitElement(o); } diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocAccessModifierImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocAccessModifierImpl.java index 98baf8acf..29655e042 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocAccessModifierImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocAccessModifierImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitAccessModifier(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocArrTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocArrTyImpl.java index b552022e8..e05b50b9c 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocArrTyImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocArrTyImpl.java @@ -17,10 +17,12 @@ public LuaDocArrTyImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitArrTy(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocClassNameRefImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocClassNameRefImpl.java index f7900e33e..4ecc16c18 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocClassNameRefImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocClassNameRefImpl.java @@ -23,6 +23,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitClassNameRef(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocCommentStringImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocCommentStringImpl.java index 64c5916c4..cc51ebf44 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocCommentStringImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocCommentStringImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitCommentString(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionParamImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionParamImpl.java index eab917fa0..1bf2a034f 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionParamImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionParamImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitFunctionParam(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionTyImpl.java index 3519ae300..b45cc4b01 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionTyImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionTyImpl.java @@ -17,10 +17,12 @@ public LuaDocFunctionTyImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitFunctionTy(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGeneralTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGeneralTyImpl.java index 4c7703865..c724372af 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGeneralTyImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGeneralTyImpl.java @@ -17,10 +17,12 @@ public LuaDocGeneralTyImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitGeneralTy(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericDefImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericDefImpl.java index aec70e8f7..977b95c87 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericDefImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericDefImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitGenericDef(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericTyImpl.java index 8b9e39eb6..99a5df1a7 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericTyImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericTyImpl.java @@ -17,10 +17,12 @@ public LuaDocGenericTyImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitGenericTy(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParTyImpl.java index 3314b773a..ff5c88f20 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParTyImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParTyImpl.java @@ -17,10 +17,12 @@ public LuaDocParTyImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitParTy(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParamNameRefImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParamNameRefImpl.java index 4df5ef059..59dec82df 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParamNameRefImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParamNameRefImpl.java @@ -22,6 +22,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitParamNameRef(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocStringLiteralTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocStringLiteralTyImpl.java index 23fe473a5..f86e4840e 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocStringLiteralTyImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocStringLiteralTyImpl.java @@ -17,10 +17,12 @@ public LuaDocStringLiteralTyImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitStringLiteralTy(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableDefImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableDefImpl.java index 7e6ad352a..e562a96c1 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableDefImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableDefImpl.java @@ -32,6 +32,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTableDef(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableFieldImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableFieldImpl.java index aa941ac38..aac9f7a69 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableFieldImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableFieldImpl.java @@ -35,6 +35,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTableField(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableTyImpl.java index 980ea65e2..2d6cc1222 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableTyImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableTyImpl.java @@ -17,10 +17,12 @@ public LuaDocTableTyImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTableTy(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagAliasImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagAliasImpl.java index 8b7b3f9d8..3d26c0cc0 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagAliasImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagAliasImpl.java @@ -33,6 +33,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTagAlias(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagClassImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagClassImpl.java index 7728a2a31..704e6b20a 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagClassImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagClassImpl.java @@ -34,6 +34,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTagClass(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagDefImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagDefImpl.java index 2ea59a857..71f1ab060 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagDefImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagDefImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTagDef(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagFieldImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagFieldImpl.java index e5e65899e..cfd4b2af4 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagFieldImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagFieldImpl.java @@ -36,6 +36,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTagField(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagGenericListImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagGenericListImpl.java index 36dbe2461..242062e70 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagGenericListImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagGenericListImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTagGenericList(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagGlobalparamImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagGlobalparamImpl.java new file mode 100644 index 000000000..9fccaae52 --- /dev/null +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagGlobalparamImpl.java @@ -0,0 +1,78 @@ +// This is a generated file. Not intended for manual editing. +package com.tang.intellij.lua.comment.psi.impl; + +import java.util.List; +import org.jetbrains.annotations.*; +import com.intellij.lang.ASTNode; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiElementVisitor; +import com.intellij.psi.util.PsiTreeUtil; +import static com.tang.intellij.lua.comment.psi.LuaDocTypes.*; +import com.intellij.extapi.psi.StubBasedPsiElementBase; +import com.tang.intellij.lua.stubs.LuaDocTagGlobalparamStub; +import com.tang.intellij.lua.comment.psi.*; +import com.tang.intellij.lua.ty.ITy; +import com.intellij.psi.stubs.IStubElementType; +import com.intellij.psi.tree.IElementType; + +public class LuaDocTagGlobalparamImpl extends StubBasedPsiElementBase implements LuaDocTagGlobalparam { + + public LuaDocTagGlobalparamImpl(@NotNull LuaDocTagGlobalparamStub stub, @NotNull IStubElementType type) { + super(stub, type); + } + + public LuaDocTagGlobalparamImpl(@NotNull ASTNode node) { + super(node); + } + + public LuaDocTagGlobalparamImpl(LuaDocTagGlobalparamStub stub, IElementType type, ASTNode node) { + super(stub, type, node); + } + + public void accept(@NotNull LuaDocVisitor visitor) { + visitor.visitTagGlobalparam(this); + } + + @Override + public void accept(@NotNull PsiElementVisitor visitor) { + if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); + else super.accept(visitor); + } + + @Override + @Nullable + public LuaDocTy getTy() { + return PsiTreeUtil.getChildOfType(this, LuaDocTy.class); + } + + @Override + @Nullable + public PsiElement getId() { + return findChildByType(ID); + } + + @Override + @NotNull + public ITy getType() { + return LuaDocPsiImplUtilKt.getType(this); + } + + @Override + @Nullable + public PsiElement getNameIdentifier() { + return LuaDocPsiImplUtilKt.getNameIdentifier(this); + } + + @Override + @NotNull + public PsiElement setName(@NotNull String newName) { + return LuaDocPsiImplUtilKt.setName(this, newName); + } + + @Override + @Nullable + public String getName() { + return LuaDocPsiImplUtilKt.getName(this); + } + +} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagLanImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagLanImpl.java index 51deccbc4..274cce970 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagLanImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagLanImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTagLan(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagOverloadImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagOverloadImpl.java index 1df812dbd..57a901e95 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagOverloadImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagOverloadImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTagOverload(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagParamImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagParamImpl.java index e5e3f2f36..c919573af 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagParamImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagParamImpl.java @@ -22,6 +22,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTagParam(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagReturnImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagReturnImpl.java index 5998e13b5..82fa8af0b 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagReturnImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagReturnImpl.java @@ -22,6 +22,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTagReturn(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSeeImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSeeImpl.java index 112df3f22..538d90d6f 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSeeImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSeeImpl.java @@ -22,6 +22,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTagSee(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSuppressImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSuppressImpl.java index 65f46ea7c..75b4178d2 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSuppressImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSuppressImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTagSuppress(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagTypeImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagTypeImpl.java index 508ff0b9d..d04d5ad5d 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagTypeImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagTypeImpl.java @@ -33,6 +33,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTagType(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagVarargImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagVarargImpl.java index 811076bbe..49318a041 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagVarargImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagVarargImpl.java @@ -22,6 +22,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTagVararg(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTyImpl.java index c85f3cf0f..1bc3100d2 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTyImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTyImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTy(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTypeListImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTypeListImpl.java index cd27ce8fe..f6e12c283 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTypeListImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTypeListImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitTypeList(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocUnionTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocUnionTyImpl.java index 023c78ec7..6d06ee846 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocUnionTyImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocUnionTyImpl.java @@ -17,10 +17,12 @@ public LuaDocUnionTyImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitUnionTy(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocVarargParamImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocVarargParamImpl.java index c1ddefb57..c53fc425a 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocVarargParamImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocVarargParamImpl.java @@ -22,6 +22,7 @@ public void accept(@NotNull LuaDocVisitor visitor) { visitor.visitVarargParam(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaDocVisitor) accept((LuaDocVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/lexer/_LuaLexer.java b/gen/com/tang/intellij/lua/lexer/_LuaLexer.java index a387370ea..b59fec393 100644 --- a/gen/com/tang/intellij/lua/lexer/_LuaLexer.java +++ b/gen/com/tang/intellij/lua/lexer/_LuaLexer.java @@ -575,7 +575,7 @@ public final int yylength() { /** - * Reports an error that occurred while scanning. + * Reports an error that occured while scanning. * * In a wellformed scanner (no or only correct usage of * yypushback(int) and a match-all fallback rule) this method diff --git a/gen/com/tang/intellij/lua/lexer/_LuaStringLexer.java b/gen/com/tang/intellij/lua/lexer/_LuaStringLexer.java index ffe36a4a7..deda8c7f8 100644 --- a/gen/com/tang/intellij/lua/lexer/_LuaStringLexer.java +++ b/gen/com/tang/intellij/lua/lexer/_LuaStringLexer.java @@ -351,7 +351,7 @@ public final int yylength() { /** - * Reports an error that occurred while scanning. + * Reports an error that occured while scanning. * * In a wellformed scanner (no or only correct usage of * yypushback(int) and a match-all fallback rule) this method diff --git a/gen/com/tang/intellij/lua/parser/LuaParser.java b/gen/com/tang/intellij/lua/parser/LuaParser.java index d28dab6cd..ead55eeaa 100644 --- a/gen/com/tang/intellij/lua/parser/LuaParser.java +++ b/gen/com/tang/intellij/lua/parser/LuaParser.java @@ -638,7 +638,7 @@ public static boolean funcPrefixRef(PsiBuilder b, int l) { boolean r; Marker m = enter_section_(b, l, _LEFT_, INDEX_EXPR, null); r = consumeToken(b, DOT); - r = r && repeat(b, l + 1, checkFuncPrefix_parser_, 1); + r = r && repeat(b, l + 1, LuaParser::checkFuncPrefix, 1); r = r && consumeToken(b, ID); exit_section_(b, l, m, r, false, null); return r; @@ -985,7 +985,7 @@ static boolean parList(PsiBuilder b, int l) { Marker m = enter_section_(b, l, _NONE_); r = parList_0(b, l + 1); if (!r) r = consumeToken(b, ELLIPSIS); - exit_section_(b, l, m, r, false, parList_recover_parser_); + exit_section_(b, l, m, r, false, LuaParser::parList_recover); return r; } @@ -1216,7 +1216,7 @@ static boolean stat_impl(PsiBuilder b, int l) { if (!r) r = gotoStat(b, l + 1); if (!r) r = assignStat(b, l + 1); if (!r) r = exprStat(b, l + 1); - exit_section_(b, l, m, r, false, stat_recover_parser_); + exit_section_(b, l, m, r, false, LuaParser::stat_recover); return r; } @@ -1320,7 +1320,7 @@ public static boolean tableField(PsiBuilder b, int l) { if (!r) r = expr(b, l + 1); register_hook_(b, LEFT_BINDER, MY_LEFT_COMMENT_BINDER); register_hook_(b, RIGHT_BINDER, MY_RIGHT_COMMENT_BINDER); - exit_section_(b, l, m, r, false, tableField_recover_parser_); + exit_section_(b, l, m, r, false, LuaParser::tableField_recover); return r; } @@ -1484,24 +1484,4 @@ public static boolean whileStat(PsiBuilder b, int l) { return r || p; } - static final Parser checkFuncPrefix_parser_ = new Parser() { - public boolean parse(PsiBuilder b, int l) { - return checkFuncPrefix(b, l + 1); - } - }; - static final Parser parList_recover_parser_ = new Parser() { - public boolean parse(PsiBuilder b, int l) { - return parList_recover(b, l + 1); - } - }; - static final Parser stat_recover_parser_ = new Parser() { - public boolean parse(PsiBuilder b, int l) { - return stat_recover(b, l + 1); - } - }; - static final Parser tableField_recover_parser_ = new Parser() { - public boolean parse(PsiBuilder b, int l) { - return tableField_recover(b, l + 1); - } - }; } diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaArgsImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaArgsImpl.java index 233b5cf89..8c901ca0f 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaArgsImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaArgsImpl.java @@ -32,6 +32,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitArgs(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaAssignStatImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaAssignStatImpl.java index 39c713112..cd15925c6 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaAssignStatImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaAssignStatImpl.java @@ -31,6 +31,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitAssignStat(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaAttributeImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaAttributeImpl.java index e12b9f3ba..d5b0eb044 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaAttributeImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaAttributeImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitAttribute(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaBinaryExprImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaBinaryExprImpl.java index 80ba6a522..c64cd4246 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaBinaryExprImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaBinaryExprImpl.java @@ -32,6 +32,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitBinaryExpr(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaBinaryOpImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaBinaryOpImpl.java index e1a2a1d97..3147132ad 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaBinaryOpImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaBinaryOpImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitBinaryOp(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaBlockImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaBlockImpl.java index 39f1d84f4..fe67d8e1f 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaBlockImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaBlockImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitBlock(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaBreakStatImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaBreakStatImpl.java index e8d476d0d..bf3cbbeb7 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaBreakStatImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaBreakStatImpl.java @@ -16,10 +16,12 @@ public LuaBreakStatImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaVisitor visitor) { visitor.visitBreakStat(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaCallExprImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaCallExprImpl.java index c257b1b4f..0b174efe7 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaCallExprImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaCallExprImpl.java @@ -34,6 +34,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitCallExpr(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaClassMethodDefImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaClassMethodDefImpl.java index 44f150b84..009759c9f 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaClassMethodDefImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaClassMethodDefImpl.java @@ -36,6 +36,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitClassMethodDef(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaClassMethodNameImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaClassMethodNameImpl.java index 4149019c3..4f2eab9ce 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaClassMethodNameImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaClassMethodNameImpl.java @@ -32,6 +32,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitClassMethodName(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaClosureExprImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaClosureExprImpl.java index 28db8eae3..0813d06e0 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaClosureExprImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaClosureExprImpl.java @@ -34,6 +34,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitClosureExpr(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaDoStatImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaDoStatImpl.java index e5b6a5d9d..62d3deb47 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaDoStatImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaDoStatImpl.java @@ -31,6 +31,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitDoStat(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaEmptyStatImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaEmptyStatImpl.java index 9812f2fa2..9cf11e226 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaEmptyStatImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaEmptyStatImpl.java @@ -16,10 +16,12 @@ public LuaEmptyStatImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaVisitor visitor) { visitor.visitEmptyStat(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaExprImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaExprImpl.java index edc997656..02186461c 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaExprImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaExprImpl.java @@ -32,6 +32,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitExpr(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaExprListImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaExprListImpl.java index 0eb13c20b..c6b8663aa 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaExprListImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaExprListImpl.java @@ -34,6 +34,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitExprList(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaExprStatImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaExprStatImpl.java index f191cdd43..2d00651f6 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaExprStatImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaExprStatImpl.java @@ -31,6 +31,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitExprStat(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaForAStatImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaForAStatImpl.java index b937f77d1..c85c68c6b 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaForAStatImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaForAStatImpl.java @@ -16,10 +16,12 @@ public LuaForAStatImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaVisitor visitor) { visitor.visitForAStat(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaForBStatImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaForBStatImpl.java index 83c7d7c19..52edb0938 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaForBStatImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaForBStatImpl.java @@ -16,10 +16,12 @@ public LuaForBStatImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaVisitor visitor) { visitor.visitForBStat(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaFuncBodyImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaFuncBodyImpl.java index c82fe5d8f..eeb427894 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaFuncBodyImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaFuncBodyImpl.java @@ -32,6 +32,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitFuncBody(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaFuncDefImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaFuncDefImpl.java index 72a18f716..448e6802b 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaFuncDefImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaFuncDefImpl.java @@ -38,6 +38,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitFuncDef(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaGotoStatImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaGotoStatImpl.java index 9ac988e39..9ea7edc92 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaGotoStatImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaGotoStatImpl.java @@ -17,10 +17,12 @@ public LuaGotoStatImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaVisitor visitor) { visitor.visitGotoStat(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaIfStatImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaIfStatImpl.java index 43fe1db36..4ac0dc901 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaIfStatImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaIfStatImpl.java @@ -31,6 +31,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitIfStat(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaIndexExprImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaIndexExprImpl.java index 40efaf83c..f71ceca44 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaIndexExprImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaIndexExprImpl.java @@ -35,6 +35,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitIndexExpr(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaLabelStatImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaLabelStatImpl.java index 71cc6af08..f8f5dfe1b 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaLabelStatImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaLabelStatImpl.java @@ -16,10 +16,12 @@ public LuaLabelStatImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaVisitor visitor) { visitor.visitLabelStat(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaListArgsImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaListArgsImpl.java index 39e18e1f6..ebb4a06d3 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaListArgsImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaListArgsImpl.java @@ -27,10 +27,12 @@ public LuaListArgsImpl(LuaPlaceholderStub stub, IElementType type, ASTNode node) super(stub, type, node); } + @Override public void accept(@NotNull LuaVisitor visitor) { visitor.visitListArgs(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaLiteralExprImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaLiteralExprImpl.java index 50d6d4d28..04b218106 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaLiteralExprImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaLiteralExprImpl.java @@ -32,6 +32,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitLiteralExpr(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaLocalDefImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaLocalDefImpl.java index 076f9017c..84a44dc52 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaLocalDefImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaLocalDefImpl.java @@ -33,6 +33,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitLocalDef(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaLocalFuncDefImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaLocalFuncDefImpl.java index 44970d613..db18437f1 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaLocalFuncDefImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaLocalFuncDefImpl.java @@ -36,6 +36,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitLocalFuncDef(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaNameDefImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaNameDefImpl.java index c62aa686f..8e661595e 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaNameDefImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaNameDefImpl.java @@ -33,6 +33,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitNameDef(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaNameExprImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaNameExprImpl.java index a8413bd70..607a9dadd 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaNameExprImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaNameExprImpl.java @@ -34,6 +34,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitNameExpr(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaNameListImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaNameListImpl.java index 6d0139aac..aacc894ef 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaNameListImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaNameListImpl.java @@ -32,6 +32,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitNameList(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaParamNameDefImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaParamNameDefImpl.java index 891094056..3646e643d 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaParamNameDefImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaParamNameDefImpl.java @@ -27,10 +27,12 @@ public LuaParamNameDefImpl(LuaNameDefStub stub, IElementType type, ASTNode node) super(stub, type, node); } + @Override public void accept(@NotNull LuaVisitor visitor) { visitor.visitParamNameDef(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaParenExprImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaParenExprImpl.java index 02a4d15da..1b23d8763 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaParenExprImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaParenExprImpl.java @@ -32,6 +32,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitParenExpr(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaRepeatStatImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaRepeatStatImpl.java index 7b5cb0745..da1cca8dd 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaRepeatStatImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaRepeatStatImpl.java @@ -16,10 +16,12 @@ public LuaRepeatStatImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaVisitor visitor) { visitor.visitRepeatStat(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaReturnStatImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaReturnStatImpl.java index d5030970f..d1869f635 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaReturnStatImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaReturnStatImpl.java @@ -31,6 +31,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitReturnStat(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaShebangLineImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaShebangLineImpl.java index 24cd05509..98bc3be94 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaShebangLineImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaShebangLineImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitShebangLine(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaSingleArgImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaSingleArgImpl.java index 80bef4772..db701abf9 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaSingleArgImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaSingleArgImpl.java @@ -27,10 +27,12 @@ public LuaSingleArgImpl(LuaPlaceholderStub stub, IElementType type, ASTNode node super(stub, type, node); } + @Override public void accept(@NotNull LuaVisitor visitor) { visitor.visitSingleArg(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaStatementImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaStatementImpl.java index 8ed3f9fda..b2de5e2fe 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaStatementImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaStatementImpl.java @@ -22,6 +22,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitStatement(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaTableExprImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaTableExprImpl.java index 9f0138886..b74106bfd 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaTableExprImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaTableExprImpl.java @@ -32,6 +32,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitTableExpr(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaTableFieldImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaTableFieldImpl.java index e06c641ca..af5163709 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaTableFieldImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaTableFieldImpl.java @@ -36,6 +36,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitTableField(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaTableFieldSepImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaTableFieldSepImpl.java index 0374f88ef..027274685 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaTableFieldSepImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaTableFieldSepImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitTableFieldSep(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaUnaryExprImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaUnaryExprImpl.java index 80d200313..56aa78396 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaUnaryExprImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaUnaryExprImpl.java @@ -32,6 +32,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitUnaryExpr(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaUnaryOpImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaUnaryOpImpl.java index 850d023dc..0b4a5f725 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaUnaryOpImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaUnaryOpImpl.java @@ -21,6 +21,7 @@ public void accept(@NotNull LuaVisitor visitor) { visitor.visitUnaryOp(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaVarListImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaVarListImpl.java index b58f1a8f2..1947f70ab 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaVarListImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaVarListImpl.java @@ -27,10 +27,12 @@ public LuaVarListImpl(LuaPlaceholderStub stub, IElementType type, ASTNode node) super(stub, type, node); } + @Override public void accept(@NotNull LuaVisitor visitor) { visitor.visitVarList(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/gen/com/tang/intellij/lua/psi/impl/LuaWhileStatImpl.java b/gen/com/tang/intellij/lua/psi/impl/LuaWhileStatImpl.java index dd5ab34cd..cf751454f 100644 --- a/gen/com/tang/intellij/lua/psi/impl/LuaWhileStatImpl.java +++ b/gen/com/tang/intellij/lua/psi/impl/LuaWhileStatImpl.java @@ -16,10 +16,12 @@ public LuaWhileStatImpl(@NotNull ASTNode node) { super(node); } + @Override public void accept(@NotNull LuaVisitor visitor) { visitor.visitWhileStat(this); } + @Override public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof LuaVisitor) accept((LuaVisitor)visitor); else super.accept(visitor); diff --git a/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.kt b/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.kt index 43bdf8c35..97920f278 100644 --- a/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.kt +++ b/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.kt @@ -266,6 +266,14 @@ class LuaAnnotator : Annotator { } } + override fun visitTagGlobalparam(o: LuaDocTagGlobalparam) { + super.visitTagGlobalparam(o) + val id = o.id ?: return + newInfoAnnotation(id, null) { + it.textAttributes(LuaHighlightingData.TYPE_ALIAS) + } + } + override fun visitClassNameRef(o: LuaDocClassNameRef) { newInfoAnnotation(o, null) { it.textAttributes(LuaHighlightingData.CLASS_REFERENCE) diff --git a/src/main/java/com/tang/intellij/lua/comment/psi/LuaDocPsiImplUtil.kt b/src/main/java/com/tang/intellij/lua/comment/psi/LuaDocPsiImplUtil.kt index ed7484401..ad4067b93 100644 --- a/src/main/java/com/tang/intellij/lua/comment/psi/LuaDocPsiImplUtil.kt +++ b/src/main/java/com/tang/intellij/lua/comment/psi/LuaDocPsiImplUtil.kt @@ -119,6 +119,10 @@ fun getType(tagParamDec: LuaDocTagParam): ITy { return type ?: Ty.UNKNOWN } +fun getType(tagGlobalparamDec: LuaDocTagGlobalparam): ITy { + return tagGlobalparamDec.ty?.getType() ?: Ty.UNKNOWN +} + fun getType(vararg: LuaDocTagVararg): ITy { return vararg.ty?.getType() ?: Ty.UNKNOWN } @@ -336,6 +340,10 @@ fun getNameIdentifier(g: LuaDocTagAlias): PsiElement? { return g.id } +fun getNameIdentifier(g: LuaDocTagGlobalparam): PsiElement? { + return g.id +} + fun getType(alias: LuaDocTagAlias): ITy { val stub = alias.stub val ty = stub?.type ?: alias.ty?.getType() diff --git a/src/main/java/com/tang/intellij/lua/doc.bnf b/src/main/java/com/tang/intellij/lua/doc.bnf index 044eed152..769aa8fd5 100644 --- a/src/main/java/com/tang/intellij/lua/doc.bnf +++ b/src/main/java/com/tang/intellij/lua/doc.bnf @@ -60,6 +60,7 @@ TAG_NAME_RETURN = 'return' TAG_NAME = 'TAG_NAME' TAG_NAME_PARAM = 'param' + TAG_NAME_GLOBALPARAM = 'globalparam' TAG_NAME_VARARG = 'vararg' TAG_NAME_PRIVATE = 'private' TAG_NAME_PROTECTED = 'protected' @@ -85,6 +86,7 @@ doc ::= (DASHES after_dash?)* private after_dash ::= doc_item | STRING { recoverWhile=after_dash_recover } private after_dash_recover ::= !(DASHES) private doc_item ::= '@' (tag_param + | tag_globalparam | tag_alias | tag_suppress | tag_vararg @@ -221,6 +223,21 @@ tag_param ::= TAG_NAME_PARAM param_name_ref ty comment_string? { pin = 1 methods = [getType] } +tag_globalparam ::= TAG_NAME_GLOBALPARAM ID ty { + pin = 1 + implements = [ + "com.tang.intellij.lua.comment.psi.LuaDocPsiElement" + "com.intellij.psi.PsiNameIdentifierOwner" + ] + methods = [ + getType + + getNameIdentifier + setName + getName + ] + stubClass = "com.tang.intellij.lua.stubs.LuaDocTagGlobalparamStub" +} tag_vararg ::= TAG_NAME_VARARG ty comment_string? { pin = 1 methods = [getType] diff --git a/src/main/java/com/tang/intellij/lua/doc.flex b/src/main/java/com/tang/intellij/lua/doc.flex index 9496517f5..be0e07838 100644 --- a/src/main/java/com/tang/intellij/lua/doc.flex +++ b/src/main/java/com/tang/intellij/lua/doc.flex @@ -58,6 +58,7 @@ SINGLE_QUOTED_STRING='([^\\\']|\\\S|\\[\r\n])*'? //'([^\\'\r\n]|\\[^\r\n])*'? %state xTAG_NAME %state xCOMMENT_STRING %state xPARAM +%state xGLOBALPARAM %state xTYPE_REF %state xCLASS %state xCLASS_EXTEND @@ -79,7 +80,7 @@ SINGLE_QUOTED_STRING='([^\\\']|\\\S|\\[\r\n])*'? //'([^\\'\r\n]|\\[^\r\n])*'? . { yybegin(xCOMMENT_STRING); yypushback(yylength()); } } - { + { {EOL} { yybegin(YYINITIAL);return com.intellij.psi.TokenType.WHITE_SPACE;} {LINE_WS}+ { return com.intellij.psi.TokenType.WHITE_SPACE; } } @@ -88,6 +89,7 @@ SINGLE_QUOTED_STRING='([^\\\']|\\\S|\\[\r\n])*'? //'([^\\'\r\n]|\\[^\r\n])*'? "field" { yybegin(xFIELD); return TAG_NAME_FIELD; } "param" { yybegin(xPARAM); return TAG_NAME_PARAM; } "vararg" { yybegin(xPARAM); return TAG_NAME_VARARG; } + "globalparam" { yybegin(xGLOBALPARAM); return TAG_NAME_GLOBALPARAM; } "class" { yybegin(xCLASS); return TAG_NAME_CLASS; } "module" { yybegin(xCLASS); return TAG_NAME_MODULE; } "return" { beginType(); return TAG_NAME_RETURN; } @@ -136,6 +138,11 @@ SINGLE_QUOTED_STRING='([^\\\']|\\\S|\\[\r\n])*'? //'([^\\'\r\n]|\\[^\r\n])*'? "..." { beginType(); return ID; } //varargs } + { + {ID} { beginType(); return ID; } + [^] { yybegin(YYINITIAL); yypushback(yylength()); } +} + { "private" { yybegin(xFIELD_ID); return PRIVATE; } "protected" { yybegin(xFIELD_ID); return PROTECTED; } diff --git a/src/main/java/com/tang/intellij/lua/lang/LuaParserDefinition.kt b/src/main/java/com/tang/intellij/lua/lang/LuaParserDefinition.kt index ebb821fa2..a4f760c39 100644 --- a/src/main/java/com/tang/intellij/lua/lang/LuaParserDefinition.kt +++ b/src/main/java/com/tang/intellij/lua/lang/LuaParserDefinition.kt @@ -84,7 +84,8 @@ class LuaParserDefinition : ParserDefinition { || type === LuaElementType.CLASS_DEF || type === LuaElementType.CLASS_FIELD_DEF || type === LuaElementType.TYPE_DEF - || type === LuaElementType.DOC_ALIAS) { + || type === LuaElementType.DOC_ALIAS + || type === LuaElementType.DOC_GLOBALPARAM) { LuaDocTypes.Factory.createElement(node) } else LuaTypes.Factory.createElement(node) } @@ -154,7 +155,8 @@ class LuaParserDefinition : ParserDefinition { LuaDocTypes.TAG_NAME_SEE, LuaDocTypes.TAG_NAME_GENERIC, LuaDocTypes.TAG_NAME_VARARG, - LuaDocTypes.TAG_NAME_ALIAS + LuaDocTypes.TAG_NAME_ALIAS, + LuaDocTypes.TAG_NAME_GLOBALPARAM ) val DOC_KEYWORD_TOKENS = TokenSet.create( LuaDocTypes.FUN, @@ -215,6 +217,7 @@ fun createDocType(string: String): IElementType { "TABLE_DEF" -> LuaElementType.DOC_TABLE_DEF "TABLE_FIELD" -> LuaElementType.DOC_TABLE_FIELD_DEF "TAG_ALIAS" -> LuaElementType.DOC_ALIAS + "TAG_GLOBALPARAM" -> LuaElementType.DOC_GLOBALPARAM else -> if ("TAG_TYPE" == string) LuaElementType.TYPE_DEF else LuaDocElementType(string) } diff --git a/src/main/java/com/tang/intellij/lua/psi/LuaElementType.java b/src/main/java/com/tang/intellij/lua/psi/LuaElementType.java index 62018c766..430e5afca 100644 --- a/src/main/java/com/tang/intellij/lua/psi/LuaElementType.java +++ b/src/main/java/com/tang/intellij/lua/psi/LuaElementType.java @@ -67,6 +67,7 @@ public ASTNode parse(@NotNull CharSequence charSequence, @NotNull CharTable char public static LuaStubElementType DOC_TABLE_DEF = new LuaDocTableDefType(); public static LuaStubElementType DOC_TABLE_FIELD_DEF = new LuaDocTableFieldType(); public static LuaStubElementType DOC_ALIAS = new LuaDocTagAliasType(); + public static LuaStubElementType DOC_GLOBALPARAM = new LuaDocTagGlobalparamType(); public static IStubElementType TABLE = new LuaTableExprType(); public static IStubElementType TABLE_FIELD = new LuaTableFieldType(); public static IStubElementType INDEX = new LuaIndexExprType(); diff --git a/src/main/java/com/tang/intellij/lua/psi/LuaPsiImplUtil.kt b/src/main/java/com/tang/intellij/lua/psi/LuaPsiImplUtil.kt index 5b600ce0b..fff591cb9 100644 --- a/src/main/java/com/tang/intellij/lua/psi/LuaPsiImplUtil.kt +++ b/src/main/java/com/tang/intellij/lua/psi/LuaPsiImplUtil.kt @@ -36,6 +36,7 @@ import com.tang.intellij.lua.lang.type.LuaString import com.tang.intellij.lua.search.SearchContext import com.tang.intellij.lua.stubs.LuaClassMemberStub import com.tang.intellij.lua.stubs.LuaFuncBodyOwnerStub +import com.tang.intellij.lua.stubs.index.LuaGlobalparamIndex import com.tang.intellij.lua.ty.* import java.util.* import javax.swing.Icon @@ -388,13 +389,23 @@ private fun getParamsInner(funcBodyOwner: LuaFuncBodyOwner): Array val paramInfo = LuaParamInfo() val paramName = paramNameList[i].text paramInfo.name = paramName - // param types + + // get type from param tag in comment if (comment != null) { val paramDef = comment.getParamDef(paramName) if (paramDef != null) { paramInfo.ty = paramDef.type } } + + // get type from global param + if (paramInfo.ty == Ty.UNKNOWN) { + val globalparam = LuaGlobalparamIndex.find(paramName, SearchContext.get(funcBodyOwner.project)); + if (globalparam != null) { + paramInfo.ty = globalparam.type; + } + } + list.add(paramInfo) } return list.toTypedArray() diff --git a/src/main/java/com/tang/intellij/lua/stubs/LuaDocTagGlobalparamStub.kt b/src/main/java/com/tang/intellij/lua/stubs/LuaDocTagGlobalparamStub.kt new file mode 100644 index 000000000..61150cca9 --- /dev/null +++ b/src/main/java/com/tang/intellij/lua/stubs/LuaDocTagGlobalparamStub.kt @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2017. tangzx(love.tangzx@qq.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.tang.intellij.lua.stubs + +import com.intellij.lang.ASTNode +import com.intellij.psi.stubs.IndexSink +import com.intellij.psi.stubs.StubElement +import com.intellij.psi.stubs.StubInputStream +import com.intellij.psi.stubs.StubOutputStream +import com.intellij.util.io.StringRef +import com.tang.intellij.lua.comment.psi.LuaDocTagClass +import com.tang.intellij.lua.comment.psi.LuaDocTagGlobalparam +import com.tang.intellij.lua.comment.psi.impl.LuaDocTagGlobalparamImpl +import com.tang.intellij.lua.psi.LuaElementType +import com.tang.intellij.lua.stubs.index.StubKeys +import com.tang.intellij.lua.ty.ITy +import com.tang.intellij.lua.ty.Ty + +class LuaDocTagGlobalparamType : LuaStubElementType("DOC_TAG_GLOBALPARAM") { + override fun shouldCreateStub(node: ASTNode): Boolean { + val psi = node.psi as LuaDocTagGlobalparam + return psi.name != null + } + + override fun createPsi(stub: LuaDocTagGlobalparamStub): LuaDocTagGlobalparam { + return LuaDocTagGlobalparamImpl(stub, this) + } + + override fun serialize(stub: LuaDocTagGlobalparamStub, stream: StubOutputStream) { + stream.writeName(stub.name) + Ty.serialize(stub.type, stream) + } + + override fun deserialize(stream: StubInputStream, parent: StubElement<*>): LuaDocTagGlobalparamStub { + val name = stream.readName() + val ty = Ty.deserialize(stream) + return LuaDocTagGlobalparamStubImpl(StringRef.toString(name), ty, parent) + } + + override fun createStub(globalparam: LuaDocTagGlobalparam, parent: StubElement<*>): LuaDocTagGlobalparamStub { + return LuaDocTagGlobalparamStubImpl(globalparam.name!!, globalparam.type, parent) + } + + override fun indexStub(stub: LuaDocTagGlobalparamStub, sink: IndexSink) { + sink.occurrence(StubKeys.GLOBALPARAM, stub.name) + sink.occurrence(StubKeys.SHORT_NAME, stub.name) + } +} + +interface LuaDocTagGlobalparamStub : StubElement { + val name: String + val type: ITy +} + +class LuaDocTagGlobalparamStubImpl( + override val name: String, + override val type: ITy, + parent: StubElement<*> +) : LuaDocStubBase(parent, LuaElementType.DOC_GLOBALPARAM), LuaDocTagGlobalparamStub \ No newline at end of file diff --git a/src/main/java/com/tang/intellij/lua/stubs/index/LuaGlobalparamIndex.kt b/src/main/java/com/tang/intellij/lua/stubs/index/LuaGlobalparamIndex.kt new file mode 100644 index 000000000..516a857b9 --- /dev/null +++ b/src/main/java/com/tang/intellij/lua/stubs/index/LuaGlobalparamIndex.kt @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2017. tangzx(love.tangzx@qq.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.tang.intellij.lua.stubs.index + +import com.intellij.psi.stubs.StringStubIndexExtension +import com.intellij.psi.stubs.StubIndexKey +import com.tang.intellij.lua.comment.psi.LuaDocTagGlobalparam +import com.tang.intellij.lua.search.SearchContext + +class LuaGlobalparamIndex : StringStubIndexExtension() { + companion object { + val instance = LuaGlobalparamIndex() + + fun find(name: String, context: SearchContext): LuaDocTagGlobalparam? { + if (context.isDumb) + return null + return instance.get(name, context.project, context.scope)?.firstOrNull() + } + } + + override fun getKey(): StubIndexKey { + return StubKeys.GLOBALPARAM + } +} \ No newline at end of file diff --git a/src/main/java/com/tang/intellij/lua/stubs/index/StubKeys.kt b/src/main/java/com/tang/intellij/lua/stubs/index/StubKeys.kt index e55edce61..0c13dea2e 100644 --- a/src/main/java/com/tang/intellij/lua/stubs/index/StubKeys.kt +++ b/src/main/java/com/tang/intellij/lua/stubs/index/StubKeys.kt @@ -20,6 +20,7 @@ import com.intellij.psi.NavigatablePsiElement import com.intellij.psi.stubs.StubIndexKey import com.tang.intellij.lua.comment.psi.LuaDocTagAlias import com.tang.intellij.lua.comment.psi.LuaDocTagClass +import com.tang.intellij.lua.comment.psi.LuaDocTagGlobalparam import com.tang.intellij.lua.psi.LuaClassMember object StubKeys { @@ -28,4 +29,5 @@ object StubKeys { val CLASS = StubIndexKey.createIndexKey("lua.index.class") val SUPER_CLASS = StubIndexKey.createIndexKey("lua.index.super_class") val ALIAS = StubIndexKey.createIndexKey("lua.index.alias") + val GLOBALPARAM = StubIndexKey.createIndexKey("lua.index.globalparam") } diff --git a/src/main/java/com/tang/intellij/lua/ty/Declarations.kt b/src/main/java/com/tang/intellij/lua/ty/Declarations.kt index a6e516d77..ec05da294 100644 --- a/src/main/java/com/tang/intellij/lua/ty/Declarations.kt +++ b/src/main/java/com/tang/intellij/lua/ty/Declarations.kt @@ -28,6 +28,8 @@ import com.tang.intellij.lua.psi.* import com.tang.intellij.lua.search.GuardType import com.tang.intellij.lua.search.SearchContext import com.tang.intellij.lua.stubs.LuaFuncBodyOwnerStub +import com.tang.intellij.lua.stubs.index.LuaAliasIndex +import com.tang.intellij.lua.stubs.index.LuaGlobalparamIndex fun infer(element: LuaTypeGuessable?, context: SearchContext): ITy { if (element == null) @@ -310,7 +312,14 @@ private fun resolveParamType(paramNameDef: LuaParamNameDef, context: SearchConte ret = ret.union(it.mainSignature.getParamTy(paramIndex)) } } - return ret + if (ret != Ty.UNKNOWN) + return ret } + + val globalparam = LuaGlobalparamIndex.find(paramName, context); + if (globalparam != null) { + return globalparam.type; + } + return Ty.UNKNOWN } diff --git a/src/main/resources/META-INF/emmylua-core.xml b/src/main/resources/META-INF/emmylua-core.xml index 4a78139b2..c37fb1215 100644 --- a/src/main/resources/META-INF/emmylua-core.xml +++ b/src/main/resources/META-INF/emmylua-core.xml @@ -128,6 +128,7 @@ + diff --git a/src/main/resources/META-INF/emmylua-core.xml.171 b/src/main/resources/META-INF/emmylua-core.xml.171 index 8abbd47ab..a756f3d0d 100644 --- a/src/main/resources/META-INF/emmylua-core.xml.171 +++ b/src/main/resources/META-INF/emmylua-core.xml.171 @@ -129,6 +129,7 @@ +