X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index beb1960..1b01b7c 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -6,17 +6,28 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.texteditor.MarkerUtilities; import org.eclipse.jface.preference.IPreferenceStore; import java.util.Hashtable; -import java.util.Enumeration; +import java.util.ArrayList; import java.io.StringReader; import java.io.*; import java.text.MessageFormat; import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; import net.sourceforge.phpeclipse.PHPeclipsePlugin; -import net.sourceforge.phpdt.internal.compiler.parser.*; import net.sourceforge.phpdt.internal.compiler.ast.*; +import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren; +import net.sourceforge.phpdt.internal.compiler.parser.Outlineable; +import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; +import net.sourceforge.phpdt.internal.corext.Assert; public class PHPParserTokenManager implements PHPParserConstants { + // CommonTokenAction: use the begins/ends fields added to the Jack + // CharStream class to set corresponding fields in each Token (which was + // also extended with new fields). By default Jack doesn't supply absolute + // offsets, just line/column offsets + static void CommonTokenAction(Token t) { + t.sourceStart = input_stream.beginOffset; + t.sourceEnd = input_stream.endOffset; + } public static java.io.PrintStream debugStream = System.out; public static void setDebugStream(java.io.PrintStream ds) { debugStream = ds; } static private final int jjStopAtPos(int pos, int kind) @@ -31,6 +42,9 @@ static private final int jjMoveStringLiteralDfa0_0() { case 60: return jjMoveStringLiteralDfa1_0(0xeL); + case 84: + case 116: + return jjMoveStringLiteralDfa1_0(0x800000L); default : return 1; } @@ -50,6 +64,9 @@ static private final int jjMoveStringLiteralDfa1_0(long active0) jjmatchedPos = 1; } return jjMoveStringLiteralDfa2_0(active0, 0xcL); + case 79: + case 111: + return jjMoveStringLiteralDfa2_0(active0, 0x800000L); default : return 2; } @@ -68,6 +85,9 @@ static private final int jjMoveStringLiteralDfa2_0(long old0, long active0) if ((active0 & 0x8L) != 0L) return jjStopAtPos(2, 3); break; + case 68: + case 100: + return jjMoveStringLiteralDfa3_0(active0, 0x800000L); case 80: case 112: return jjMoveStringLiteralDfa3_0(active0, 0x4L); @@ -89,9 +109,15 @@ static private final int jjMoveStringLiteralDfa3_0(long old0, long active0) case 72: case 104: return jjMoveStringLiteralDfa4_0(active0, 0x4L); + case 79: + case 111: + if ((active0 & 0x800000L) != 0L) + return jjStopAtPos(3, 23); + break; default : return 4; } + return 4; } static private final int jjMoveStringLiteralDfa4_0(long old0, long active0) { @@ -113,17 +139,20 @@ static private final int jjMoveStringLiteralDfa4_0(long old0, long active0) } return 5; } -static private final int jjMoveStringLiteralDfa0_4() +static private final int jjMoveStringLiteralDfa0_5() { switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_4(0x40000L); + return jjMoveStringLiteralDfa1_5(0x2000000L); + case 84: + case 116: + return jjMoveStringLiteralDfa1_5(0x400000L); default : return 1; } } -static private final int jjMoveStringLiteralDfa1_4(long active0) +static private final int jjMoveStringLiteralDfa1_5(long active0) { try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { @@ -132,14 +161,54 @@ static private final int jjMoveStringLiteralDfa1_4(long active0) switch(curChar) { case 47: - if ((active0 & 0x40000L) != 0L) - return jjStopAtPos(1, 18); + if ((active0 & 0x2000000L) != 0L) + return jjStopAtPos(1, 25); break; + case 79: + case 111: + return jjMoveStringLiteralDfa2_5(active0, 0x400000L); default : return 2; } return 2; } +static private final int jjMoveStringLiteralDfa2_5(long old0, long active0) +{ + if (((active0 &= old0)) == 0L) + return 2; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + return 2; + } + switch(curChar) + { + case 68: + case 100: + return jjMoveStringLiteralDfa3_5(active0, 0x400000L); + default : + return 3; + } +} +static private final int jjMoveStringLiteralDfa3_5(long old0, long active0) +{ + if (((active0 &= old0)) == 0L) + return 3; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + return 3; + } + switch(curChar) + { + case 79: + case 111: + if ((active0 & 0x400000L) != 0L) + return jjStopAtPos(3, 22); + break; + default : + return 4; + } + return 4; +} private static final int jjStopStringLiteralDfa_2(int pos, long active0) { switch (pos) @@ -165,7 +234,10 @@ static private final int jjMoveStringLiteralDfa0_2() switch(curChar) { case 63: - return jjMoveStringLiteralDfa1_2(0x10000L); + return jjMoveStringLiteralDfa1_2(0x10L); + case 84: + case 116: + return jjMoveStringLiteralDfa1_2(0x400000L); default : return jjMoveNfa_2(0, 0); } @@ -180,14 +252,57 @@ static private final int jjMoveStringLiteralDfa1_2(long active0) switch(curChar) { case 62: - if ((active0 & 0x10000L) != 0L) - return jjStopAtPos(1, 16); + if ((active0 & 0x10L) != 0L) + return jjStopAtPos(1, 4); break; + case 79: + case 111: + return jjMoveStringLiteralDfa2_2(active0, 0x400000L); default : break; } return jjStartNfa_2(0, active0); } +static private final int jjMoveStringLiteralDfa2_2(long old0, long active0) +{ + if (((active0 &= old0)) == 0L) + return jjStartNfa_2(0, old0); + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + jjStopStringLiteralDfa_2(1, active0); + return 2; + } + switch(curChar) + { + case 68: + case 100: + return jjMoveStringLiteralDfa3_2(active0, 0x400000L); + default : + break; + } + return jjStartNfa_2(1, active0); +} +static private final int jjMoveStringLiteralDfa3_2(long old0, long active0) +{ + if (((active0 &= old0)) == 0L) + return jjStartNfa_2(1, old0); + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + jjStopStringLiteralDfa_2(2, active0); + return 3; + } + switch(curChar) + { + case 79: + case 111: + if ((active0 & 0x400000L) != 0L) + return jjStopAtPos(3, 22); + break; + default : + break; + } + return jjStartNfa_2(2, active0); +} static private final void jjCheckNAdd(int state) { if (jjrounds[state] != jjround) @@ -240,15 +355,15 @@ static private final int jjMoveNfa_2(int startState, int curPos) case 0: if ((0x2400L & l) != 0L) { - if (kind > 15) - kind = 15; + if (kind > 20) + kind = 20; } if (curChar == 13) jjstateSet[jjnewStateCnt++] = 1; break; case 1: - if (curChar == 10 && kind > 15) - kind = 15; + if (curChar == 10 && kind > 20) + kind = 20; break; case 2: if (curChar == 13) @@ -299,124 +414,122 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac switch (pos) { case 0: - if ((active0 & 0x4800L) != 0L || (active1 & 0x400000000000L) != 0L || (active2 & 0x4L) != 0L) + if ((active0 & 0x90000L) != 0L || (active1 & 0x10000000L) != 0L || (active2 & 0x800L) != 0L) return 2; - if ((active1 & 0x40000000000000L) != 0L) - return 16; - if ((active1 & 0x4000100000000L) != 0L) + if ((active1 & 0x2000000000000000L) != 0L || (active2 & 0x8000L) != 0L) return 8; - if ((active0 & 0xffffff1ffff00000L) != 0L || (active1 & 0x3ffL) != 0L) + if ((active0 & 0xffff1ffff8000000L) != 0L || (active1 & 0x300000ffffL) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 113; return 14; } return -1; case 1: - if ((active0 & 0xbfffef1fff700000L) != 0L || (active1 & 0x2efL) != 0L) + if ((active0 & 0x80000L) != 0L) + return 0; + if ((active0 & 0x10000040000000L) != 0L || (active1 & 0x1000001040L) != 0L) + return 14; + if ((active0 & 0xffef1fffb8000000L) != 0L || (active1 & 0x200000efbfL) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 84; + jjmatchedKind = 113; jjmatchedPos = 1; } return 14; } - if ((active0 & 0x4000L) != 0L) - return 0; - if ((active0 & 0x4000100000800000L) != 0L || (active1 & 0x110L) != 0L) - return 14; return -1; case 2: - if ((active0 & 0x2001400000400000L) != 0L || (active1 & 0x2c0L) != 0L) - return 14; - if ((active0 & 0x9ffeaf1fff300000L) != 0L || (active1 & 0x3fL) != 0L) + if ((active0 & 0xfeaf1fff98000000L) != 0L || (active1 & 0x3f9fL) != 0L) { if (jjmatchedPos != 2) { - jjmatchedKind = 84; + jjmatchedKind = 113; jjmatchedPos = 2; } return 14; } + if ((active0 & 0x140000020000000L) != 0L || (active1 & 0x200000c020L) != 0L) + return 14; return -1; case 3: - if ((active0 & 0x62810053000000L) != 0L || (active1 & 0xeL) != 0L) + if ((active0 & 0x6281002980000000L) != 0L || (active1 & 0xe00L) != 0L) return 14; - if ((active0 & 0xbf9c2e1fac300000L) != 0L || (active1 & 0xb1L) != 0L) + if ((active0 & 0x9c2e1fd618000000L) != 0L || (active1 & 0xb1bfL) != 0L) { if (jjmatchedPos != 3) { - jjmatchedKind = 84; + jjmatchedKind = 113; jjmatchedPos = 3; } return 14; } return -1; case 4: - if ((active0 & 0xb6142c1f81200000L) != 0L || (active1 & 0x95L) != 0L) + if ((active0 & 0x8802001608000000L) != 0L || (active1 & 0x2009L) != 0L) + return 14; + if ((active0 & 0x142c1fc090000000L) != 0L || (active1 & 0x95b6L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 113; jjmatchedPos = 4; return 14; } - if ((active0 & 0x98802002c100000L) != 0L || (active1 & 0x20L) != 0L) - return 14; return -1; case 5: - if ((active0 & 0x9014001801000000L) != 0L || (active1 & 0x11L) != 0L) - return 14; - if ((active0 & 0x26002c0780200000L) != 0L || (active1 & 0x84L) != 0L) + if ((active0 & 0x2c03c010000000L) != 0L || (active1 & 0x8426L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 113; jjmatchedPos = 5; return 14; } + if ((active0 & 0x14001c0080000000L) != 0L || (active1 & 0x1190L) != 0L) + return 14; return -1; case 6: - if ((active0 & 0x2000280780000000L) != 0L || (active1 & 0x84L) != 0L) + if ((active0 & 0x2803c000000000L) != 0L || (active1 & 0x8420L) != 0L) return 14; - if ((active0 & 0x600040000200000L) != 0L) + if ((active0 & 0x4000010000000L) != 0L || (active1 & 0x6L) != 0L) { if (jjmatchedPos != 6) { - jjmatchedKind = 84; + jjmatchedKind = 113; jjmatchedPos = 6; } return 14; } return -1; case 7: - if ((active0 & 0x200040000200000L) != 0L) + if ((active0 & 0x4000010000000L) != 0L || (active1 & 0x2L) != 0L) return 14; - if ((active0 & 0x400000600000000L) != 0L) + if ((active0 & 0x30000000000L) != 0L || (active1 & 0x4L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 113; jjmatchedPos = 7; return 14; } return -1; case 8: - if ((active0 & 0x600000000L) != 0L) + if ((active1 & 0x4L) != 0L) + return 14; + if ((active0 & 0x30000000000L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 113; jjmatchedPos = 8; return 14; } - if ((active0 & 0x400000000000000L) != 0L) - return 14; return -1; case 9: - if ((active0 & 0x600000000L) != 0L) + if ((active0 & 0x30000000000L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 113; jjmatchedPos = 9; return 14; } return -1; case 10: - if ((active0 & 0x600000000L) != 0L) + if ((active0 & 0x30000000000L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 113; jjmatchedPos = 10; return 14; } @@ -442,126 +555,126 @@ static private final int jjMoveStringLiteralDfa0_1() switch(curChar) { case 33: - jjmatchedKind = 119; - return jjMoveStringLiteralDfa1_1(0x0L, 0x14000000000L, 0x0L); + jjmatchedKind = 81; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x28L); case 35: - return jjStopAtPos(0, 12); + return jjStopAtPos(0, 17); case 36: - return jjStartNfaWithStates_1(0, 118, 16); + return jjStopAtPos(0, 112); case 37: - jjmatchedKind = 134; - return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000L, 0x0L); + jjmatchedKind = 96; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x10000L); case 38: - jjmatchedKind = 131; - return jjMoveStringLiteralDfa1_1(0x0L, 0x1000800000000000L, 0x0L); + jjmatchedKind = 93; + return jjMoveStringLiteralDfa1_1(0x0L, 0x400000L, 0x1000L); case 40: - return jjStopAtPos(0, 88); + return jjStopAtPos(0, 117); case 41: - return jjStopAtPos(0, 89); + return jjStopAtPos(0, 118); case 42: - jjmatchedKind = 129; - return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000000L, 0x0L); + jjmatchedKind = 91; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x400L); case 43: - jjmatchedKind = 127; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000080000000000L, 0x0L); + jjmatchedKind = 89; + return jjMoveStringLiteralDfa1_1(0x0L, 0x800000L, 0x100L); case 44: - return jjStopAtPos(0, 95); + return jjStopAtPos(0, 124); case 45: - jjmatchedKind = 128; - return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x4000100000000000L, 0x0L); + jjmatchedKind = 90; + return jjMoveStringLiteralDfa1_1(0x200000000000L, 0x1000000L, 0x200L); case 46: - jjmatchedKind = 96; - return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000L, 0x0L); + jjmatchedKind = 125; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x8000L); case 47: - jjmatchedKind = 130; - return jjMoveStringLiteralDfa1_1(0x4800L, 0x400000000000L, 0x0L); + jjmatchedKind = 92; + return jjMoveStringLiteralDfa1_1(0x90000L, 0x0L, 0x800L); case 58: - jjmatchedKind = 122; - return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x0L, 0x0L); + jjmatchedKind = 84; + return jjMoveStringLiteralDfa1_1(0x400000000000L, 0x0L, 0x0L); case 59: - return jjStopAtPos(0, 94); + return jjStopAtPos(0, 123); case 60: - jjmatchedKind = 98; - return jjMoveStringLiteralDfa1_1(0x0L, 0x9000000000L, 0x480L); + jjmatchedKind = 127; + return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000L, 0x40012L); case 61: - jjmatchedKind = 106; - return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x20800000000L, 0x0L); + jjmatchedKind = 135; + return jjMoveStringLiteralDfa1_1(0x800000000000L, 0x0L, 0x41L); case 62: - jjmatchedKind = 97; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000L, 0xb00L); + jjmatchedKind = 126; + return jjMoveStringLiteralDfa1_1(0x0L, 0xc00000000L, 0x80004L); case 63: - jjmatchedKind = 121; + jjmatchedKind = 83; return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L); case 64: - return jjStopAtPos(0, 117); + return jjStopAtPos(0, 80); case 91: - return jjStopAtPos(0, 92); + return jjStopAtPos(0, 121); case 93: - return jjStopAtPos(0, 93); + return jjStopAtPos(0, 122); case 94: - jjmatchedKind = 133; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L); + jjmatchedKind = 95; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x4000L); case 65: case 97: - return jjMoveStringLiteralDfa1_1(0x4000000004000000L, 0x200L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x200000000L, 0x2000000040L, 0x0L); case 66: case 98: - return jjMoveStringLiteralDfa1_1(0x8000000L, 0x6L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x400000000L, 0x600L, 0x0L); case 67: case 99: - return jjMoveStringLiteralDfa1_1(0x70000100000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x7000008000000L, 0x0L, 0x0L); case 68: case 100: - return jjMoveStringLiteralDfa1_1(0x180000000000L, 0x10L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x18080000000000L, 0x1000L, 0x0L); case 69: case 101: - return jjMoveStringLiteralDfa1_1(0x1e00200043000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x20002180000000L, 0x1eL, 0x0L); case 70: case 102: - return jjMoveStringLiteralDfa1_1(0x2080400000200000L, 0x20L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8040000010000000L, 0x2020L, 0x0L); case 71: case 103: - return jjMoveStringLiteralDfa1_1(0x800800000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x80040000000000L, 0x0L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_1(0x280800000L, 0xc0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x14040000000L, 0xc000L, 0x0L); case 76: case 108: - return jjMoveStringLiteralDfa1_1(0x10000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x800000000L, 0x0L, 0x0L); case 78: case 110: - return jjMoveStringLiteralDfa1_1(0x3000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x300000000000000L, 0x0L, 0x0L); case 79: case 111: - return jjMoveStringLiteralDfa1_1(0x0L, 0x101L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000100L, 0x0L); case 80: case 112: - return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1000000000L, 0x0L, 0x0L); case 82: case 114: - return jjMoveStringLiteralDfa1_1(0x4000500000000L, 0x8L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x400028000000000L, 0x800L, 0x0L); case 83: case 115: - return jjMoveStringLiteralDfa1_1(0x8018001000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1800100000000000L, 0x80L, 0x0L); case 84: case 116: - return jjMoveStringLiteralDfa1_1(0x60000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x6000000000000000L, 0x0L, 0x0L); case 86: case 118: - return jjMoveStringLiteralDfa1_1(0x400000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L); case 87: case 119: - return jjMoveStringLiteralDfa1_1(0x100000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x1L, 0x0L); case 123: - return jjStopAtPos(0, 90); + return jjStopAtPos(0, 119); case 124: - jjmatchedKind = 132; - return jjMoveStringLiteralDfa1_1(0x0L, 0x801000000000000L, 0x0L); + jjmatchedKind = 94; + return jjMoveStringLiteralDfa1_1(0x0L, 0x200000L, 0x2000L); case 125: - return jjStopAtPos(0, 91); + return jjStopAtPos(0, 120); case 126: - jjmatchedKind = 120; - return jjMoveStringLiteralDfa1_1(0x0L, 0x10000000000000L, 0x0L); + jjmatchedKind = 82; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x20000L); default : return jjMoveNfa_1(3, 0); } @@ -576,149 +689,149 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l switch(curChar) { case 38: - if ((active1 & 0x1000000000000000L) != 0L) - return jjStopAtPos(1, 124); + if ((active1 & 0x400000L) != 0L) + return jjStopAtPos(1, 86); break; case 42: - if ((active0 & 0x4000L) != 0L) - return jjStartNfaWithStates_1(1, 14, 0); + if ((active0 & 0x80000L) != 0L) + return jjStartNfaWithStates_1(1, 19, 0); break; case 43: - if ((active1 & 0x2000000000000000L) != 0L) - return jjStopAtPos(1, 125); + if ((active1 & 0x800000L) != 0L) + return jjStopAtPos(1, 87); break; case 45: - if ((active1 & 0x4000000000000000L) != 0L) - return jjStopAtPos(1, 126); + if ((active1 & 0x1000000L) != 0L) + return jjStopAtPos(1, 88); break; case 47: - if ((active0 & 0x800L) != 0L) - return jjStopAtPos(1, 11); + if ((active0 & 0x10000L) != 0L) + return jjStopAtPos(1, 16); break; case 58: - if ((active0 & 0x4000000000L) != 0L) - return jjStopAtPos(1, 38); + if ((active0 & 0x400000000000L) != 0L) + return jjStopAtPos(1, 46); break; case 60: - if ((active2 & 0x80L) != 0L) + if ((active1 & 0x200000000L) != 0L) { - jjmatchedKind = 135; + jjmatchedKind = 97; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x400L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x40000L); case 61: - if ((active1 & 0x800000000L) != 0L) + if ((active2 & 0x1L) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 128; jjmatchedPos = 1; } - else if ((active1 & 0x1000000000L) != 0L) - return jjStopAtPos(1, 100); - else if ((active1 & 0x2000000000L) != 0L) - return jjStopAtPos(1, 101); - else if ((active1 & 0x4000000000L) != 0L) + else if ((active2 & 0x2L) != 0L) + return jjStopAtPos(1, 129); + else if ((active2 & 0x4L) != 0L) + return jjStopAtPos(1, 130); + else if ((active2 & 0x8L) != 0L) { - jjmatchedKind = 102; + jjmatchedKind = 131; jjmatchedPos = 1; } - else if ((active1 & 0x80000000000L) != 0L) - return jjStopAtPos(1, 107); - else if ((active1 & 0x100000000000L) != 0L) - return jjStopAtPos(1, 108); - else if ((active1 & 0x200000000000L) != 0L) - return jjStopAtPos(1, 109); - else if ((active1 & 0x400000000000L) != 0L) - return jjStopAtPos(1, 110); - else if ((active1 & 0x800000000000L) != 0L) - return jjStopAtPos(1, 111); - else if ((active1 & 0x1000000000000L) != 0L) - return jjStopAtPos(1, 112); - else if ((active1 & 0x2000000000000L) != 0L) - return jjStopAtPos(1, 113); - else if ((active1 & 0x4000000000000L) != 0L) - return jjStopAtPos(1, 114); - else if ((active1 & 0x8000000000000L) != 0L) - return jjStopAtPos(1, 115); - else if ((active1 & 0x10000000000000L) != 0L) - return jjStopAtPos(1, 116); - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x30000000000L, active2, 0L); + else if ((active2 & 0x100L) != 0L) + return jjStopAtPos(1, 136); + else if ((active2 & 0x200L) != 0L) + return jjStopAtPos(1, 137); + else if ((active2 & 0x400L) != 0L) + return jjStopAtPos(1, 138); + else if ((active2 & 0x800L) != 0L) + return jjStopAtPos(1, 139); + else if ((active2 & 0x1000L) != 0L) + return jjStopAtPos(1, 140); + else if ((active2 & 0x2000L) != 0L) + return jjStopAtPos(1, 141); + else if ((active2 & 0x4000L) != 0L) + return jjStopAtPos(1, 142); + else if ((active2 & 0x8000L) != 0L) + return jjStopAtPos(1, 143); + else if ((active2 & 0x10000L) != 0L) + return jjStopAtPos(1, 144); + else if ((active2 & 0x20000L) != 0L) + return jjStopAtPos(1, 145); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x60L); case 62: if ((active0 & 0x10L) != 0L) return jjStopAtPos(1, 4); - else if ((active0 & 0x2000000000L) != 0L) - return jjStopAtPos(1, 37); - else if ((active0 & 0x8000000000L) != 0L) - return jjStopAtPos(1, 39); - else if ((active1 & 0x8000000000L) != 0L) - return jjStopAtPos(1, 103); - else if ((active2 & 0x100L) != 0L) + else if ((active0 & 0x200000000000L) != 0L) + return jjStopAtPos(1, 45); + else if ((active0 & 0x800000000000L) != 0L) + return jjStopAtPos(1, 47); + else if ((active1 & 0x400000000L) != 0L) { - jjmatchedKind = 136; + jjmatchedKind = 98; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0xa00L); + else if ((active2 & 0x10L) != 0L) + return jjStopAtPos(1, 132); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x800000000L, active2, 0x80000L); case 65: case 97: - return jjMoveStringLiteralDfa2_1(active0, 0x80010000400000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x8001000020000000L, active1, 0L, active2, 0L); case 66: case 98: - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x1L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x100L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa2_1(active0, 0x40000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x2000000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_1(active0, 0x5080500000000L, active1, 0x8L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x5080a8000000000L, active1, 0x800L, active2, 0L); case 70: case 102: - if ((active0 & 0x800000L) != 0L) - return jjStartNfaWithStates_1(1, 23, 14); + if ((active0 & 0x40000000L) != 0L) + return jjStartNfaWithStates_1(1, 30, 14); break; case 72: case 104: - return jjMoveStringLiteralDfa2_1(active0, 0x120000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x2000000000000000L, active1, 0x1L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa2_1(active0, 0x10000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x800000000L, active1, 0L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa2_1(active0, 0x803100000L, active1, 0x20L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x40188000000L, active1, 0x2000L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa2_1(active0, 0x1e00000280000000L, active1, 0x2c0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x14000000000L, active1, 0x200000c01eL, active2, 0L); case 79: case 111: - if ((active0 & 0x100000000000L) != 0L) + if ((active0 & 0x10000000000000L) != 0L) { - jjmatchedKind = 44; + jjmatchedKind = 52; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0x2000c60000000000L, active1, 0x16L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0xc6000000000000L, active1, 0x1620L, active2, 0L); case 82: case 114: - if ((active1 & 0x100L) != 0L) - return jjStartNfaWithStates_1(1, 72, 14); - return jjMoveStringLiteralDfa2_1(active0, 0x4000002c000000L, active1, 0L, active2, 0L); + if ((active1 & 0x1000000000L) != 0L) + return jjStartNfaWithStates_1(1, 100, 14); + return jjMoveStringLiteralDfa2_1(active0, 0x4000001600000000L, active1, 0L, active2, 0L); case 83: case 115: - if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_1(1, 62, 14); + if ((active1 & 0x40L) != 0L) + return jjStartNfaWithStates_1(1, 70, 14); break; case 84: case 116: - return jjMoveStringLiteralDfa2_1(active0, 0x8000001000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x100000000000L, active1, 0x80L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa2_1(active0, 0xa000000200000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0xa00000010000000L, active1, 0L, active2, 0L); case 87: case 119: - return jjMoveStringLiteralDfa2_1(active0, 0x10000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x1000000000000000L, active1, 0L, active2, 0L); case 88: case 120: - return jjMoveStringLiteralDfa2_1(active0, 0x200000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x20000000000000L, active1, 0L, active2, 0L); case 124: - if ((active1 & 0x800000000000000L) != 0L) - return jjStopAtPos(1, 123); + if ((active1 & 0x200000L) != 0L) + return jjStopAtPos(1, 85); break; default : break; @@ -737,88 +850,88 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long switch(curChar) { case 61: - if ((active1 & 0x10000000000L) != 0L) - return jjStopAtPos(2, 104); - else if ((active1 & 0x20000000000L) != 0L) - return jjStopAtPos(2, 105); - else if ((active2 & 0x400L) != 0L) - return jjStopAtPos(2, 138); - else if ((active2 & 0x800L) != 0L) - return jjStopAtPos(2, 139); + if ((active2 & 0x20L) != 0L) + return jjStopAtPos(2, 133); + else if ((active2 & 0x40L) != 0L) + return jjStopAtPos(2, 134); + else if ((active2 & 0x40000L) != 0L) + return jjStopAtPos(2, 146); + else if ((active2 & 0x80000L) != 0L) + return jjStopAtPos(2, 147); break; case 62: - if ((active2 & 0x200L) != 0L) - return jjStopAtPos(2, 137); + if ((active1 & 0x800000000L) != 0L) + return jjStopAtPos(2, 99); break; case 65: case 97: - return jjMoveStringLiteralDfa3_1(active0, 0x1000100000L, active1, 0x8L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x100008000000L, active1, 0x800L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa3_1(active0, 0x280000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x14000000000L, active1, 0L, active2, 0L); case 68: case 100: - if ((active1 & 0x200L) != 0L) - return jjStartNfaWithStates_1(2, 73, 14); - return jjMoveStringLiteralDfa3_1(active0, 0x1e00000000000000L, active1, 0L, active2, 0L); + if ((active1 & 0x2000000000L) != 0L) + return jjStartNfaWithStates_1(2, 101, 14); + return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x1eL, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa3_1(active0, 0x8000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x400000000L, active1, 0L, active2, 0L); case 70: case 102: - return jjMoveStringLiteralDfa3_1(active0, 0x80000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x8080000000000L, active1, 0L, active2, 0L); case 72: case 104: - return jjMoveStringLiteralDfa3_1(active0, 0x40000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x2000000000L, active1, 0L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa3_1(active0, 0x130000020000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x3000001000000000L, active1, 0x1L, active2, 0L); case 74: case 106: - return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x1L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x100L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_1(active0, 0x82000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x8200000000000000L, active1, 0L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa3_1(active0, 0x60000200000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x6000010000000L, active1, 0L, active2, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_1(active0, 0x800000000L, active1, 0x26L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x40000000000L, active1, 0x2600L, active2, 0L); case 80: case 112: - return jjMoveStringLiteralDfa3_1(active0, 0x8000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x800000000000000L, active1, 0L, active2, 0L); case 81: case 113: - return jjMoveStringLiteralDfa3_1(active0, 0x500000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x28000000000L, active1, 0L, active2, 0L); case 82: case 114: - if ((active0 & 0x400000L) != 0L) - return jjStartNfaWithStates_1(2, 22, 14); - else if ((active0 & 0x400000000000L) != 0L) + if ((active0 & 0x20000000L) != 0L) + return jjStartNfaWithStates_1(2, 29, 14); + else if ((active0 & 0x40000000000000L) != 0L) { - jjmatchedKind = 46; + jjmatchedKind = 54; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0xa000000004000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x200000000L, active1, 0xa0L, active2, 0L); case 83: case 115: - return jjMoveStringLiteralDfa3_1(active0, 0x10013000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x1000980000000L, active1, 0L, active2, 0L); case 84: case 116: - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x4000L) != 0L) { - jjmatchedKind = 70; + jjmatchedKind = 78; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x4a00000000000L, active1, 0x80L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4a0000000000000L, active1, 0x8000L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_1(active0, 0x40000000000000L, active1, 0x10L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4000000000000000L, active1, 0x1000L, active2, 0L); case 87: case 119: - if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_1(2, 48, 14); + if ((active0 & 0x100000000000000L) != 0L) + return jjStartNfaWithStates_1(2, 56, 14); break; default : break; @@ -838,69 +951,69 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa4_1(active0, 0x8000c000000L, active1, 0x20L); + return jjMoveStringLiteralDfa4_1(active0, 0x8000600000000L, active1, 0x2000L); case 66: case 98: - return jjMoveStringLiteralDfa4_1(active0, 0x800000000L, active1, 0x10L); + return jjMoveStringLiteralDfa4_1(active0, 0x40000000000L, active1, 0x1000L); case 67: case 99: - return jjMoveStringLiteralDfa4_1(active0, 0x200000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x10000000L, active1, 0L); case 69: case 101: - if ((active0 & 0x2000000L) != 0L) + if ((active0 & 0x100000000L) != 0L) { - jjmatchedKind = 25; + jjmatchedKind = 32; jjmatchedPos = 3; } - else if ((active0 & 0x10000000000L) != 0L) - return jjStartNfaWithStates_1(3, 40, 14); - else if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 54, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x2008200001000000L, active1, 0x81L); + else if ((active0 & 0x1000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 48, 14); + else if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 62, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x820000080000000L, active1, 0x8120L); case 70: case 102: - return jjMoveStringLiteralDfa4_1(active0, 0x1000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0L, active1, 0x10L); case 73: case 105: - return jjMoveStringLiteralDfa4_1(active0, 0x8800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x80000000000L, active1, 0x88L); case 76: case 108: - if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 49, 14); - else if ((active1 & 0x2L) != 0L) + if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 57, 14); + else if ((active1 & 0x200L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 73; jjmatchedPos = 3; } - else if ((active1 & 0x8L) != 0L) - return jjStartNfaWithStates_1(3, 67, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x100000280000000L, active1, 0x4L); + else if ((active1 & 0x800L) != 0L) + return jjStartNfaWithStates_1(3, 75, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x14000000000L, active1, 0x401L); case 78: case 110: - return jjMoveStringLiteralDfa4_1(active0, 0x20000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x1000000000L, active1, 0L); case 79: case 111: - if ((active0 & 0x40000000L) != 0L) - return jjStartNfaWithStates_1(3, 30, 14); - else if ((active0 & 0x800000000000L) != 0L) - return jjStartNfaWithStates_1(3, 47, 14); + if ((active0 & 0x2000000000L) != 0L) + return jjStartNfaWithStates_1(3, 37, 14); + else if ((active0 & 0x80000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 55, 14); break; case 83: case 115: - if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 53, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x480020000100000L, active1, 0L); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 61, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x8002000008000000L, active1, 0x4L); case 84: case 116: - if ((active0 & 0x10000000L) != 0L) - return jjStartNfaWithStates_1(3, 28, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x10041000000000L, active1, 0L); + if ((active0 & 0x800000000L) != 0L) + return jjStartNfaWithStates_1(3, 35, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x1004100000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa4_1(active0, 0x4000500000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x400028000000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa4_1(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0L, active1, 0x2L); default : break; } @@ -919,74 +1032,74 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa5_1(active0, 0x2000000800000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x40000000000L, active1, 0x20L); case 67: case 99: - return jjMoveStringLiteralDfa5_1(active0, 0x10000000000000L, active1, 0x1L); + return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000000L, active1, 0x100L); case 69: case 101: - if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 55, 14); - else if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 56, 14); - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L); + if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 63, 14); + else if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_1(4, 64, 14); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x400L); case 70: case 102: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 59, 14); + if ((active1 & 0x8L) != 0L) + return jjStartNfaWithStates_1(4, 67, 14); break; case 71: case 103: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x80L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x8000L); case 72: case 104: - return jjMoveStringLiteralDfa5_1(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x2L); case 73: case 105: - return jjMoveStringLiteralDfa5_1(active0, 0x41501000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x4128080000000L, active1, 0L); case 75: case 107: - if ((active0 & 0x8000000L) != 0L) - return jjStartNfaWithStates_1(4, 27, 14); + if ((active0 & 0x400000000L) != 0L) + return jjStartNfaWithStates_1(4, 34, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x1000L); case 78: case 110: - return jjMoveStringLiteralDfa5_1(active0, 0x8000200000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x20080000000000L, active1, 0x80L); case 79: case 111: - return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L); case 82: case 114: - if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 51, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x4000000000000L, active1, 0L); + if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 59, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L); case 83: case 115: - if ((active0 & 0x100000L) != 0L) - return jjStartNfaWithStates_1(4, 20, 14); + if ((active0 & 0x8000000L) != 0L) + return jjStartNfaWithStates_1(4, 27, 14); break; case 84: case 116: - if ((active0 & 0x20000000L) != 0L) - return jjStartNfaWithStates_1(4, 29, 14); - else if ((active0 & 0x20000000000L) != 0L) - return jjStartNfaWithStates_1(4, 41, 14); - else if ((active1 & 0x20L) != 0L) - return jjStartNfaWithStates_1(4, 69, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x200000L, active1, 0L); + if ((active0 & 0x1000000000L) != 0L) + return jjStartNfaWithStates_1(4, 36, 14); + else if ((active0 & 0x2000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 49, 14); + else if ((active1 & 0x2000L) != 0L) + return jjStartNfaWithStates_1(4, 77, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x10000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa5_1(active0, 0x80280000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x8014000000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L); case 89: case 121: - if ((active0 & 0x4000000L) != 0L) - return jjStartNfaWithStates_1(4, 26, 14); + if ((active0 & 0x200000000L) != 0L) + return jjStartNfaWithStates_1(4, 33, 14); break; default : break; @@ -1006,57 +1119,59 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x4L); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x400L); case 67: case 99: - if ((active0 & 0x1000000000L) != 0L) - return jjStartNfaWithStates_1(5, 36, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x2000000000000000L, active1, 0L); + if ((active0 & 0x100000000000L) != 0L) + return jjStartNfaWithStates_1(5, 44, 14); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x20L); case 68: case 100: - return jjMoveStringLiteralDfa6_1(active0, 0x200280000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x20014000000000L, active1, 0L); case 69: case 101: - if ((active1 & 0x10L) != 0L) - return jjStartNfaWithStates_1(5, 68, 14); - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x80L); + if ((active0 & 0x80000000000L) != 0L) + return jjStartNfaWithStates_1(5, 43, 14); + else if ((active1 & 0x1000L) != 0L) + return jjStartNfaWithStates_1(5, 76, 14); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x8000L); case 70: case 102: - if ((active0 & 0x1000000L) != 0L) - return jjStartNfaWithStates_1(5, 24, 14); + if ((active0 & 0x80000000L) != 0L) + return jjStartNfaWithStates_1(5, 31, 14); break; case 71: case 103: - if ((active0 & 0x8000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 63, 14); + if ((active1 & 0x80L) != 0L) + return jjStartNfaWithStates_1(5, 71, 14); break; case 72: case 104: - if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 52, 14); + if ((active0 & 0x1000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 60, 14); break; case 73: case 105: - return jjMoveStringLiteralDfa6_1(active0, 0x600000000200000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x10000000L, active1, 0x6L); case 76: case 108: - if ((active0 & 0x800000000L) != 0L) - return jjStartNfaWithStates_1(5, 35, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x80000000000L, active1, 0L); + if ((active0 & 0x40000000000L) != 0L) + return jjStartNfaWithStates_1(5, 42, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x8000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 50, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x40000000000L, active1, 0L); + if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 58, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x4000000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 60, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x500000000L, active1, 0L); + if ((active1 & 0x10L) != 0L) + return jjStartNfaWithStates_1(5, 68, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x28000000000L, active1, 0L); case 84: case 116: - if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_1(5, 64, 14); + if ((active1 & 0x100L) != 0L) + return jjStartNfaWithStates_1(5, 72, 14); break; default : break; @@ -1076,51 +1191,51 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long { case 69: case 101: - if ((active0 & 0x80000000L) != 0L) + if ((active0 & 0x4000000000L) != 0L) { - jjmatchedKind = 31; + jjmatchedKind = 38; jjmatchedPos = 6; } - else if ((active0 & 0x100000000L) != 0L) + else if ((active0 & 0x8000000000L) != 0L) { - jjmatchedKind = 32; + jjmatchedKind = 39; jjmatchedPos = 6; } - return jjMoveStringLiteralDfa7_1(active0, 0x600000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x30000000000L, active1, 0L); case 72: case 104: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 61, 14); + if ((active1 & 0x20L) != 0L) + return jjStartNfaWithStates_1(6, 69, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa7_1(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0L, active1, 0x2L); case 78: case 110: - if ((active1 & 0x4L) != 0L) - return jjStartNfaWithStates_1(6, 66, 14); + if ((active1 & 0x400L) != 0L) + return jjStartNfaWithStates_1(6, 74, 14); break; case 79: case 111: - return jjMoveStringLiteralDfa7_1(active0, 0x200000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x10000000L, active1, 0L); case 82: case 114: - if ((active1 & 0x80L) != 0L) - return jjStartNfaWithStates_1(6, 71, 14); + if ((active1 & 0x8000L) != 0L) + return jjStartNfaWithStates_1(6, 79, 14); break; case 83: case 115: - if ((active0 & 0x200000000000L) != 0L) - return jjStartNfaWithStates_1(6, 45, 14); + if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 53, 14); break; case 84: case 116: - if ((active0 & 0x80000000000L) != 0L) - return jjStartNfaWithStates_1(6, 43, 14); - return jjMoveStringLiteralDfa7_1(active0, 0x400000000000000L, active1, 0L); + if ((active0 & 0x8000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 51, 14); + return jjMoveStringLiteralDfa7_1(active0, 0L, active1, 0x4L); case 85: case 117: - return jjMoveStringLiteralDfa7_1(active0, 0x40000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x4000000000000L, active1, 0L); default : break; } @@ -1132,61 +1247,61 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long return jjStartNfa_1(5, old0, old1, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(6, active0, 0L, 0L); + jjStopStringLiteralDfa_1(6, active0, active1, 0L); return 7; } switch(curChar) { case 95: - return jjMoveStringLiteralDfa8_1(active0, 0x600000000L); + return jjMoveStringLiteralDfa8_1(active0, 0x30000000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa8_1(active0, 0x400000000000000L); + return jjMoveStringLiteralDfa8_1(active0, 0L, active1, 0x4L); case 69: case 101: - if ((active0 & 0x40000000000L) != 0L) - return jjStartNfaWithStates_1(7, 42, 14); - else if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_1(7, 57, 14); + if ((active0 & 0x4000000000000L) != 0L) + return jjStartNfaWithStates_1(7, 50, 14); + else if ((active1 & 0x2L) != 0L) + return jjStartNfaWithStates_1(7, 65, 14); break; case 78: case 110: - if ((active0 & 0x200000L) != 0L) - return jjStartNfaWithStates_1(7, 21, 14); + if ((active0 & 0x10000000L) != 0L) + return jjStartNfaWithStates_1(7, 28, 14); break; default : break; } - return jjStartNfa_1(6, active0, 0L, 0L); + return jjStartNfa_1(6, active0, active1, 0L); } -static private final int jjMoveStringLiteralDfa8_1(long old0, long active0) +static private final int jjMoveStringLiteralDfa8_1(long old0, long active0, long old1, long active1) { - if (((active0 &= old0)) == 0L) - return jjStartNfa_1(6, old0, 0L, 0L); + if (((active0 &= old0) | (active1 &= old1)) == 0L) + return jjStartNfa_1(6, old0, old1, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(7, active0, 0L, 0L); + jjStopStringLiteralDfa_1(7, active0, active1, 0L); return 8; } switch(curChar) { case 72: case 104: - if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_1(8, 58, 14); + if ((active1 & 0x4L) != 0L) + return jjStartNfaWithStates_1(8, 66, 14); break; case 79: case 111: - return jjMoveStringLiteralDfa9_1(active0, 0x600000000L); + return jjMoveStringLiteralDfa9_1(active0, 0x30000000000L, active1, 0L); default : break; } - return jjStartNfa_1(7, active0, 0L, 0L); + return jjStartNfa_1(7, active0, active1, 0L); } -static private final int jjMoveStringLiteralDfa9_1(long old0, long active0) +static private final int jjMoveStringLiteralDfa9_1(long old0, long active0, long old1, long active1) { - if (((active0 &= old0)) == 0L) - return jjStartNfa_1(7, old0, 0L, 0L); + if (((active0 &= old0) | (active1 &= old1)) == 0L) + return jjStartNfa_1(7, old0, old1, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { jjStopStringLiteralDfa_1(8, active0, 0L, 0L); @@ -1196,7 +1311,7 @@ static private final int jjMoveStringLiteralDfa9_1(long old0, long active0) { case 78: case 110: - return jjMoveStringLiteralDfa10_1(active0, 0x600000000L); + return jjMoveStringLiteralDfa10_1(active0, 0x30000000000L); default : break; } @@ -1215,7 +1330,7 @@ static private final int jjMoveStringLiteralDfa10_1(long old0, long active0) { case 67: case 99: - return jjMoveStringLiteralDfa11_1(active0, 0x600000000L); + return jjMoveStringLiteralDfa11_1(active0, 0x30000000000L); default : break; } @@ -1234,10 +1349,10 @@ static private final int jjMoveStringLiteralDfa11_1(long old0, long active0) { case 69: case 101: - if ((active0 & 0x200000000L) != 0L) - return jjStartNfaWithStates_1(11, 33, 14); - else if ((active0 & 0x400000000L) != 0L) - return jjStartNfaWithStates_1(11, 34, 14); + if ((active0 & 0x10000000000L) != 0L) + return jjStartNfaWithStates_1(11, 40, 14); + else if ((active0 & 0x20000000000L) != 0L) + return jjStartNfaWithStates_1(11, 41, 14); break; default : break; @@ -1251,7 +1366,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) { int[] nextStates; int startsAt = 0; - jjnewStateCnt = 70; + jjnewStateCnt = 61; int i = 1; jjstateSet[0] = startState; int j, kind = 0x7fffffff; @@ -1272,24 +1387,22 @@ static private final int jjMoveNfa_1(int startState, int curPos) else if (curChar == 39) jjCheckNAddStates(7, 12); else if (curChar == 34) - jjCheckNAddStates(13, 20); - else if (curChar == 36) - jjstateSet[jjnewStateCnt++] = 16; + jjCheckNAddStates(13, 18); else if (curChar == 46) jjCheckNAdd(8); else if (curChar == 47) jjstateSet[jjnewStateCnt++] = 2; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 74) - kind = 74; + if (kind > 102) + kind = 102; jjCheckNAddTwoStates(5, 6); } else if (curChar == 48) { - if (kind > 74) - kind = 74; - jjCheckNAddStates(21, 23); + if (kind > 102) + kind = 102; + jjCheckNAddStates(19, 21); } break; case 0: @@ -1297,8 +1410,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 1; break; case 1: - if ((0xffff7fffffffffffL & l) != 0L && kind > 13) - kind = 13; + if ((0xffff7fffffffffffL & l) != 0L && kind > 18) + kind = 18; break; case 2: if (curChar == 42) @@ -1307,15 +1420,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 4: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 102) + kind = 102; jjCheckNAddTwoStates(5, 6); break; case 5: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 102) + kind = 102; jjCheckNAddTwoStates(5, 6); break; case 7: @@ -1325,9 +1438,9 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 8: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; - jjCheckNAddStates(24, 26); + if (kind > 106) + kind = 106; + jjCheckNAddStates(22, 24); break; case 10: if ((0x280000000000L & l) != 0L) @@ -1336,176 +1449,157 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; + if (kind > 106) + kind = 106; jjCheckNAddTwoStates(11, 12); break; case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 84) - kind = 84; + if (kind > 113) + kind = 113; jjstateSet[jjnewStateCnt++] = 14; break; case 15: - if (curChar == 36) - jjstateSet[jjnewStateCnt++] = 16; - break; - case 17: - if ((0x3ff000000000000L & l) == 0L) - break; - if (kind > 140) - kind = 140; - jjstateSet[jjnewStateCnt++] = 17; - break; - case 18: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(0, 6); break; - case 19: + case 16: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(19, 20); + jjCheckNAddTwoStates(16, 17); break; - case 20: + case 17: if (curChar != 46) break; - if (kind > 78) - kind = 78; - jjCheckNAddStates(27, 29); + if (kind > 106) + kind = 106; + jjCheckNAddStates(25, 27); break; - case 21: + case 18: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; - jjCheckNAddStates(27, 29); + if (kind > 106) + kind = 106; + jjCheckNAddStates(25, 27); break; - case 23: + case 20: if ((0x280000000000L & l) != 0L) - jjCheckNAdd(24); + jjCheckNAdd(21); break; - case 24: + case 21: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; - jjCheckNAddTwoStates(24, 12); + if (kind > 106) + kind = 106; + jjCheckNAddTwoStates(21, 12); break; - case 25: + case 22: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(25, 26); + jjCheckNAddTwoStates(22, 23); break; - case 27: + case 24: if ((0x280000000000L & l) != 0L) - jjCheckNAdd(28); + jjCheckNAdd(25); break; - case 28: + case 25: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; - jjCheckNAddTwoStates(28, 12); + if (kind > 106) + kind = 106; + jjCheckNAddTwoStates(25, 12); break; - case 29: + case 26: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(30, 32); + jjCheckNAddStates(28, 30); break; - case 31: + case 28: if ((0x280000000000L & l) != 0L) - jjCheckNAdd(32); + jjCheckNAdd(29); break; - case 32: + case 29: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(32, 12); + jjCheckNAddTwoStates(29, 12); break; - case 33: + case 30: if (curChar != 48) break; - if (kind > 74) - kind = 74; - jjCheckNAddStates(21, 23); + if (kind > 102) + kind = 102; + jjCheckNAddStates(19, 21); break; - case 35: + case 32: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; - jjCheckNAddTwoStates(35, 6); + if (kind > 102) + kind = 102; + jjCheckNAddTwoStates(32, 6); break; - case 36: + case 33: if ((0xff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; - jjCheckNAddTwoStates(36, 6); - break; - case 37: - if (curChar == 34) - jjCheckNAddStates(13, 20); - break; - case 38: - jjCheckNAddStates(33, 36); + if (kind > 102) + kind = 102; + jjCheckNAddTwoStates(33, 6); break; - case 39: + case 34: if (curChar == 34) - jjCheckNAddStates(33, 36); + jjCheckNAddStates(13, 18); break; - case 42: + case 35: if ((0xfffffffbffffffffL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 43; - break; - case 44: - if (curChar == 34 && kind > 80) - kind = 80; + jjCheckNAddStates(31, 33); break; - case 45: - jjCheckNAddStates(37, 40); + case 37: + jjCheckNAddStates(31, 33); break; - case 46: - if (curChar == 34) - jjCheckNAddStates(37, 40); + case 38: + if (curChar == 34 && kind > 108) + kind = 108; break; - case 49: + case 39: if ((0xfffffffbffffffffL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 50; + jjCheckNAddStates(34, 36); break; - case 51: - if (curChar == 34 && kind > 81) - kind = 81; + case 41: + jjCheckNAddStates(34, 36); break; - case 52: + case 42: + if (curChar == 34 && kind > 109) + kind = 109; + break; + case 43: if (curChar == 39) jjCheckNAddStates(7, 12); break; - case 53: + case 44: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(41, 43); + jjCheckNAddStates(37, 39); break; - case 54: - if (curChar == 39) - jjCheckNAddStates(41, 43); + case 46: + jjCheckNAddStates(37, 39); break; - case 56: - if (curChar == 39 && kind > 80) - kind = 80; + case 47: + if (curChar == 39 && kind > 108) + kind = 108; break; - case 57: + case 48: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(44, 46); + jjCheckNAddStates(40, 42); break; - case 58: - if (curChar == 39) - jjCheckNAddStates(44, 46); + case 50: + jjCheckNAddStates(40, 42); break; - case 60: - if (curChar == 39 && kind > 82) - kind = 82; + case 51: + if (curChar == 39 && kind > 110) + kind = 110; break; - case 62: - jjAddStates(47, 49); + case 53: + case 55: + jjCheckNAddStates(43, 45); break; - case 66: - jjAddStates(50, 52); + case 57: + case 59: + jjCheckNAddStates(46, 48); break; default : break; } @@ -1521,153 +1615,137 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 3: if ((0x87fffffe87fffffeL & l) != 0L) { - if (kind > 84) - kind = 84; + if (kind > 113) + kind = 113; jjCheckNAdd(14); } else if (curChar == 96) - jjCheckNAddStates(53, 58); + jjCheckNAddStates(49, 54); break; case 1: - if (kind > 13) - kind = 13; + if (kind > 18) + kind = 18; break; case 6: - if ((0x100000001000L & l) != 0L && kind > 74) - kind = 74; + if ((0x100000001000L & l) != 0L && kind > 102) + kind = 102; break; case 9: if ((0x2000000020L & l) != 0L) - jjAddStates(59, 60); + jjAddStates(55, 56); break; case 12: - if ((0x5000000050L & l) != 0L && kind > 78) - kind = 78; + if ((0x5000000050L & l) != 0L && kind > 106) + kind = 106; break; case 13: case 14: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 84) - kind = 84; + if (kind > 113) + kind = 113; jjCheckNAdd(14); break; - case 16: - case 17: - if ((0x87fffffe87fffffeL & l) == 0L) - break; - if (kind > 140) - kind = 140; - jjCheckNAdd(17); - break; - case 22: + case 19: if ((0x2000000020L & l) != 0L) - jjAddStates(61, 62); + jjAddStates(57, 58); break; - case 26: + case 23: if ((0x2000000020L & l) != 0L) - jjAddStates(63, 64); + jjAddStates(59, 60); break; - case 30: + case 27: if ((0x2000000020L & l) != 0L) - jjAddStates(65, 66); + jjAddStates(61, 62); break; - case 34: + case 31: if ((0x100000001000000L & l) != 0L) - jjCheckNAdd(35); + jjCheckNAdd(32); break; - case 35: + case 32: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; - jjCheckNAddTwoStates(35, 6); + if (kind > 102) + kind = 102; + jjCheckNAddTwoStates(32, 6); break; - case 38: - jjCheckNAddStates(33, 36); + case 35: + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(31, 33); + break; + case 36: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 37; + break; + case 37: + jjCheckNAddStates(31, 33); + break; + case 39: + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(34, 36); break; case 40: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 39; + jjstateSet[jjnewStateCnt++] = 41; break; case 41: - if (curChar == 123) - jjstateSet[jjnewStateCnt++] = 42; + jjCheckNAddStates(34, 36); break; - case 42: - jjstateSet[jjnewStateCnt++] = 43; - break; - case 43: - if (curChar == 125) - jjCheckNAddStates(33, 36); + case 44: + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(37, 39); break; case 45: - jjCheckNAddStates(37, 40); - break; - case 47: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 46; break; + case 46: + jjCheckNAddStates(37, 39); + break; case 48: - if (curChar == 123) - jjstateSet[jjnewStateCnt++] = 49; + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(40, 42); break; case 49: - jjstateSet[jjnewStateCnt++] = 50; - break; - case 50: - if (curChar == 125) - jjCheckNAddStates(37, 40); - break; - case 53: - jjAddStates(41, 43); - break; - case 55: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 54; - break; - case 57: - jjAddStates(44, 46); + jjstateSet[jjnewStateCnt++] = 50; break; - case 59: - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 58; + case 50: + jjCheckNAddStates(40, 42); break; - case 61: + case 52: if (curChar == 96) - jjCheckNAddStates(53, 58); + jjCheckNAddStates(49, 54); break; - case 62: - if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(47, 49); - break; - case 63: - if (curChar == 96) - jjCheckNAddStates(47, 49); + case 53: + if ((0xfffffffeefffffffL & l) != 0L) + jjCheckNAddStates(43, 45); break; - case 64: + case 54: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 63; + jjstateSet[jjnewStateCnt++] = 55; break; - case 65: - if (curChar == 96 && kind > 80) - kind = 80; + case 55: + jjCheckNAddStates(43, 45); break; - case 66: - if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(50, 52); + case 56: + if (curChar == 96 && kind > 108) + kind = 108; break; - case 67: - if (curChar == 96) - jjCheckNAddStates(50, 52); + case 57: + if ((0xfffffffeefffffffL & l) != 0L) + jjCheckNAddStates(46, 48); break; - case 68: + case 58: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 67; + jjstateSet[jjnewStateCnt++] = 59; + break; + case 59: + jjCheckNAddStates(46, 48); break; - case 69: - if (curChar == 96 && kind > 83) - kind = 83; + case 60: + if (curChar == 96 && kind > 111) + kind = 111; break; default : break; } @@ -1685,53 +1763,43 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 14: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 84) - kind = 84; + if (kind > 113) + kind = 113; jjCheckNAdd(14); break; case 1: - if ((jjbitVec0[i2] & l2) != 0L && kind > 13) - kind = 13; - break; - case 16: - case 17: - if ((jjbitVec0[i2] & l2) == 0L) - break; - if (kind > 140) - kind = 140; - jjCheckNAdd(17); + if ((jjbitVec0[i2] & l2) != 0L && kind > 18) + kind = 18; break; - case 38: + case 35: + case 37: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(33, 36); + jjCheckNAddStates(31, 33); break; - case 42: + case 39: + case 41: if ((jjbitVec0[i2] & l2) != 0L) - jjstateSet[jjnewStateCnt++] = 43; + jjCheckNAddStates(34, 36); break; - case 45: + case 44: + case 46: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(37, 40); + jjCheckNAddStates(37, 39); break; - case 49: + case 48: + case 50: if ((jjbitVec0[i2] & l2) != 0L) - jjstateSet[jjnewStateCnt++] = 50; + jjCheckNAddStates(40, 42); break; case 53: + case 55: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(41, 43); + jjCheckNAddStates(43, 45); break; case 57: + case 59: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(44, 46); - break; - case 62: - if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(47, 49); - break; - case 66: - if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(50, 52); + jjCheckNAddStates(46, 48); break; default : break; } @@ -1744,23 +1812,26 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 70 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 61 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } } } -static private final int jjMoveStringLiteralDfa0_3() +static private final int jjMoveStringLiteralDfa0_4() { switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_3(0x20000L); + return jjMoveStringLiteralDfa1_4(0x1000000L); + case 84: + case 116: + return jjMoveStringLiteralDfa1_4(0x400000L); default : return 1; } } -static private final int jjMoveStringLiteralDfa1_3(long active0) +static private final int jjMoveStringLiteralDfa1_4(long active0) { try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { @@ -1769,65 +1840,453 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) switch(curChar) { case 47: - if ((active0 & 0x20000L) != 0L) - return jjStopAtPos(1, 17); + if ((active0 & 0x1000000L) != 0L) + return jjStopAtPos(1, 24); break; + case 79: + case 111: + return jjMoveStringLiteralDfa2_4(active0, 0x400000L); default : return 2; } return 2; } +static private final int jjMoveStringLiteralDfa2_4(long old0, long active0) +{ + if (((active0 &= old0)) == 0L) + return 2; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + return 2; + } + switch(curChar) + { + case 68: + case 100: + return jjMoveStringLiteralDfa3_4(active0, 0x400000L); + default : + return 3; + } +} +static private final int jjMoveStringLiteralDfa3_4(long old0, long active0) +{ + if (((active0 &= old0)) == 0L) + return 3; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + return 3; + } + switch(curChar) + { + case 79: + case 111: + if ((active0 & 0x400000L) != 0L) + return jjStopAtPos(3, 22); + break; + default : + return 4; + } + return 4; +} +private static final int jjStopStringLiteralDfa_3(int pos, long active0, long active1, long active2) +{ + switch (pos) + { + case 0: + if ((active1 & 0x3000000000L) != 0L) + { + jjmatchedKind = 113; + return 1; + } + return -1; + case 1: + if ((active1 & 0x2000000000L) != 0L) + { + if (jjmatchedPos != 1) + { + jjmatchedKind = 113; + jjmatchedPos = 1; + } + return 1; + } + if ((active1 & 0x1000000000L) != 0L) + return 1; + return -1; + default : + return -1; + } +} +private static final int jjStartNfa_3(int pos, long active0, long active1, long active2) +{ + return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0, active1, active2), pos + 1); +} +static private final int jjStartNfaWithStates_3(int pos, int kind, int state) +{ + jjmatchedKind = kind; + jjmatchedPos = pos; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { return pos + 1; } + return jjMoveNfa_3(state, pos + 1); +} +static private final int jjMoveStringLiteralDfa0_3() +{ + switch(curChar) + { + case 9: + return jjStopAtPos(0, 12); + case 10: + return jjStopAtPos(0, 13); + case 12: + return jjStopAtPos(0, 15); + case 13: + return jjStopAtPos(0, 14); + case 32: + return jjStopAtPos(0, 11); + case 33: + jjmatchedKind = 81; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x28L); + case 36: + return jjStopAtPos(0, 112); + case 37: + jjmatchedKind = 96; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x10000L); + case 38: + jjmatchedKind = 93; + return jjMoveStringLiteralDfa1_3(0x0L, 0x400000L, 0x1000L); + case 40: + return jjStopAtPos(0, 117); + case 41: + return jjStopAtPos(0, 118); + case 42: + jjmatchedKind = 91; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x400L); + case 43: + jjmatchedKind = 89; + return jjMoveStringLiteralDfa1_3(0x0L, 0x800000L, 0x100L); + case 44: + return jjStopAtPos(0, 124); + case 45: + jjmatchedKind = 90; + return jjMoveStringLiteralDfa1_3(0x200000000000L, 0x1000000L, 0x200L); + case 46: + jjmatchedKind = 125; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x8000L); + case 47: + jjmatchedKind = 92; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x800L); + case 58: + jjmatchedKind = 84; + return jjMoveStringLiteralDfa1_3(0x400000000000L, 0x0L, 0x0L); + case 59: + return jjStopAtPos(0, 123); + case 60: + jjmatchedKind = 127; + return jjMoveStringLiteralDfa1_3(0x0L, 0x200000000L, 0x40012L); + case 61: + jjmatchedKind = 135; + return jjMoveStringLiteralDfa1_3(0x800000000000L, 0x0L, 0x41L); + case 62: + jjmatchedKind = 126; + return jjMoveStringLiteralDfa1_3(0x0L, 0xc00000000L, 0x80004L); + case 63: + jjmatchedKind = 83; + return jjMoveStringLiteralDfa1_3(0x10L, 0x0L, 0x0L); + case 64: + return jjStopAtPos(0, 80); + case 91: + return jjStopAtPos(0, 121); + case 93: + return jjStopAtPos(0, 122); + case 94: + jjmatchedKind = 95; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x4000L); + case 65: + case 97: + return jjMoveStringLiteralDfa1_3(0x0L, 0x2000000000L, 0x0L); + case 79: + case 111: + return jjMoveStringLiteralDfa1_3(0x0L, 0x1000000000L, 0x0L); + case 123: + return jjStopAtPos(0, 119); + case 124: + jjmatchedKind = 94; + return jjMoveStringLiteralDfa1_3(0x0L, 0x200000L, 0x2000L); + case 125: + return jjStopAtPos(0, 120); + case 126: + jjmatchedKind = 82; + return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x20000L); + default : + return jjMoveNfa_3(0, 0); + } +} +static private final int jjMoveStringLiteralDfa1_3(long active0, long active1, long active2) +{ + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + jjStopStringLiteralDfa_3(0, active0, active1, active2); + return 1; + } + switch(curChar) + { + case 38: + if ((active1 & 0x400000L) != 0L) + return jjStopAtPos(1, 86); + break; + case 43: + if ((active1 & 0x800000L) != 0L) + return jjStopAtPos(1, 87); + break; + case 45: + if ((active1 & 0x1000000L) != 0L) + return jjStopAtPos(1, 88); + break; + case 58: + if ((active0 & 0x400000000000L) != 0L) + return jjStopAtPos(1, 46); + break; + case 60: + if ((active1 & 0x200000000L) != 0L) + { + jjmatchedKind = 97; + jjmatchedPos = 1; + } + return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0L, active2, 0x40000L); + case 61: + if ((active2 & 0x1L) != 0L) + { + jjmatchedKind = 128; + jjmatchedPos = 1; + } + else if ((active2 & 0x2L) != 0L) + return jjStopAtPos(1, 129); + else if ((active2 & 0x4L) != 0L) + return jjStopAtPos(1, 130); + else if ((active2 & 0x8L) != 0L) + { + jjmatchedKind = 131; + jjmatchedPos = 1; + } + else if ((active2 & 0x100L) != 0L) + return jjStopAtPos(1, 136); + else if ((active2 & 0x200L) != 0L) + return jjStopAtPos(1, 137); + else if ((active2 & 0x400L) != 0L) + return jjStopAtPos(1, 138); + else if ((active2 & 0x800L) != 0L) + return jjStopAtPos(1, 139); + else if ((active2 & 0x1000L) != 0L) + return jjStopAtPos(1, 140); + else if ((active2 & 0x2000L) != 0L) + return jjStopAtPos(1, 141); + else if ((active2 & 0x4000L) != 0L) + return jjStopAtPos(1, 142); + else if ((active2 & 0x8000L) != 0L) + return jjStopAtPos(1, 143); + else if ((active2 & 0x10000L) != 0L) + return jjStopAtPos(1, 144); + else if ((active2 & 0x20000L) != 0L) + return jjStopAtPos(1, 145); + return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0L, active2, 0x60L); + case 62: + if ((active0 & 0x10L) != 0L) + return jjStopAtPos(1, 4); + else if ((active0 & 0x200000000000L) != 0L) + return jjStopAtPos(1, 45); + else if ((active0 & 0x800000000000L) != 0L) + return jjStopAtPos(1, 47); + else if ((active1 & 0x400000000L) != 0L) + { + jjmatchedKind = 98; + jjmatchedPos = 1; + } + else if ((active2 & 0x10L) != 0L) + return jjStopAtPos(1, 132); + return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0x800000000L, active2, 0x80000L); + case 78: + case 110: + return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0x2000000000L, active2, 0L); + case 82: + case 114: + if ((active1 & 0x1000000000L) != 0L) + return jjStartNfaWithStates_3(1, 100, 1); + break; + case 124: + if ((active1 & 0x200000L) != 0L) + return jjStopAtPos(1, 85); + break; + default : + break; + } + return jjStartNfa_3(0, active0, active1, active2); +} +static private final int jjMoveStringLiteralDfa2_3(long old0, long active0, long old1, long active1, long old2, long active2) +{ + if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L) + return jjStartNfa_3(0, old0, old1, old2); + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { + jjStopStringLiteralDfa_3(1, 0L, active1, active2); + return 2; + } + switch(curChar) + { + case 61: + if ((active2 & 0x20L) != 0L) + return jjStopAtPos(2, 133); + else if ((active2 & 0x40L) != 0L) + return jjStopAtPos(2, 134); + else if ((active2 & 0x40000L) != 0L) + return jjStopAtPos(2, 146); + else if ((active2 & 0x80000L) != 0L) + return jjStopAtPos(2, 147); + break; + case 62: + if ((active1 & 0x800000000L) != 0L) + return jjStopAtPos(2, 99); + break; + case 68: + case 100: + if ((active1 & 0x2000000000L) != 0L) + return jjStartNfaWithStates_3(2, 101, 1); + break; + default : + break; + } + return jjStartNfa_3(1, 0L, active1, active2); +} +static private final int jjMoveNfa_3(int startState, int curPos) +{ + int[] nextStates; + int startsAt = 0; + jjnewStateCnt = 2; + int i = 1; + jjstateSet[0] = startState; + int j, kind = 0x7fffffff; + for (;;) + { + if (++jjround == 0x7fffffff) + ReInitRounds(); + if (curChar < 64) + { + long l = 1L << curChar; + MatchLoop: do + { + switch(jjstateSet[--i]) + { + case 1: + if ((0x3ff000000000000L & l) == 0L) + break; + kind = 113; + jjstateSet[jjnewStateCnt++] = 1; + break; + default : break; + } + } while(i != startsAt); + } + else if (curChar < 128) + { + long l = 1L << (curChar & 077); + MatchLoop: do + { + switch(jjstateSet[--i]) + { + case 0: + case 1: + if ((0x87fffffe87fffffeL & l) == 0L) + break; + if (kind > 113) + kind = 113; + jjCheckNAdd(1); + break; + default : break; + } + } while(i != startsAt); + } + else + { + int i2 = (curChar & 0xff) >> 6; + long l2 = 1L << (curChar & 077); + MatchLoop: do + { + switch(jjstateSet[--i]) + { + case 0: + case 1: + if ((jjbitVec0[i2] & l2) == 0L) + break; + if (kind > 113) + kind = 113; + jjCheckNAdd(1); + break; + default : break; + } + } while(i != startsAt); + } + if (kind != 0x7fffffff) + { + jjmatchedKind = kind; + jjmatchedPos = curPos; + kind = 0x7fffffff; + } + ++curPos; + if ((i = jjnewStateCnt) == (startsAt = 2 - (jjnewStateCnt = startsAt))) + return curPos; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { return curPos; } + } +} static final int[] jjnextStates = { - 19, 20, 25, 26, 29, 30, 12, 53, 55, 56, 57, 59, 60, 38, 40, 41, - 44, 45, 47, 48, 51, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, - 12, 38, 40, 41, 44, 45, 47, 48, 51, 53, 55, 56, 57, 59, 60, 62, - 64, 65, 66, 68, 69, 62, 64, 65, 66, 68, 69, 10, 11, 23, 24, 27, - 28, 31, 32, + 16, 17, 22, 23, 26, 27, 12, 44, 45, 47, 48, 49, 51, 35, 36, 38, + 39, 40, 42, 31, 33, 6, 8, 9, 12, 18, 19, 12, 26, 27, 12, 35, + 36, 38, 39, 40, 42, 44, 45, 47, 48, 49, 51, 53, 54, 56, 57, 58, + 60, 53, 54, 56, 57, 58, 60, 10, 11, 20, 21, 24, 25, 28, 29, }; public static final String[] jjstrLiteralImages = { "", "\74\77", null, "\74\77\75", "\77\76", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, null, null, null, null, null, null, null, null, null, "\55\76", -"\72\72", "\75\76", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, +null, null, null, null, null, null, "\55\76", "\72\72", "\75\76", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, null, null, null, null, null, null, "\50", "\51", "\173", "\175", -"\133", "\135", "\73", "\54", "\56", "\76", "\74", "\75\75", "\74\75", "\76\75", -"\41\75", "\74\76", "\41\75\75", "\75\75\75", "\75", "\53\75", "\55\75", "\52\75", -"\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\176\75", "\100", "\44", -"\41", "\176", "\77", "\72", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", -"\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", -"\74\74\75", "\76\76\75", null, }; +null, null, null, null, null, null, null, null, null, null, null, null, null, null, +null, "\100", "\41", "\176", "\77", "\72", "\174\174", "\46\46", "\53\53", "\55\55", +"\53", "\55", "\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", +"\76\76\76", null, null, null, null, null, null, null, null, null, null, null, null, "\44", +null, null, null, null, "\50", "\51", "\173", "\175", "\133", "\135", "\73", "\54", +"\56", "\76", "\74", "\75\75", "\74\75", "\76\75", "\41\75", "\74\76", "\41\75\75", +"\75\75\75", "\75", "\53\75", "\55\75", "\52\75", "\57\75", "\46\75", "\174\75", "\136\75", +"\56\75", "\45\75", "\176\75", "\74\74\75", "\76\76\75", }; public static final String[] lexStateNames = { "DEFAULT", "PHPPARSING", "IN_SINGLE_LINE_COMMENT", + "IN_VARIABLE", "IN_FORMAL_COMMENT", "IN_MULTI_LINE_COMMENT", }; public static final int[] jjnewLexState = { - -1, 1, 1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 2, 3, 4, 1, 0, 1, 1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 1, 1, 1, 0, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 2, 2, 4, 5, 1, -1, -1, -1, 1, + 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, }; static final long[] jjtoToken = { - 0xfffffffffff0001fL, 0xffffffffff1f47ffL, 0x1fffL, + 0xfffffffff880001fL, 0xffe3f47fffffffffL, 0xfffffL, }; static final long[] jjtoSkip = { - 0x7ffe0L, 0x0L, 0x0L, + 0x37fffe0L, 0x0L, 0x0L, }; static final long[] jjtoSpecial = { - 0x7f800L, 0x0L, 0x0L, + 0x37ff800L, 0x0L, 0x0L, }; static final long[] jjtoMore = { - 0x80000L, 0x0L, 0x0L, + 0x4000000L, 0x0L, 0x0L, }; static protected SimpleCharStream input_stream; -static private final int[] jjrounds = new int[70]; -static private final int[] jjstateSet = new int[140]; +static private final int[] jjrounds = new int[61]; +static private final int[] jjstateSet = new int[122]; static StringBuffer image; static int jjimageLen; static int lengthOfMatch; @@ -1854,7 +2313,7 @@ static private final void ReInitRounds() { int i; jjround = 0x80000001; - for (i = 70; i-- > 0;) + for (i = 61; i-- > 0;) jjrounds[i] = 0x80000000; } static public void ReInit(SimpleCharStream stream, int lexState) @@ -1864,7 +2323,7 @@ static public void ReInit(SimpleCharStream stream, int lexState) } static public void SwitchTo(int lexState) { - if (lexState >= 5 || lexState < 0) + if (lexState >= 6 || lexState < 0) throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE); else curLexState = lexState; @@ -1909,6 +2368,7 @@ public static Token getNextToken() jjmatchedKind = 0; matchedToken = jjFillToken(); matchedToken.specialToken = specialToken; + CommonTokenAction(matchedToken); return matchedToken; } image = null; @@ -1941,27 +2401,32 @@ public static Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_2(); - if (jjmatchedPos == 0 && jjmatchedKind > 19) + if (jjmatchedPos == 0 && jjmatchedKind > 21) { - jjmatchedKind = 19; + jjmatchedKind = 21; } break; case 3: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_3(); - if (jjmatchedPos == 0 && jjmatchedKind > 19) - { - jjmatchedKind = 19; - } break; case 4: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_4(); - if (jjmatchedPos == 0 && jjmatchedKind > 19) + if (jjmatchedPos == 0 && jjmatchedKind > 26) + { + jjmatchedKind = 26; + } + break; + case 5: + jjmatchedKind = 0x7fffffff; + jjmatchedPos = 0; + curPos = jjMoveStringLiteralDfa0_5(); + if (jjmatchedPos == 0 && jjmatchedKind > 26) { - jjmatchedKind = 19; + jjmatchedKind = 26; } break; } @@ -1975,6 +2440,7 @@ public static Token getNextToken() matchedToken.specialToken = specialToken; if (jjnewLexState[jjmatchedKind] != -1) curLexState = jjnewLexState[jjmatchedKind]; + CommonTokenAction(matchedToken); return matchedToken; } else if ((jjtoSkip[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) @@ -2036,7 +2502,7 @@ static void SkipLexicalActions(Token matchedToken) { switch(jjmatchedKind) { - case 13 : + case 18 : if (image == null) image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); else