From 2364a690b0e5f22b880b04494e97b766e2d1e754 Mon Sep 17 00:00:00 2001 From: Alexander Kass Date: Mon, 9 Oct 2017 15:27:23 +0300 Subject: [PATCH] RegExp: support MySQL syntax extension --- .../org/intellij/lang/regexp/_RegExLexer.java | 668 ++++++++++-------- .../lang/regexp/RegExpCapability.java | 5 + .../lang/regexp/RegExpElementTypes.java | 2 + .../intellij/lang/regexp/RegExpParser.java | 27 + .../org/intellij/lang/regexp/RegExpTT.java | 8 + .../intellij/lang/regexp/regexp-lexer.flex | 30 +- .../regexp/validation/RegExpAnnotator.java | 2 +- .../intellij/lang/regexp/RegExpLexerTest.java | 18 + 8 files changed, 451 insertions(+), 309 deletions(-) diff --git a/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java b/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java index 40e812f8900e..f1ca889ebc85 100644 --- a/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java +++ b/RegExpSupport/gen/org/intellij/lang/regexp/_RegExLexer.java @@ -45,7 +45,9 @@ class _RegExLexer implements FlexLexer { public static final int PY_NAMED_GROUP_REF = 28; public static final int PY_COND_REF = 30; public static final int BRACKET_EXPRESSION = 32; - public static final int EMBRACED_HEX = 34; + public static final int MYSQL_CHAR_EXPRESSION = 34; + public static final int MYSQL_CHAR_EQ_EXPRESSION = 36; + public static final int EMBRACED_HEX = 38; /** * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l @@ -56,7 +58,7 @@ class _RegExLexer implements FlexLexer { 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, - 16, 16, 17, 17 + 16, 16, 17, 17, 18, 18, 19, 19 }; /** @@ -134,9 +136,9 @@ class _RegExLexer implements FlexLexer { /* The ZZ_CMAP_A table has 3024 entries */ static final char ZZ_CMAP_A[] = zzUnpackCMap( - "\10\0\2\61\1\76\1\0\1\61\1\76\22\0\1\14\1\74\1\0\1\75\1\16\1\0\1\71\1\64\1"+ - "\2\1\3\1\20\1\21\1\56\1\13\1\1\1\0\1\53\3\55\4\54\2\47\1\70\1\0\1\63\1\73"+ - "\1\72\1\17\1\0\2\30\1\37\1\35\1\45\1\46\1\31\1\57\1\40\2\66\1\44\1\67\1\60"+ + "\10\0\2\61\1\76\1\0\1\61\1\76\22\0\1\14\1\74\1\0\1\75\1\16\1\0\1\72\1\64\1"+ + "\2\1\3\1\20\1\21\1\56\1\13\1\1\1\0\1\53\3\55\4\54\2\47\1\70\1\0\1\63\1\71"+ + "\1\73\1\17\1\0\2\30\1\37\1\35\1\45\1\46\1\31\1\57\1\40\2\66\1\44\1\67\1\60"+ "\1\66\1\42\1\50\1\65\1\34\1\66\1\43\3\33\1\66\1\32\1\6\1\10\1\7\1\23\1\12"+ "\1\0\1\25\1\26\1\36\1\35\2\25\1\27\1\57\1\40\1\66\1\62\1\43\1\66\1\24\1\66"+ "\1\41\1\66\1\24\1\33\1\24\1\52\2\33\1\51\1\66\1\31\1\4\1\22\1\5\14\0\1\11"+ @@ -190,26 +192,28 @@ class _RegExLexer implements FlexLexer { private static final int [] ZZ_ACTION = zzUnpackAction(); private static final String ZZ_ACTION_PACKED_0 = - "\13\0\1\1\6\0\1\2\1\3\1\4\1\5\1\6"+ + "\13\0\1\1\10\0\1\2\1\3\1\4\1\5\1\6"+ "\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16"+ "\1\17\1\20\1\21\1\22\1\23\1\2\1\24\1\25"+ "\1\26\1\27\1\30\1\31\2\32\1\33\1\34\1\35"+ "\1\33\1\36\1\37\1\40\1\12\1\41\1\2\1\42"+ "\1\12\1\43\1\44\1\45\1\46\1\47\1\50\1\1"+ - "\1\26\1\51\1\52\2\53\1\54\1\55\2\0\1\56"+ - "\1\57\1\60\1\61\1\62\1\63\1\64\1\65\1\66"+ - "\1\12\1\66\1\67\2\70\1\71\1\72\1\12\1\73"+ - "\1\74\1\75\1\76\1\77\1\100\1\101\1\12\1\102"+ - "\1\103\1\104\1\105\1\106\1\107\1\110\1\111\1\112"+ - "\1\113\2\54\1\114\1\0\1\115\1\116\1\117\1\120"+ - "\1\121\1\122\1\0\1\123\1\0\1\124\4\0\1\125"+ - "\1\126\1\127\1\73\1\130\1\131\1\132\1\133\2\134"+ - "\1\135\1\136\1\137\1\140\1\141\1\142\1\143\1\0"+ - "\1\144\1\145\1\0\1\146\2\0\1\73\1\147\1\133"+ - "\2\134\1\150\1\151\1\133\1\152\1\153"; + "\1\26\1\51\1\52\1\53\1\54\3\53\1\26\1\53"+ + "\1\26\1\53\1\55\1\56\2\0\1\57\1\60\1\61"+ + "\1\62\1\63\1\64\1\65\1\66\1\67\1\12\1\67"+ + "\1\70\2\71\1\72\1\73\1\12\1\74\1\75\1\76"+ + "\1\77\1\100\1\101\1\102\1\12\1\103\1\104\1\105"+ + "\1\106\1\107\1\110\1\111\1\112\1\113\1\114\1\115"+ + "\1\0\1\116\2\26\1\117\2\55\1\120\1\0\1\121"+ + "\1\122\1\123\1\124\1\125\1\126\1\0\1\127\1\0"+ + "\1\130\4\0\1\131\1\132\1\133\1\74\1\134\1\135"+ + "\1\136\1\137\2\140\1\141\1\142\1\143\1\144\1\145"+ + "\1\146\1\147\1\150\1\0\1\151\1\152\1\0\1\153"+ + "\2\0\1\74\1\154\1\137\2\140\1\155\1\156\1\137"+ + "\1\157\1\160"; private static int [] zzUnpackAction() { - int [] result = new int[160]; + int [] result = new int[176]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -236,27 +240,29 @@ class _RegExLexer implements FlexLexer { private static final String ZZ_ROWMAP_PACKED_0 = "\0\0\0\77\0\176\0\275\0\374\0\u013b\0\u017a\0\u01b9"+ "\0\u01f8\0\u0237\0\u0276\0\u02b5\0\u02f4\0\u0333\0\u0372\0\u03b1"+ - "\0\u03f0\0\u042f\0\u046e\0\u046e\0\u04ad\0\u046e\0\u04ec\0\u046e"+ - "\0\u052b\0\u046e\0\u056a\0\u046e\0\u046e\0\u046e\0\u046e\0\u046e"+ - "\0\u046e\0\u046e\0\u046e\0\u046e\0\u05a9\0\u046e\0\u046e\0\u05e8"+ - "\0\u0627\0\u046e\0\u046e\0\u046e\0\u05a9\0\u046e\0\u0666\0\u046e"+ - "\0\u06a5\0\u046e\0\u06e4\0\u046e\0\u0723\0\u046e\0\u0762\0\u046e"+ - "\0\u07a1\0\u046e\0\u046e\0\u046e\0\u07e0\0\u081f\0\u046e\0\u046e"+ - "\0\u085e\0\u046e\0\u046e\0\u046e\0\u089d\0\u08dc\0\u091b\0\u095a"+ - "\0\u0999\0\u046e\0\u046e\0\u046e\0\u09d8\0\u046e\0\u046e\0\u046e"+ - "\0\u046e\0\u0a17\0\u0a56\0\u046e\0\u046e\0\u0a95\0\u046e\0\u046e"+ - "\0\u046e\0\u046e\0\u0ad4\0\u046e\0\u0b13\0\u0b52\0\u0b91\0\u046e"+ - "\0\u046e\0\u0bd0\0\u046e\0\u046e\0\u046e\0\u046e\0\u046e\0\u046e"+ - "\0\u046e\0\u046e\0\u046e\0\u046e\0\u046e\0\u0c0f\0\u046e\0\u0c4e"+ - "\0\u0c8d\0\u046e\0\u046e\0\u046e\0\u046e\0\u046e\0\u0ccc\0\u046e"+ - "\0\u0d0b\0\u046e\0\u0d4a\0\u0d89\0\u0dc8\0\u0e07\0\u046e\0\u046e"+ - "\0\u046e\0\u0e46\0\u046e\0\u0e85\0\u046e\0\u0ec4\0\u0f03\0\u0f42"+ - "\0\u046e\0\u046e\0\u046e\0\u046e\0\u046e\0\u046e\0\u046e\0\u0f81"+ - "\0\u046e\0\u046e\0\u0fc0\0\u046e\0\u0fff\0\u103e\0\u046e\0\u046e"+ - "\0\u107d\0\u10bc\0\u046e\0\u046e\0\u046e\0\u10fb\0\u046e\0\u046e"; + "\0\u03f0\0\u042f\0\u046e\0\u04ad\0\u04ec\0\u04ec\0\u052b\0\u04ec"+ + "\0\u056a\0\u04ec\0\u05a9\0\u04ec\0\u05e8\0\u04ec\0\u04ec\0\u04ec"+ + "\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u0627\0\u04ec"+ + "\0\u04ec\0\u0666\0\u06a5\0\u04ec\0\u04ec\0\u04ec\0\u0627\0\u04ec"+ + "\0\u06e4\0\u04ec\0\u0723\0\u04ec\0\u0762\0\u04ec\0\u07a1\0\u04ec"+ + "\0\u07e0\0\u04ec\0\u081f\0\u04ec\0\u04ec\0\u04ec\0\u085e\0\u089d"+ + "\0\u04ec\0\u04ec\0\u08dc\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u091b"+ + "\0\u095a\0\u0999\0\u09d8\0\u0a17\0\u0a56\0\u0a95\0\u0ad4\0\u0b13"+ + "\0\u0b52\0\u0b91\0\u04ec\0\u04ec\0\u04ec\0\u0bd0\0\u04ec\0\u04ec"+ + "\0\u04ec\0\u04ec\0\u0c0f\0\u0c4e\0\u04ec\0\u04ec\0\u0c8d\0\u04ec"+ + "\0\u04ec\0\u04ec\0\u04ec\0\u0ccc\0\u04ec\0\u0d0b\0\u0d4a\0\u0d89"+ + "\0\u04ec\0\u04ec\0\u0dc8\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec"+ + "\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u0e07\0\u04ec"+ + "\0\u0e46\0\u04ec\0\u04ec\0\u04ec\0\u0e85\0\u04ec\0\u0ec4\0\u0f03"+ + "\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u0f42\0\u04ec\0\u0f81"+ + "\0\u04ec\0\u0fc0\0\u0fff\0\u103e\0\u107d\0\u04ec\0\u04ec\0\u04ec"+ + "\0\u10bc\0\u04ec\0\u10fb\0\u04ec\0\u113a\0\u1179\0\u11b8\0\u04ec"+ + "\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u04ec\0\u11f7"+ + "\0\u04ec\0\u04ec\0\u1236\0\u04ec\0\u1275\0\u12b4\0\u04ec\0\u04ec"+ + "\0\u12f3\0\u1332\0\u04ec\0\u04ec\0\u04ec\0\u1371\0\u04ec\0\u04ec"; private static int [] zzUnpackRowMap() { - int [] result = new int[160]; + int [] result = new int[176]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -279,85 +285,98 @@ class _RegExLexer implements FlexLexer { private static final int [] ZZ_TRANS = zzUnpackTrans(); private static final String ZZ_TRANS_PACKED_0 = - "\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32"+ - "\1\33\3\23\1\34\1\23\1\35\1\36\1\37\1\40"+ - "\1\41\1\42\35\23\1\43\13\23\1\44\1\43\10\23"+ - "\1\45\66\23\5\46\1\47\3\46\1\50\11\46\1\42"+ - "\23\50\1\46\3\50\4\46\2\50\1\46\1\50\2\46"+ - "\3\50\14\46\1\47\7\46\1\51\31\46\1\51\3\46"+ - "\3\51\1\52\20\46\23\0\1\53\53\0\10\54\1\55"+ - "\66\54\6\56\1\57\1\60\1\61\3\56\1\62\44\56"+ - "\1\62\14\56\1\62\6\23\1\63\1\64\1\65\2\23"+ - "\1\66\1\34\44\23\1\43\7\23\1\67\4\23\1\43"+ - "\4\46\1\70\3\46\1\71\21\46\1\72\1\46\1\72"+ - "\2\46\1\72\2\46\1\72\1\46\1\72\13\46\1\72"+ - "\6\46\1\72\13\46\1\70\3\46\1\71\66\46\3\73"+ - "\1\74\5\73\1\75\1\73\1\76\10\73\23\75\1\73"+ - "\3\75\4\73\2\75\1\73\1\75\2\73\3\75\1\77"+ - "\6\73\76\14\1\100\11\73\1\101\12\73\23\101\1\73"+ - "\3\101\4\73\2\101\1\73\1\101\2\73\3\101\2\73"+ - "\1\102\15\73\1\101\12\73\23\101\1\73\3\101\4\73"+ - "\2\101\1\73\1\101\1\73\1\103\3\101\12\73\1\74"+ - "\5\73\1\101\12\73\23\101\1\73\3\101\4\73\2\101"+ - "\1\73\1\101\2\73\3\101\12\73\1\74\5\73\1\101"+ - "\3\73\1\51\6\73\23\101\1\51\3\101\3\51\1\73"+ - "\2\101\1\73\1\101\2\73\3\101\7\73\11\104\1\50"+ - "\11\104\1\42\23\50\1\104\3\50\4\104\2\50\1\104"+ - "\1\50\2\104\3\50\1\105\6\104\4\0\1\106\210\0"+ - "\1\107\74\0\1\110\31\0\1\110\3\0\3\110\1\111"+ - "\43\0\1\112\53\0\1\113\3\114\1\115\1\116\1\114"+ - "\1\113\1\114\2\113\1\117\1\120\1\113\6\114\2\121"+ - "\1\122\1\123\3\124\3\125\1\126\2\127\2\130\3\131"+ - "\1\132\1\133\1\134\1\135\1\136\1\137\2\133\1\113"+ - "\1\140\1\141\1\120\1\142\2\113\1\125\2\132\6\113"+ - "\1\120\45\0\1\143\33\0\2\50\5\0\5\50\6\0"+ - "\32\50\1\0\2\50\1\0\1\50\2\0\3\50\24\0"+ - "\1\51\31\0\1\51\3\0\3\51\44\0\1\144\44\0"+ - "\1\145\15\0\1\146\13\0\1\147\24\0\1\150\51\0"+ - "\1\151\44\0\1\152\6\0\6\113\3\114\2\113\1\117"+ - "\1\120\7\113\3\121\4\132\3\125\1\126\2\127\2\130"+ - "\3\131\1\132\1\133\1\134\1\135\1\136\1\137\2\133"+ - "\1\113\1\140\1\141\1\120\1\132\2\113\3\132\6\113"+ - "\1\120\71\0\1\153\5\0\6\113\1\114\1\113\1\114"+ - "\2\113\1\117\1\120\7\113\2\121\5\132\3\125\1\126"+ - "\2\127\2\130\3\131\1\132\1\133\1\134\1\135\1\136"+ - "\1\137\2\133\1\113\1\140\1\141\1\120\1\132\2\113"+ - "\3\132\6\113\1\120\11\0\1\75\12\0\23\75\1\0"+ - "\3\75\4\0\2\75\1\0\1\75\2\0\3\75\20\0"+ - "\1\76\12\0\23\76\1\0\3\76\4\0\2\76\1\0"+ - "\1\76\2\0\3\76\20\0\5\101\6\0\32\101\1\0"+ - "\2\101\1\0\1\101\2\0\3\101\16\0\1\154\74\0"+ - "\1\155\17\0\2\156\1\0\1\156\4\0\3\156\5\0"+ - "\3\156\3\0\3\156\23\0\1\157\37\0\1\160\20\0"+ - "\1\161\1\162\3\0\1\163\1\0\1\164\1\165\1\166"+ - "\1\167\6\0\1\170\7\0\1\110\31\0\1\110\3\0"+ - "\3\110\1\171\25\0\1\172\7\0\1\173\31\0\1\173"+ - "\3\0\3\173\36\0\1\174\31\0\1\174\3\0\3\174"+ - "\1\175\24\0\1\176\155\0\1\177\1\200\12\0\77\201"+ - "\47\0\1\202\3\0\3\202\25\0\1\203\20\0\2\204"+ - "\1\0\1\204\4\0\3\204\5\0\3\204\3\0\3\204"+ - "\25\0\1\205\20\0\2\206\1\0\1\206\4\0\3\206"+ - "\5\0\3\206\3\0\3\206\74\0\1\207\1\210\1\207"+ - "\104\0\1\211\1\212\17\0\1\213\17\0\2\156\1\0"+ - "\1\156\4\0\3\156\5\0\3\156\3\0\3\156\104\0"+ - "\1\214\7\0\1\215\76\0\1\216\1\217\2\0\3\220"+ - "\1\0\73\220\5\0\1\170\7\0\1\171\31\0\1\171"+ - "\3\0\3\171\26\0\1\221\7\0\1\173\31\0\1\173"+ - "\3\0\3\173\26\0\1\222\7\0\1\174\31\0\1\174"+ - "\3\0\3\174\1\223\25\0\1\224\7\0\1\225\31\0"+ - "\1\225\3\0\3\225\50\0\1\226\116\0\1\227\3\0"+ - "\3\227\46\0\2\230\1\0\1\230\4\0\3\230\5\0"+ - "\3\230\3\0\3\230\46\0\2\231\1\0\1\231\4\0"+ - "\3\231\5\0\3\231\3\0\3\231\74\0\3\232\74\0"+ - "\3\233\21\0\3\220\1\234\73\220\5\0\1\222\7\0"+ - "\1\223\31\0\1\223\3\0\3\223\26\0\1\235\7\0"+ - "\1\225\31\0\1\225\3\0\3\225\26\0\1\124\116\0"+ - "\2\236\1\0\1\236\4\0\3\236\5\0\3\236\3\0"+ - "\3\236\74\0\3\237\46\0\2\240\1\0\1\240\4\0"+ - "\3\240\5\0\3\240\3\0\3\240\21\0"; + "\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34"+ + "\1\35\3\25\1\36\1\25\1\37\1\40\1\41\1\42"+ + "\1\43\1\44\35\25\1\45\13\25\1\46\1\45\10\25"+ + "\1\47\66\25\5\50\1\51\3\50\1\52\11\50\1\44"+ + "\23\52\1\50\3\52\4\50\2\52\1\50\1\52\2\50"+ + "\3\52\14\50\1\51\7\50\1\53\31\50\1\53\3\50"+ + "\3\53\1\54\20\50\23\0\1\55\53\0\10\56\1\57"+ + "\66\56\6\60\1\61\1\62\1\63\3\60\1\64\44\60"+ + "\1\64\14\60\1\64\6\25\1\65\1\66\1\67\2\25"+ + "\1\70\1\36\44\25\1\45\10\25\1\71\3\25\1\45"+ + "\4\50\1\72\3\50\1\73\21\50\1\74\1\50\1\74"+ + "\2\50\1\74\2\50\1\74\1\50\1\74\13\50\1\74"+ + "\6\50\1\74\13\50\1\72\3\50\1\73\66\50\3\75"+ + "\1\76\5\75\1\77\1\75\1\100\10\75\23\77\1\75"+ + "\3\77\4\75\2\77\1\75\1\77\2\75\3\77\1\101"+ + "\6\75\76\14\1\102\11\75\1\103\12\75\23\103\1\75"+ + "\3\103\4\75\2\103\1\75\1\103\2\75\3\103\3\75"+ + "\1\104\14\75\1\103\12\75\23\103\1\75\3\103\4\75"+ + "\2\103\1\75\1\103\1\75\1\105\3\103\12\75\1\76"+ + "\5\75\1\103\12\75\23\103\1\75\3\103\4\75\2\103"+ + "\1\75\1\103\2\75\3\103\12\75\1\76\5\75\1\103"+ + "\3\75\1\53\6\75\23\103\1\53\3\103\3\53\1\75"+ + "\2\103\1\75\1\103\2\75\3\103\7\75\11\106\1\52"+ + "\11\106\1\44\23\52\1\106\3\52\4\106\2\52\1\106"+ + "\1\52\1\107\1\106\3\52\1\110\2\106\1\107\3\106"+ + "\1\111\1\112\7\111\1\113\12\111\23\113\1\111\3\113"+ + "\4\111\2\113\1\111\1\113\2\111\3\113\7\111\11\114"+ + "\1\115\12\114\23\115\1\114\3\115\4\114\2\115\1\114"+ + "\1\115\2\114\3\115\1\114\1\116\5\114\4\0\1\117"+ + "\210\0\1\120\74\0\1\121\31\0\1\121\3\0\3\121"+ + "\1\122\43\0\1\123\53\0\1\124\3\125\1\126\1\127"+ + "\1\125\1\124\1\125\2\124\1\130\1\131\1\124\6\125"+ + "\2\132\1\133\1\134\3\135\3\136\1\137\2\140\2\141"+ + "\3\142\1\143\1\144\1\145\1\146\1\147\1\150\2\144"+ + "\1\124\1\151\1\152\1\131\1\153\2\124\1\136\2\143"+ + "\6\124\1\131\45\0\1\154\33\0\2\52\5\0\5\52"+ + "\6\0\32\52\1\0\2\52\1\0\1\52\2\0\3\52"+ + "\24\0\1\53\31\0\1\53\3\0\3\53\22\0\1\155"+ + "\21\0\1\156\44\0\1\157\1\155\14\0\1\160\13\0"+ + "\1\161\24\0\1\162\27\0\1\163\21\0\1\164\44\0"+ + "\2\163\5\0\6\124\3\125\2\124\1\130\1\131\7\124"+ + "\3\132\4\143\3\136\1\137\2\140\2\141\3\142\1\143"+ + "\1\144\1\145\1\146\1\147\1\150\2\144\1\124\1\151"+ + "\1\152\1\131\1\143\2\124\3\143\6\124\1\131\72\0"+ + "\1\165\4\0\6\124\1\125\1\124\1\125\2\124\1\130"+ + "\1\131\7\124\2\132\5\143\3\136\1\137\2\140\2\141"+ + "\3\142\1\143\1\144\1\145\1\146\1\147\1\150\2\144"+ + "\1\124\1\151\1\152\1\131\1\143\2\124\3\143\6\124"+ + "\1\131\11\0\1\77\12\0\23\77\1\0\3\77\4\0"+ + "\2\77\1\0\1\77\2\0\3\77\20\0\1\100\12\0"+ + "\23\100\1\0\3\100\4\0\2\100\1\0\1\100\2\0"+ + "\3\100\20\0\5\103\6\0\32\103\1\0\2\103\1\0"+ + "\1\103\2\0\3\103\16\0\1\166\70\0\1\167\76\0"+ + "\1\167\5\0\1\170\70\0\1\167\7\0\1\171\1\0"+ + "\1\171\1\0\1\172\6\0\23\171\1\172\3\171\3\172"+ + "\1\0\2\171\1\0\1\171\2\0\3\171\100\0\1\167"+ + "\7\0\2\52\5\0\5\52\6\0\32\52\1\0\2\52"+ + "\1\0\1\52\2\0\3\52\1\0\1\167\14\0\1\173"+ + "\61\0\1\167\12\0\1\174\17\0\2\175\1\0\1\175"+ + "\4\0\3\175\5\0\3\175\3\0\3\175\23\0\1\176"+ + "\37\0\1\177\20\0\1\200\1\201\3\0\1\202\1\203"+ + "\1\0\1\204\1\205\1\206\6\0\1\207\7\0\1\121"+ + "\31\0\1\121\3\0\3\121\1\210\25\0\1\211\7\0"+ + "\1\212\31\0\1\212\3\0\3\212\36\0\1\213\31\0"+ + "\1\213\3\0\3\213\1\214\24\0\1\215\155\0\1\216"+ + "\1\217\12\0\77\220\47\0\1\221\3\0\3\221\25\0"+ + "\1\222\20\0\2\223\1\0\1\223\4\0\3\223\5\0"+ + "\3\223\3\0\3\223\25\0\1\224\20\0\2\225\1\0"+ + "\1\225\4\0\3\225\5\0\3\225\3\0\3\225\74\0"+ + "\1\226\1\227\1\226\104\0\1\230\1\231\21\0\1\232"+ + "\100\0\1\171\1\0\1\171\1\0\1\172\6\0\23\171"+ + "\1\172\3\171\3\172\1\0\2\171\1\0\1\171\2\0"+ + "\3\171\14\0\1\233\17\0\2\175\1\0\1\175\4\0"+ + "\3\175\5\0\3\175\3\0\3\175\104\0\1\234\5\0"+ + "\1\235\76\0\1\236\2\0\1\237\2\0\3\240\1\0"+ + "\73\240\5\0\1\207\7\0\1\210\31\0\1\210\3\0"+ + "\3\210\26\0\1\241\7\0\1\212\31\0\1\212\3\0"+ + "\3\212\26\0\1\242\7\0\1\213\31\0\1\213\3\0"+ + "\3\213\1\243\25\0\1\244\7\0\1\245\31\0\1\245"+ + "\3\0\3\245\50\0\1\246\116\0\1\247\3\0\3\247"+ + "\46\0\2\250\1\0\1\250\4\0\3\250\5\0\3\250"+ + "\3\0\3\250\46\0\2\251\1\0\1\251\4\0\3\251"+ + "\5\0\3\251\3\0\3\251\74\0\3\252\74\0\3\253"+ + "\21\0\3\240\1\254\73\240\5\0\1\242\7\0\1\243"+ + "\31\0\1\243\3\0\3\243\26\0\1\255\7\0\1\245"+ + "\31\0\1\245\3\0\3\245\26\0\1\135\116\0\2\256"+ + "\1\0\1\256\4\0\3\256\5\0\3\256\3\0\3\256"+ + "\74\0\3\257\46\0\2\260\1\0\1\260\4\0\3\260"+ + "\5\0\3\260\3\0\3\260\21\0"; private static int [] zzUnpackTrans() { - int [] result = new int[4410]; + int [] result = new int[5040]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -395,19 +414,19 @@ class _RegExLexer implements FlexLexer { private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\13\0\1\1\6\0\2\11\1\1\1\11\1\1\1\11"+ + "\13\0\1\1\10\0\2\11\1\1\1\11\1\1\1\11"+ "\1\1\1\11\1\1\11\11\1\1\2\11\2\1\3\11"+ "\1\1\1\11\1\1\1\11\1\1\1\11\1\1\1\11"+ "\1\1\1\11\1\1\1\11\1\1\3\11\2\1\2\11"+ - "\1\1\3\11\3\1\2\0\3\11\1\1\4\11\2\1"+ + "\1\1\4\11\11\1\2\0\3\11\1\1\4\11\2\1"+ "\2\11\1\1\4\11\1\1\1\11\3\1\2\11\1\1"+ - "\13\11\1\1\1\11\1\0\1\1\5\11\1\0\1\11"+ - "\1\0\1\11\4\0\3\11\1\1\1\11\1\1\1\11"+ - "\3\1\7\11\1\0\2\11\1\0\1\11\2\0\2\11"+ - "\2\1\3\11\1\1\2\11"; + "\13\11\1\0\1\11\1\1\3\11\1\1\1\11\1\0"+ + "\1\1\5\11\1\0\1\11\1\0\1\11\4\0\3\11"+ + "\1\1\1\11\1\1\1\11\3\1\10\11\1\0\2\11"+ + "\1\0\1\11\2\0\2\11\2\1\3\11\1\1\2\11"; private static int [] zzUnpackAttribute() { - int [] result = new int[160]; + int [] result = new int[176]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; @@ -484,6 +503,7 @@ class _RegExLexer implements FlexLexer { private boolean allowTransformationEscapes; private boolean allowExtendedUnicodeCharacter; private boolean allowOneHexCharEscape; + private boolean allowMysqlBracketExpressions; private int maxOctal = 0777; private int minOctalDigits = 1; @@ -502,6 +522,7 @@ class _RegExLexer implements FlexLexer { this.allowEmptyCharacterClass = capabilities.contains(ALLOW_EMPTY_CHARACTER_CLASS); this.allowPosixBracketExpressions = capabilities.contains(POSIX_BRACKET_EXPRESSIONS); this.allowTransformationEscapes = capabilities.contains(TRANSFORMATION_ESCAPES); + this.allowMysqlBracketExpressions = capabilities.contains(MYSQL_BRACKET_EXPRESSIONS); if (capabilities.contains(MAX_OCTAL_177)) { maxOctal = 0177; } @@ -787,239 +808,243 @@ class _RegExLexer implements FlexLexer { case 1: { yypopstate(); return RegExpTT.COMMENT; } - case 108: break; + case 113: break; case 2: { return RegExpTT.CHARACTER; } - case 109: break; + case 114: break; case 3: { return RegExpTT.DOT; } - case 110: break; + case 115: break; case 4: { capturingGroupCount++; return RegExpTT.GROUP_BEGIN; } - case 111: break; + case 116: break; case 5: { return RegExpTT.GROUP_END; } - case 112: break; + case 117: break; case 6: { if (allowDanglingMetacharacters != Boolean.TRUE) { yypushstate(QUANTIFIER); return RegExpTT.LBRACE; } return RegExpTT.CHARACTER; } - case 113: break; + case 118: break; case 7: { return (allowDanglingMetacharacters != Boolean.FALSE) ? RegExpTT.CHARACTER : RegExpTT.RBRACE; } - case 114: break; + case 119: break; case 8: { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } - case 115: break; + case 120: break; case 9: { return allowDanglingMetacharacters == Boolean.FALSE ? RegExpTT.CLASS_END : RegExpTT.CHARACTER; } - case 116: break; + case 121: break; case 10: { return StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN; } - case 117: break; + case 122: break; case 11: { return commentMode ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CHARACTER; } - case 118: break; + case 123: break; case 12: { return RegExpTT.DOLLAR; } - case 119: break; + case 124: break; case 13: { return RegExpTT.QUEST; } - case 120: break; + case 125: break; case 14: { return RegExpTT.STAR; } - case 121: break; + case 126: break; case 15: { return RegExpTT.PLUS; } - case 122: break; + case 127: break; case 16: { return RegExpTT.UNION; } - case 123: break; + case 128: break; case 17: { return RegExpTT.CARET; } - case 124: break; + case 129: break; case 18: { return commentMode ? com.intellij.psi.TokenType.WHITE_SPACE : RegExpTT.CTRL_CHARACTER; } - case 125: break; + case 130: break; case 19: { if (commentMode) { yypushstate(COMMENT); return RegExpTT.COMMENT; } else return RegExpTT.CHARACTER; } - case 126: break; + case 131: break; case 20: { yypopstate(); yypushback(1); } - case 127: break; + case 132: break; case 21: { yypopstate(); return RegExpTT.RBRACE; } - case 128: break; + case 133: break; case 22: { return RegExpTT.NAME; } - case 129: break; + case 134: break; case 23: { return RegExpTT.NUMBER; } - case 130: break; + case 135: break; case 24: { return RegExpTT.COMMA; } - case 131: break; + case 136: break; case 25: { yybegin(CLASS1); return RegExpTT.CARET; } - case 132: break; + case 137: break; case 26: { states.set(states.size() - 1, CLASS2); return RegExpTT.CHARACTER; } - case 133: break; + case 138: break; case 27: { yypushback(1); yybegin(CLASS2); } - case 134: break; + case 139: break; case 28: { yybegin(CLASS2); if (allowNestedCharacterClasses) { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } return RegExpTT.CHARACTER; } - case 135: break; + case 140: break; case 29: { if (allowEmptyCharacterClass) { yypopstate(); return RegExpTT.CLASS_END; } yybegin(CLASS2); return RegExpTT.CHARACTER; } - case 136: break; + case 141: break; case 30: { if (commentMode) return com.intellij.psi.TokenType.WHITE_SPACE; yypushback(1); yybegin(CLASS2); } - case 137: break; + case 142: break; case 31: { if (allowNestedCharacterClasses) { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } return RegExpTT.CHARACTER; } - case 138: break; + case 143: break; case 32: { yypopstate(); return RegExpTT.CLASS_END; } - case 139: break; + case 144: break; case 33: { return RegExpTT.MINUS; } - case 140: break; + case 145: break; case 34: { yypopstate(); yypushstate(EMBRACED); return RegExpTT.LBRACE; } - case 141: break; + case 146: break; case 35: { yypopstate(); return RegExpTT.CATEGORY_SHORT_HAND; } - case 142: break; + case 147: break; case 36: { yybegin(YYINITIAL); return RegExpTT.BAD_CHARACTER; } - case 143: break; + case 148: break; case 37: { yybegin(YYINITIAL); return RegExpTT.GROUP_END; } - case 144: break; + case 149: break; case 38: { handleOptions(); return RegExpTT.OPTIONS_ON; } - case 145: break; + case 150: break; case 39: { handleOptions(); return RegExpTT.OPTIONS_OFF; } - case 146: break; + case 151: break; case 40: { yybegin(YYINITIAL); return RegExpTT.COLON; } - case 147: break; + case 152: break; case 41: { yybegin(YYINITIAL); return RegExpTT.GT; } - case 148: break; + case 153: break; case 42: { yybegin(YYINITIAL); return RegExpTT.QUOTE; } - case 149: break; + case 154: break; case 43: { return RegExpTT.BAD_CHARACTER; } - case 150: break; + case 155: break; case 44: + { return allowMysqlBracketExpressions ? RegExpTT.NAME : RegExpTT.BAD_CHARACTER; + } + case 156: break; + case 45: { yypopstate(); return (yycharat(-1) == 'u') ? StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN : RegExpTT.BAD_HEX_VALUE; } - case 151: break; - case 45: + case 157: break; + case 46: { yybegin(OPTIONS); return RegExpTT.SET_OPTIONS; } - case 152: break; - case 46: + case 158: break; + case 47: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); { yypushstate(NEGATED_CLASS); return RegExpTT.CLASS_BEGIN; } - case 153: break; - case 47: + case 159: break; + case 48: { return RegExpTT.REDUNDANT_ESCAPE; } - case 154: break; - case 48: + case 160: break; + case 49: { return RegExpTT.ESC_CHARACTER; } - case 155: break; - case 49: + case 161: break; + case 50: { return (allowDanglingMetacharacters != Boolean.TRUE) ? RegExpTT.ESC_CHARACTER : RegExpTT.REDUNDANT_ESCAPE; } - case 156: break; - case 50: + case 162: break; + case 51: { return (allowDanglingMetacharacters == Boolean.FALSE) ? RegExpTT.ESC_CHARACTER : RegExpTT.REDUNDANT_ESCAPE; } - case 157: break; - case 51: + case 163: break; + case 52: { return (yystate() == CLASS2) ? RegExpTT.ESC_CHARACTER : RegExpTT.REDUNDANT_ESCAPE; } - case 158: break; - case 52: + case 164: break; + case 53: { return commentMode ? RegExpTT.ESC_CTRL_CHARACTER : RegExpTT.REDUNDANT_ESCAPE; } - case 159: break; - case 53: + case 165: break; + case 54: { return RegExpTT.ESC_CTRL_CHARACTER; } - case 160: break; - case 54: + case 166: break; + case 55: { return RegExpTT.BOUNDARY; } - case 161: break; - case 55: + case 167: break; + case 56: { return RegExpTT.CHAR_CLASS; } - case 162: break; - case 56: + case 168: break; + case 57: { if (xmlSchemaMode) return RegExpTT.CHAR_CLASS; else return StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN; } - case 163: break; - case 57: + case 169: break; + case 58: { yypushstate(PROP); return RegExpTT.PROPERTY; } - case 164: break; - case 58: + case 170: break; + case 59: { return allowTransformationEscapes ? RegExpTT.CHAR_CLASS : StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN; } - case 165: break; - case 59: + case 171: break; + case 60: { String text = yytext().toString().substring(1); if (allowOctalNoLeadingZero) { if (Integer.parseInt(text) <= capturingGroupCount && yystate() != CLASS2) return RegExpTT.BACKREF; @@ -1061,238 +1086,267 @@ class _RegExLexer implements FlexLexer { return RegExpTT.BACKREF; } } - case 166: break; - case 60: + case 172: break; + case 61: { yypushstate(QUOTED); return RegExpTT.QUOTE_BEGIN; } - case 167: break; - case 61: + case 173: break; + case 62: { return RegExpTT.BAD_HEX_VALUE; } - case 168: break; - case 62: + case 174: break; + case 63: { return allowTransformationEscapes ? RegExpTT.CHAR_CLASS : StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN; } - case 169: break; - case 63: + case 175: break; + case 64: { return (allowOctalNoLeadingZero ? RegExpTT.OCT_CHAR : RegExpTT.BAD_OCT_VALUE); } - case 170: break; - case 64: + case 176: break; + case 65: { return (allowHexDigitClass || allowHorizontalWhitespaceClass ? RegExpTT.CHAR_CLASS : StringEscapesTokenTypes.INVALID_CHARACTER_ESCAPE_TOKEN); } - case 171: break; - case 65: + case 177: break; + case 66: { yypushstate(NAMED); return RegExpTT.NAMED_CHARACTER; } - case 172: break; - case 66: + case 178: break; + case 67: { yypopstate(); return RegExpTT.QUOTE_END; } - case 173: break; - case 67: + case 179: break; + case 68: + // lookahead expression with fixed base length + zzMarkedPos = Character.offsetByCodePoints + (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); + { yybegin(CLASS2); if (allowMysqlBracketExpressions) { yypushback(1); } else if (allowNestedCharacterClasses) { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } else { return RegExpTT.CHARACTER; } + } + case 180: break; + case 69: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); { yybegin(CLASS2); if (allowNestedCharacterClasses) { yypushstate(NEGATED_CLASS); return RegExpTT.CLASS_BEGIN; } return RegExpTT.CHARACTER; } - case 174: break; - case 68: + case 181: break; + case 70: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); { yybegin(CLASS2); if (allowPosixBracketExpressions) { yypushback(1); } else if (allowNestedCharacterClasses) { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } else { return RegExpTT.CHARACTER; } } - case 175: break; - case 69: + case 182: break; + case 71: { yybegin(CLASS2); return allowEmptyCharacterClass ? RegExpTT.ESC_CHARACTER : RegExpTT.REDUNDANT_ESCAPE; } - case 176: break; - case 70: + case 183: break; + case 72: { yypushstate(CLASS2); return RegExpTT.ESC_CHARACTER; } - case 177: break; - case 71: + case 184: break; + case 73: { yypushstate(QUOTED_CLASS1); return RegExpTT.QUOTE_BEGIN; } - case 178: break; - case 72: - // lookahead expression with fixed base length - zzMarkedPos = Character.offsetByCodePoints - (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); - { if (allowNestedCharacterClasses) { yypushstate(NEGATED_CLASS); return RegExpTT.CLASS_BEGIN; } return RegExpTT.CHARACTER; - } - case 179: break; - case 73: - { if (allowPosixBracketExpressions) { + case 185: break; + case 74: + { char c = yycharat(1); + if (allowPosixBracketExpressions && c == ':') { yybegin(BRACKET_EXPRESSION); return RegExpTT.BRACKET_EXPRESSION_BEGIN; + } else if (allowMysqlBracketExpressions && c == '=') { + yybegin(MYSQL_CHAR_EQ_EXPRESSION); + return RegExpTT.MYSQL_CHAR_EQ_BEGIN; + } else if (allowMysqlBracketExpressions && c == '.') { + yybegin(MYSQL_CHAR_EXPRESSION); + return RegExpTT.MYSQL_CHAR_BEGIN; } else { yypushback(1); return allowNestedCharacterClasses ? RegExpTT.CLASS_BEGIN : RegExpTT.CHARACTER; } } - case 180: break; - case 74: - { if (allowNestedCharacterClasses) return RegExpTT.ANDAND; else yypushback(1); return RegExpTT.CHARACTER; - } - case 181: break; - case 75: - { yybegin(CLASS2); return RegExpTT.BRACKET_EXPRESSION_END; - } - case 182: break; - case 76: - { yybegin(PY_COND_REF); return RegExpTT.PYTHON_COND_REF; - } - case 183: break; - case 77: - { yybegin(NAMED_GROUP); capturingGroupCount++; return RegExpTT.RUBY_NAMED_GROUP; - } - case 184: break; - case 78: - { yybegin(QUOTED_NAMED_GROUP); capturingGroupCount++; return RegExpTT.RUBY_QUOTED_NAMED_GROUP; - } - case 185: break; - case 79: - { return RegExpTT.NON_CAPT_GROUP; - } case 186: break; - case 80: - { return RegExpTT.ATOMIC_GROUP; + case 75: + // lookahead expression with fixed base length + zzMarkedPos = Character.offsetByCodePoints + (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); + { if (allowNestedCharacterClasses) { yypushstate(NEGATED_CLASS); return RegExpTT.CLASS_BEGIN; } return RegExpTT.CHARACTER; } case 187: break; - case 81: - { return RegExpTT.POS_LOOKAHEAD; + case 76: + { if (allowNestedCharacterClasses) return RegExpTT.ANDAND; else yypushback(1); return RegExpTT.CHARACTER; } case 188: break; - case 82: - { return RegExpTT.NEG_LOOKAHEAD; + case 77: + { yybegin(CLASS2); return RegExpTT.BRACKET_EXPRESSION_END; } case 189: break; + case 78: + { yybegin(CLASS2); return RegExpTT.MYSQL_CHAR_END; + } + case 190: break; + case 79: + { yybegin(CLASS2); return RegExpTT.MYSQL_CHAR_EQ_END; + } + case 191: break; + case 80: + { yybegin(PY_COND_REF); return RegExpTT.PYTHON_COND_REF; + } + case 192: break; + case 81: + { yybegin(NAMED_GROUP); capturingGroupCount++; return RegExpTT.RUBY_NAMED_GROUP; + } + case 193: break; + case 82: + { yybegin(QUOTED_NAMED_GROUP); capturingGroupCount++; return RegExpTT.RUBY_QUOTED_NAMED_GROUP; + } + case 194: break; case 83: + { return RegExpTT.NON_CAPT_GROUP; + } + case 195: break; + case 84: + { return RegExpTT.POS_LOOKAHEAD; + } + case 196: break; + case 85: + { return RegExpTT.ATOMIC_GROUP; + } + case 197: break; + case 86: + { return RegExpTT.NEG_LOOKAHEAD; + } + case 198: break; + case 87: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); { yypushstate(QUANTIFIER); return RegExpTT.LBRACE; } - case 190: break; - case 84: + case 199: break; + case 88: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); { if (allowOmitBothNumbersInQuantifiers || allowDanglingMetacharacters != Boolean.TRUE) { yypushstate(QUANTIFIER); return RegExpTT.LBRACE; } else return RegExpTT.CHARACTER; } - case 191: break; - case 85: + case 200: break; + case 89: { yybegin(NAMED_GROUP); return RegExpTT.RUBY_NAMED_GROUP_CALL; } - case 192: break; - case 86: + case 201: break; + case 90: { yybegin(QUOTED_NAMED_GROUP); return RegExpTT.RUBY_QUOTED_NAMED_GROUP_CALL; } - case 193: break; - case 87: + case 202: break; + case 91: { if (xmlSchemaMode) { yypushback(1); return RegExpTT.CHAR_CLASS; } else return RegExpTT.CTRL; } - case 194: break; - case 88: + case 203: break; + case 92: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 2); { if (allowExtendedUnicodeCharacter) yypushstate(EMBRACED_HEX); else return RegExpTT.BAD_HEX_VALUE; } - case 195: break; - case 89: + case 204: break; + case 93: { if (allowOneHexCharEscape) { return RegExpTT.HEX_CHAR; } else { yypushback(1); return RegExpTT.BAD_HEX_VALUE; } } - case 196: break; - case 90: + case 205: break; + case 94: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 2); { if (allowExtendedUnicodeCharacter) yypushstate(EMBRACED_HEX); else return StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN; } - case 197: break; - case 91: + case 206: break; + case 95: { yypushback(yylength() - 2); return StringEscapesTokenTypes.INVALID_UNICODE_ESCAPE_TOKEN; } - case 198: break; - case 92: + case 207: break; + case 96: { return RegExpTT.OCT_CHAR; } - case 199: break; - case 93: + case 208: break; + case 97: { yybegin(NAMED_GROUP); return RegExpTT.RUBY_NAMED_GROUP_REF; } - case 200: break; - case 94: + case 209: break; + case 98: { yybegin(QUOTED_NAMED_GROUP); return RegExpTT.RUBY_QUOTED_NAMED_GROUP_REF; } - case 201: break; - case 95: + case 210: break; + case 99: + // lookahead expression with fixed base length + zzMarkedPos = Character.offsetByCodePoints + (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); + { return RegExpTT.CHARACTER; + } + case 211: break; + case 100: { yypopstate(); return (yycharat(-1) == 'u') ? RegExpTT.UNICODE_CHAR : RegExpTT.HEX_CHAR; } - case 202: break; - case 96: + case 212: break; + case 101: { yybegin(NAMED_GROUP); capturingGroupCount++; return RegExpTT.PYTHON_NAMED_GROUP; } - case 203: break; - case 97: + case 213: break; + case 102: { yybegin(PY_NAMED_GROUP_REF); return RegExpTT.PYTHON_NAMED_GROUP_REF; } - case 204: break; - case 98: + case 214: break; + case 103: { return RegExpTT.POS_LOOKBEHIND; } - case 205: break; - case 99: + case 215: break; + case 104: { return RegExpTT.NEG_LOOKBEHIND; } - case 206: break; - case 100: + case 216: break; + case 105: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 1); { if (allowOmitNumbersInQuantifiers || allowDanglingMetacharacters != Boolean.TRUE) { yypushstate(QUANTIFIER); return RegExpTT.LBRACE; } else return RegExpTT.CHARACTER; } - case 207: break; - case 101: + case 217: break; + case 106: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 2); { return RegExpTT.ESC_CHARACTER; } - case 208: break; - case 102: + case 218: break; + case 107: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 2); { return allowOmitBothNumbersInQuantifiers ? RegExpTT.ESC_CHARACTER : RegExpTT.REDUNDANT_ESCAPE; } - case 209: break; - case 103: + case 219: break; + case 108: { return RegExpTT.HEX_CHAR; } - case 210: break; - case 104: + case 220: break; + case 109: { return RegExpTT.COMMENT; } - case 211: break; - case 105: + case 221: break; + case 110: // lookahead expression with fixed base length zzMarkedPos = Character.offsetByCodePoints (zzBufferL/*, zzStartRead, zzEndRead - zzStartRead*/, zzStartRead, 2); { return allowOmitNumbersInQuantifiers ? RegExpTT.ESC_CHARACTER : RegExpTT.REDUNDANT_ESCAPE; } - case 212: break; - case 106: + case 222: break; + case 111: { if (allowOctalNoLeadingZero) yypushback(1); return RegExpTT.OCT_CHAR; } - case 213: break; - case 107: + case 223: break; + case 112: { return RegExpTT.UNICODE_CHAR; } - case 214: break; + case 224: break; default: zzScanError(ZZ_NO_MATCH); } diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpCapability.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpCapability.java index 48207daf28b0..eca27c81e8e6 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpCapability.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpCapability.java @@ -111,4 +111,9 @@ public enum RegExpCapability { * Allow \x9 in addition to \x09 (ruby) */ ONE_HEX_CHAR_ESCAPE, + + /** + * MySQL character classes [=c=] [.class.] [:<:] [:>:] + */ + MYSQL_BRACKET_EXPRESSIONS, } diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpElementTypes.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpElementTypes.java index db26d98e4825..e12f38a0d3d3 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpElementTypes.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpElementTypes.java @@ -40,6 +40,8 @@ public interface RegExpElementTypes { IElementType NAMED_GROUP_REF = new RegExpElementType("NAMED_GROUP_REF"); IElementType PY_COND_REF = new RegExpElementType("PY_COND_REF"); IElementType POSIX_BRACKET_EXPRESSION = new RegExpElementType("POSIX_BRACKET_EXPRESSION"); + IElementType MYSQL_CHAR_EXPRESSION = new RegExpElementType("MYSQL_CHAR_EXPRESSION"); + IElementType MYSQL_CHAR_EQ_EXPRESSION = new RegExpElementType("MYSQL_CHAR_EQ_EXPRESSION"); IElementType NUMBER = new RegExpElementType("NUMBER"); TokenSet ATOMS = TokenSet.create(CLOSURE, BOUNDARY, SIMPLE_CLASS, CLASS, CHAR, GROUP, PROPERTY, BACKREF, NAMED_GROUP_REF, diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java index 785635b5db44..c0a0b02134ae 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpParser.java @@ -256,6 +256,12 @@ public class RegExpParser implements PsiParser, LightPsiParser { else if (token == RegExpTT.BRACKET_EXPRESSION_BEGIN) { parseBracketExpression(builder); } + else if (token == RegExpTT.MYSQL_CHAR_BEGIN) { + parseMysqlCharExpression(builder); + } + else if (token == RegExpTT.MYSQL_CHAR_EQ_BEGIN) { + parseMysqlCharEqExpression(builder); + } else if (RegExpTT.CHARACTERS.contains(token) || token == RegExpTT.NAMED_CHARACTER) { parseCharacterRange(builder); } @@ -285,6 +291,27 @@ public class RegExpParser implements PsiParser, LightPsiParser { marker.done(RegExpElementTypes.POSIX_BRACKET_EXPRESSION); } + private static void parseMysqlCharExpression(PsiBuilder builder) { + final PsiBuilder.Marker marker = builder.mark(); + builder.advanceLexer(); + if (builder.getTokenType() == RegExpTT.NAME) { + builder.advanceLexer(); + } + else { + checkMatches(builder, RegExpTT.CHARACTER, "Character or MySQL character name expected"); + } + checkMatches(builder, RegExpTT.MYSQL_CHAR_END, "Unclosed MySQL character expression"); + marker.done(RegExpElementTypes.MYSQL_CHAR_EXPRESSION); + } + + private static void parseMysqlCharEqExpression(PsiBuilder builder) { + final PsiBuilder.Marker marker = builder.mark(); + builder.advanceLexer(); + checkMatches(builder, RegExpTT.CHARACTER, "Character expected"); + checkMatches(builder, RegExpTT.MYSQL_CHAR_EQ_END, "Unclosed MySQL character equivalence class"); + marker.done(RegExpElementTypes.MYSQL_CHAR_EQ_EXPRESSION); + } + private void parseCharacterRange(PsiBuilder builder) { final PsiBuilder.Marker rangeMarker = builder.mark(); parseCharacter(builder); diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpTT.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpTT.java index 86c7db996ecb..d341daa65fac 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpTT.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpTT.java @@ -48,6 +48,14 @@ public interface RegExpTT { IElementType BRACKET_EXPRESSION_BEGIN = new RegExpElementType("BRACKET_EXPRESSION_BEGIN"); /** ":]" */ IElementType BRACKET_EXPRESSION_END = new RegExpElementType("BRACKET_EXPRESSION_END"); + /** "[." */ + IElementType MYSQL_CHAR_BEGIN = new RegExpElementType("MYSQL_CHAR_BEGIN"); + /** ".]" */ + IElementType MYSQL_CHAR_END = new RegExpElementType("MYSQL_CHAR_END"); + /** "[=" */ + IElementType MYSQL_CHAR_EQ_BEGIN = new RegExpElementType("MYSQL_CHAR_EQ_BEGIN"); + /** "=]" */ + IElementType MYSQL_CHAR_EQ_END = new RegExpElementType("MYSQL_CHAR_EQ_END"); /** "(" */ IElementType GROUP_BEGIN = new RegExpElementType("GROUP_BEGIN"); diff --git a/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex b/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex index a03162f01cac..88e9527e06e2 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex +++ b/RegExpSupport/src/org/intellij/lang/regexp/regexp-lexer.flex @@ -41,6 +41,7 @@ import static org.intellij.lang.regexp.RegExpCapability.*; private boolean allowTransformationEscapes; private boolean allowExtendedUnicodeCharacter; private boolean allowOneHexCharEscape; + private boolean allowMysqlBracketExpressions; private int maxOctal = 0777; private int minOctalDigits = 1; @@ -59,6 +60,7 @@ import static org.intellij.lang.regexp.RegExpCapability.*; this.allowEmptyCharacterClass = capabilities.contains(ALLOW_EMPTY_CHARACTER_CLASS); this.allowPosixBracketExpressions = capabilities.contains(POSIX_BRACKET_EXPRESSIONS); this.allowTransformationEscapes = capabilities.contains(TRANSFORMATION_ESCAPES); + this.allowMysqlBracketExpressions = capabilities.contains(MYSQL_BRACKET_EXPRESSIONS); if (capabilities.contains(MAX_OCTAL_177)) { maxOctal = 0177; } @@ -113,6 +115,8 @@ import static org.intellij.lang.regexp.RegExpCapability.*; %xstate PY_NAMED_GROUP_REF %xstate PY_COND_REF %xstate BRACKET_EXPRESSION +%xstate MYSQL_CHAR_EXPRESSION +%xstate MYSQL_CHAR_EQ_EXPRESSION %xstate EMBRACED_HEX DOT="." @@ -126,6 +130,7 @@ RBRACKET="]" ESCAPE="\\" NAME=[:letter:]([:letter:]|_|-|" "|"("|")"|[:digit:])* GROUP_NAME=[:letter:]([:letter:]|_|-|" "|[:digit:])* +MYSQL_CHAR_NAME=[:letter:](-|[:letter:])*[:digit:]? ANY=[^] META1 = {ESCAPE} | {LBRACKET} @@ -322,6 +327,7 @@ HEX_CHAR=[0-9a-fA-F] {ESCAPE} {RBRACKET} { yybegin(CLASS2); return allowEmptyCharacterClass ? RegExpTT.ESC_CHARACTER : RegExpTT.REDUNDANT_ESCAPE; } {RBRACKET} { if (allowEmptyCharacterClass) { yypopstate(); return RegExpTT.CLASS_END; } yybegin(CLASS2); return RegExpTT.CHARACTER; } {LBRACKET} / ":" { yybegin(CLASS2); if (allowPosixBracketExpressions) { yypushback(1); } else if (allowNestedCharacterClasses) { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } else { return RegExpTT.CHARACTER; } } + {LBRACKET} / [.=] { yybegin(CLASS2); if (allowMysqlBracketExpressions) { yypushback(1); } else if (allowNestedCharacterClasses) { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } else { return RegExpTT.CHARACTER; } } {LBRACKET} / "^" { yybegin(CLASS2); if (allowNestedCharacterClasses) { yypushstate(NEGATED_CLASS); return RegExpTT.CLASS_BEGIN; } return RegExpTT.CHARACTER; } {LBRACKET} { yybegin(CLASS2); if (allowNestedCharacterClasses) { yypushstate(CLASS1); return RegExpTT.CLASS_BEGIN; } return RegExpTT.CHARACTER; } [\n\b\t\r\f ] { if (commentMode) return com.intellij.psi.TokenType.WHITE_SPACE; yypushback(1); yybegin(CLASS2); } @@ -329,9 +335,16 @@ HEX_CHAR=[0-9a-fA-F] } { - {LBRACKET} ":" { if (allowPosixBracketExpressions) { + {LBRACKET} [:=.] { char c = yycharat(1); + if (allowPosixBracketExpressions && c == ':') { yybegin(BRACKET_EXPRESSION); return RegExpTT.BRACKET_EXPRESSION_BEGIN; + } else if (allowMysqlBracketExpressions && c == '=') { + yybegin(MYSQL_CHAR_EQ_EXPRESSION); + return RegExpTT.MYSQL_CHAR_EQ_BEGIN; + } else if (allowMysqlBracketExpressions && c == '.') { + yybegin(MYSQL_CHAR_EXPRESSION); + return RegExpTT.MYSQL_CHAR_BEGIN; } else { yypushback(1); return allowNestedCharacterClasses ? RegExpTT.CLASS_BEGIN : RegExpTT.CHARACTER; @@ -351,6 +364,21 @@ HEX_CHAR=[0-9a-fA-F] "^" { return RegExpTT.CARET; } {NAME} { return RegExpTT.NAME; } ":" {RBRACKET} { yybegin(CLASS2); return RegExpTT.BRACKET_EXPRESSION_END; } + [<>] { return allowMysqlBracketExpressions ? RegExpTT.NAME : RegExpTT.BAD_CHARACTER; } + {ANY} { return RegExpTT.BAD_CHARACTER; } +} + + { + {MYSQL_CHAR_NAME} { return RegExpTT.NAME; } + "." {RBRACKET} { yybegin(CLASS2); return RegExpTT.MYSQL_CHAR_END; } + {ANY} / "." {RBRACKET} { return RegExpTT.CHARACTER; } + {ANY} { return RegExpTT.BAD_CHARACTER; } +} + + { + {NAME} { return RegExpTT.NAME; } + "=" {RBRACKET} { yybegin(CLASS2); return RegExpTT.MYSQL_CHAR_EQ_END; } + {ANY} / "=" {RBRACKET} { return RegExpTT.CHARACTER; } {ANY} { return RegExpTT.BAD_CHARACTER; } } diff --git a/RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java b/RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java index 933b006fecef..0f5223af41f3 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java @@ -418,7 +418,7 @@ public final class RegExpAnnotator extends RegExpElementVisitor implements Annot @Override public void visitPosixBracketExpression(RegExpPosixBracketExpression posixBracketExpression) { final String className = posixBracketExpression.getClassName(); - if (!POSIX_CHARACTER_CLASSES.contains(className)) { + if (!POSIX_CHARACTER_CLASSES.contains(className) && !"<".equals(className) && !">".equals(className)) { final ASTNode node = posixBracketExpression.getNode().findChildByType(RegExpTT.NAME); if (node != null) { final Annotation annotation = myHolder.createErrorAnnotation(node, "Unknown POSIX character class"); diff --git a/RegExpSupport/test/org/intellij/lang/regexp/RegExpLexerTest.java b/RegExpSupport/test/org/intellij/lang/regexp/RegExpLexerTest.java index 038ed62a57a8..7ddcf44e977e 100644 --- a/RegExpSupport/test/org/intellij/lang/regexp/RegExpLexerTest.java +++ b/RegExpSupport/test/org/intellij/lang/regexp/RegExpLexerTest.java @@ -132,6 +132,24 @@ public class RegExpLexerTest extends LexerTestCase { "CLASS_END (']')", lexer); } + public void testMysqlCharExpressions() { + final RegExpLexer lexer = new RegExpLexer(EnumSet.of(MYSQL_BRACKET_EXPRESSIONS)); + doTest("[[.~.][.tilda.][.NUL.][.plus-sign.]]", "CLASS_BEGIN ('[')\n" + + "MYSQL_CHAR_BEGIN ('[.')\nCHARACTER ('~')\nMYSQL_CHAR_END ('.]')\n" + + "MYSQL_CHAR_BEGIN ('[.')\nNAME ('tilda')\nMYSQL_CHAR_END ('.]')\n" + + "MYSQL_CHAR_BEGIN ('[.')\nNAME ('NUL')\nMYSQL_CHAR_END ('.]')\n" + + "MYSQL_CHAR_BEGIN ('[.')\nNAME ('plus-sign')\nMYSQL_CHAR_END ('.]')\n" + + "CLASS_END (']')", lexer); + } + + public void testMysqlCharEqExpressions() { + final RegExpLexer lexer = new RegExpLexer(EnumSet.of(MYSQL_BRACKET_EXPRESSIONS)); + doTest("[[=.=][=c=]]", "CLASS_BEGIN ('[')\n" + + "MYSQL_CHAR_EQ_BEGIN ('[=')\nCHARACTER ('.')\nMYSQL_CHAR_EQ_END ('=]')\n" + + "MYSQL_CHAR_EQ_BEGIN ('[=')\nCHARACTER ('c')\nMYSQL_CHAR_EQ_END ('=]')\n" + + "CLASS_END (']')", lexer); + } + /** * \\177 is the maximum valid octal character under Ruby. */