From 42670ef9c5a04777e55b645ff104ff0a334eb5ac Mon Sep 17 00:00:00 2001 From: CppCXY <812125110@qq.com> Date: Fri, 16 Aug 2024 16:58:35 +0800 Subject: [PATCH] Fix doc error --- README.md | 3 +- .../lua/comment/lexer/_LuaDocLexer.java | 859 ++++++++----- .../lua/comment/parser/LuaDocParser.java | 1077 +---------------- .../lua/comment/psi/LuaDocAccessModifier.java | 10 - .../{LuaDocTagAlias.java => LuaDocAny.java} | 6 +- .../intellij/lua/comment/psi/LuaDocArrTy.java | 13 - .../lua/comment/psi/LuaDocClassNameRef.java | 13 - .../lua/comment/psi/LuaDocCommentString.java | 13 - .../lua/comment/psi/LuaDocFunctionParam.java | 16 - .../lua/comment/psi/LuaDocFunctionTy.java | 22 - .../lua/comment/psi/LuaDocGeneralTy.java | 13 - .../lua/comment/psi/LuaDocGenericDef.java | 16 - .../lua/comment/psi/LuaDocGenericTy.java | 13 - .../intellij/lua/comment/psi/LuaDocParTy.java | 13 - .../lua/comment/psi/LuaDocParamNameRef.java | 13 - .../comment/psi/LuaDocStringLiteralTy.java | 10 - .../lua/comment/psi/LuaDocTableDef.java | 13 - .../lua/comment/psi/LuaDocTableField.java | 16 - .../lua/comment/psi/LuaDocTableTy.java | 13 - .../lua/comment/psi/LuaDocTagAuthor.java | 13 - .../lua/comment/psi/LuaDocTagClass.java | 19 - .../lua/comment/psi/LuaDocTagDef.java | 16 - .../lua/comment/psi/LuaDocTagDeprecated.java | 13 - .../lua/comment/psi/LuaDocTagField.java | 25 - .../lua/comment/psi/LuaDocTagGenericList.java | 13 - .../lua/comment/psi/LuaDocTagLan.java | 16 - .../lua/comment/psi/LuaDocTagNormal.java | 4 +- .../lua/comment/psi/LuaDocTagOverload.java | 13 - .../lua/comment/psi/LuaDocTagParam.java | 19 - .../lua/comment/psi/LuaDocTagReturn.java | 16 - .../lua/comment/psi/LuaDocTagSee.java | 16 - .../lua/comment/psi/LuaDocTagSince.java | 13 - .../lua/comment/psi/LuaDocTagSuppress.java | 10 - .../lua/comment/psi/LuaDocTagType.java | 16 - .../lua/comment/psi/LuaDocTagVararg.java | 16 - .../intellij/lua/comment/psi/LuaDocTy.java | 10 - .../lua/comment/psi/LuaDocTypeList.java | 13 - .../intellij/lua/comment/psi/LuaDocTypes.java | 157 +-- .../lua/comment/psi/LuaDocUnionTy.java | 13 - .../lua/comment/psi/LuaDocVarargParam.java | 13 - .../lua/comment/psi/LuaDocVersion.java | 13 - .../lua/comment/psi/LuaDocVisitor.java | 126 +- .../psi/impl/LuaDocAccessModifierImpl.java | 30 - ...ocTagAliasImpl.java => LuaDocAnyImpl.java} | 14 +- .../lua/comment/psi/impl/LuaDocArrTyImpl.java | 36 - .../psi/impl/LuaDocClassNameRefImpl.java | 36 - .../psi/impl/LuaDocCommentStringImpl.java | 36 - .../psi/impl/LuaDocFunctionParamImpl.java | 42 - .../psi/impl/LuaDocFunctionTyImpl.java | 54 - .../comment/psi/impl/LuaDocGeneralTyImpl.java | 36 - .../psi/impl/LuaDocGenericDefImpl.java | 42 - .../comment/psi/impl/LuaDocGenericTyImpl.java | 36 - .../lua/comment/psi/impl/LuaDocParTyImpl.java | 36 - .../psi/impl/LuaDocParamNameRefImpl.java | 36 - .../psi/impl/LuaDocStringLiteralTyImpl.java | 30 - .../comment/psi/impl/LuaDocTableDefImpl.java | 36 - .../psi/impl/LuaDocTableFieldImpl.java | 42 - .../comment/psi/impl/LuaDocTableTyImpl.java | 36 - .../comment/psi/impl/LuaDocTagClassImpl.java | 48 - .../comment/psi/impl/LuaDocTagDefImpl.java | 42 - .../comment/psi/impl/LuaDocTagFieldImpl.java | 60 - .../psi/impl/LuaDocTagGenericListImpl.java | 36 - .../comment/psi/impl/LuaDocTagLanImpl.java | 42 - .../comment/psi/impl/LuaDocTagNormalImpl.java | 6 +- .../psi/impl/LuaDocTagOverloadImpl.java | 36 - .../comment/psi/impl/LuaDocTagParamImpl.java | 48 - .../comment/psi/impl/LuaDocTagReturnImpl.java | 42 - .../comment/psi/impl/LuaDocTagSeeImpl.java | 42 - .../psi/impl/LuaDocTagSuppressImpl.java | 30 - .../comment/psi/impl/LuaDocTagTypeImpl.java | 42 - .../comment/psi/impl/LuaDocTagVarargImpl.java | 42 - .../lua/comment/psi/impl/LuaDocTyImpl.java | 30 - .../comment/psi/impl/LuaDocTypeListImpl.java | 36 - .../comment/psi/impl/LuaDocUnionTyImpl.java | 36 - .../psi/impl/LuaDocVarargParamImpl.java | 36 - .../intellij/lua/annotator/LuaAnnotator.kt | 48 +- .../codeInsight/LuaReadWriteAccessDetector.kt | 8 - src/main/java/com/tang/intellij/lua/doc.bnf | 148 +-- src/main/java/com/tang/intellij/lua/doc.flex | 79 +- .../intellij/lua/lang/LuaParserDefinition.kt | 15 +- 80 files changed, 711 insertions(+), 3554 deletions(-) delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocAccessModifier.java rename gen/com/tang/intellij/lua/comment/psi/{LuaDocTagAlias.java => LuaDocAny.java} (75%) delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocArrTy.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocClassNameRef.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocCommentString.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocFunctionParam.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocFunctionTy.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocGeneralTy.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocGenericDef.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocGenericTy.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocParTy.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocParamNameRef.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocStringLiteralTy.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTableDef.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTableField.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTableTy.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagAuthor.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagClass.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagDef.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagDeprecated.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagField.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagGenericList.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagLan.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagOverload.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagParam.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagReturn.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagSee.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagSince.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagSuppress.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagType.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTagVararg.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTy.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocTypeList.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocUnionTy.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocVarargParam.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/LuaDocVersion.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocAccessModifierImpl.java rename gen/com/tang/intellij/lua/comment/psi/impl/{LuaDocTagAliasImpl.java => LuaDocAnyImpl.java} (77%) delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocArrTyImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocClassNameRefImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocCommentStringImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionParamImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionTyImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGeneralTyImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericDefImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericTyImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParTyImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParamNameRefImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocStringLiteralTyImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableDefImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableFieldImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableTyImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagClassImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagDefImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagFieldImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagGenericListImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagLanImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagOverloadImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagParamImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagReturnImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSeeImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSuppressImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagTypeImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagVarargImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTyImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTypeListImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocUnionTyImpl.java delete mode 100644 gen/com/tang/intellij/lua/comment/psi/impl/LuaDocVarargParamImpl.java diff --git a/README.md b/README.md index 0c9cf10..9bbb071 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,7 @@ ## MarketPlace -TODO - +https://plugins.jetbrains.com/plugin/25076-emmylua2 ## How to develop diff --git a/gen/com/tang/intellij/lua/comment/lexer/_LuaDocLexer.java b/gen/com/tang/intellij/lua/comment/lexer/_LuaDocLexer.java index 51ecc6e..355d876 100644 --- a/gen/com/tang/intellij/lua/comment/lexer/_LuaDocLexer.java +++ b/gen/com/tang/intellij/lua/comment/lexer/_LuaDocLexer.java @@ -3,7 +3,7 @@ package com.tang.intellij.lua.comment.lexer; import com.intellij.lexer.FlexLexer; -import com.intellij.psi.tree.IElementType; +import com.intellij.psi.TokenType;import com.intellij.psi.tree.IElementType; import com.tang.intellij.lua.comment.psi.LuaDocTypes; @@ -29,14 +29,19 @@ public class _LuaDocLexer implements FlexLexer, LuaDocTypes { 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 xCLASS_GENERIC = 16; + public static final int xCLASS_EXTEND = 18; + public static final int xFIELD = 20; + public static final int xFIELD_INDEX = 22; + public static final int xFIELD_ID = 24; + public static final int xGENERIC = 26; + public static final int xALIAS = 28; + public static final int xDOUBLE_QUOTED_STRING = 30; + public static final int xSINGLE_QUOTED_STRING = 32; + public static final int xMODULE = 34; + public static final int xTAG_ENUMFIELD = 36; + public static final int xTAG_DIAGNOSTIC = 38; + public static final int xENUM = 40; /** * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l @@ -46,13 +51,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, 13, 13, 14, 14, 15, 15, + 16, 16, 17, 17, 18, 18, 19, 19, 18, 18 }; /** * Translates characters to character classes * Chosen bits are [13, 6, 2] - * Total runtime size is 25672 bytes + * Total runtime size is 25680 bytes */ public static int ZZ_CMAP(int ch) { return ZZ_CMAP_A[(ZZ_CMAP_Y[(ZZ_CMAP_Z[ch>>8]<<6)|((ch>>2)&0x3f)]<<2)|(ch&0x3)]; @@ -76,143 +82,143 @@ public static int ZZ_CMAP(int ch) { /* The ZZ_CMAP_Y table has 8128 entries */ static final char ZZ_CMAP_Y[] = zzUnpackCMap( - "\2\0\1\1\1\2\3\0\1\3\1\4\1\5\1\6\1\7\2\0\1\10\1\11\1\12\5\13\1\14\1\15\1\16"+ - "\1\17\1\20\1\21\1\22\1\23\1\24\1\25\1\0\1\26\6\0\1\27\1\30\1\31\1\32\1\3\1"+ - "\33\1\31\1\3\5\13\1\34\7\13\1\34\162\13\1\30\1\35\2\13\1\30\3\3\1\13\1\36"+ - "\1\3\1\37\4\3\34\0\1\13\1\40\1\35\1\41\1\3\1\31\1\34\1\40\4\13\1\41\24\13"+ - "\1\41\42\13\1\42\1\0\1\35\51\13\1\43\10\13\1\34\1\33\1\3\12\13\1\36\1\44\1"+ - "\45\12\0\1\46\1\47\1\46\2\3\6\13\1\34\1\44\1\34\3\3\1\0\1\50\1\44\1\3\2\0"+ - "\1\51\1\52\12\13\1\53\7\0\1\50\1\35\1\54\30\13\1\55\1\0\1\46\1\0\1\56\1\57"+ - "\1\60\2\0\1\60\1\61\3\3\1\62\1\63\7\13\6\0\1\51\1\43\25\13\1\64\2\0\1\65\3"+ - "\3\2\0\1\60\7\13\1\53\2\0\1\30\1\31\1\66\5\13\1\64\1\67\2\0\2\70\1\50\4\3"+ - "\6\13\1\70\1\3\2\13\1\34\1\3\6\13\1\43\1\34\1\50\1\3\2\0\12\13\1\64\16\0\15"+ - "\13\1\64\1\71\4\0\1\70\1\0\2\13\1\64\1\72\2\0\1\43\3\13\1\70\1\43\1\13\2\61"+ - "\5\13\1\40\1\13\1\37\1\35\1\30\1\71\1\0\2\73\1\74\1\3\1\62\1\3\1\41\1\64\1"+ - "\72\2\0\1\13\1\3\1\44\1\75\1\45\1\43\1\34\1\44\1\61\5\13\1\40\1\13\1\40\1"+ - "\76\1\30\1\57\1\51\1\62\1\73\1\50\1\32\1\3\1\43\1\37\1\3\1\72\2\0\1\60\1\77"+ - "\2\3\1\45\1\43\1\13\2\41\5\13\1\40\1\13\1\40\1\43\1\30\1\71\1\0\2\46\1\50"+ - "\1\36\3\3\1\64\1\72\2\0\1\33\1\3\1\55\1\0\1\45\1\43\1\13\2\61\5\13\1\40\1"+ - "\13\1\40\1\43\1\30\1\71\1\0\2\73\1\50\1\3\1\45\1\3\1\41\1\64\1\72\2\0\1\33"+ - "\3\3\1\100\1\43\1\34\1\35\1\40\1\30\1\76\1\40\1\44\1\36\1\34\1\35\2\13\1\30"+ - "\1\72\1\51\1\72\1\57\1\50\1\36\1\62\3\3\1\72\2\0\2\3\1\33\1\3\1\0\1\54\1\13"+ - "\2\40\5\13\1\40\3\13\1\30\1\71\1\0\2\57\1\50\1\3\1\47\1\34\1\33\1\64\1\72"+ - "\2\0\4\3\1\70\1\43\1\13\2\40\5\13\1\40\2\13\1\43\1\30\1\71\1\0\2\57\1\50\1"+ - "\3\1\47\1\3\1\76\1\64\1\72\2\0\1\101\3\3\1\0\2\13\2\40\11\13\1\53\1\71\1\0"+ - "\2\57\1\74\1\3\1\53\1\3\1\44\1\64\1\72\2\0\2\3\1\35\1\13\1\45\1\43\3\13\1"+ - "\34\1\35\5\13\1\41\2\13\1\33\1\13\1\34\1\102\1\62\1\0\1\103\2\0\1\3\1\72\2"+ - "\0\1\72\3\3\1\43\13\13\1\63\1\0\1\51\1\44\1\13\1\53\1\0\1\51\2\0\1\50\11\3"+ - "\1\76\1\40\1\34\6\13\1\104\2\13\1\63\2\0\1\65\1\13\1\37\1\0\1\51\2\0\1\50"+ - "\1\13\10\3\1\36\5\3\1\50\1\3\2\0\1\50\2\3\1\105\1\32\1\72\2\13\1\43\10\13"+ - "\1\36\1\45\4\0\1\57\1\13\1\70\2\0\1\45\10\0\1\52\1\3\1\102\16\3\12\13\1\53"+ - "\4\0\1\106\2\0\1\50\1\3\1\13\1\64\1\60\1\64\1\71\1\56\1\0\1\60\1\70\1\54\2"+ - "\13\1\64\2\0\1\67\3\0\1\50\11\13\1\41\1\3\1\33\12\13\1\34\23\13\1\40\1\30"+ - "\1\13\1\34\1\40\1\30\12\13\1\40\1\30\10\13\1\40\1\30\1\13\1\34\1\40\1\30\3"+ - "\13\1\34\16\13\1\40\1\30\20\13\1\34\1\45\10\3\4\13\4\3\25\13\1\30\1\13\1\30"+ - "\1\43\132\13\1\61\4\13\1\107\5\13\1\34\1\3\22\13\1\34\1\35\2\13\1\36\1\3\4"+ - "\13\1\64\1\50\1\3\1\44\4\13\1\64\1\52\2\3\4\13\1\64\3\3\3\13\1\40\1\110\3"+ - "\3\15\13\10\0\2\44\1\77\2\0\1\50\7\3\1\62\3\0\1\50\1\3\26\13\1\36\1\3\1\13"+ - "\1\111\10\13\1\112\1\3\21\13\1\30\2\3\7\13\1\34\3\0\1\3\3\0\2\3\1\72\2\0\7"+ - "\13\1\30\1\13\1\36\2\3\13\13\1\3\6\13\1\30\1\3\2\0\1\50\11\3\5\13\1\53\1\0"+ - "\1\3\15\13\1\70\1\0\1\51\7\0\1\73\2\0\1\50\1\3\2\0\1\50\2\3\1\44\2\3\3\0\1"+ - "\46\3\0\1\51\14\3\1\0\1\54\13\13\4\0\1\54\1\13\1\36\2\0\1\50\3\3\1\62\2\0"+ - "\3\3\1\106\7\13\1\70\2\0\1\60\2\0\1\60\12\13\1\64\3\0\3\3\11\13\5\0\2\3\2"+ - "\0\1\50\1\43\2\0\1\60\10\13\1\30\2\13\1\36\1\3\12\13\1\34\1\43\4\3\1\51\5"+ - "\0\1\54\1\63\1\13\1\56\1\74\1\3\60\13\20\0\5\13\1\30\1\13\1\30\11\13\1\30"+ - "\1\13\1\30\2\13\2\104\7\13\1\30\15\13\1\40\1\13\1\37\1\35\1\40\1\13\1\36\1"+ - "\13\1\35\1\13\1\3\3\13\1\36\1\35\1\40\1\13\1\36\2\113\1\114\1\0\6\3\1\115"+ - "\1\116\3\3\1\44\1\36\4\3\1\36\1\3\1\117\1\0\1\57\2\0\1\33\2\3\1\44\4\3\3\13"+ - "\1\36\10\13\1\36\3\3\3\0\1\52\1\32\1\45\2\0\1\52\3\3\1\31\1\44\1\35\2\13\1"+ - "\33\1\43\1\30\1\3\1\37\1\40\1\41\2\13\1\30\1\13\1\3\1\43\1\30\1\31\4\3\12"+ - "\13\1\36\135\3\71\13\1\36\1\44\1\53\1\60\3\3\11\13\1\41\1\3\1\33\16\13\1\3"+ - "\1\44\3\3\1\62\5\13\1\34\2\3\1\13\1\34\1\13\1\34\1\13\1\34\1\13\1\34\1\13"+ - "\1\34\1\13\1\34\1\13\1\34\1\13\1\34\10\0\13\3\1\44\64\3\1\120\1\43\6\3\1\43"+ - "\1\13\1\64\1\0\1\43\1\30\1\13\1\36\1\43\24\13\1\34\1\47\2\43\25\13\1\34\1"+ - "\13\1\3\1\43\12\13\1\43\26\13\1\34\4\3\10\13\14\3\64\13\20\3\43\13\1\36\20"+ - "\3\13\13\1\30\3\13\1\36\4\13\2\0\1\60\5\3\13\13\1\53\1\3\2\0\1\121\7\13\1"+ - "\64\24\13\1\50\10\3\1\44\2\13\1\35\31\13\1\61\17\13\1\34\1\3\1\41\1\43\1\30"+ - "\5\3\1\35\3\13\2\122\1\53\5\13\1\53\1\0\1\3\1\52\2\3\1\36\1\3\15\13\3\3\1"+ - "\60\14\13\4\0\1\50\2\3\2\0\1\50\1\3\4\0\1\60\1\13\1\44\1\101\2\0\1\60\6\13"+ - "\1\64\1\0\1\50\5\13\1\53\3\0\3\3\7\13\1\36\1\0\13\13\1\53\3\0\1\52\2\3\1\44"+ - "\2\0\1\50\1\3\1\13\1\63\2\13\2\0\1\60\1\34\12\13\1\70\2\0\1\51\2\3\1\53\2"+ - "\13\1\50\2\0\1\50\1\3\5\13\1\34\1\123\1\60\14\13\1\71\1\56\1\54\1\64\1\112"+ - "\5\3\1\44\1\30\2\13\1\53\1\0\1\35\1\124\2\3\1\43\1\34\1\43\1\34\1\43\1\34"+ - "\2\3\1\13\1\34\1\13\1\34\12\13\1\34\3\13\1\30\1\3\34\13\1\53\1\0\1\51\1\50"+ - "\2\0\1\50\1\3\51\13\3\3\5\13\1\34\1\44\14\13\1\3\33\13\1\30\32\13\1\30\11"+ - "\3\1\13\1\34\2\3\1\44\1\13\1\3\1\125\2\13\1\40\2\13\1\34\1\13\1\37\1\41\1"+ - "\40\32\13\1\30\7\3\1\44\32\13\1\30\4\3\20\13\1\35\15\13\12\3\3\13\1\36\4\0"+ - "\4\3\4\0\1\44\1\36\5\3\1\43\6\3\1\33\1\3\1\13\1\40\41\13\1\126\1\3\1\36\2"+ - "\3\2\0\1\50\1\3\1\43\5\13\1\34\1\44\1\43\5\13\1\34\2\3\1\35\25\13\1\34\1\35"+ - "\1\13\1\35\1\13\1\35\1\13\1\35\1\36\1\30\1\76\4\3\1\45\1\3\3\13\1\43\5\13"+ - "\1\34\4\13\1\34\1\41\3\13\1\30\3\13\1\30\10\3\36\13\1\34\21\3\15\13\1\36\41"+ - "\3\1\32\40\3\7\13\1\36\14\13\1\36\3\3\1\52\7\3\10\13\3\3\1\43\6\13\1\34\1"+ - "\3\11\13\1\64\1\51\1\3\7\13\1\30\11\13\1\3\2\13\1\43\1\30\12\3\47\13\1\30"+ - "\2\0\1\50\1\3\11\13\1\3\11\13\1\3\12\13\2\3\15\13\3\3\2\13\1\34\3\13\1\34"+ - "\1\13\1\34\1\41\2\13\1\41\3\13\1\41\1\13\1\41\1\36\20\3\15\13\1\34\2\3\5\13"+ - "\1\30\2\3\2\13\6\3\1\13\1\41\12\13\1\40\1\13\1\34\21\3\1\13\1\30\1\40\12\13"+ - "\1\41\1\36\1\61\5\13\1\30\2\3\5\13\1\34\2\3\7\13\1\34\20\3\4\13\1\34\1\30"+ - "\2\3\5\13\1\30\2\3\6\13\1\30\21\3\16\13\1\3\1\35\20\3\1\70\1\47\1\3\1\0\1"+ - "\13\2\43\6\13\1\30\1\51\1\62\10\3\7\13\1\36\7\13\1\36\10\3\2\13\1\43\6\13"+ - "\1\124\6\3\15\13\1\30\2\3\5\13\1\30\2\3\4\13\1\34\3\3\4\13\1\30\33\3\22\13"+ - "\1\36\15\3\14\13\1\34\3\3\14\13\1\34\3\3\11\13\1\0\2\3\2\0\1\50\121\3\12\13"+ - "\1\42\1\52\1\30\22\3\1\45\7\13\1\36\1\3\1\44\2\3\5\13\1\64\2\0\1\52\7\3\4"+ - "\13\1\64\1\50\12\3\5\13\1\36\6\3\5\13\1\34\2\3\1\106\15\13\3\0\1\51\7\3\1"+ - "\72\2\0\1\56\1\65\1\3\1\62\1\106\13\13\2\0\1\51\1\32\1\102\2\3\1\32\6\13\1"+ - "\36\1\3\2\0\1\50\1\3\1\106\10\13\1\53\3\0\1\57\2\0\1\3\1\111\2\3\10\13\1\53"+ - "\1\31\2\3\1\106\13\13\1\53\3\0\1\54\1\36\1\45\1\57\2\0\1\74\1\36\10\3\4\13"+ - "\1\41\6\13\3\0\1\3\1\100\1\77\17\3\1\13\1\34\1\40\1\41\3\13\1\41\2\13\1\36"+ - "\1\3\13\13\1\53\2\0\1\51\1\3\2\0\1\50\1\3\1\0\1\43\1\13\2\61\5\13\1\40\1\13"+ - "\1\40\1\43\1\42\1\71\1\0\2\73\1\50\1\36\1\62\1\3\1\43\1\64\1\72\1\0\1\52\1"+ - "\0\1\52\42\3\15\13\1\70\3\0\1\106\1\34\1\3\2\0\1\50\1\100\1\30\7\3\14\13\5"+ - "\0\1\41\2\3\2\0\1\50\51\3\13\13\1\53\1\0\1\50\2\0\1\52\5\3\1\13\1\50\10\3"+ - "\14\13\4\0\1\52\1\36\2\3\2\0\1\50\11\3\12\13\1\53\3\0\1\36\1\3\2\0\1\50\15"+ - "\3\6\13\1\34\1\45\3\0\1\3\2\0\1\50\1\3\1\13\1\34\56\3\13\13\3\0\1\51\31\3"+ - "\20\13\2\0\1\50\4\3\1\44\1\13\1\34\1\33\2\13\1\76\6\13\1\0\1\46\1\73\1\106"+ - "\1\71\3\3\2\0\1\50\21\3\2\13\1\35\11\13\1\70\1\0\1\72\1\0\1\127\1\52\6\3\1"+ - "\70\1\0\1\106\11\13\1\53\1\0\1\67\1\51\1\3\1\62\2\3\1\70\2\0\13\13\1\64\3"+ - "\0\1\50\1\33\4\3\22\13\1\36\1\3\2\13\1\40\10\13\1\53\1\0\1\51\2\0\1\36\3\3"+ - "\2\0\1\50\5\3\1\35\7\13\1\72\5\0\1\45\2\0\1\51\22\3\1\13\1\34\1\41\11\13\1"+ - "\70\1\51\1\102\1\46\1\0\1\67\2\3\2\0\1\50\1\3\1\13\1\41\1\40\7\13\1\64\1\51"+ - "\1\46\1\0\1\36\1\3\2\0\1\50\115\3\4\13\1\53\1\51\2\3\1\67\3\13\1\40\10\13"+ - "\1\0\1\51\1\72\1\51\3\3\2\0\1\50\25\3\1\36\12\3\1\43\1\36\7\3\46\13\1\30\31"+ - "\3\33\13\1\34\4\3\61\13\123\3\30\13\1\36\3\3\14\13\4\0\1\54\1\53\3\0\1\50"+ - "\52\3\21\13\1\34\56\3\16\13\1\36\1\3\7\13\1\34\2\0\1\50\1\3\23\13\1\34\2\0"+ - "\1\50\1\3\7\13\1\30\1\0\1\52\2\3\14\13\1\0\1\51\2\3\1\13\3\3\2\0\1\50\1\3"+ - "\1\44\5\13\1\3\1\43\4\13\54\3\20\13\40\3\22\13\1\34\1\62\1\70\15\0\1\3\1\62"+ - "\1\106\3\13\20\3\1\41\1\52\2\3\1\50\3\3\76\13\2\3\65\13\1\30\12\3\2\13\1\36"+ - "\171\3\1\13\1\43\1\13\1\76\10\13\1\34\3\3\1\31\7\3\1\34\1\33\3\3\1\13\2\3"+ - "\143\13\1\3\32\13\1\34\1\3\3\13\1\36\2\13\1\36\1\3\2\13\1\30\1\47\1\0\27\3"+ - "\13\0\1\50\5\0\1\51\107\3\1\45\1\50\1\45\4\0\1\51\1\45\1\0\7\3\1\72\1\50\44"+ - "\3\1\72\1\52\56\3\25\13\1\40\21\13\1\40\1\31\1\76\1\43\1\40\2\13\1\41\1\43"+ - "\1\13\1\43\17\13\1\41\1\34\1\43\1\13\1\40\1\13\1\40\6\13\1\41\1\34\1\13\1"+ - "\37\1\35\1\13\1\40\124\13\1\30\6\13\1\40\5\13\1\34\7\13\1\34\6\13\1\40\7\13"+ - "\1\40\5\13\1\34\7\13\1\34\6\13\1\40\7\13\1\40\5\13\1\34\2\13\1\72\31\0\1\51"+ - "\1\62\14\0\1\52\1\3\1\32\3\3\1\52\4\3\1\62\1\0\1\45\3\0\24\3\7\13\1\34\1\3"+ - "\1\43\1\34\65\3\1\0\1\51\4\0\1\73\1\0\1\46\1\57\1\51\1\3\17\13\1\30\7\3\1"+ - "\62\34\3\13\13\1\36\1\0\1\106\1\13\1\30\2\0\1\50\1\31\120\3\7\13\1\130\4\3"+ - "\13\13\3\0\1\50\1\44\64\3\7\13\3\0\1\50\71\3\1\13\1\34\1\13\1\76\3\13\1\34"+ - "\61\13\1\36\2\3\1\0\1\51\12\3\21\13\1\0\1\106\1\3\2\0\1\50\125\3\1\36\23\3"+ - "\1\13\1\43\6\13\1\76\1\61\1\43\1\13\1\34\1\13\1\104\1\3\1\31\1\44\1\104\1"+ - "\43\1\76\1\61\2\104\1\76\1\61\1\34\1\13\1\34\1\13\1\43\1\37\2\13\1\41\4\13"+ - "\1\3\2\43\1\41\4\13\115\3\2\0\1\50\1\3\70\13\10\3\16\13\1\30\1\3\67\13\1\30"+ - "\140\13\1\30\3\3\114\13\1\36\7\3\7\13\1\30\70\3\22\13\1\34\1\3\130\13\24\3"+ - "\1\32\7\3\30\0\40\3\74\0\4\3"); - - /* The ZZ_CMAP_A table has 356 entries */ + "\2\0\1\1\1\2\3\0\1\3\1\4\1\5\1\6\1\7\2\10\1\11\1\12\1\13\5\14\1\15\1\16\1"+ + "\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\0\1\27\6\0\1\30\1\31\1\32\1\33\1"+ + "\3\1\34\1\32\1\3\5\14\1\35\7\14\1\35\162\14\1\31\1\36\2\14\1\31\3\3\1\14\1"+ + "\37\1\3\1\40\4\3\34\0\1\14\1\41\1\36\1\42\1\3\1\32\1\35\1\41\4\14\1\42\24"+ + "\14\1\42\42\14\1\43\1\0\1\36\51\14\1\44\10\14\1\35\1\34\1\3\12\14\1\37\1\45"+ + "\1\46\12\0\1\47\1\50\1\47\2\3\6\14\1\35\1\45\1\35\3\3\1\0\1\51\1\45\1\3\2"+ + "\0\1\52\1\53\12\14\1\54\7\0\1\51\1\36\1\55\30\14\1\56\1\0\1\47\1\0\1\57\1"+ + "\60\1\61\2\0\1\61\1\62\3\3\1\63\1\64\7\14\6\0\1\52\1\44\25\14\1\65\2\0\1\66"+ + "\3\3\2\0\1\61\7\14\1\54\2\0\1\31\1\32\1\67\5\14\1\65\1\70\2\0\2\71\1\51\4"+ + "\3\6\14\1\71\1\3\2\14\1\35\1\3\6\14\1\44\1\35\1\51\1\3\2\0\12\14\1\65\16\0"+ + "\15\14\1\65\1\72\4\0\1\71\1\0\2\14\1\65\1\73\2\0\1\44\3\14\1\71\1\44\1\14"+ + "\2\62\5\14\1\41\1\14\1\40\1\36\1\31\1\72\1\0\2\74\1\75\1\3\1\63\1\3\1\42\1"+ + "\65\1\73\2\0\1\14\1\3\1\45\1\76\1\46\1\44\1\35\1\45\1\62\5\14\1\41\1\14\1"+ + "\41\1\77\1\31\1\60\1\52\1\63\1\74\1\51\1\33\1\3\1\44\1\40\1\3\1\73\2\0\1\61"+ + "\1\100\2\3\1\46\1\44\1\14\2\42\5\14\1\41\1\14\1\41\1\44\1\31\1\72\1\0\2\47"+ + "\1\51\1\37\3\3\1\65\1\73\2\0\1\34\1\3\1\56\1\0\1\46\1\44\1\14\2\62\5\14\1"+ + "\41\1\14\1\41\1\44\1\31\1\72\1\0\2\74\1\51\1\3\1\46\1\3\1\42\1\65\1\73\2\0"+ + "\1\34\3\3\1\101\1\44\1\35\1\36\1\41\1\31\1\77\1\41\1\45\1\37\1\35\1\36\2\14"+ + "\1\31\1\73\1\52\1\73\1\60\1\51\1\37\1\63\3\3\1\73\2\0\2\3\1\34\1\3\1\0\1\55"+ + "\1\14\2\41\5\14\1\41\3\14\1\31\1\72\1\0\2\60\1\51\1\3\1\50\1\35\1\34\1\65"+ + "\1\73\2\0\4\3\1\71\1\44\1\14\2\41\5\14\1\41\2\14\1\44\1\31\1\72\1\0\2\60\1"+ + "\51\1\3\1\50\1\3\1\77\1\65\1\73\2\0\1\102\3\3\1\0\2\14\2\41\11\14\1\54\1\72"+ + "\1\0\2\60\1\75\1\3\1\54\1\3\1\45\1\65\1\73\2\0\2\3\1\36\1\14\1\46\1\44\3\14"+ + "\1\35\1\36\5\14\1\42\2\14\1\34\1\14\1\35\1\103\1\63\1\0\1\104\2\0\1\3\1\73"+ + "\2\0\1\73\3\3\1\44\13\14\1\64\1\0\1\52\1\45\1\14\1\54\1\0\1\52\2\0\1\51\11"+ + "\3\1\77\1\41\1\35\6\14\1\105\2\14\1\64\2\0\1\66\1\14\1\40\1\0\1\52\2\0\1\51"+ + "\1\14\10\3\1\37\5\3\1\51\1\3\2\0\1\51\2\3\1\106\1\33\1\73\2\14\1\44\10\14"+ + "\1\37\1\46\4\0\1\60\1\14\1\71\2\0\1\46\10\0\1\53\1\3\1\103\16\3\12\14\1\54"+ + "\4\0\1\107\2\0\1\51\1\3\1\14\1\65\1\61\1\65\1\72\1\57\1\0\1\61\1\71\1\55\2"+ + "\14\1\65\2\0\1\70\3\0\1\51\11\14\1\42\1\3\1\34\12\14\1\35\23\14\1\41\1\31"+ + "\1\14\1\35\1\41\1\31\12\14\1\41\1\31\10\14\1\41\1\31\1\14\1\35\1\41\1\31\3"+ + "\14\1\35\16\14\1\41\1\31\20\14\1\35\1\46\10\3\4\14\4\3\25\14\1\31\1\14\1\31"+ + "\1\44\132\14\1\62\4\14\1\110\5\14\1\35\1\3\22\14\1\35\1\36\2\14\1\37\1\3\4"+ + "\14\1\65\1\51\1\3\1\45\4\14\1\65\1\53\2\3\4\14\1\65\3\3\3\14\1\41\1\111\3"+ + "\3\15\14\10\0\2\45\1\100\2\0\1\51\7\3\1\63\3\0\1\51\1\3\26\14\1\37\1\3\1\14"+ + "\1\112\10\14\1\113\1\3\21\14\1\31\2\3\7\14\1\35\3\0\1\3\3\0\2\3\1\73\2\0\7"+ + "\14\1\31\1\14\1\37\2\3\13\14\1\3\6\14\1\31\1\3\2\0\1\51\11\3\5\14\1\54\1\0"+ + "\1\3\15\14\1\71\1\0\1\52\7\0\1\74\2\0\1\51\1\3\2\0\1\51\2\3\1\45\2\3\3\0\1"+ + "\47\3\0\1\52\14\3\1\0\1\55\13\14\4\0\1\55\1\14\1\37\2\0\1\51\3\3\1\63\2\0"+ + "\3\3\1\107\7\14\1\71\2\0\1\61\2\0\1\61\12\14\1\65\3\0\3\3\11\14\5\0\2\3\2"+ + "\0\1\51\1\44\2\0\1\61\10\14\1\31\2\14\1\37\1\3\12\14\1\35\1\44\4\3\1\52\5"+ + "\0\1\55\1\64\1\14\1\57\1\75\1\3\60\14\20\0\5\14\1\31\1\14\1\31\11\14\1\31"+ + "\1\14\1\31\2\14\2\105\7\14\1\31\15\14\1\41\1\14\1\40\1\36\1\41\1\14\1\37\1"+ + "\14\1\36\1\14\1\3\3\14\1\37\1\36\1\41\1\14\1\37\2\114\1\115\1\0\6\3\1\116"+ + "\1\117\3\3\1\45\1\37\4\3\1\37\1\3\1\120\1\0\1\60\2\0\1\34\2\3\1\45\4\3\3\14"+ + "\1\37\10\14\1\37\3\3\3\0\1\53\1\33\1\46\2\0\1\53\3\3\1\32\1\45\1\36\2\14\1"+ + "\34\1\44\1\31\1\3\1\40\1\41\1\42\2\14\1\31\1\14\1\3\1\44\1\31\1\32\4\3\12"+ + "\14\1\37\135\3\71\14\1\37\1\45\1\54\1\61\3\3\11\14\1\42\1\3\1\34\16\14\1\3"+ + "\1\45\3\3\1\63\5\14\1\35\2\3\1\14\1\35\1\14\1\35\1\14\1\35\1\14\1\35\1\14"+ + "\1\35\1\14\1\35\1\14\1\35\1\14\1\35\10\0\13\3\1\45\64\3\1\121\1\44\6\3\1\44"+ + "\1\14\1\65\1\0\1\44\1\31\1\14\1\37\1\44\24\14\1\35\1\50\2\44\25\14\1\35\1"+ + "\14\1\3\1\44\12\14\1\44\26\14\1\35\4\3\10\14\14\3\64\14\20\3\43\14\1\37\20"+ + "\3\13\14\1\31\3\14\1\37\4\14\2\0\1\61\5\3\13\14\1\54\1\3\2\0\1\122\7\14\1"+ + "\65\24\14\1\51\10\3\1\45\2\14\1\36\31\14\1\62\17\14\1\35\1\3\1\42\1\44\1\31"+ + "\5\3\1\36\3\14\2\123\1\54\5\14\1\54\1\0\1\3\1\53\2\3\1\37\1\3\15\14\3\3\1"+ + "\61\14\14\4\0\1\51\2\3\2\0\1\51\1\3\4\0\1\61\1\14\1\45\1\102\2\0\1\61\6\14"+ + "\1\65\1\0\1\51\5\14\1\54\3\0\3\3\7\14\1\37\1\0\13\14\1\54\3\0\1\53\2\3\1\45"+ + "\2\0\1\51\1\3\1\14\1\64\2\14\2\0\1\61\1\35\12\14\1\71\2\0\1\52\2\3\1\54\2"+ + "\14\1\51\2\0\1\51\1\3\5\14\1\35\1\124\1\61\14\14\1\72\1\57\1\55\1\65\1\113"+ + "\5\3\1\45\1\31\2\14\1\54\1\0\1\36\1\125\2\3\1\44\1\35\1\44\1\35\1\44\1\35"+ + "\2\3\1\14\1\35\1\14\1\35\12\14\1\35\3\14\1\31\1\3\34\14\1\54\1\0\1\52\1\51"+ + "\2\0\1\51\1\3\51\14\3\3\5\14\1\35\1\45\14\14\1\3\33\14\1\31\32\14\1\31\11"+ + "\3\1\14\1\35\2\3\1\45\1\14\1\3\1\126\2\14\1\41\2\14\1\35\1\14\1\40\1\42\1"+ + "\41\32\14\1\31\7\3\1\45\32\14\1\31\4\3\20\14\1\36\15\14\12\3\3\14\1\37\4\0"+ + "\4\3\4\0\1\45\1\37\5\3\1\44\6\3\1\34\1\3\1\14\1\41\41\14\1\127\1\3\1\37\2"+ + "\3\2\0\1\51\1\3\1\44\5\14\1\35\1\45\1\44\5\14\1\35\2\3\1\36\25\14\1\35\1\36"+ + "\1\14\1\36\1\14\1\36\1\14\1\36\1\37\1\31\1\77\4\3\1\46\1\3\3\14\1\44\5\14"+ + "\1\35\4\14\1\35\1\42\3\14\1\31\3\14\1\31\10\3\36\14\1\35\21\3\15\14\1\37\41"+ + "\3\1\33\40\3\7\14\1\37\14\14\1\37\3\3\1\53\7\3\10\14\3\3\1\44\6\14\1\35\1"+ + "\3\11\14\1\65\1\52\1\3\7\14\1\31\11\14\1\3\2\14\1\44\1\31\12\3\47\14\1\31"+ + "\2\0\1\51\1\3\11\14\1\3\11\14\1\3\12\14\2\3\15\14\3\3\2\14\1\35\3\14\1\35"+ + "\1\14\1\35\1\42\2\14\1\42\3\14\1\42\1\14\1\42\1\37\20\3\15\14\1\35\2\3\5\14"+ + "\1\31\2\3\2\14\6\3\1\14\1\42\12\14\1\41\1\14\1\35\21\3\1\14\1\31\1\41\12\14"+ + "\1\42\1\37\1\62\5\14\1\31\2\3\5\14\1\35\2\3\7\14\1\35\20\3\4\14\1\35\1\31"+ + "\2\3\5\14\1\31\2\3\6\14\1\31\21\3\16\14\1\3\1\36\20\3\1\71\1\50\1\3\1\0\1"+ + "\14\2\44\6\14\1\31\1\52\1\63\10\3\7\14\1\37\7\14\1\37\10\3\2\14\1\44\6\14"+ + "\1\125\6\3\15\14\1\31\2\3\5\14\1\31\2\3\4\14\1\35\3\3\4\14\1\31\33\3\22\14"+ + "\1\37\15\3\14\14\1\35\3\3\14\14\1\35\3\3\11\14\1\0\2\3\2\0\1\51\121\3\12\14"+ + "\1\43\1\53\1\31\22\3\1\46\7\14\1\37\1\3\1\45\2\3\5\14\1\65\2\0\1\53\7\3\4"+ + "\14\1\65\1\51\12\3\5\14\1\37\6\3\5\14\1\35\2\3\1\107\15\14\3\0\1\52\7\3\1"+ + "\73\2\0\1\57\1\66\1\3\1\63\1\107\13\14\2\0\1\52\1\33\1\103\2\3\1\33\6\14\1"+ + "\37\1\3\2\0\1\51\1\3\1\107\10\14\1\54\3\0\1\60\2\0\1\3\1\112\2\3\10\14\1\54"+ + "\1\32\2\3\1\107\13\14\1\54\3\0\1\55\1\37\1\46\1\60\2\0\1\75\1\37\10\3\4\14"+ + "\1\42\6\14\3\0\1\3\1\101\1\100\17\3\1\14\1\35\1\41\1\42\3\14\1\42\2\14\1\37"+ + "\1\3\13\14\1\54\2\0\1\52\1\3\2\0\1\51\1\3\1\0\1\44\1\14\2\62\5\14\1\41\1\14"+ + "\1\41\1\44\1\43\1\72\1\0\2\74\1\51\1\37\1\63\1\3\1\44\1\65\1\73\1\0\1\53\1"+ + "\0\1\53\42\3\15\14\1\71\3\0\1\107\1\35\1\3\2\0\1\51\1\101\1\31\7\3\14\14\5"+ + "\0\1\42\2\3\2\0\1\51\51\3\13\14\1\54\1\0\1\51\2\0\1\53\5\3\1\14\1\51\10\3"+ + "\14\14\4\0\1\53\1\37\2\3\2\0\1\51\11\3\12\14\1\54\3\0\1\37\1\3\2\0\1\51\15"+ + "\3\6\14\1\35\1\46\3\0\1\3\2\0\1\51\1\3\1\14\1\35\56\3\13\14\3\0\1\52\31\3"+ + "\20\14\2\0\1\51\4\3\1\45\1\14\1\35\1\34\2\14\1\77\6\14\1\0\1\47\1\74\1\107"+ + "\1\72\3\3\2\0\1\51\21\3\2\14\1\36\11\14\1\71\1\0\1\73\1\0\1\130\1\53\6\3\1"+ + "\71\1\0\1\107\11\14\1\54\1\0\1\70\1\52\1\3\1\63\2\3\1\71\2\0\13\14\1\65\3"+ + "\0\1\51\1\34\4\3\22\14\1\37\1\3\2\14\1\41\10\14\1\54\1\0\1\52\2\0\1\37\3\3"+ + "\2\0\1\51\5\3\1\36\7\14\1\73\5\0\1\46\2\0\1\52\22\3\1\14\1\35\1\42\11\14\1"+ + "\71\1\52\1\103\1\47\1\0\1\70\2\3\2\0\1\51\1\3\1\14\1\42\1\41\7\14\1\65\1\52"+ + "\1\47\1\0\1\37\1\3\2\0\1\51\115\3\4\14\1\54\1\52\2\3\1\70\3\14\1\41\10\14"+ + "\1\0\1\52\1\73\1\52\3\3\2\0\1\51\25\3\1\37\12\3\1\44\1\37\7\3\46\14\1\31\31"+ + "\3\33\14\1\35\4\3\61\14\123\3\30\14\1\37\3\3\14\14\4\0\1\55\1\54\3\0\1\51"+ + "\52\3\21\14\1\35\56\3\16\14\1\37\1\3\7\14\1\35\2\0\1\51\1\3\23\14\1\35\2\0"+ + "\1\51\1\3\7\14\1\31\1\0\1\53\2\3\14\14\1\0\1\52\2\3\1\14\3\3\2\0\1\51\1\3"+ + "\1\45\5\14\1\3\1\44\4\14\54\3\20\14\40\3\22\14\1\35\1\63\1\71\15\0\1\3\1\63"+ + "\1\107\3\14\20\3\1\42\1\53\2\3\1\51\3\3\76\14\2\3\65\14\1\31\12\3\2\14\1\37"+ + "\171\3\1\14\1\44\1\14\1\77\10\14\1\35\3\3\1\32\7\3\1\35\1\34\3\3\1\14\2\3"+ + "\143\14\1\3\32\14\1\35\1\3\3\14\1\37\2\14\1\37\1\3\2\14\1\31\1\50\1\0\27\3"+ + "\13\0\1\51\5\0\1\52\107\3\1\46\1\51\1\46\4\0\1\52\1\46\1\0\7\3\1\73\1\51\44"+ + "\3\1\73\1\53\56\3\25\14\1\41\21\14\1\41\1\32\1\77\1\44\1\41\2\14\1\42\1\44"+ + "\1\14\1\44\17\14\1\42\1\35\1\44\1\14\1\41\1\14\1\41\6\14\1\42\1\35\1\14\1"+ + "\40\1\36\1\14\1\41\124\14\1\31\6\14\1\41\5\14\1\35\7\14\1\35\6\14\1\41\7\14"+ + "\1\41\5\14\1\35\7\14\1\35\6\14\1\41\7\14\1\41\5\14\1\35\2\14\1\73\31\0\1\52"+ + "\1\63\14\0\1\53\1\3\1\33\3\3\1\53\4\3\1\63\1\0\1\46\3\0\24\3\7\14\1\35\1\3"+ + "\1\44\1\35\65\3\1\0\1\52\4\0\1\74\1\0\1\47\1\60\1\52\1\3\17\14\1\31\7\3\1"+ + "\63\34\3\13\14\1\37\1\0\1\107\1\14\1\31\2\0\1\51\1\32\120\3\7\14\1\131\4\3"+ + "\13\14\3\0\1\51\1\45\64\3\7\14\3\0\1\51\71\3\1\14\1\35\1\14\1\77\3\14\1\35"+ + "\61\14\1\37\2\3\1\0\1\52\12\3\21\14\1\0\1\107\1\3\2\0\1\51\125\3\1\37\23\3"+ + "\1\14\1\44\6\14\1\77\1\62\1\44\1\14\1\35\1\14\1\105\1\3\1\32\1\45\1\105\1"+ + "\44\1\77\1\62\2\105\1\77\1\62\1\35\1\14\1\35\1\14\1\44\1\40\2\14\1\42\4\14"+ + "\1\3\2\44\1\42\4\14\115\3\2\0\1\51\1\3\70\14\10\3\16\14\1\31\1\3\67\14\1\31"+ + "\140\14\1\31\3\3\114\14\1\37\7\3\7\14\1\31\70\3\22\14\1\35\1\3\130\14\24\3"+ + "\1\33\7\3\30\0\40\3\74\0\4\3"); + + /* The ZZ_CMAP_A table has 360 entries */ static final char ZZ_CMAP_A[] = zzUnpackCMap( - "\5\15\1\4\1\2\1\17\1\4\1\1\2\15\4\14\1\3\1\14\1\12\1\53\1\5\2\14\1\16\1\42"+ - "\1\43\2\14\1\20\1\11\1\7\1\14\2\15\1\21\1\14\1\40\1\14\1\41\1\14\1\10\12\5"+ - "\1\46\1\13\1\47\1\14\1\5\1\14\1\26\1\35\1\32\1\33\1\30\1\50\1\52\1\5\1\24"+ - "\2\5\1\36\1\5\1\51\1\31\1\22\1\5\1\23\1\5\1\27\1\34\1\25\4\5\1\44\1\37\1\45"+ - "\1\14\2\15\1\6\2\15\1\0\1\14\4\5\4\14\1\5\2\14\1\15\3\14\1\5\2\14\3\5\3\14"+ - "\3\5\3\14\1\5\1\14\1\5\1\14\1\5\1\14\4\5\1\14\3\5\1\14\1\15\1\14\3\5\3\14"+ - "\1\5\1\14\5\15\1\14\1\15\1\14\2\15\1\14\2\15\2\14\3\15\1\14\1\15\3\14\3\5"+ - "\2\15\3\5\1\14\1\5\3\15\2\5\2\15\1\14\4\15\3\5\2\14\1\5\3\14\1\15\1\5\1\15"+ - "\4\5\3\15\1\5\3\14\1\15\2\5\2\15\1\5\1\15\1\5\4\15\1\5\2\15\2\14\3\15\2\14"+ - "\3\15\1\5\1\14\1\5\1\14\1\15\2\14\2\5\1\14\1\5\1\15\4\14\1\15\1\5\1\14\2\5"+ - "\1\15\2\14\1\15\1\14\1\15\1\14\1\15\2\14\1\5\1\14\1\5\1\14\1\15\1\14\4\15"+ - "\1\5\1\0\4\5\1\14\2\15\1\5\2\15\2\5\1\15\1\5\1\14\7\0\1\15\2\17\5\15\1\0\3"+ - "\14\2\0\3\14\2\15\1\14\3\5\1\15\1\5\2\14\1\5\1\15\1\5\2\15\2\14\1\5\1\15\2"+ - "\5\2\14\2\15\1\5\1\14\3\5\1\15\1\14"); + "\5\10\1\4\1\2\1\21\1\4\1\1\2\10\4\16\1\3\1\16\1\14\1\55\1\5\2\16\1\17\1\56"+ + "\1\57\1\10\1\16\1\47\1\11\1\7\1\16\6\12\1\46\1\16\1\50\1\16\1\51\1\54\1\13"+ + "\12\5\1\52\1\15\1\53\1\16\1\5\1\16\1\30\1\43\1\33\1\26\1\24\1\22\1\45\1\5"+ + "\1\23\1\5\1\44\1\25\1\32\1\35\1\40\1\27\1\5\1\31\1\34\1\36\1\37\1\42\2\5\1"+ + "\41\1\5\1\60\1\20\1\61\1\16\2\10\1\6\2\10\1\0\1\16\4\5\4\16\1\5\2\16\1\10"+ + "\3\16\1\5\2\16\3\5\3\16\3\5\3\16\1\5\1\16\1\5\1\16\1\5\1\16\4\5\1\16\3\5\1"+ + "\16\1\10\1\16\3\5\3\16\1\5\1\16\5\10\1\16\1\10\1\16\2\10\1\16\2\10\2\16\3"+ + "\10\1\16\1\10\3\16\3\5\2\10\3\5\1\16\1\5\3\10\2\5\2\10\1\16\4\10\3\5\2\16"+ + "\1\5\3\16\1\10\1\5\1\10\4\5\3\10\1\5\3\16\1\10\2\5\2\10\1\5\1\10\1\5\4\10"+ + "\1\5\2\10\2\16\3\10\2\16\3\10\1\5\1\16\1\5\1\16\1\10\2\16\2\5\1\16\1\5\1\10"+ + "\4\16\1\10\1\5\1\16\2\5\1\10\2\16\1\10\1\16\1\10\1\16\1\10\2\16\1\5\1\16\1"+ + "\5\1\16\1\10\1\16\4\10\1\5\1\0\4\5\1\16\2\10\1\5\2\10\2\5\1\10\1\5\1\16\7"+ + "\0\1\10\2\21\5\10\1\0\3\16\2\0\3\16\2\10\1\16\3\5\1\10\1\5\2\16\1\5\1\10\1"+ + "\5\2\10\2\16\1\5\1\10\2\5\2\16\2\10\1\5\1\16\3\5\1\10\1\16"); /** * Translates DFA states to action switch labels. @@ -220,17 +226,23 @@ public static int ZZ_CMAP(int ch) { private static final int [] ZZ_ACTION = zzUnpackAction(); 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\1\14\1\1"+ - "\1\4\1\15\1\5\1\16\1\5\1\17\1\20\1\21"+ - "\1\22\1\16\1\23\1\24\1\25\1\26\1\27\1\30"+ - "\1\31\1\5\1\16\1\32\1\33\1\15\1\34\1\35"+ - "\1\36\2\37\1\40\2\0\1\16\1\41\1\16\2\15"+ - "\1\37\2\0\1\15\2\16\1\42\3\15\1\16\3\15"+ - "\1\16\3\15\1\43\2\15\1\44\1\45\2\15\1\46"; + "\4\0\1\1\14\0\1\2\2\0\1\3\2\4\1\5"+ + "\1\6\1\3\1\7\1\10\1\11\2\12\1\13\1\14"+ + "\1\15\1\16\21\17\1\1\1\5\1\20\1\6\1\21"+ + "\1\6\1\22\1\23\1\24\1\25\3\21\1\26\1\27"+ + "\1\30\1\31\1\6\1\32\1\33\1\34\1\35\1\36"+ + "\1\37\1\40\1\41\1\42\1\43\1\44\1\20\1\45"+ + "\1\46\1\47\1\50\2\51\1\2\1\5\1\13\1\52"+ + "\23\17\2\0\3\21\1\53\3\20\1\51\2\0\16\17"+ + "\1\54\6\17\1\20\1\21\1\55\2\21\4\20\2\17"+ + "\1\56\15\17\1\57\3\17\2\21\4\20\1\60\3\17"+ + "\1\61\4\17\1\62\2\17\1\63\1\17\1\64\2\17"+ + "\1\65\1\21\4\20\6\17\1\66\1\67\3\17\1\70"+ + "\3\20\1\71\6\17\1\72\1\73\1\74\1\20\1\17"+ + "\1\75\2\17\1\20\1\17\1\76\1\77"; private static int [] zzUnpackAction() { - int [] result = new int[92]; + int [] result = new int[236]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -255,21 +267,39 @@ private static int zzUnpackAction(String packed, int offset, int [] result) { private static final int [] ZZ_ROWMAP = zzUnpackRowMap(); private static final String ZZ_ROWMAP_PACKED_0 = - "\0\0\0\54\0\130\0\204\0\260\0\334\0\u0108\0\u0134"+ - "\0\u0160\0\u018c\0\u01b8\0\u01e4\0\u0210\0\u023c\0\u0268\0\u0294"+ - "\0\u02c0\0\u02ec\0\u02c0\0\u0318\0\u02c0\0\u02c0\0\u0344\0\u0370"+ - "\0\u02c0\0\u039c\0\u02c0\0\u02c0\0\u03c8\0\u03f4\0\u0420\0\u044c"+ - "\0\u0478\0\u04a4\0\u04d0\0\u04fc\0\u02c0\0\u02c0\0\u02c0\0\u02c0"+ - "\0\u0528\0\u02c0\0\u02c0\0\u02c0\0\u02c0\0\u02c0\0\u02c0\0\u02c0"+ - "\0\u0554\0\u0580\0\u05ac\0\u02c0\0\u05d8\0\u02c0\0\u02c0\0\u02c0"+ - "\0\u0604\0\u0630\0\u0344\0\u065c\0\u0688\0\u06b4\0\u02c0\0\u06e0"+ - "\0\u070c\0\u0738\0\u02c0\0\u0764\0\u0790\0\u02c0\0\u02c0\0\u07bc"+ - "\0\u04d0\0\u07e8\0\u0814\0\u0840\0\u086c\0\u0898\0\u08c4\0\u08f0"+ - "\0\u091c\0\u0948\0\u0974\0\u09a0\0\u04d0\0\u09cc\0\u09f8\0\u0478"+ - "\0\u0478\0\u0a24\0\u0a50\0\u0478"; + "\0\0\0\62\0\144\0\226\0\310\0\372\0\u012c\0\u015e"+ + "\0\u0190\0\u01c2\0\u01f4\0\u0226\0\u0258\0\u028a\0\u02bc\0\u02ee"+ + "\0\u0320\0\u0352\0\u0384\0\u03b6\0\u03e8\0\u041a\0\u03e8\0\u044c"+ + "\0\u03e8\0\u047e\0\u03e8\0\u03e8\0\u03e8\0\u04b0\0\u03e8\0\u04e2"+ + "\0\u03e8\0\u03e8\0\u0514\0\u0546\0\u0578\0\u05aa\0\u05dc\0\u060e"+ + "\0\u0640\0\u0672\0\u06a4\0\u06d6\0\u0708\0\u073a\0\u076c\0\u079e"+ + "\0\u07d0\0\u0802\0\u0834\0\u0866\0\u0898\0\u08ca\0\u08fc\0\u092e"+ + "\0\u0960\0\u0992\0\u09c4\0\u03e8\0\u03e8\0\u03e8\0\u09f6\0\u0a28"+ + "\0\u0a5a\0\u03e8\0\u03e8\0\u03e8\0\u03e8\0\u0a8c\0\u03e8\0\u03e8"+ + "\0\u03e8\0\u03e8\0\u03e8\0\u0abe\0\u03e8\0\u03e8\0\u03e8\0\u03e8"+ + "\0\u03e8\0\u0af0\0\u03e8\0\u03e8\0\u03e8\0\u03e8\0\u0b22\0\u0b54"+ + "\0\u0b86\0\u0bb8\0\u0bea\0\u047e\0\u0c1c\0\u0c4e\0\u0c80\0\u0cb2"+ + "\0\u0ce4\0\u0d16\0\u0d48\0\u0d7a\0\u0dac\0\u0dde\0\u0e10\0\u0e42"+ + "\0\u0e74\0\u0ea6\0\u0ed8\0\u0f0a\0\u0f3c\0\u0f6e\0\u0fa0\0\u0fd2"+ + "\0\u1004\0\u1036\0\u1068\0\u109a\0\u03e8\0\u10cc\0\u10fe\0\u1130"+ + "\0\u03e8\0\u1162\0\u1194\0\u11c6\0\u11f8\0\u122a\0\u125c\0\u128e"+ + "\0\u12c0\0\u12f2\0\u1324\0\u1356\0\u1388\0\u13ba\0\u13ec\0\u141e"+ + "\0\u1450\0\u0546\0\u1482\0\u14b4\0\u14e6\0\u1518\0\u154a\0\u157c"+ + "\0\u03e8\0\u03e8\0\u0960\0\u15ae\0\u15e0\0\u1612\0\u1644\0\u1676"+ + "\0\u16a8\0\u16da\0\u170c\0\u0546\0\u173e\0\u1770\0\u17a2\0\u17d4"+ + "\0\u1806\0\u1838\0\u186a\0\u189c\0\u18ce\0\u1900\0\u1932\0\u1964"+ + "\0\u1996\0\u0546\0\u19c8\0\u19fa\0\u1a2c\0\u1a5e\0\u1a90\0\u1ac2"+ + "\0\u1af4\0\u1b26\0\u1b58\0\u0546\0\u1b8a\0\u1bbc\0\u1bee\0\u0546"+ + "\0\u1c20\0\u1c52\0\u1c84\0\u1cb6\0\u0546\0\u1ce8\0\u1d1a\0\u0546"+ + "\0\u1d4c\0\u0546\0\u1d7e\0\u1db0\0\u0960\0\u1de2\0\u1e14\0\u1e46"+ + "\0\u1e78\0\u1eaa\0\u1edc\0\u1f0e\0\u1f40\0\u1f72\0\u1fa4\0\u1fd6"+ + "\0\u0546\0\u0546\0\u2008\0\u203a\0\u206c\0\u0960\0\u209e\0\u20d0"+ + "\0\u2102\0\u08fc\0\u2134\0\u2166\0\u2198\0\u21ca\0\u21fc\0\u222e"+ + "\0\u0546\0\u08fc\0\u08fc\0\u2260\0\u2292\0\u0546\0\u22c4\0\u22f6"+ + "\0\u2328\0\u235a\0\u08fc\0\u0546"; private static int [] zzUnpackRowMap() { - int [] result = new int[92]; + int [] result = new int[236]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -292,72 +322,151 @@ private static int zzUnpackRowMap(String packed, int offset, int [] result) { private static final int [] ZZ_TRANS = zzUnpackTrans(); private static final String ZZ_TRANS_PACKED_0 = - "\1\21\1\22\1\23\2\24\1\21\1\25\1\21\1\26"+ - "\1\27\5\21\1\25\34\21\1\25\1\30\1\31\2\24"+ - "\1\32\2\25\1\33\11\25\15\32\11\25\3\32\1\34"+ - "\1\25\1\30\1\31\2\24\1\35\14\25\15\35\11\25"+ - "\3\35\2\25\1\30\1\31\2\24\1\36\14\25\15\36"+ - "\11\25\3\36\1\25\1\37\1\30\1\31\1\40\1\24"+ - "\47\37\1\25\1\30\1\31\2\24\1\41\1\25\1\42"+ - "\12\25\15\41\11\25\3\41\2\25\1\30\1\31\2\24"+ - "\1\43\1\25\1\44\1\33\1\25\1\45\3\25\1\46"+ - "\1\25\1\47\1\50\3\43\1\51\11\43\1\52\1\53"+ - "\1\54\1\55\1\56\1\57\1\60\1\61\1\25\1\62"+ - "\2\43\2\25\1\30\1\31\2\24\1\63\14\25\15\63"+ - "\11\25\3\63\1\25\1\21\1\30\1\31\2\24\14\21"+ - "\1\64\32\21\1\25\1\30\1\31\2\24\1\41\14\25"+ - "\1\65\14\41\11\25\3\41\2\25\1\30\1\31\2\24"+ - "\1\41\14\25\15\41\11\25\3\41\1\25\1\66\1\30"+ - "\1\31\2\24\1\32\12\66\1\67\1\70\15\32\11\66"+ - "\3\32\2\66\1\30\1\31\2\24\1\41\14\66\15\41"+ - "\11\66\3\41\2\66\1\30\1\31\2\24\1\32\12\66"+ - "\1\67\1\66\15\32\11\66\3\32\1\66\12\25\1\71"+ - "\57\25\1\72\35\25\56\0\1\23\54\0\2\24\60\0"+ - "\1\73\44\0\1\31\56\0\3\32\5\0\1\32\4\0"+ - "\15\32\11\0\3\32\6\0\3\35\5\0\1\35\4\0"+ - "\15\35\11\0\3\35\6\0\3\36\5\0\1\36\4\0"+ - "\15\36\11\0\3\36\1\0\1\37\2\0\1\37\1\0"+ - "\50\37\2\0\1\40\1\24\47\37\5\0\3\41\5\0"+ - "\1\41\4\0\15\41\11\0\3\41\10\0\1\74\51\0"+ - "\3\43\5\0\1\43\4\0\15\43\11\0\3\43\10\0"+ - "\1\75\51\0\3\43\5\0\1\43\4\0\4\43\1\76"+ - "\10\43\11\0\3\43\50\0\1\77\11\0\3\43\5\0"+ - "\1\43\4\0\12\43\1\100\2\43\11\0\3\43\6\0"+ - "\3\63\5\0\1\63\4\0\15\63\11\0\3\63\6\0"+ - "\3\41\5\0\1\41\4\0\1\41\1\101\10\41\1\102"+ - "\2\41\11\0\3\41\1\0\12\71\1\103\1\104\40\71"+ - "\13\72\1\105\2\72\1\103\35\72\7\0\1\106\53\0"+ - "\1\107\51\0\3\43\5\0\1\43\4\0\1\43\1\110"+ - "\13\43\11\0\3\43\6\0\3\43\5\0\1\43\4\0"+ - "\15\43\11\0\1\43\1\111\1\43\6\0\3\41\5\0"+ - "\1\41\4\0\2\41\1\112\4\41\1\113\5\41\11\0"+ - "\3\41\6\0\3\41\5\0\1\41\4\0\13\41\1\114"+ - "\1\41\11\0\3\41\2\0\2\71\2\0\1\71\1\0"+ - "\10\71\1\0\34\71\1\0\2\72\2\0\1\72\1\0"+ - "\10\72\1\0\34\72\5\0\3\43\5\0\1\43\4\0"+ - "\4\43\1\115\10\43\11\0\3\43\6\0\3\41\5\0"+ - "\1\41\4\0\3\41\1\116\11\41\11\0\3\41\6\0"+ - "\3\41\5\0\1\41\4\0\5\41\1\117\7\41\11\0"+ - "\3\41\6\0\3\41\5\0\1\41\4\0\14\41\1\120"+ - "\11\0\3\41\6\0\3\43\5\0\1\43\4\0\1\43"+ - "\1\121\13\43\11\0\3\43\6\0\3\41\5\0\1\41"+ - "\4\0\4\41\1\122\10\41\11\0\3\41\6\0\3\41"+ - "\5\0\1\41\4\0\6\41\1\123\6\41\11\0\3\41"+ - "\6\0\3\41\5\0\1\41\4\0\2\41\1\124\12\41"+ - "\11\0\3\41\6\0\3\43\5\0\1\43\4\0\15\43"+ - "\11\0\2\43\1\125\6\0\3\41\5\0\1\41\4\0"+ - "\5\41\1\126\7\41\11\0\3\41\6\0\3\41\5\0"+ - "\1\41\4\0\10\41\1\127\4\41\11\0\3\41\6\0"+ - "\3\41\5\0\1\41\4\0\10\41\1\130\4\41\11\0"+ - "\3\41\6\0\3\41\5\0\1\41\4\0\6\41\1\131"+ - "\6\41\11\0\3\41\6\0\3\41\5\0\1\41\4\0"+ - "\5\41\1\132\7\41\11\0\3\41\6\0\3\41\5\0"+ - "\1\41\4\0\6\41\1\133\6\41\11\0\3\41\6\0"+ - "\3\41\5\0\1\41\4\0\11\41\1\134\3\41\11\0"+ - "\3\41\1\0"; + "\1\25\1\26\1\27\2\30\1\25\1\31\2\25\1\32"+ + "\1\25\1\33\4\25\1\34\1\31\40\25\1\35\1\36"+ + "\1\37\2\30\1\40\5\35\1\41\6\35\24\40\7\35"+ + "\1\42\4\35\1\31\1\36\1\37\2\30\1\43\14\31"+ + "\24\43\14\31\1\35\1\36\1\37\2\30\1\44\14\35"+ + "\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\61\1\62\1\63\4\44"+ + "\1\64\14\35\1\65\1\36\1\37\1\66\1\30\55\65"+ + "\1\31\1\36\1\37\2\30\1\67\1\31\1\70\12\31"+ + "\24\67\15\31\1\36\1\37\2\30\1\71\1\31\1\72"+ + "\2\31\1\73\1\41\1\74\2\31\1\75\1\76\1\31"+ + "\1\77\5\71\1\100\11\71\1\101\3\71\1\102\1\103"+ + "\1\104\1\105\1\106\1\31\1\107\1\41\1\110\1\111"+ + "\1\112\1\113\1\31\1\36\1\37\2\30\1\114\14\31"+ + "\24\114\2\31\1\115\12\31\1\36\1\37\2\30\1\40"+ + "\14\31\24\40\1\116\1\117\1\31\1\120\10\31\1\25"+ + "\1\36\1\37\2\30\41\25\1\121\13\25\1\31\1\36"+ + "\1\37\2\30\1\67\14\31\5\67\1\122\16\67\4\31"+ + "\1\123\10\31\1\36\1\37\2\30\1\40\4\31\1\73"+ + "\7\31\24\40\5\31\1\124\7\31\1\36\1\37\2\30"+ + "\1\67\14\31\24\67\4\31\1\125\7\31\1\126\1\36"+ + "\1\37\2\30\1\40\14\126\24\40\1\116\1\117\13\126"+ + "\1\36\1\37\2\30\1\67\14\126\24\67\14\126\14\31"+ + "\1\127\64\31\1\130\42\31\1\131\1\36\1\37\1\132"+ + "\1\30\1\133\14\131\24\133\14\131\1\31\1\36\1\37"+ + "\2\30\56\31\1\36\1\37\2\30\1\40\14\31\24\40"+ + "\1\116\1\117\12\31\64\0\1\27\62\0\2\30\66\0"+ + "\1\134\52\0\1\37\64\0\6\40\7\0\24\40\21\0"+ + "\6\43\7\0\24\43\21\0\6\44\7\0\24\44\21\0"+ + "\6\44\7\0\1\44\1\135\22\44\21\0\6\44\7\0"+ + "\13\44\1\136\10\44\21\0\6\44\7\0\13\44\1\137"+ + "\10\44\21\0\6\44\7\0\6\44\1\140\15\44\21\0"+ + "\6\44\7\0\1\44\1\141\22\44\21\0\6\44\7\0"+ + "\6\44\1\142\1\143\5\44\1\144\6\44\21\0\6\44"+ + "\7\0\3\44\1\145\20\44\21\0\6\44\7\0\2\44"+ + "\1\146\21\44\21\0\6\44\7\0\16\44\1\147\5\44"+ + "\21\0\6\44\7\0\3\44\1\150\20\44\21\0\6\44"+ + "\7\0\2\44\1\151\13\44\1\152\5\44\21\0\6\44"+ + "\7\0\6\44\1\153\15\44\21\0\6\44\7\0\17\44"+ + "\1\154\4\44\21\0\6\44\7\0\12\44\1\155\11\44"+ + "\21\0\6\44\7\0\20\44\1\156\3\44\21\0\6\44"+ + "\7\0\2\44\1\157\21\44\14\0\1\65\2\0\1\65"+ + "\1\0\56\65\2\0\1\66\1\30\55\65\5\0\6\67"+ + "\7\0\24\67\23\0\1\160\57\0\6\71\7\0\24\71"+ + "\23\0\1\161\64\0\1\73\54\0\6\71\7\0\15\71"+ + "\1\162\6\71\21\0\6\71\7\0\12\71\1\163\11\71"+ + "\21\0\6\71\7\0\6\71\1\164\15\71\67\0\1\165"+ + "\13\0\6\114\7\0\24\114\21\0\6\67\7\0\6\67"+ + "\1\166\1\167\5\67\1\170\6\67\14\0\14\127\1\171"+ + "\1\172\44\127\15\130\1\173\1\130\1\171\42\130\1\131"+ + "\2\0\1\131\1\0\56\131\2\0\1\132\1\30\56\131"+ + "\2\0\1\131\1\0\6\133\7\131\24\133\14\131\5\0"+ + "\6\44\7\0\2\44\1\174\21\44\21\0\6\44\7\0"+ + "\14\44\1\175\7\44\21\0\6\44\7\0\15\44\1\176"+ + "\6\44\21\0\6\44\7\0\13\44\1\177\10\44\21\0"+ + "\6\44\7\0\6\44\1\200\15\44\21\0\6\44\7\0"+ + "\7\44\1\201\1\44\1\202\12\44\21\0\6\44\7\0"+ + "\1\44\1\203\14\44\1\204\5\44\21\0\6\44\7\0"+ + "\21\44\1\205\2\44\21\0\6\44\7\0\1\44\1\206"+ + "\22\44\21\0\6\44\7\0\14\44\1\207\7\44\21\0"+ + "\6\44\7\0\4\44\1\210\17\44\21\0\6\44\7\0"+ + "\6\44\1\211\15\44\21\0\6\44\7\0\2\44\1\212"+ + "\21\44\21\0\6\44\7\0\15\44\1\213\6\44\21\0"+ + "\6\44\7\0\10\44\1\214\13\44\21\0\6\44\7\0"+ + "\5\44\1\215\16\44\21\0\6\44\7\0\1\44\1\216"+ + "\22\44\21\0\6\44\7\0\2\44\1\217\21\44\21\0"+ + "\6\44\7\0\13\44\1\220\10\44\23\0\1\221\61\0"+ + "\1\222\57\0\6\71\7\0\13\71\1\223\10\71\21\0"+ + "\6\71\7\0\17\71\1\224\4\71\21\0\6\71\7\0"+ + "\7\71\1\225\14\71\21\0\6\67\7\0\11\67\1\226"+ + "\12\67\21\0\6\67\7\0\1\67\1\227\14\67\1\230"+ + "\5\67\21\0\6\67\7\0\21\67\1\231\2\67\15\0"+ + "\2\127\2\0\1\127\1\0\12\127\1\0\40\127\1\0"+ + "\2\130\2\0\1\130\1\0\12\130\1\0\40\130\5\0"+ + "\6\44\7\0\3\44\1\232\20\44\21\0\6\44\7\0"+ + "\2\44\1\233\21\44\21\0\6\44\7\0\10\44\1\234"+ + "\13\44\21\0\6\44\7\0\23\44\1\235\21\0\6\44"+ + "\7\0\23\44\1\236\21\0\6\44\7\0\6\44\1\237"+ + "\15\44\21\0\6\44\7\0\22\44\1\240\1\44\21\0"+ + "\6\44\7\0\20\44\1\241\3\44\21\0\6\44\7\0"+ + "\14\44\1\242\7\44\21\0\6\44\7\0\3\44\1\243"+ + "\20\44\21\0\6\44\7\0\6\44\1\244\15\44\21\0"+ + "\6\44\7\0\15\44\1\245\6\44\21\0\6\44\7\0"+ + "\15\44\1\246\6\44\21\0\6\44\7\0\12\44\1\247"+ + "\11\44\21\0\6\44\7\0\7\44\1\250\14\44\21\0"+ + "\6\44\7\0\2\44\1\251\21\44\21\0\6\44\7\0"+ + "\2\44\1\252\21\44\21\0\6\44\7\0\13\44\1\253"+ + "\10\44\21\0\6\44\7\0\7\44\1\254\14\44\21\0"+ + "\6\44\7\0\2\44\1\255\21\44\21\0\6\71\7\0"+ + "\13\71\1\256\10\71\21\0\6\71\7\0\6\71\1\257"+ + "\15\71\21\0\6\67\7\0\22\67\1\260\1\67\21\0"+ + "\6\67\7\0\20\67\1\261\3\67\21\0\6\67\7\0"+ + "\14\67\1\262\7\67\21\0\6\67\7\0\3\67\1\263"+ + "\20\67\21\0\6\44\7\0\4\44\1\264\17\44\21\0"+ + "\6\44\7\0\7\44\1\265\14\44\21\0\6\44\7\0"+ + "\15\44\1\266\6\44\21\0\6\44\7\0\13\44\1\267"+ + "\10\44\21\0\6\44\7\0\10\44\1\270\13\44\21\0"+ + "\6\44\7\0\6\44\1\271\15\44\21\0\6\44\7\0"+ + "\6\44\1\272\15\44\21\0\6\44\7\0\2\44\1\273"+ + "\21\44\21\0\6\44\7\0\1\44\1\274\22\44\21\0"+ + "\6\44\7\0\12\44\1\275\11\44\21\0\6\44\7\0"+ + "\7\44\1\276\14\44\21\0\6\44\7\0\3\44\1\277"+ + "\20\44\21\0\6\44\7\0\12\44\1\300\11\44\21\0"+ + "\6\44\7\0\11\44\1\277\12\44\21\0\6\44\7\0"+ + "\12\44\1\301\11\44\21\0\6\44\7\0\23\44\1\302"+ + "\21\0\6\44\7\0\3\44\1\303\20\44\21\0\6\44"+ + "\7\0\7\44\1\304\14\44\21\0\6\71\7\0\11\71"+ + "\1\305\12\71\21\0\6\71\7\0\7\71\1\306\14\71"+ + "\21\0\6\67\7\0\6\67\1\307\15\67\21\0\6\67"+ + "\7\0\6\67\1\310\15\67\21\0\6\67\7\0\2\67"+ + "\1\311\21\67\21\0\6\67\7\0\1\67\1\312\22\67"+ + "\21\0\6\44\7\0\1\313\23\44\21\0\6\44\7\0"+ + "\6\44\1\314\15\44\21\0\6\44\7\0\16\44\1\315"+ + "\5\44\21\0\6\44\7\0\23\44\1\316\21\0\6\44"+ + "\7\0\14\44\1\317\7\44\21\0\6\44\7\0\11\44"+ + "\1\320\12\44\21\0\6\44\7\0\11\44\1\321\12\44"+ + "\21\0\6\44\7\0\13\44\1\252\10\44\21\0\6\44"+ + "\7\0\2\44\1\322\21\44\21\0\6\44\7\0\5\44"+ + "\1\323\16\44\21\0\6\44\7\0\16\44\1\324\5\44"+ + "\21\0\6\44\7\0\1\44\1\325\22\44\21\0\6\71"+ + "\7\0\23\71\1\326\21\0\6\67\7\0\23\67\1\327"+ + "\21\0\6\67\7\0\14\67\1\330\7\67\21\0\6\67"+ + "\7\0\11\67\1\331\12\67\21\0\6\67\7\0\11\67"+ + "\1\332\12\67\21\0\6\44\7\0\6\44\1\333\15\44"+ + "\21\0\6\44\7\0\23\44\1\334\21\0\6\44\7\0"+ + "\12\44\1\335\11\44\21\0\6\44\7\0\2\44\1\302"+ + "\21\44\21\0\6\44\7\0\2\44\1\321\21\44\21\0"+ + "\6\44\7\0\14\44\1\336\7\44\21\0\6\44\7\0"+ + "\6\44\1\337\15\44\21\0\6\44\7\0\6\44\1\340"+ + "\15\44\21\0\6\44\7\0\11\44\1\341\12\44\21\0"+ + "\6\67\7\0\2\67\1\342\21\67\21\0\6\67\7\0"+ + "\2\67\1\343\21\67\21\0\6\67\7\0\14\67\1\344"+ + "\7\67\21\0\6\44\7\0\11\44\1\345\12\44\21\0"+ + "\6\44\7\0\2\44\1\346\21\44\21\0\6\44\7\0"+ + "\14\44\1\347\7\44\21\0\6\44\7\0\2\44\1\350"+ + "\21\44\21\0\6\44\7\0\11\44\1\316\12\44\21\0"+ + "\6\44\7\0\4\44\1\252\17\44\21\0\6\67\7\0"+ + "\2\67\1\351\21\67\21\0\6\44\7\0\2\44\1\300"+ + "\21\44\21\0\6\44\7\0\1\44\1\352\22\44\21\0"+ + "\6\44\7\0\4\44\1\321\17\44\21\0\6\67\7\0"+ + "\4\67\1\353\17\67\21\0\6\44\7\0\11\44\1\354"+ + "\12\44\14\0"; private static int [] zzUnpackTrans() { - int [] result = new int[2684]; + int [] result = new int[9100]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -395,13 +504,14 @@ private static int zzUnpackTrans(String packed, int offset, int [] result) { private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); 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\10\1\4\11\1\1\7\11"+ - "\3\1\1\11\1\1\3\11\3\1\2\0\1\1\1\11"+ - "\3\1\1\11\2\0\2\11\25\1"; + "\4\0\1\1\14\0\1\1\2\0\1\11\1\1\1\11"+ + "\1\1\1\11\1\1\3\11\1\1\1\11\1\1\2\11"+ + "\31\1\3\11\3\1\4\11\1\1\5\11\1\1\5\11"+ + "\1\1\4\11\31\1\2\0\3\1\1\11\3\1\1\11"+ + "\2\0\25\1\2\11\132\1"; private static int [] zzUnpackAttribute() { - int [] result = new int[92]; + int [] result = new int[236]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; @@ -731,192 +841,317 @@ else if (zzAtEOF) { { yybegin(YYINITIAL); return STRING; } // fall through - case 39: break; + case 64: break; case 2: - { yybegin(xCOMMENT_STRING); yypushback(yylength()); + { return STRING_LITERAL; } // fall through - case 40: break; + case 65: break; case 3: - { yybegin(YYINITIAL); return com.intellij.psi.TokenType.WHITE_SPACE; + { yybegin(xCOMMENT_STRING); yypushback(yylength()); } // fall through - case 41: break; + case 66: break; case 4: - { return com.intellij.psi.TokenType.WHITE_SPACE; + { yybegin(YYINITIAL); return com.intellij.psi.TokenType.WHITE_SPACE; } // fall through - case 42: break; + case 67: break; case 5: - { return com.intellij.psi.TokenType.BAD_CHARACTER; + { return com.intellij.psi.TokenType.WHITE_SPACE; } // fall through - case 43: break; + case 68: break; case 6: - { yybegin(xTAG_NAME); return AT; + { return TokenType.WHITE_SPACE; } // fall through - case 44: break; + case 69: break; case 7: - { yybegin(YYINITIAL);return com.intellij.psi.TokenType.WHITE_SPACE; + { yybegin(xTAG_NAME); return AT; } // fall through - case 45: break; + case 70: break; case 8: - { return ID; + { yybegin(xTAG_ENUMFIELD); ;return OR; } // fall through - case 46: break; + case 71: break; case 9: - { yybegin(xCOMMENT_STRING); return STRING_BEGIN; + { return com.intellij.psi.TokenType.BAD_CHARACTER; } // fall through - case 47: break; + case 72: break; case 10: - { return SHARP; + { yybegin(YYINITIAL);return com.intellij.psi.TokenType.WHITE_SPACE; } // fall through - case 48: break; + case 73: break; case 11: - { yybegin(xCOMMENT_STRING); return ID; + { return ID; } // fall through - case 49: break; + case 74: break; case 12: - { yybegin(xCOMMENT_STRING); return TAG_NAME; + { yybegin(xCOMMENT_STRING); return STRING_BEGIN; } // fall through - case 50: break; + case 75: break; case 13: - { beginType(); return ID; + { return SHARP; } // fall through - case 51: break; + case 76: break; case 14: - { if (_typeReq || _typeLevel > 0) { _typeReq = false; return ID; } else { yybegin(xCOMMENT_STRING); yypushback(yylength()); } + { yybegin(xCOMMENT_STRING); return ID; } // fall through - case 52: break; + case 77: break; case 15: - { yybegin(xDOUBLE_QUOTED_STRING); yypushback(yylength()); + { yybegin(xCOMMENT_STRING); return TAG_NAME; } // fall through - case 53: break; + case 78: break; case 16: - { yybegin(xSINGLE_QUOTED_STRING); yypushback(yylength()); + { beginType(); return ID; } // fall through - case 54: break; + case 79: break; case 17: - { _typeReq = true; return COMMA; + { if (_typeReq || _typeLevel > 0) { _typeReq = false; return ID; } else { yybegin(xCOMMENT_STRING); yypushback(yylength()); } } // fall through - case 55: break; + case 80: break; case 18: - { _typeReq = true; return EXTENDS; + { return NUMBER; } // fall through - case 56: break; + case 81: break; case 19: - { _typeReq = true; return OR; + { yybegin(xDOUBLE_QUOTED_STRING); yypushback(yylength()); } // fall through - case 57: break; + case 82: break; case 20: - { _typeLevel++; return LT; + { yybegin(xSINGLE_QUOTED_STRING); yypushback(yylength()); } // fall through - case 58: break; + case 83: break; case 21: - { _typeLevel--; _typeReq = false; return GT; + { _typeReq = true; return OR; } // fall through - case 59: break; + case 84: break; case 22: - { _typeLevel++; return LPAREN; + { _typeReq = true; return EXTENDS; } // fall through - case 60: break; + case 85: break; case 23: - { _typeLevel--; _typeReq = false; return RPAREN; + { _typeReq = true; return COMMA; } // fall through - case 61: break; + case 86: break; case 24: - { _typeLevel++; return LCURLY; + { _typeLevel++; return LT; } // fall through - case 62: break; + case 87: break; case 25: - { _typeLevel--; _typeReq = false; return RCURLY; + { _typeLevel--; _typeReq = false; return GT; } // fall through - case 63: break; + case 88: break; case 26: - { yybegin(xCLASS_EXTEND); return ID; + { return NULLABLE; } // fall through - case 64: break; + case 89: break; case 27: - { beginType(); return EXTENDS; + { _typeLevel++; return LPAREN; } // fall through - case 65: break; + case 90: break; case 28: - { yybegin(YYINITIAL); yypushback(yylength()); + { _typeLevel--; _typeReq = false; return RPAREN; } // fall through - case 66: break; + case 91: break; case 29: - { return COMMA; + { _typeLevel++; return LCURLY; } // fall through - case 67: break; + case 92: break; case 30: - { return EXTENDS; + { _typeLevel--; _typeReq = false; return RCURLY; } // fall through - case 68: break; + case 93: break; case 31: - { yybegin(xTYPE_REF); return STRING_LITERAL; + { yybegin(xCLASS_EXTEND); return ID; } // fall through - case 69: break; + case 94: break; case 32: - { return DASHES; + { yybegin(xCLASS_GENERIC); return LT; } // fall through - case 70: break; + case 95: break; case 33: - { _typeReq = false; return ARR; + { return EXTENDS; } // fall through - case 71: break; + case 96: break; case 34: - { return FUN; + { return COMMA; } // fall through - case 72: break; + case 97: break; case 35: - { _typeReq = true; return VARARG; + { return GT; } // fall through - case 73: break; + case 98: break; case 36: - { yybegin(xFIELD_ID); return PUBLIC; + { beginType(); return EXTENDS; } // fall through - case 74: break; + case 99: break; case 37: - { yybegin(xFIELD_ID); return PRIVATE; + { yybegin(xFIELD_ID); yypushback(yylength()); } // fall through - case 75: break; + case 100: break; case 38: + { yybegin(xFIELD_ID); return RBRACK; + } + // fall through + case 101: break; + case 39: + { yybegin(xFIELD_INDEX); return LBRACK; + } + // fall through + case 102: break; + case 40: + { yybegin(YYINITIAL); yypushback(yylength()); + } + // fall through + case 103: break; + case 41: + { yybegin(xTYPE_REF); return STRING_LITERAL; + } + // fall through + case 104: break; + case 42: + { return DASHES; + } + // fall through + case 105: break; + case 43: + { _typeReq = false; return ARR; + } + // fall through + case 106: break; + case 44: + { yybegin(xTAG); return TAG_NAME; + } + // fall through + case 107: break; + case 45: + { return FUN; + } + // fall through + case 108: break; + case 46: + { yybegin(xENUM); return TAG_NAME; + } + // fall through + case 109: break; + case 47: + { beginType(); return TAG_NAME; + } + // fall through + case 110: break; + case 48: + { yybegin(xFIELD); return TAG_NAME; + } + // fall through + case 111: break; + case 49: + { yybegin(xPARAM); return TAG_NAME; + } + // fall through + case 112: break; + case 50: + { yybegin(xALIAS); return TAG_NAME; + } + // fall through + case 113: break; + case 51: + { yybegin(xCLASS); return TAG_NAME; + } + // fall through + case 114: break; + case 52: + { yybegin(xTAG_WITH_ID); return TAG_NAME; + } + // fall through + case 115: break; + case 53: + { return ASYNC; + } + // fall through + case 116: break; + case 54: + { return TAG_NAME; + } + // fall through + case 117: break; + case 55: + { yybegin(xMODULE); return TAG_NAME; + } + // fall through + case 118: break; + case 56: + { _typeReq = true; return VARARG; + } + // fall through + case 119: break; + case 57: + { yybegin(xFIELD_ID); return PUBLIC; + } + // fall through + case 120: break; + case 58: + { yybegin(xGENERIC); return TAG_NAME; + } + // fall through + case 121: break; + case 59: + { yybegin(xFIELD_ID); return PACKAGE; + } + // fall through + case 122: break; + case 60: + { yybegin(xFIELD_ID); return PRIVATE; + } + // fall through + case 123: break; + case 61: + { yybegin(xTAG_WITH_ID); return TAG_NAME_LANGUAGE; + } + // fall through + case 124: break; + case 62: { yybegin(xFIELD_ID); return PROTECTED; } // fall through - case 76: break; + case 125: break; + case 63: + { yybegin(xTAG_DIAGNOSTIC); return TAG_NAME; + } + // fall through + case 126: 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 4119951..9a77abc 100644 --- a/gen/com/tang/intellij/lua/comment/parser/LuaDocParser.java +++ b/gen/com/tang/intellij/lua/comment/parser/LuaDocParser.java @@ -21,7 +21,7 @@ public ASTNode parse(IElementType t, PsiBuilder b) { public void parseLight(IElementType t, PsiBuilder b) { boolean r; - b = adapt_builder_(t, b, this, EXTENDS_SETS_); + b = adapt_builder_(t, b, this, null); Marker m = enter_section_(b, 0, _COLLAPSE_, null); r = parse_root_(t, b); exit_section_(b, 0, m, t, r, true, TRUE_CONDITION); @@ -35,28 +35,6 @@ static boolean parse_root_(IElementType t, PsiBuilder b, int l) { return doc(b, l + 1); } - public static final TokenSet[] EXTENDS_SETS_ = new TokenSet[] { - create_token_set_(ARR_TY, FUNCTION_TY, GENERAL_TY, GENERIC_TY, - PAR_TY, STRING_LITERAL_TY, TABLE_TY, TY, - UNION_TY), - }; - - /* ********************************************************** */ - // PRIVATE | PUBLIC | PROTECTED | TAG_NAME_PRIVATE | TAG_NAME_PUBLIC | TAG_NAME_PROTECTED - public static boolean access_modifier(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "access_modifier")) return false; - boolean r; - Marker m = enter_section_(b, l, _NONE_, ACCESS_MODIFIER, ""); - r = consumeToken(b, PRIVATE); - if (!r) r = consumeToken(b, PUBLIC); - if (!r) r = consumeToken(b, PROTECTED); - if (!r) r = consumeToken(b, TAG_NAME_PRIVATE); - if (!r) r = consumeToken(b, TAG_NAME_PUBLIC); - if (!r) r = consumeToken(b, TAG_NAME_PROTECTED); - exit_section_(b, l, m, r, false, null); - return r; - } - /* ********************************************************** */ // doc_item | STRING static boolean after_dash(PsiBuilder b, int l) { @@ -81,51 +59,48 @@ static boolean after_dash_recover(PsiBuilder b, int l) { } /* ********************************************************** */ - // ID { - // } - public static boolean class_name_ref(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "class_name_ref")) return false; - if (!nextTokenIs(b, ID)) return false; + // ID | STRING | NUMBER | AT | SHARP | EQ | COMMA | EXTENDS | OR | GT | LT | LPAREN | RPAREN | LCURLY | RCURLY + // | STRING_LITERAL | ARR | FUN | VARARG | PRIVATE | PROTECTED | PUBLIC | DASHES | STRING_BEGIN | TAG_NAME | + // TAG_NAME_LANGUAGE | ASYNC | NULLABLE | LBRACK | RBRACK | PACKAGE + public static boolean any(PsiBuilder b, int l) { + if (!recursion_guard_(b, l, "any")) return false; boolean r; - Marker m = enter_section_(b); + Marker m = enter_section_(b, l, _NONE_, ANY, ""); r = consumeToken(b, ID); - r = r && class_name_ref_1(b, l + 1); - exit_section_(b, m, CLASS_NAME_REF, r); - return r; - } - - // { - // } - private static boolean class_name_ref_1(PsiBuilder b, int l) { - return true; - } - - /* ********************************************************** */ - // STRING_BEGIN? STRING? - public static boolean comment_string(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "comment_string")) return false; - boolean r; - Marker m = enter_section_(b, l, _NONE_, COMMENT_STRING, ""); - r = comment_string_0(b, l + 1); - r = r && comment_string_1(b, l + 1); + if (!r) r = consumeToken(b, STRING); + if (!r) r = consumeToken(b, NUMBER); + if (!r) r = consumeToken(b, AT); + if (!r) r = consumeToken(b, SHARP); + if (!r) r = consumeToken(b, EQ); + if (!r) r = consumeToken(b, COMMA); + if (!r) r = consumeToken(b, EXTENDS); + if (!r) r = consumeToken(b, OR); + if (!r) r = consumeToken(b, GT); + if (!r) r = consumeToken(b, LT); + if (!r) r = consumeToken(b, LPAREN); + if (!r) r = consumeToken(b, RPAREN); + if (!r) r = consumeToken(b, LCURLY); + if (!r) r = consumeToken(b, RCURLY); + if (!r) r = consumeToken(b, STRING_LITERAL); + if (!r) r = consumeToken(b, ARR); + if (!r) r = consumeToken(b, FUN); + if (!r) r = consumeToken(b, VARARG); + if (!r) r = consumeToken(b, PRIVATE); + if (!r) r = consumeToken(b, PROTECTED); + if (!r) r = consumeToken(b, PUBLIC); + if (!r) r = consumeToken(b, DASHES); + if (!r) r = consumeToken(b, STRING_BEGIN); + if (!r) r = consumeToken(b, TAG_NAME); + if (!r) r = consumeToken(b, TAG_NAME_LANGUAGE); + if (!r) r = consumeToken(b, ASYNC); + if (!r) r = consumeToken(b, NULLABLE); + if (!r) r = consumeToken(b, LBRACK); + if (!r) r = consumeToken(b, RBRACK); + if (!r) r = consumeToken(b, PACKAGE); exit_section_(b, l, m, r, false, null); return r; } - // STRING_BEGIN? - private static boolean comment_string_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "comment_string_0")) return false; - consumeToken(b, STRING_BEGIN); - return true; - } - - // STRING? - private static boolean comment_string_1(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "comment_string_1")) return false; - consumeToken(b, STRING); - return true; - } - /* ********************************************************** */ // (DASHES after_dash?)* static boolean doc(PsiBuilder b, int l) { @@ -170,993 +145,27 @@ static boolean doc_item(PsiBuilder b, int l) { } /* ********************************************************** */ - // (tableField (',' tableField)* (',')?)? - static boolean fieldList(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "fieldList")) return false; - fieldList_0(b, l + 1); - return true; - } - - // tableField (',' tableField)* (',')? - private static boolean fieldList_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "fieldList_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = tableField(b, l + 1); - r = r && fieldList_0_1(b, l + 1); - r = r && fieldList_0_2(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - - // (',' tableField)* - private static boolean fieldList_0_1(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "fieldList_0_1")) return false; - while (true) { - int c = current_position_(b); - if (!fieldList_0_1_0(b, l + 1)) break; - if (!empty_element_parsed_guard_(b, "fieldList_0_1", c)) break; - } - return true; - } - - // ',' tableField - private static boolean fieldList_0_1_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "fieldList_0_1_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, COMMA); - r = r && tableField(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - - // (',')? - private static boolean fieldList_0_2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "fieldList_0_2")) return false; - consumeToken(b, COMMA); - return true; - } - - /* ********************************************************** */ - // '<' generic_def (',' generic_def)* '>' - static boolean function_generic(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_generic")) return false; - if (!nextTokenIs(b, LT)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_); - r = consumeToken(b, LT); - p = r; // pin = 1 - r = r && report_error_(b, generic_def(b, l + 1)); - r = p && report_error_(b, function_generic_2(b, l + 1)) && r; - r = p && consumeToken(b, GT) && r; - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // (',' generic_def)* - private static boolean function_generic_2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_generic_2")) return false; - while (true) { - int c = current_position_(b); - if (!function_generic_2_0(b, l + 1)) break; - if (!empty_element_parsed_guard_(b, "function_generic_2", c)) break; - } - return true; - } - - // ',' generic_def - private static boolean function_generic_2_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_generic_2_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, COMMA); - r = r && generic_def(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - - /* ********************************************************** */ - // ID (':' ty)? - public static boolean function_param(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_param")) return false; - if (!nextTokenIs(b, ID)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, FUNCTION_PARAM, null); - r = consumeToken(b, ID); - p = r; // pin = 1 - r = r && function_param_1(b, l + 1); - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // (':' ty)? - private static boolean function_param_1(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_param_1")) return false; - function_param_1_0(b, l + 1); - return true; - } - - // ':' ty - private static boolean function_param_1_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_param_1_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, EXTENDS); - r = r && ty(b, l + 1, -1); - exit_section_(b, m, null, r); - return r; - } - - /* ********************************************************** */ - // (function_param ',')* ((function_param|vararg_param) |& ')') - static boolean function_param_list(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_param_list")) return false; - boolean r; - Marker m = enter_section_(b); - r = function_param_list_0(b, l + 1); - r = r && function_param_list_1(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - - // (function_param ',')* - private static boolean function_param_list_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_param_list_0")) return false; - while (true) { - int c = current_position_(b); - if (!function_param_list_0_0(b, l + 1)) break; - if (!empty_element_parsed_guard_(b, "function_param_list_0", c)) break; - } - return true; - } - - // function_param ',' - private static boolean function_param_list_0_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_param_list_0_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = function_param(b, l + 1); - r = r && consumeToken(b, COMMA); - exit_section_(b, m, null, r); - return r; - } - - // (function_param|vararg_param) |& ')' - private static boolean function_param_list_1(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_param_list_1")) return false; - boolean r; - Marker m = enter_section_(b); - r = function_param_list_1_0(b, l + 1); - if (!r) r = function_param_list_1_1(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - - // function_param|vararg_param - private static boolean function_param_list_1_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_param_list_1_0")) return false; - boolean r; - r = function_param(b, l + 1); - if (!r) r = vararg_param(b, l + 1); - return r; - } - - // & ')' - private static boolean function_param_list_1_1(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_param_list_1_1")) return false; - boolean r; - Marker m = enter_section_(b, l, _AND_); - r = consumeToken(b, RPAREN); - exit_section_(b, l, m, r, false, null); - return r; - } - - /* ********************************************************** */ - // ID (EXTENDS class_name_ref)? - public static boolean generic_def(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "generic_def")) return false; - if (!nextTokenIs(b, ID)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, GENERIC_DEF, null); - r = consumeToken(b, ID); - p = r; // pin = 1 - r = r && generic_def_1(b, l + 1); - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // (EXTENDS class_name_ref)? - private static boolean generic_def_1(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "generic_def_1")) return false; - generic_def_1_0(b, l + 1); - return true; - } - - // EXTENDS class_name_ref - private static boolean generic_def_1_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "generic_def_1_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, EXTENDS); - r = r && class_name_ref(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - - /* ********************************************************** */ - // (ty ',')* ty - static boolean generic_param_list(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "generic_param_list")) return false; - boolean r; - Marker m = enter_section_(b); - r = generic_param_list_0(b, l + 1); - r = r && ty(b, l + 1, -1); - exit_section_(b, m, null, r); - return r; - } - - // (ty ',')* - private static boolean generic_param_list_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "generic_param_list_0")) return false; - while (true) { - int c = current_position_(b); - if (!generic_param_list_0_0(b, l + 1)) break; - if (!empty_element_parsed_guard_(b, "generic_param_list_0", c)) break; - } - return true; - } - - // ty ',' - private static boolean generic_param_list_0_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "generic_param_list_0_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = ty(b, l + 1, -1); - r = r && consumeToken(b, COMMA); - exit_section_(b, m, null, r); - return r; - } - - /* ********************************************************** */ - // ID { - // } - public static boolean param_name_ref(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "param_name_ref")) return false; - if (!nextTokenIs(b, ID)) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, ID); - r = r && param_name_ref_1(b, l + 1); - exit_section_(b, m, PARAM_NAME_REF, r); - return r; - } - - // { - // } - private static boolean param_name_ref_1(PsiBuilder b, int l) { - return true; - } - - /* ********************************************************** */ - // tableField2 { - // } - public static boolean tableField(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tableField")) return false; - if (!nextTokenIs(b, ID)) return false; - boolean r; - Marker m = enter_section_(b); - r = tableField2(b, l + 1); - r = r && tableField_1(b, l + 1); - exit_section_(b, m, TABLE_FIELD, r); - return r; - } - - // { - // } - private static boolean tableField_1(PsiBuilder b, int l) { - return true; - } - - /* ********************************************************** */ - // ID ':' ty - static boolean tableField2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tableField2")) return false; - if (!nextTokenIs(b, ID)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_); - r = consumeTokens(b, 1, ID, EXTENDS); - p = r; // pin = 1 - r = r && ty(b, l + 1, -1); - exit_section_(b, l, m, r, p, null); - return r || p; - } - - /* ********************************************************** */ - // '{' fieldList '}' - public static boolean table_def(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "table_def")) return false; - if (!nextTokenIs(b, LCURLY)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TABLE_DEF, null); - r = consumeToken(b, LCURLY); - p = r; // pin = 1 - r = r && report_error_(b, fieldList(b, l + 1)); - r = p && consumeToken(b, RCURLY) && r; - exit_section_(b, l, m, r, p, null); - return r || p; - } - - /* ********************************************************** */ - // TAG_NAME_ALIAS ID ty - public static boolean tag_alias(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_alias")) return false; - if (!nextTokenIs(b, TAG_NAME_ALIAS)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_ALIAS, null); - r = consumeTokens(b, 1, TAG_NAME_ALIAS, 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_CLASS|TAG_NAME_MODULE) ID (EXTENDS class_name_ref)? comment_string? - public static boolean tag_class(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_class")) return false; - if (!nextTokenIs(b, "", TAG_NAME_CLASS, TAG_NAME_MODULE)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_CLASS, ""); - r = tag_class_0(b, l + 1); - r = r && consumeToken(b, ID); - p = r; // pin = 2 - r = r && report_error_(b, tag_class_2(b, l + 1)); - r = p && tag_class_3(b, l + 1) && r; - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // TAG_NAME_CLASS|TAG_NAME_MODULE - private static boolean tag_class_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_class_0")) return false; - boolean r; - r = consumeToken(b, TAG_NAME_CLASS); - if (!r) r = consumeToken(b, TAG_NAME_MODULE); - return r; - } - - // (EXTENDS class_name_ref)? - private static boolean tag_class_2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_class_2")) return false; - tag_class_2_0(b, l + 1); - return true; - } - - // EXTENDS class_name_ref - private static boolean tag_class_2_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_class_2_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, EXTENDS); - r = r && class_name_ref(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - - // comment_string? - private static boolean tag_class_3(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_class_3")) return false; - comment_string(b, l + 1); - return true; - } - - /* ********************************************************** */ - // TAG_NAME_NAME comment_string? - public static boolean tag_def(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_def")) return false; - if (!nextTokenIs(b, TAG_NAME_NAME)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_DEF, null); - r = consumeToken(b, TAG_NAME_NAME); - p = r; // pin = 1 - r = r && tag_def_1(b, l + 1); - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // comment_string? - private static boolean tag_def_1(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_def_1")) return false; - comment_string(b, l + 1); - return true; - } - - /* ********************************************************** */ - // TAG_NAME_FIELD access_modifier? ('<' class_name_ref '>')? ID ty comment_string? - public static boolean tag_field(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_field")) return false; - if (!nextTokenIs(b, TAG_NAME_FIELD)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_FIELD, null); - r = consumeToken(b, TAG_NAME_FIELD); - p = r; // pin = 1 - r = r && report_error_(b, tag_field_1(b, l + 1)); - r = p && report_error_(b, tag_field_2(b, l + 1)) && r; - r = p && report_error_(b, consumeToken(b, ID)) && r; - r = p && report_error_(b, ty(b, l + 1, -1)) && r; - r = p && tag_field_5(b, l + 1) && r; - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // access_modifier? - private static boolean tag_field_1(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_field_1")) return false; - access_modifier(b, l + 1); - return true; - } - - // ('<' class_name_ref '>')? - private static boolean tag_field_2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_field_2")) return false; - tag_field_2_0(b, l + 1); - return true; - } - - // '<' class_name_ref '>' - private static boolean tag_field_2_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_field_2_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, LT); - r = r && class_name_ref(b, l + 1); - r = r && consumeToken(b, GT); - exit_section_(b, m, null, r); - return r; - } - - // comment_string? - private static boolean tag_field_5(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_field_5")) return false; - comment_string(b, l + 1); - return true; - } - - /* ********************************************************** */ - // TAG_NAME_GENERIC generic_def (',' generic_def)* - public static boolean tag_generic_list(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_generic_list")) return false; - if (!nextTokenIs(b, TAG_NAME_GENERIC)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_GENERIC_LIST, null); - r = consumeToken(b, TAG_NAME_GENERIC); - p = r; // pin = 1 - r = r && report_error_(b, generic_def(b, l + 1)); - r = p && tag_generic_list_2(b, l + 1) && r; - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // (',' generic_def)* - private static boolean tag_generic_list_2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_generic_list_2")) return false; - while (true) { - int c = current_position_(b); - if (!tag_generic_list_2_0(b, l + 1)) break; - if (!empty_element_parsed_guard_(b, "tag_generic_list_2", c)) break; - } - return true; - } - - // ',' generic_def - private static boolean tag_generic_list_2_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_generic_list_2_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, COMMA); - r = r && generic_def(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - - /* ********************************************************** */ - // TAG_NAME_LANGUAGE ID comment_string? - public static boolean tag_lan(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_lan")) return false; - if (!nextTokenIs(b, TAG_NAME_LANGUAGE)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_LAN, null); - r = consumeTokens(b, 1, TAG_NAME_LANGUAGE, ID); - p = r; // pin = 1 - r = r && tag_lan_2(b, l + 1); - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // comment_string? - private static boolean tag_lan_2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_lan_2")) return false; - comment_string(b, l + 1); - return true; - } - - /* ********************************************************** */ - // TAG_NAME comment_string? + // TAG_NAME any* public static boolean tag_normal(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "tag_normal")) return false; - if (!nextTokenIs(b, TAG_NAME)) return false; boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_NORMAL, null); + Marker m = enter_section_(b, l, _NONE_, TAG_NORMAL, ""); r = consumeToken(b, TAG_NAME); p = r; // pin = 1 r = r && tag_normal_1(b, l + 1); - exit_section_(b, l, m, r, p, null); + exit_section_(b, l, m, r, p, LuaDocParser::after_dash_recover); return r || p; } - // comment_string? + // any* private static boolean tag_normal_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "tag_normal_1")) return false; - comment_string(b, l + 1); - return true; - } - - /* ********************************************************** */ - // TAG_NAME_OVERLOAD function_ty - public static boolean tag_overload(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_overload")) return false; - if (!nextTokenIs(b, TAG_NAME_OVERLOAD)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_OVERLOAD, null); - r = consumeToken(b, TAG_NAME_OVERLOAD); - p = r; // pin = 1 - r = r && function_ty(b, l + 1); - exit_section_(b, l, m, r, p, null); - return r || p; - } - - /* ********************************************************** */ - // TAG_NAME_PARAM param_name_ref ty comment_string? - public static boolean tag_param(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_param")) return false; - if (!nextTokenIs(b, TAG_NAME_PARAM)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_PARAM, null); - r = consumeToken(b, TAG_NAME_PARAM); - p = r; // pin = 1 - r = r && report_error_(b, param_name_ref(b, l + 1)); - r = p && report_error_(b, ty(b, l + 1, -1)) && r; - r = p && tag_param_3(b, l + 1) && r; - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // comment_string? - private static boolean tag_param_3(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_param_3")) return false; - comment_string(b, l + 1); - return true; - } - - /* ********************************************************** */ - // TAG_NAME_RETURN type_list comment_string? - public static boolean tag_return(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_return")) return false; - if (!nextTokenIs(b, TAG_NAME_RETURN)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_RETURN, null); - r = consumeToken(b, TAG_NAME_RETURN); - p = r; // pin = 1 - r = r && report_error_(b, type_list(b, l + 1)); - r = p && tag_return_2(b, l + 1) && r; - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // comment_string? - private static boolean tag_return_2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_return_2")) return false; - comment_string(b, l + 1); - return true; - } - - /* ********************************************************** */ - // TAG_NAME_SEE class_name_ref (SHARP ID)? - public static boolean tag_see(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_see")) return false; - if (!nextTokenIs(b, TAG_NAME_SEE)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_SEE, null); - r = consumeToken(b, TAG_NAME_SEE); - p = r; // pin = 1 - r = r && report_error_(b, class_name_ref(b, l + 1)); - r = p && tag_see_2(b, l + 1) && r; - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // (SHARP ID)? - private static boolean tag_see_2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_see_2")) return false; - tag_see_2_0(b, l + 1); - return true; - } - - // SHARP ID - private static boolean tag_see_2_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_see_2_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeTokens(b, 0, SHARP, ID); - exit_section_(b, m, null, r); - return r; - } - - /* ********************************************************** */ - // TAG_NAME_SUPPRESS ID (',' ID)* - public static boolean tag_suppress(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_suppress")) return false; - if (!nextTokenIs(b, TAG_NAME_SUPPRESS)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_SUPPRESS, null); - r = consumeTokens(b, 1, TAG_NAME_SUPPRESS, ID); - p = r; // pin = 1 - r = r && tag_suppress_2(b, l + 1); - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // (',' ID)* - private static boolean tag_suppress_2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_suppress_2")) return false; while (true) { int c = current_position_(b); - if (!tag_suppress_2_0(b, l + 1)) break; - if (!empty_element_parsed_guard_(b, "tag_suppress_2", c)) break; + if (!any(b, l + 1)) break; + if (!empty_element_parsed_guard_(b, "tag_normal_1", c)) break; } return true; } - // ',' ID - private static boolean tag_suppress_2_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_suppress_2_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeTokens(b, 0, COMMA, ID); - exit_section_(b, m, null, r); - return r; - } - - /* ********************************************************** */ - // TAG_NAME_TYPE ty comment_string? - public static boolean tag_type(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_type")) return false; - if (!nextTokenIs(b, TAG_NAME_TYPE)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_TYPE, null); - r = consumeToken(b, TAG_NAME_TYPE); - p = r; // pin = 1 - r = r && report_error_(b, ty(b, l + 1, -1)); - r = p && tag_type_2(b, l + 1) && r; - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // comment_string? - private static boolean tag_type_2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_type_2")) return false; - comment_string(b, l + 1); - return true; - } - - /* ********************************************************** */ - // TAG_NAME_VARARG ty comment_string? - public static boolean tag_vararg(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_vararg")) return false; - if (!nextTokenIs(b, TAG_NAME_VARARG)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, TAG_VARARG, null); - r = consumeToken(b, TAG_NAME_VARARG); - p = r; // pin = 1 - r = r && report_error_(b, ty(b, l + 1, -1)); - r = p && tag_vararg_2(b, l + 1) && r; - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // comment_string? - private static boolean tag_vararg_2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "tag_vararg_2")) return false; - comment_string(b, l + 1); - return true; - } - - /* ********************************************************** */ - // ty(',' ty)* - public static boolean type_list(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "type_list")) return false; - boolean r; - Marker m = enter_section_(b, l, _NONE_, TYPE_LIST, ""); - r = ty(b, l + 1, -1); - r = r && type_list_1(b, l + 1); - exit_section_(b, l, m, r, false, null); - return r; - } - - // (',' ty)* - private static boolean type_list_1(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "type_list_1")) return false; - while (true) { - int c = current_position_(b); - if (!type_list_1_0(b, l + 1)) break; - if (!empty_element_parsed_guard_(b, "type_list_1", c)) break; - } - return true; - } - - // ',' ty - private static boolean type_list_1_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "type_list_1_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, COMMA); - r = r && ty(b, l + 1, -1); - exit_section_(b, m, null, r); - return r; - } - - /* ********************************************************** */ - // VARARG ty - public static boolean vararg_param(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "vararg_param")) return false; - if (!nextTokenIs(b, VARARG)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, VARARG_PARAM, null); - r = consumeToken(b, VARARG); - p = r; // pin = 1 - r = r && ty(b, l + 1, -1); - exit_section_(b, l, m, r, p, null); - return r || p; - } - - /* ********************************************************** */ - // Expression root: ty - // Operator priority table: - // 0: POSTFIX(union_ty) - // 1: ATOM(function_ty) - // 2: ATOM(table_ty) - // 3: POSTFIX(generic_ty) - // 4: POSTFIX(arr_ty) - // 5: ATOM(general_ty) - // 6: ATOM(par_ty) - // 7: ATOM(string_literal_ty) - public static boolean ty(PsiBuilder b, int l, int g) { - if (!recursion_guard_(b, l, "ty")) return false; - addVariant(b, ""); - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, ""); - r = function_ty(b, l + 1); - if (!r) r = table_ty(b, l + 1); - if (!r) r = general_ty(b, l + 1); - if (!r) r = par_ty(b, l + 1); - if (!r) r = string_literal_ty(b, l + 1); - p = r; - r = r && ty_0(b, l + 1, g); - exit_section_(b, l, m, null, r, p, null); - return r || p; - } - - public static boolean ty_0(PsiBuilder b, int l, int g) { - if (!recursion_guard_(b, l, "ty_0")) return false; - boolean r = true; - while (true) { - Marker m = enter_section_(b, l, _LEFT_, null); - if (g < 0 && union_ty_0(b, l + 1)) { - r = true; - exit_section_(b, l, m, UNION_TY, r, true, null); - } - else if (g < 3 && leftMarkerIs(b, GENERAL_TY) && generic_ty_0(b, l + 1)) { - r = true; - exit_section_(b, l, m, GENERIC_TY, r, true, null); - } - else if (g < 4 && arr_ty_0(b, l + 1)) { - r = true; - exit_section_(b, l, m, ARR_TY, r, true, null); - } - else { - exit_section_(b, l, m, null, false, false, null); - break; - } - } - return r; - } - - // ('|' ty)+ { - // } - private static boolean union_ty_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "union_ty_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = union_ty_0_0(b, l + 1); - r = r && union_ty_0_1(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - - // ('|' ty)+ - private static boolean union_ty_0_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "union_ty_0_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = union_ty_0_0_0(b, l + 1); - while (r) { - int c = current_position_(b); - if (!union_ty_0_0_0(b, l + 1)) break; - if (!empty_element_parsed_guard_(b, "union_ty_0_0", c)) break; - } - exit_section_(b, m, null, r); - return r; - } - - // '|' ty - private static boolean union_ty_0_0_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "union_ty_0_0_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeTokenSmart(b, OR); - r = r && ty(b, l + 1, -1); - exit_section_(b, m, null, r); - return r; - } - - // { - // } - private static boolean union_ty_0_1(PsiBuilder b, int l) { - return true; - } - - // fun function_generic? '(' function_param_list ')' (':' type_list)? - public static boolean function_ty(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_ty")) return false; - if (!nextTokenIsSmart(b, FUN)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, FUNCTION_TY, null); - r = consumeTokenSmart(b, FUN); - p = r; // pin = 1 - r = r && report_error_(b, function_ty_1(b, l + 1)); - r = p && report_error_(b, consumeToken(b, LPAREN)) && r; - r = p && report_error_(b, function_param_list(b, l + 1)) && r; - r = p && report_error_(b, consumeToken(b, RPAREN)) && r; - r = p && function_ty_5(b, l + 1) && r; - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // function_generic? - private static boolean function_ty_1(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_ty_1")) return false; - function_generic(b, l + 1); - return true; - } - - // (':' type_list)? - private static boolean function_ty_5(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_ty_5")) return false; - function_ty_5_0(b, l + 1); - return true; - } - - // ':' type_list - private static boolean function_ty_5_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "function_ty_5_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeTokenSmart(b, EXTENDS); - r = r && type_list(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - - // table_def { - // } - public static boolean table_ty(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "table_ty")) return false; - if (!nextTokenIsSmart(b, LCURLY)) return false; - boolean r; - Marker m = enter_section_(b); - r = table_def(b, l + 1); - r = r && table_ty_1(b, l + 1); - exit_section_(b, m, TABLE_TY, r); - return r; - } - - // { - // } - private static boolean table_ty_1(PsiBuilder b, int l) { - return true; - } - - // '<' generic_param_list '>' - private static boolean generic_ty_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "generic_ty_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeTokenSmart(b, LT); - r = r && generic_param_list(b, l + 1); - r = r && consumeToken(b, GT); - exit_section_(b, m, null, r); - return r; - } - - // '[]' { - // } - private static boolean arr_ty_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "arr_ty_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeTokenSmart(b, ARR); - r = r && arr_ty_0_1(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - - // { - // } - private static boolean arr_ty_0_1(PsiBuilder b, int l) { - return true; - } - - // class_name_ref { - // } - public static boolean general_ty(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "general_ty")) return false; - if (!nextTokenIsSmart(b, ID)) return false; - boolean r; - Marker m = enter_section_(b); - r = class_name_ref(b, l + 1); - r = r && general_ty_1(b, l + 1); - exit_section_(b, m, GENERAL_TY, r); - return r; - } - - // { - // } - private static boolean general_ty_1(PsiBuilder b, int l) { - return true; - } - - // '(' ty ')' - public static boolean par_ty(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "par_ty")) return false; - if (!nextTokenIsSmart(b, LPAREN)) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_, PAR_TY, null); - r = consumeTokenSmart(b, LPAREN); - p = r; // pin = 1 - r = r && report_error_(b, ty(b, l + 1, -1)); - r = p && consumeToken(b, RPAREN) && r; - exit_section_(b, l, m, r, p, null); - return r || p; - } - - // STRING_LITERAL{ - // } - public static boolean string_literal_ty(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "string_literal_ty")) return false; - if (!nextTokenIsSmart(b, STRING_LITERAL)) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeTokenSmart(b, STRING_LITERAL); - r = r && string_literal_ty_1(b, l + 1); - exit_section_(b, m, STRING_LITERAL_TY, r); - return r; - } - - // { - // } - private static boolean string_literal_ty_1(PsiBuilder b, int l) { - return true; - } - } diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocAccessModifier.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocAccessModifier.java deleted file mode 100644 index 06e722d..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocAccessModifier.java +++ /dev/null @@ -1,10 +0,0 @@ -// 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; - -public interface LuaDocAccessModifier extends LuaDocPsiElement { - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagAlias.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocAny.java similarity index 75% rename from gen/com/tang/intellij/lua/comment/psi/LuaDocTagAlias.java rename to gen/com/tang/intellij/lua/comment/psi/LuaDocAny.java index 38cbbbe..518e840 100644 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagAlias.java +++ b/gen/com/tang/intellij/lua/comment/psi/LuaDocAny.java @@ -5,12 +5,12 @@ import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; -public interface LuaDocTagAlias extends LuaDocTag { +public interface LuaDocAny extends LuaDocPsiElement { @Nullable - LuaDocTy getTy(); + PsiElement getId(); @Nullable - PsiElement getId(); + PsiElement getNumber(); } diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocArrTy.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocArrTy.java deleted file mode 100644 index c6c0f1b..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocArrTy.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocArrTy extends LuaDocTy { - - @NotNull - LuaDocTy getTy(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocClassNameRef.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocClassNameRef.java deleted file mode 100644 index 81751d9..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocClassNameRef.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocClassNameRef extends LuaDocPsiElement { - - @NotNull - PsiElement getId(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocCommentString.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocCommentString.java deleted file mode 100644 index d687da9..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocCommentString.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocCommentString extends LuaDocPsiElement { - - @Nullable - PsiElement getString(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocFunctionParam.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocFunctionParam.java deleted file mode 100644 index 4ac1c05..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocFunctionParam.java +++ /dev/null @@ -1,16 +0,0 @@ -// 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; - -public interface LuaDocFunctionParam extends LuaDocPsiElement { - - @Nullable - LuaDocTy getTy(); - - @NotNull - PsiElement getId(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocFunctionTy.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocFunctionTy.java deleted file mode 100644 index 629c76b..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocFunctionTy.java +++ /dev/null @@ -1,22 +0,0 @@ -// 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; - -public interface LuaDocFunctionTy extends LuaDocTy { - - @NotNull - List getFunctionParamList(); - - @NotNull - List getGenericDefList(); - - @Nullable - LuaDocTypeList getTypeList(); - - @Nullable - LuaDocVarargParam getVarargParam(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocGeneralTy.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocGeneralTy.java deleted file mode 100644 index 9a5be01..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocGeneralTy.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocGeneralTy extends LuaDocTy { - - @NotNull - LuaDocClassNameRef getClassNameRef(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocGenericDef.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocGenericDef.java deleted file mode 100644 index e303a9f..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocGenericDef.java +++ /dev/null @@ -1,16 +0,0 @@ -// 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; - -public interface LuaDocGenericDef extends LuaDocPsiElement { - - @Nullable - LuaDocClassNameRef getClassNameRef(); - - @NotNull - PsiElement getId(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocGenericTy.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocGenericTy.java deleted file mode 100644 index 07a0910..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocGenericTy.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocGenericTy extends LuaDocTy { - - @NotNull - List getTyList(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocParTy.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocParTy.java deleted file mode 100644 index 969a3cc..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocParTy.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocParTy extends LuaDocTy { - - @Nullable - LuaDocTy getTy(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocParamNameRef.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocParamNameRef.java deleted file mode 100644 index 02154d4..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocParamNameRef.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocParamNameRef extends LuaDocPsiElement { - - @NotNull - PsiElement getId(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocStringLiteralTy.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocStringLiteralTy.java deleted file mode 100644 index b60406b..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocStringLiteralTy.java +++ /dev/null @@ -1,10 +0,0 @@ -// 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; - -public interface LuaDocStringLiteralTy extends LuaDocTy { - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTableDef.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTableDef.java deleted file mode 100644 index 6916046..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTableDef.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocTableDef extends LuaDocPsiElement { - - @NotNull - List getTableFieldList(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTableField.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTableField.java deleted file mode 100644 index 3aee5cd..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTableField.java +++ /dev/null @@ -1,16 +0,0 @@ -// 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; - -public interface LuaDocTableField extends LuaDocPsiElement { - - @Nullable - LuaDocTy getTy(); - - @NotNull - PsiElement getId(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTableTy.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTableTy.java deleted file mode 100644 index 602a8d5..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTableTy.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocTableTy extends LuaDocTy { - - @NotNull - LuaDocTableDef getTableDef(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagAuthor.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagAuthor.java deleted file mode 100644 index 3f05ccd..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagAuthor.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocTagAuthor extends LuaDocPsiElement { - - @Nullable - LuaDocCommentString getCommentString(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagClass.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagClass.java deleted file mode 100644 index 47a8577..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagClass.java +++ /dev/null @@ -1,19 +0,0 @@ -// 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; - -public interface LuaDocTagClass extends LuaDocTag { - - @Nullable - LuaDocClassNameRef getClassNameRef(); - - @Nullable - LuaDocCommentString getCommentString(); - - @NotNull - PsiElement getId(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagDef.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagDef.java deleted file mode 100644 index 3cd7c52..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagDef.java +++ /dev/null @@ -1,16 +0,0 @@ -// 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; - -public interface LuaDocTagDef extends LuaDocTag { - - @Nullable - LuaDocCommentString getCommentString(); - - @NotNull - PsiElement getTagName(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagDeprecated.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagDeprecated.java deleted file mode 100644 index 2ec4317..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagDeprecated.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocTagDeprecated extends LuaDocPsiElement { - - @Nullable - LuaDocCommentString getCommentString(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagField.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagField.java deleted file mode 100644 index c3962f6..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagField.java +++ /dev/null @@ -1,25 +0,0 @@ -// 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; - -public interface LuaDocTagField extends LuaDocTag { - - @Nullable - LuaDocAccessModifier getAccessModifier(); - - @Nullable - LuaDocClassNameRef getClassNameRef(); - - @Nullable - LuaDocCommentString getCommentString(); - - @Nullable - LuaDocTy getTy(); - - @Nullable - PsiElement getId(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagGenericList.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagGenericList.java deleted file mode 100644 index bf85ccd..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagGenericList.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocTagGenericList extends LuaDocTag { - - @NotNull - List getGenericDefList(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagLan.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagLan.java deleted file mode 100644 index 0e31582..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagLan.java +++ /dev/null @@ -1,16 +0,0 @@ -// 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; - -public interface LuaDocTagLan extends LuaDocTag { - - @Nullable - LuaDocCommentString getCommentString(); - - @Nullable - PsiElement getId(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagNormal.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagNormal.java index bbcb10c..ee70562 100644 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagNormal.java +++ b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagNormal.java @@ -7,7 +7,7 @@ public interface LuaDocTagNormal extends LuaDocTag { - @Nullable - LuaDocCommentString getCommentString(); + @NotNull + List getAnyList(); } diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagOverload.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagOverload.java deleted file mode 100644 index f65ab1a..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagOverload.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocTagOverload extends LuaDocTag { - - @Nullable - LuaDocFunctionTy getFunctionTy(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagParam.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagParam.java deleted file mode 100644 index 87caa1d..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagParam.java +++ /dev/null @@ -1,19 +0,0 @@ -// 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; - -public interface LuaDocTagParam extends LuaDocTag { - - @Nullable - LuaDocCommentString getCommentString(); - - @Nullable - LuaDocParamNameRef getParamNameRef(); - - @Nullable - LuaDocTy getTy(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagReturn.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagReturn.java deleted file mode 100644 index d354d18..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagReturn.java +++ /dev/null @@ -1,16 +0,0 @@ -// 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; - -public interface LuaDocTagReturn extends LuaDocTag { - - @Nullable - LuaDocCommentString getCommentString(); - - @Nullable - LuaDocTypeList getTypeList(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagSee.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagSee.java deleted file mode 100644 index f624995..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagSee.java +++ /dev/null @@ -1,16 +0,0 @@ -// 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; - -public interface LuaDocTagSee extends LuaDocTag { - - @Nullable - LuaDocClassNameRef getClassNameRef(); - - @Nullable - PsiElement getId(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagSince.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagSince.java deleted file mode 100644 index 3f3efe2..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagSince.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocTagSince extends LuaDocPsiElement { - - @Nullable - LuaDocCommentString getCommentString(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagSuppress.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagSuppress.java deleted file mode 100644 index b8e2fe9..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagSuppress.java +++ /dev/null @@ -1,10 +0,0 @@ -// 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; - -public interface LuaDocTagSuppress extends LuaDocTag { - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagType.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagType.java deleted file mode 100644 index 56750a0..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagType.java +++ /dev/null @@ -1,16 +0,0 @@ -// 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; - -public interface LuaDocTagType extends LuaDocTag { - - @Nullable - LuaDocCommentString getCommentString(); - - @Nullable - LuaDocTy getTy(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagVararg.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTagVararg.java deleted file mode 100644 index f6ed174..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTagVararg.java +++ /dev/null @@ -1,16 +0,0 @@ -// 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; - -public interface LuaDocTagVararg extends LuaDocTag { - - @Nullable - LuaDocCommentString getCommentString(); - - @Nullable - LuaDocTy getTy(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTy.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTy.java deleted file mode 100644 index d310313..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTy.java +++ /dev/null @@ -1,10 +0,0 @@ -// 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; - -public interface LuaDocTy extends LuaDocPsiElement { - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTypeList.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTypeList.java deleted file mode 100644 index 937cdf7..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTypeList.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocTypeList extends LuaDocPsiElement { - - @NotNull - List getTyList(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocTypes.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocTypes.java index 5f4fd59..ec0a65f 100644 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocTypes.java +++ b/gen/com/tang/intellij/lua/comment/psi/LuaDocTypes.java @@ -9,41 +9,11 @@ public interface LuaDocTypes { - IElementType ACCESS_MODIFIER = LuaParserDefinitionKt.createDocType("ACCESS_MODIFIER"); - IElementType ARR_TY = LuaParserDefinitionKt.createDocType("ARR_TY"); - IElementType CLASS_NAME_REF = LuaParserDefinitionKt.createDocType("CLASS_NAME_REF"); - IElementType COMMENT_STRING = LuaParserDefinitionKt.createDocType("COMMENT_STRING"); - IElementType FUNCTION_PARAM = LuaParserDefinitionKt.createDocType("FUNCTION_PARAM"); - IElementType FUNCTION_TY = LuaParserDefinitionKt.createDocType("FUNCTION_TY"); - IElementType GENERAL_TY = LuaParserDefinitionKt.createDocType("GENERAL_TY"); - IElementType GENERIC_DEF = LuaParserDefinitionKt.createDocType("GENERIC_DEF"); - IElementType GENERIC_TY = LuaParserDefinitionKt.createDocType("GENERIC_TY"); - IElementType PARAM_NAME_REF = LuaParserDefinitionKt.createDocType("PARAM_NAME_REF"); - IElementType PAR_TY = LuaParserDefinitionKt.createDocType("PAR_TY"); - IElementType STRING_LITERAL_TY = LuaParserDefinitionKt.createDocType("STRING_LITERAL_TY"); - IElementType TABLE_DEF = LuaParserDefinitionKt.createDocType("TABLE_DEF"); - IElementType TABLE_FIELD = LuaParserDefinitionKt.createDocType("TABLE_FIELD"); - IElementType TABLE_TY = LuaParserDefinitionKt.createDocType("TABLE_TY"); - IElementType TAG_ALIAS = LuaParserDefinitionKt.createDocType("TAG_ALIAS"); - IElementType TAG_CLASS = LuaParserDefinitionKt.createDocType("TAG_CLASS"); - 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_LAN = LuaParserDefinitionKt.createDocType("TAG_LAN"); + IElementType ANY = LuaParserDefinitionKt.createDocType("ANY"); IElementType TAG_NORMAL = LuaParserDefinitionKt.createDocType("TAG_NORMAL"); - IElementType TAG_OVERLOAD = LuaParserDefinitionKt.createDocType("TAG_OVERLOAD"); - IElementType TAG_PARAM = LuaParserDefinitionKt.createDocType("TAG_PARAM"); - IElementType TAG_RETURN = LuaParserDefinitionKt.createDocType("TAG_RETURN"); - IElementType TAG_SEE = LuaParserDefinitionKt.createDocType("TAG_SEE"); - IElementType TAG_SUPPRESS = LuaParserDefinitionKt.createDocType("TAG_SUPPRESS"); - IElementType TAG_TYPE = LuaParserDefinitionKt.createDocType("TAG_TYPE"); - IElementType TAG_VARARG = LuaParserDefinitionKt.createDocType("TAG_VARARG"); - IElementType TY = LuaParserDefinitionKt.createDocType("TY"); - IElementType TYPE_LIST = LuaParserDefinitionKt.createDocType("TYPE_LIST"); - IElementType UNION_TY = LuaParserDefinitionKt.createDocType("UNION_TY"); - IElementType VARARG_PARAM = LuaParserDefinitionKt.createDocType("VARARG_PARAM"); IElementType ARR = new LuaDocTokenType("[]"); + IElementType ASYNC = new LuaDocTokenType("async"); IElementType AT = new LuaDocTokenType("@"); IElementType COMMA = new LuaDocTokenType(","); IElementType DASHES = new LuaDocTokenType("DASHES"); @@ -52,13 +22,18 @@ public interface LuaDocTypes { IElementType FUN = new LuaDocTokenType("fun"); IElementType GT = new LuaDocTokenType(">"); IElementType ID = new LuaDocTokenType("ID"); + IElementType LBRACK = new LuaDocTokenType("["); IElementType LCURLY = new LuaDocTokenType("{"); IElementType LPAREN = new LuaDocTokenType("("); IElementType LT = new LuaDocTokenType("<"); + IElementType NULLABLE = new LuaDocTokenType("?"); + IElementType NUMBER = new LuaDocTokenType("NUMBER"); IElementType OR = new LuaDocTokenType("|"); - IElementType PRIVATE = new LuaDocTokenType("PRIVATE"); - IElementType PROTECTED = new LuaDocTokenType("PROTECTED"); - IElementType PUBLIC = new LuaDocTokenType("PUBLIC"); + IElementType PACKAGE = new LuaDocTokenType("package"); + IElementType PRIVATE = new LuaDocTokenType("private"); + IElementType PROTECTED = new LuaDocTokenType("protected"); + IElementType PUBLIC = new LuaDocTokenType("public"); + IElementType RBRACK = new LuaDocTokenType("]"); IElementType RCURLY = new LuaDocTokenType("}"); IElementType RPAREN = new LuaDocTokenType(")"); IElementType SHARP = new LuaDocTokenType("#"); @@ -66,124 +41,18 @@ public interface LuaDocTypes { IElementType STRING_BEGIN = new LuaDocTokenType("STRING_BEGIN"); IElementType STRING_LITERAL = new LuaDocTokenType("STRING_LITERAL"); IElementType TAG_NAME = new LuaDocTokenType("TAG_NAME"); - IElementType TAG_NAME_ALIAS = new LuaDocTokenType("alias"); - IElementType TAG_NAME_CLASS = new LuaDocTokenType("class"); - IElementType TAG_NAME_FIELD = new LuaDocTokenType("field"); - IElementType TAG_NAME_GENERIC = new LuaDocTokenType("generic"); IElementType TAG_NAME_LANGUAGE = new LuaDocTokenType("language"); - IElementType TAG_NAME_MODULE = new LuaDocTokenType("module"); - IElementType TAG_NAME_NAME = new LuaDocTokenType("TAG_NAME_NAME"); - IElementType TAG_NAME_OVERLOAD = new LuaDocTokenType("overload"); - IElementType TAG_NAME_PARAM = new LuaDocTokenType("param"); - IElementType TAG_NAME_PRIVATE = new LuaDocTokenType("private"); - IElementType TAG_NAME_PROTECTED = new LuaDocTokenType("protected"); - IElementType TAG_NAME_PUBLIC = new LuaDocTokenType("public"); - IElementType TAG_NAME_RETURN = new LuaDocTokenType("return"); - IElementType TAG_NAME_SEE = new LuaDocTokenType("see"); - IElementType TAG_NAME_SUPPRESS = new LuaDocTokenType("suppress"); - IElementType TAG_NAME_TYPE = new LuaDocTokenType("type"); - IElementType TAG_NAME_VARARG = new LuaDocTokenType("vararg"); - IElementType VARARG = new LuaDocTokenType("VARARG"); + IElementType VARARG = new LuaDocTokenType("vararg"); class Factory { public static PsiElement createElement(ASTNode node) { IElementType type = node.getElementType(); - if (type == ACCESS_MODIFIER) { - return new LuaDocAccessModifierImpl(node); - } - else if (type == ARR_TY) { - return new LuaDocArrTyImpl(node); - } - else if (type == CLASS_NAME_REF) { - return new LuaDocClassNameRefImpl(node); - } - else if (type == COMMENT_STRING) { - return new LuaDocCommentStringImpl(node); - } - else if (type == FUNCTION_PARAM) { - return new LuaDocFunctionParamImpl(node); - } - else if (type == FUNCTION_TY) { - return new LuaDocFunctionTyImpl(node); - } - else if (type == GENERAL_TY) { - return new LuaDocGeneralTyImpl(node); - } - else if (type == GENERIC_DEF) { - return new LuaDocGenericDefImpl(node); - } - else if (type == GENERIC_TY) { - return new LuaDocGenericTyImpl(node); - } - else if (type == PARAM_NAME_REF) { - return new LuaDocParamNameRefImpl(node); - } - else if (type == PAR_TY) { - return new LuaDocParTyImpl(node); - } - else if (type == STRING_LITERAL_TY) { - return new LuaDocStringLiteralTyImpl(node); - } - else if (type == TABLE_DEF) { - return new LuaDocTableDefImpl(node); - } - else if (type == TABLE_FIELD) { - return new LuaDocTableFieldImpl(node); - } - else if (type == TABLE_TY) { - return new LuaDocTableTyImpl(node); - } - else if (type == TAG_ALIAS) { - return new LuaDocTagAliasImpl(node); - } - else if (type == TAG_CLASS) { - return new LuaDocTagClassImpl(node); - } - else if (type == TAG_DEF) { - return new LuaDocTagDefImpl(node); - } - else if (type == TAG_FIELD) { - return new LuaDocTagFieldImpl(node); - } - else if (type == TAG_GENERIC_LIST) { - return new LuaDocTagGenericListImpl(node); - } - else if (type == TAG_LAN) { - return new LuaDocTagLanImpl(node); + if (type == ANY) { + return new LuaDocAnyImpl(node); } else if (type == TAG_NORMAL) { return new LuaDocTagNormalImpl(node); } - else if (type == TAG_OVERLOAD) { - return new LuaDocTagOverloadImpl(node); - } - else if (type == TAG_PARAM) { - return new LuaDocTagParamImpl(node); - } - else if (type == TAG_RETURN) { - return new LuaDocTagReturnImpl(node); - } - else if (type == TAG_SEE) { - return new LuaDocTagSeeImpl(node); - } - else if (type == TAG_SUPPRESS) { - return new LuaDocTagSuppressImpl(node); - } - else if (type == TAG_TYPE) { - return new LuaDocTagTypeImpl(node); - } - else if (type == TAG_VARARG) { - return new LuaDocTagVarargImpl(node); - } - else if (type == TYPE_LIST) { - return new LuaDocTypeListImpl(node); - } - else if (type == UNION_TY) { - return new LuaDocUnionTyImpl(node); - } - else if (type == VARARG_PARAM) { - return new LuaDocVarargParamImpl(node); - } throw new AssertionError("Unknown element type: " + type); } } diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocUnionTy.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocUnionTy.java deleted file mode 100644 index eb7aafa..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocUnionTy.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocUnionTy extends LuaDocTy { - - @NotNull - List getTyList(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocVarargParam.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocVarargParam.java deleted file mode 100644 index b94bc76..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocVarargParam.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocVarargParam extends LuaDocPsiElement { - - @Nullable - LuaDocTy getTy(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocVersion.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocVersion.java deleted file mode 100644 index 68249d4..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocVersion.java +++ /dev/null @@ -1,13 +0,0 @@ -// 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; - -public interface LuaDocVersion extends LuaDocPsiElement { - - @Nullable - LuaDocCommentString getCommentString(); - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/LuaDocVisitor.java b/gen/com/tang/intellij/lua/comment/psi/LuaDocVisitor.java index 9209b55..320ce40 100644 --- a/gen/com/tang/intellij/lua/comment/psi/LuaDocVisitor.java +++ b/gen/com/tang/intellij/lua/comment/psi/LuaDocVisitor.java @@ -6,138 +6,14 @@ public class LuaDocVisitor extends PsiElementVisitor { - public void visitAccessModifier(@NotNull LuaDocAccessModifier o) { + public void visitAny(@NotNull LuaDocAny o) { visitPsiElement(o); } - public void visitArrTy(@NotNull LuaDocArrTy o) { - visitTy(o); - } - - public void visitClassNameRef(@NotNull LuaDocClassNameRef o) { - visitPsiElement(o); - } - - public void visitCommentString(@NotNull LuaDocCommentString o) { - visitPsiElement(o); - } - - public void visitFunctionParam(@NotNull LuaDocFunctionParam o) { - visitPsiElement(o); - } - - public void visitFunctionTy(@NotNull LuaDocFunctionTy o) { - visitTy(o); - } - - public void visitGeneralTy(@NotNull LuaDocGeneralTy o) { - visitTy(o); - } - - public void visitGenericDef(@NotNull LuaDocGenericDef o) { - visitPsiElement(o); - } - - public void visitGenericTy(@NotNull LuaDocGenericTy o) { - visitTy(o); - } - - public void visitParTy(@NotNull LuaDocParTy o) { - visitTy(o); - } - - public void visitParamNameRef(@NotNull LuaDocParamNameRef o) { - visitPsiElement(o); - } - - public void visitStringLiteralTy(@NotNull LuaDocStringLiteralTy o) { - visitTy(o); - } - - public void visitTableField(@NotNull LuaDocTableField o) { - visitPsiElement(o); - } - - public void visitTableDef(@NotNull LuaDocTableDef o) { - visitPsiElement(o); - } - - public void visitTableTy(@NotNull LuaDocTableTy o) { - visitTy(o); - } - - public void visitTagAlias(@NotNull LuaDocTagAlias o) { - visitTag(o); - } - - public void visitTagClass(@NotNull LuaDocTagClass o) { - visitTag(o); - } - - public void visitTagDef(@NotNull LuaDocTagDef o) { - visitTag(o); - } - - public void visitTagField(@NotNull LuaDocTagField o) { - visitTag(o); - } - - public void visitTagGenericList(@NotNull LuaDocTagGenericList o) { - visitTag(o); - } - - public void visitTagLan(@NotNull LuaDocTagLan o) { - visitTag(o); - } - public void visitTagNormal(@NotNull LuaDocTagNormal o) { visitTag(o); } - public void visitTagOverload(@NotNull LuaDocTagOverload o) { - visitTag(o); - } - - public void visitTagParam(@NotNull LuaDocTagParam o) { - visitTag(o); - } - - public void visitTagReturn(@NotNull LuaDocTagReturn o) { - visitTag(o); - } - - public void visitTagSee(@NotNull LuaDocTagSee o) { - visitTag(o); - } - - public void visitTagSuppress(@NotNull LuaDocTagSuppress o) { - visitTag(o); - } - - public void visitTagType(@NotNull LuaDocTagType o) { - visitTag(o); - } - - public void visitTagVararg(@NotNull LuaDocTagVararg o) { - visitTag(o); - } - - public void visitTy(@NotNull LuaDocTy o) { - visitPsiElement(o); - } - - public void visitTypeList(@NotNull LuaDocTypeList o) { - visitPsiElement(o); - } - - public void visitUnionTy(@NotNull LuaDocUnionTy o) { - visitTy(o); - } - - public void visitVarargParam(@NotNull LuaDocVarargParam o) { - visitPsiElement(o); - } - public void visitTag(@NotNull LuaDocTag o) { visitPsiElement(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 deleted file mode 100644 index 29655e0..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocAccessModifierImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocAccessModifierImpl extends ASTWrapperPsiElement implements LuaDocAccessModifier { - - public LuaDocAccessModifierImpl(@NotNull ASTNode node) { - super(node); - } - - 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/LuaDocTagAliasImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocAnyImpl.java similarity index 77% rename from gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagAliasImpl.java rename to gen/com/tang/intellij/lua/comment/psi/impl/LuaDocAnyImpl.java index 975c0f8..7a0c943 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagAliasImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocAnyImpl.java @@ -11,14 +11,14 @@ import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.tang.intellij.lua.comment.psi.*; -public class LuaDocTagAliasImpl extends ASTWrapperPsiElement implements LuaDocTagAlias { +public class LuaDocAnyImpl extends ASTWrapperPsiElement implements LuaDocAny { - public LuaDocTagAliasImpl(@NotNull ASTNode node) { + public LuaDocAnyImpl(@NotNull ASTNode node) { super(node); } public void accept(@NotNull LuaDocVisitor visitor) { - visitor.visitTagAlias(this); + visitor.visitAny(this); } @Override @@ -29,14 +29,14 @@ public void accept(@NotNull PsiElementVisitor visitor) { @Override @Nullable - public LuaDocTy getTy() { - return findChildByClass(LuaDocTy.class); + public PsiElement getId() { + return findChildByType(ID); } @Override @Nullable - public PsiElement getId() { - return findChildByType(ID); + public PsiElement getNumber() { + return findChildByType(NUMBER); } } diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocArrTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocArrTyImpl.java deleted file mode 100644 index bce6ef2..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocArrTyImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.tang.intellij.lua.comment.psi.*; - -public class LuaDocArrTyImpl extends LuaDocTyImpl implements LuaDocArrTy { - - 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); - } - - @Override - @NotNull - public LuaDocTy getTy() { - return findNotNullChildByClass(LuaDocTy.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocClassNameRefImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocClassNameRefImpl.java deleted file mode 100644 index 0555c45..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocClassNameRefImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocClassNameRefImpl extends ASTWrapperPsiElement implements LuaDocClassNameRef { - - public LuaDocClassNameRefImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @NotNull - public PsiElement getId() { - return findNotNullChildByType(ID); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocCommentStringImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocCommentStringImpl.java deleted file mode 100644 index cc51ebf..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocCommentStringImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocCommentStringImpl extends ASTWrapperPsiElement implements LuaDocCommentString { - - public LuaDocCommentStringImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public PsiElement getString() { - return findChildByType(STRING); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionParamImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionParamImpl.java deleted file mode 100644 index bf08dd2..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionParamImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocFunctionParamImpl extends ASTWrapperPsiElement implements LuaDocFunctionParam { - - public LuaDocFunctionParamImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocTy getTy() { - return findChildByClass(LuaDocTy.class); - } - - @Override - @NotNull - public PsiElement getId() { - return findNotNullChildByType(ID); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionTyImpl.java deleted file mode 100644 index d6f2b27..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocFunctionTyImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -// 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.tang.intellij.lua.comment.psi.*; - -public class LuaDocFunctionTyImpl extends LuaDocTyImpl implements LuaDocFunctionTy { - - 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); - } - - @Override - @NotNull - public List getFunctionParamList() { - return PsiTreeUtil.getChildrenOfTypeAsList(this, LuaDocFunctionParam.class); - } - - @Override - @NotNull - public List getGenericDefList() { - return PsiTreeUtil.getChildrenOfTypeAsList(this, LuaDocGenericDef.class); - } - - @Override - @Nullable - public LuaDocTypeList getTypeList() { - return findChildByClass(LuaDocTypeList.class); - } - - @Override - @Nullable - public LuaDocVarargParam getVarargParam() { - return findChildByClass(LuaDocVarargParam.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGeneralTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGeneralTyImpl.java deleted file mode 100644 index 3af6dc9..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGeneralTyImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.tang.intellij.lua.comment.psi.*; - -public class LuaDocGeneralTyImpl extends LuaDocTyImpl implements LuaDocGeneralTy { - - 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); - } - - @Override - @NotNull - public LuaDocClassNameRef getClassNameRef() { - return findNotNullChildByClass(LuaDocClassNameRef.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericDefImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericDefImpl.java deleted file mode 100644 index 0a42f73..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericDefImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocGenericDefImpl extends ASTWrapperPsiElement implements LuaDocGenericDef { - - public LuaDocGenericDefImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocClassNameRef getClassNameRef() { - return findChildByClass(LuaDocClassNameRef.class); - } - - @Override - @NotNull - public PsiElement getId() { - return findNotNullChildByType(ID); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericTyImpl.java deleted file mode 100644 index 5537162..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocGenericTyImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.tang.intellij.lua.comment.psi.*; - -public class LuaDocGenericTyImpl extends LuaDocTyImpl implements LuaDocGenericTy { - - 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); - } - - @Override - @NotNull - public List getTyList() { - return PsiTreeUtil.getChildrenOfTypeAsList(this, LuaDocTy.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParTyImpl.java deleted file mode 100644 index 0afe7ce..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParTyImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.tang.intellij.lua.comment.psi.*; - -public class LuaDocParTyImpl extends LuaDocTyImpl implements LuaDocParTy { - - 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); - } - - @Override - @Nullable - public LuaDocTy getTy() { - return findChildByClass(LuaDocTy.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParamNameRefImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParamNameRefImpl.java deleted file mode 100644 index 64c20b8..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocParamNameRefImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocParamNameRefImpl extends ASTWrapperPsiElement implements LuaDocParamNameRef { - - public LuaDocParamNameRefImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @NotNull - public PsiElement getId() { - return findNotNullChildByType(ID); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocStringLiteralTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocStringLiteralTyImpl.java deleted file mode 100644 index 490cf10..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocStringLiteralTyImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -// 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.tang.intellij.lua.comment.psi.*; - -public class LuaDocStringLiteralTyImpl extends LuaDocTyImpl implements LuaDocStringLiteralTy { - - 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 deleted file mode 100644 index dfd0329..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableDefImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTableDefImpl extends ASTWrapperPsiElement implements LuaDocTableDef { - - public LuaDocTableDefImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @NotNull - public List getTableFieldList() { - return PsiTreeUtil.getChildrenOfTypeAsList(this, LuaDocTableField.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableFieldImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableFieldImpl.java deleted file mode 100644 index c9e488c..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableFieldImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTableFieldImpl extends ASTWrapperPsiElement implements LuaDocTableField { - - public LuaDocTableFieldImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocTy getTy() { - return findChildByClass(LuaDocTy.class); - } - - @Override - @NotNull - public PsiElement getId() { - return findNotNullChildByType(ID); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableTyImpl.java deleted file mode 100644 index 1d24e51..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTableTyImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.tang.intellij.lua.comment.psi.*; - -public class LuaDocTableTyImpl extends LuaDocTyImpl implements LuaDocTableTy { - - 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); - } - - @Override - @NotNull - public LuaDocTableDef getTableDef() { - return findNotNullChildByClass(LuaDocTableDef.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagClassImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagClassImpl.java deleted file mode 100644 index accc8e0..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagClassImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTagClassImpl extends ASTWrapperPsiElement implements LuaDocTagClass { - - public LuaDocTagClassImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocClassNameRef getClassNameRef() { - return findChildByClass(LuaDocClassNameRef.class); - } - - @Override - @Nullable - public LuaDocCommentString getCommentString() { - return findChildByClass(LuaDocCommentString.class); - } - - @Override - @NotNull - public PsiElement getId() { - return findNotNullChildByType(ID); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagDefImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagDefImpl.java deleted file mode 100644 index 9936e9c..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagDefImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTagDefImpl extends ASTWrapperPsiElement implements LuaDocTagDef { - - public LuaDocTagDefImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocCommentString getCommentString() { - return findChildByClass(LuaDocCommentString.class); - } - - @Override - @NotNull - public PsiElement getTagName() { - return findNotNullChildByType(TAG_NAME_NAME); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagFieldImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagFieldImpl.java deleted file mode 100644 index 9df92f8..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagFieldImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTagFieldImpl extends ASTWrapperPsiElement implements LuaDocTagField { - - public LuaDocTagFieldImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocAccessModifier getAccessModifier() { - return findChildByClass(LuaDocAccessModifier.class); - } - - @Override - @Nullable - public LuaDocClassNameRef getClassNameRef() { - return findChildByClass(LuaDocClassNameRef.class); - } - - @Override - @Nullable - public LuaDocCommentString getCommentString() { - return findChildByClass(LuaDocCommentString.class); - } - - @Override - @Nullable - public LuaDocTy getTy() { - return findChildByClass(LuaDocTy.class); - } - - @Override - @Nullable - public PsiElement getId() { - return findChildByType(ID); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagGenericListImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagGenericListImpl.java deleted file mode 100644 index 242062e..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagGenericListImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTagGenericListImpl extends ASTWrapperPsiElement implements LuaDocTagGenericList { - - public LuaDocTagGenericListImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @NotNull - public List getGenericDefList() { - return PsiTreeUtil.getChildrenOfTypeAsList(this, LuaDocGenericDef.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagLanImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagLanImpl.java deleted file mode 100644 index a0eef08..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagLanImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTagLanImpl extends ASTWrapperPsiElement implements LuaDocTagLan { - - public LuaDocTagLanImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocCommentString getCommentString() { - return findChildByClass(LuaDocCommentString.class); - } - - @Override - @Nullable - public PsiElement getId() { - return findChildByType(ID); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagNormalImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagNormalImpl.java index 712d488..fa56c1c 100644 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagNormalImpl.java +++ b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagNormalImpl.java @@ -28,9 +28,9 @@ public void accept(@NotNull PsiElementVisitor visitor) { } @Override - @Nullable - public LuaDocCommentString getCommentString() { - return findChildByClass(LuaDocCommentString.class); + @NotNull + public List getAnyList() { + return PsiTreeUtil.getChildrenOfTypeAsList(this, LuaDocAny.class); } } diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagOverloadImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagOverloadImpl.java deleted file mode 100644 index 7d4601c..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagOverloadImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTagOverloadImpl extends ASTWrapperPsiElement implements LuaDocTagOverload { - - public LuaDocTagOverloadImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocFunctionTy getFunctionTy() { - return findChildByClass(LuaDocFunctionTy.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagParamImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagParamImpl.java deleted file mode 100644 index 1e0a4f0..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagParamImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTagParamImpl extends ASTWrapperPsiElement implements LuaDocTagParam { - - public LuaDocTagParamImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocCommentString getCommentString() { - return findChildByClass(LuaDocCommentString.class); - } - - @Override - @Nullable - public LuaDocParamNameRef getParamNameRef() { - return findChildByClass(LuaDocParamNameRef.class); - } - - @Override - @Nullable - public LuaDocTy getTy() { - return findChildByClass(LuaDocTy.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagReturnImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagReturnImpl.java deleted file mode 100644 index c9d8cb7..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagReturnImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTagReturnImpl extends ASTWrapperPsiElement implements LuaDocTagReturn { - - public LuaDocTagReturnImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocCommentString getCommentString() { - return findChildByClass(LuaDocCommentString.class); - } - - @Override - @Nullable - public LuaDocTypeList getTypeList() { - return findChildByClass(LuaDocTypeList.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSeeImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSeeImpl.java deleted file mode 100644 index cd7fca4..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSeeImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTagSeeImpl extends ASTWrapperPsiElement implements LuaDocTagSee { - - public LuaDocTagSeeImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocClassNameRef getClassNameRef() { - return findChildByClass(LuaDocClassNameRef.class); - } - - @Override - @Nullable - public PsiElement getId() { - return findChildByType(ID); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSuppressImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSuppressImpl.java deleted file mode 100644 index 75b4178..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagSuppressImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTagSuppressImpl extends ASTWrapperPsiElement implements LuaDocTagSuppress { - - public LuaDocTagSuppressImpl(@NotNull ASTNode node) { - super(node); - } - - 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 deleted file mode 100644 index b9b7ac6..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagTypeImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTagTypeImpl extends ASTWrapperPsiElement implements LuaDocTagType { - - public LuaDocTagTypeImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocCommentString getCommentString() { - return findChildByClass(LuaDocCommentString.class); - } - - @Override - @Nullable - public LuaDocTy getTy() { - return findChildByClass(LuaDocTy.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagVarargImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagVarargImpl.java deleted file mode 100644 index 1bc3071..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagVarargImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTagVarargImpl extends ASTWrapperPsiElement implements LuaDocTagVararg { - - public LuaDocTagVarargImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocCommentString getCommentString() { - return findChildByClass(LuaDocCommentString.class); - } - - @Override - @Nullable - public LuaDocTy getTy() { - return findChildByClass(LuaDocTy.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTyImpl.java deleted file mode 100644 index 1bc3100..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTyImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public abstract class LuaDocTyImpl extends ASTWrapperPsiElement implements LuaDocTy { - - public LuaDocTyImpl(@NotNull ASTNode node) { - super(node); - } - - 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 deleted file mode 100644 index f6e12c2..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTypeListImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocTypeListImpl extends ASTWrapperPsiElement implements LuaDocTypeList { - - public LuaDocTypeListImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @NotNull - public List getTyList() { - return PsiTreeUtil.getChildrenOfTypeAsList(this, LuaDocTy.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocUnionTyImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocUnionTyImpl.java deleted file mode 100644 index 8d51152..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocUnionTyImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.tang.intellij.lua.comment.psi.*; - -public class LuaDocUnionTyImpl extends LuaDocTyImpl implements LuaDocUnionTy { - - 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); - } - - @Override - @NotNull - public List getTyList() { - return PsiTreeUtil.getChildrenOfTypeAsList(this, LuaDocTy.class); - } - -} diff --git a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocVarargParamImpl.java b/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocVarargParamImpl.java deleted file mode 100644 index 4c8ebdf..0000000 --- a/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocVarargParamImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -// 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.ASTWrapperPsiElement; -import com.tang.intellij.lua.comment.psi.*; - -public class LuaDocVarargParamImpl extends ASTWrapperPsiElement implements LuaDocVarargParam { - - public LuaDocVarargParamImpl(@NotNull ASTNode node) { - super(node); - } - - 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); - } - - @Override - @Nullable - public LuaDocTy getTy() { - return findChildByClass(LuaDocTy.class); - } - -} 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 3133e29..f7cfcd1 100644 --- a/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.kt +++ b/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.kt @@ -19,7 +19,6 @@ import com.tang.intellij.lua.psi.* class LuaAnnotator : Annotator { private var myHolder: AnnotationHolder? = null private val luaVisitor = LuaElementVisitor() - private val docVisitor = LuaDocElementVisitor() // companion object { // private val STD_MARKER = Key.create("lua.std.marker") @@ -28,9 +27,7 @@ class LuaAnnotator : Annotator { override fun annotate(psiElement: PsiElement, annotationHolder: AnnotationHolder) { myHolder = annotationHolder - if (psiElement is LuaDocPsiElement) { - psiElement.accept(docVisitor) - } else if (psiElement is LuaPsiElement) { + if (psiElement is LuaPsiElement) { psiElement.accept(luaVisitor) } myHolder = null @@ -76,7 +73,7 @@ class LuaAnnotator : Annotator { super.visitTableField(o) val id = o.id if (id != null) { - newInfoAnnotation(id, null) { + newInfoAnnotation(id, "field") { it.textAttributes(LuaHighlightingData.FIELD) } } @@ -123,8 +120,7 @@ class LuaAnnotator : Annotator { newInfoAnnotation(expr, null) { it.textAttributes(LuaHighlightingData.INSTANCE_METHOD) } - } - else if(expr is LuaIndexExpr) { + } else if (expr is LuaIndexExpr) { val id = expr.id if (id != null) { newInfoAnnotation(id, null) { @@ -137,7 +133,7 @@ class LuaAnnotator : Annotator { override fun visitFuncDef(o: LuaFuncDef) { super.visitFuncDef(o) val id = o.id - if (id != null){ + if (id != null) { newInfoAnnotation(id, null) { it.textAttributes(LuaHighlightingData.GLOBAL_FUNCTION) } @@ -157,32 +153,12 @@ class LuaAnnotator : Annotator { } } - internal inner class LuaDocElementVisitor : LuaDocVisitor() { - override fun visitTagClass(o: LuaDocTagClass) { - super.visitTagClass(o) - newInfoAnnotation(o.id, null) { - it.textAttributes(LuaHighlightingData.CLASS_NAME) - } - } - - override fun visitTagAlias(o: LuaDocTagAlias) { - super.visitTagAlias(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) - } - } - - override fun visitParamNameRef(o: LuaDocParamNameRef) { - newInfoAnnotation(o, null) { - it.textAttributes(LuaHighlightingData.DOC_COMMENT_TAG_VALUE) - } - } - } +// internal inner class LuaDocElementVisitor : LuaDocVisitor() { +// override fun visitTagClass(o: LuaDocTagClass) { +// super.visitTagClass(o) +// newInfoAnnotation(o.id, null) { +// it.textAttributes(LuaHighlightingData.CLASS_NAME) +// } +// } +// } } diff --git a/src/main/java/com/tang/intellij/lua/codeInsight/LuaReadWriteAccessDetector.kt b/src/main/java/com/tang/intellij/lua/codeInsight/LuaReadWriteAccessDetector.kt index d2d296f..ae10ae6 100644 --- a/src/main/java/com/tang/intellij/lua/codeInsight/LuaReadWriteAccessDetector.kt +++ b/src/main/java/com/tang/intellij/lua/codeInsight/LuaReadWriteAccessDetector.kt @@ -3,10 +3,6 @@ package com.tang.intellij.lua.codeInsight import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference -import com.tang.intellij.lua.comment.psi.LuaDocClassNameRef -import com.tang.intellij.lua.comment.psi.LuaDocParamNameRef -import com.tang.intellij.lua.comment.psi.LuaDocTagClass -import com.tang.intellij.lua.comment.psi.LuaDocTagField import com.tang.intellij.lua.psi.LuaExpr import com.tang.intellij.lua.psi.LuaIndexExpr import com.tang.intellij.lua.psi.LuaNameDef @@ -26,10 +22,6 @@ class LuaReadWriteAccessDetector : ReadWriteAccessDetector() { return when (element) { is LuaNameDef -> Access.Write is LuaExpr -> Access.Read - is LuaDocTagClass -> Access.Write - is LuaDocClassNameRef -> Access.Read - is LuaDocParamNameRef -> Access.Read - is LuaDocTagField -> Access.Write else -> return Access.ReadWrite } } diff --git a/src/main/java/com/tang/intellij/lua/doc.bnf b/src/main/java/com/tang/intellij/lua/doc.bnf index 37e732e..53b5312 100644 --- a/src/main/java/com/tang/intellij/lua/doc.bnf +++ b/src/main/java/com/tang/intellij/lua/doc.bnf @@ -57,23 +57,14 @@ DASHES = 'DASHES' STRING_BEGIN = 'STRING_BEGIN' STRING = 'STRING' - TAG_NAME_RETURN = 'return' TAG_NAME = 'TAG_NAME' - TAG_NAME_PARAM = 'param' - TAG_NAME_VARARG = 'vararg' - TAG_NAME_PRIVATE = 'private' - TAG_NAME_PROTECTED = 'protected' - TAG_NAME_PUBLIC = 'public' - TAG_NAME_CLASS = 'class' - TAG_NAME_FIELD = 'field' - TAG_NAME_TYPE = 'type' TAG_NAME_LANGUAGE = 'language' - TAG_NAME_OVERLOAD = 'overload' - TAG_NAME_MODULE = 'module' - TAG_NAME_SEE = 'see' - TAG_NAME_GENERIC = 'generic' - TAG_NAME_ALIAS = 'alias' - TAG_NAME_SUPPRESS = 'suppress' + NUMBER = 'regexp:[0-9]+' + ASYNC = 'async' + NULLABLE = '?' + LBRACK = '[' + RBRACK = ']' + PACKAGE = 'package' ] implements("tag.*") = [ "com.tang.intellij.lua.comment.psi.LuaDocTag" @@ -85,128 +76,11 @@ doc ::= (DASHES after_dash?)* private after_dash ::= doc_item | STRING { recoverWhile=after_dash_recover } private after_dash_recover ::= !(DASHES) private doc_item ::= '@' tag_normal -tag_normal ::= TAG_NAME comment_string? { +tag_normal ::= TAG_NAME any* { pin = 1 + recoverWhile = after_dash_recover } -ty ::= union_ty | function_ty | table_ty | generic_ty | arr_ty | general_ty | par_ty | string_literal_ty { -} - -arr_ty ::= ty '[]' { -} -general_ty ::= class_name_ref { -} -par_ty ::= '(' ty ')' { - pin = 1 -} -string_literal_ty ::= STRING_LITERAL{ -} - -private fieldList ::= (tableField (',' tableField)* (',')?)? - -private tableField2 ::= ID ':' ty { pin = 1 } - -tableField ::= tableField2 { -} - -table_def ::= '{' fieldList '}' { - pin = 1 -} - -table_ty ::= table_def { -} - -private generic_param_list ::= (ty ',')* ty -generic_ty ::= general_ty '<' generic_param_list '>' { - pin = 2 -} - -function_param ::= ID (':' ty)? { - pin = 1 -} -vararg_param ::= VARARG ty { - pin = 1 -} -private function_param_list::= (function_param ',')* ((function_param|vararg_param) |& ')') -private function_generic ::= '<' generic_def (',' generic_def)* '>' { - pin = 1 -} -function_ty ::= fun function_generic? '(' function_param_list ')' (':' type_list)? { - pin = 1 -} - -union_ty ::= ty ('|' ty)+ { -} -access_modifier ::= PRIVATE | PUBLIC | PROTECTED | TAG_NAME_PRIVATE | TAG_NAME_PUBLIC | TAG_NAME_PROTECTED - -tag_field ::= TAG_NAME_FIELD access_modifier? ('<' class_name_ref '>')? ID ty comment_string? { - pin = 1 -} - -//--- tag -tag_def ::= TAG_NAME_NAME comment_string? { - pin = 1 - methods = [ - tagName = 'TAG_NAME_NAME' - ] -} - -//@overload -tag_overload ::= TAG_NAME_OVERLOAD function_ty { pin = 1 } - -//@language json -tag_lan ::= TAG_NAME_LANGUAGE ID comment_string? { pin = 1 } - -//@param PARAM_NAME CLASS_REF -param_name_ref ::= ID { -} -tag_param ::= TAG_NAME_PARAM param_name_ref ty comment_string? { - pin = 1 -} -tag_vararg ::= TAG_NAME_VARARG ty comment_string? { - pin = 1 -} - -//--- return -type_list ::= ty(',' ty)* -tag_return ::= TAG_NAME_RETURN type_list comment_string? { - pin = 1 -} - -class_name_ref ::= ID { -} -tag_class ::= (TAG_NAME_CLASS|TAG_NAME_MODULE) ID (EXTENDS class_name_ref)? comment_string? { - pin = 2 -} - -// @type CLASS_REF -tag_type ::= TAG_NAME_TYPE ty comment_string? { - pin = 1 -} - -comment_string ::= STRING_BEGIN? STRING? { - //pin = 1 - methods = [ - string = "STRING" - ] -} - -tag_see ::= TAG_NAME_SEE class_name_ref (SHARP ID)? { - pin = 1 -} - -generic_def ::= ID (EXTENDS class_name_ref)? { - pin = 1 -} - -tag_generic_list ::= TAG_NAME_GENERIC generic_def (',' generic_def)* { - pin = 1 -} - -tag_alias ::= TAG_NAME_ALIAS ID ty { - pin = 1 -} - -tag_suppress ::= TAG_NAME_SUPPRESS ID (',' ID)* { - pin = 1 -} \ No newline at end of file +any ::= ID | STRING | NUMBER | AT | SHARP | EQ | COMMA | EXTENDS | OR | GT | LT | LPAREN | RPAREN | LCURLY | RCURLY +| STRING_LITERAL | ARR | FUN | VARARG | PRIVATE | PROTECTED | PUBLIC | DASHES | STRING_BEGIN | TAG_NAME | +TAG_NAME_LANGUAGE | ASYNC | NULLABLE | LBRACK | RBRACK | PACKAGE \ No newline at end of file diff --git a/src/main/java/com/tang/intellij/lua/doc.flex b/src/main/java/com/tang/intellij/lua/doc.flex index 89e318a..80d3fd8 100644 --- a/src/main/java/com/tang/intellij/lua/doc.flex +++ b/src/main/java/com/tang/intellij/lua/doc.flex @@ -1,7 +1,7 @@ package com.tang.intellij.lua.comment.lexer; import com.intellij.lexer.FlexLexer; -import com.intellij.psi.tree.IElementType; +import com.intellij.psi.TokenType;import com.intellij.psi.tree.IElementType; import com.tang.intellij.lua.comment.psi.LuaDocTypes; %% @@ -45,7 +45,8 @@ EOL="\r"|"\n"|"\r\n" LINE_WS=[\ \t\f] WHITE_SPACE=({LINE_WS}|{EOL})+ STRING=[^\r\n\t\f]* -ID=[:jletter:] ([:jletterdigit:]|\.)* +ID=[:jletter:] ([:jletterdigit:]|\.|\*|\-)* +NUMBER=[0-9]+ AT=@ //三个-以上 DOC_DASHES = --+ @@ -60,15 +61,19 @@ SINGLE_QUOTED_STRING='([^\\\']|\\\S|\\[\r\n])*'? //'([^\\'\r\n]|\\[^\r\n])*'? %state xPARAM %state xTYPE_REF %state xCLASS +%state xCLASS_GENERIC %state xCLASS_EXTEND %state xFIELD +%state xFIELD_INDEX %state xFIELD_ID %state xGENERIC %state xALIAS -%state xSUPPRESS %state xDOUBLE_QUOTED_STRING %state xSINGLE_QUOTED_STRING - +%state xMODULE +%state xTAG_ENUMFIELD +%state xTAG_DIAGNOSTIC +%state xENUM %% { @@ -76,25 +81,42 @@ SINGLE_QUOTED_STRING='([^\\\']|\\\S|\\[\r\n])*'? //'([^\\'\r\n]|\\[^\r\n])*'? {LINE_WS}+ { return com.intellij.psi.TokenType.WHITE_SPACE; } {DOC_DASHES} { return DASHES; } "@" { yybegin(xTAG_NAME); return AT; } + "|" { yybegin(xTAG_ENUMFIELD); ;return OR; } . { yybegin(xCOMMENT_STRING); yypushback(yylength()); } } - { + { {EOL} { yybegin(YYINITIAL);return com.intellij.psi.TokenType.WHITE_SPACE;} {LINE_WS}+ { return com.intellij.psi.TokenType.WHITE_SPACE; } } { + "field" { yybegin(xFIELD); return TAG_NAME; } + "param" { yybegin(xPARAM); return TAG_NAME; } + "class" { yybegin(xCLASS); return TAG_NAME; } + "interface" { yybegin(xCLASS); return TAG_NAME; } + "enum" { yybegin(xENUM); return TAG_NAME; } + "module" { yybegin(xMODULE); return TAG_NAME; } + "source" { yybegin(xMODULE); return TAG_NAME; } + "return" { beginType(); return TAG_NAME; } + "type" { beginType(); return TAG_NAME;} + "overload" { beginType(); return TAG_NAME; } + "private" { return TAG_NAME; } + "protected" { return TAG_NAME; } + "public" { return TAG_NAME; } + "package" { yybegin(xTAG_WITH_ID); return TAG_NAME; } + "language" { yybegin(xTAG_WITH_ID); return TAG_NAME_LANGUAGE;} + "generic" { yybegin(xGENERIC); return TAG_NAME; } + "see" { yybegin(xTAG); return TAG_NAME; } + "namespace" { yybegin(xTAG_WITH_ID); return TAG_NAME; } + "using" { yybegin(xTAG_WITH_ID); return TAG_NAME; } + "alias" { yybegin(xALIAS); return TAG_NAME; } + "diagnostic" { yybegin(xTAG_DIAGNOSTIC); return TAG_NAME; } {ID} { yybegin(xCOMMENT_STRING); return TAG_NAME; } [^] { return com.intellij.psi.TokenType.BAD_CHARACTER; } } - { - {ID} { return ID; } - "," { return COMMA; } - [^] { yybegin(YYINITIAL); yypushback(yylength()); } -} - { {ID} { beginType(); return ID; } [^] { yybegin(YYINITIAL); yypushback(yylength()); } @@ -108,8 +130,16 @@ SINGLE_QUOTED_STRING='([^\\\']|\\\S|\\[\r\n])*'? //'([^\\'\r\n]|\\[^\r\n])*'? } { + "<" { yybegin(xCLASS_GENERIC); return LT; } {ID} { yybegin(xCLASS_EXTEND); return ID; } } + { + {ID} { return ID; } + "," { return COMMA; } + ":" { return EXTENDS;} + ">" { return GT; } +} + { ":" { beginType(); return EXTENDS;} [^] { yybegin(xCOMMENT_STRING); yypushback(yylength()); } @@ -124,14 +154,37 @@ SINGLE_QUOTED_STRING='([^\\\']|\\\S|\\[\r\n])*'? //'([^\\'\r\n]|\\[^\r\n])*'? "private" { yybegin(xFIELD_ID); return PRIVATE; } "protected" { yybegin(xFIELD_ID); return PROTECTED; } "public" { yybegin(xFIELD_ID); return PUBLIC; } + "package" { yybegin(xFIELD_ID); return PACKAGE; } + "[" { yybegin(xFIELD_ID); yypushback(yylength());} {ID} { beginType(); return ID; } } { + "[" { yybegin(xFIELD_INDEX); return LBRACK; } {ID} { beginType(); return ID; } } + { + {NUMBER} { return NUMBER; } + {ID} { return ID; } + "]" { yybegin(xFIELD_ID); return RBRACK; } +} + + { + {ID} { return ID; } + {STRING} { return STRING_LITERAL; } + "." { return DOT; } +} + + { + {ID} { return ID; } + ":" { return EXTENDS;} + "," { return COMMA; } +} + { + "?" { return NULLABLE; } "@" { yybegin(xCOMMENT_STRING); return STRING_BEGIN; } + "#" { yybegin(xCOMMENT_STRING); return STRING_BEGIN; } "," { _typeReq = true; return COMMA; } "|" { _typeReq = true; return OR; } ":" { _typeReq = true; return EXTENDS;} @@ -146,6 +199,8 @@ SINGLE_QUOTED_STRING='([^\\\']|\\\S|\\[\r\n])*'? //'([^\\'\r\n]|\\[^\r\n])*'? "[]" { _typeReq = false; return ARR; } "fun" { return FUN; } "vararg" { _typeReq = true; return VARARG; } + "async" { return ASYNC; } + {NUMBER} { return NUMBER; } "..."|{ID} { if (_typeReq || _typeLevel > 0) { _typeReq = false; return ID; } else { yybegin(xCOMMENT_STRING); yypushback(yylength()); } } } @@ -171,4 +226,4 @@ SINGLE_QUOTED_STRING='([^\\\']|\\\S|\\[\r\n])*'? //'([^\\'\r\n]|\\[^\r\n])*'? {STRING} { yybegin(YYINITIAL); return STRING; } } -[^] { return com.intellij.psi.TokenType.BAD_CHARACTER; } \ No newline at end of file +[^] { return TokenType.WHITE_SPACE; } \ No newline at end of file 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 bbf2091..656437a 100644 --- a/src/main/java/com/tang/intellij/lua/lang/LuaParserDefinition.kt +++ b/src/main/java/com/tang/intellij/lua/lang/LuaParserDefinition.kt @@ -143,21 +143,8 @@ class LuaParserDefinition : ParserDefinition { LuaTypes.TRUE ) val DOC_TAG_TOKENS = TokenSet.create( - LuaDocTypes.TAG_NAME_PARAM, - LuaDocTypes.TAG_NAME_RETURN, - LuaDocTypes.TAG_NAME_CLASS, - LuaDocTypes.TAG_NAME_MODULE, - LuaDocTypes.TAG_NAME_TYPE, - LuaDocTypes.TAG_NAME_FIELD, + LuaDocTypes.TAG_NAME, LuaDocTypes.TAG_NAME_LANGUAGE, - LuaDocTypes.TAG_NAME_OVERLOAD, - LuaDocTypes.TAG_NAME_PRIVATE, - LuaDocTypes.TAG_NAME_PROTECTED, - LuaDocTypes.TAG_NAME_PUBLIC, - LuaDocTypes.TAG_NAME_SEE, - LuaDocTypes.TAG_NAME_GENERIC, - LuaDocTypes.TAG_NAME_VARARG, - LuaDocTypes.TAG_NAME_ALIAS ) val DOC_KEYWORD_TOKENS = TokenSet.create( LuaDocTypes.FUN,