X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index 480026c..b7f86bf 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -6,13 +6,15 @@ 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.PHPOutlineInfo; public class PHPParserTokenManager implements PHPParserConstants { @@ -117,7 +119,10 @@ static private final int jjMoveStringLiteralDfa0_4() switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_4(0x40000L); + return jjMoveStringLiteralDfa1_4(0x80000L); + case 84: + case 116: + return jjMoveStringLiteralDfa1_4(0x20000L); default : return 1; } @@ -131,14 +136,54 @@ static private final int jjMoveStringLiteralDfa1_4(long active0) switch(curChar) { case 47: - if ((active0 & 0x40000L) != 0L) - return jjStopAtPos(1, 18); + if ((active0 & 0x80000L) != 0L) + return jjStopAtPos(1, 19); break; + case 79: + case 111: + return jjMoveStringLiteralDfa2_4(active0, 0x20000L); 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, 0x20000L); + 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 & 0x20000L) != 0L) + return jjStopAtPos(3, 17); + break; + default : + return 4; + } + return 4; +} private static final int jjStopStringLiteralDfa_2(int pos, long active0) { switch (pos) @@ -165,6 +210,9 @@ static private final int jjMoveStringLiteralDfa0_2() { case 63: return jjMoveStringLiteralDfa1_2(0x10000L); + case 84: + case 116: + return jjMoveStringLiteralDfa1_2(0x20000L); default : return jjMoveNfa_2(0, 0); } @@ -182,11 +230,54 @@ static private final int jjMoveStringLiteralDfa1_2(long active0) if ((active0 & 0x10000L) != 0L) return jjStopAtPos(1, 16); break; + case 79: + case 111: + return jjMoveStringLiteralDfa2_2(active0, 0x20000L); 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, 0x20000L); + 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 & 0x20000L) != 0L) + return jjStopAtPos(3, 17); + break; + default : + break; + } + return jjStartNfa_2(2, active0); +} static private final void jjCheckNAdd(int state) { if (jjrounds[state] != jjround) @@ -298,124 +389,124 @@ 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 & 0x4800L) != 0L || (active1 & 0x400000L) != 0L || (active2 & 0x10L) != 0L) return 2; - if ((active1 & 0x40000000000000L) != 0L) + if ((active1 & 0x400L) != 0L) return 16; - if ((active1 & 0x4000100000000L) != 0L) + if ((active1 & 0x40000000000000L) != 0L || (active2 & 0x100L) != 0L) return 8; - if ((active0 & 0xffffff1ffff00000L) != 0L || (active1 & 0x3ffL) != 0L) + if ((active0 & 0xfffffe3fffe00000L) != 0L || (active1 & 0xc00001ffL) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 106; return 14; } return -1; case 1: - if ((active0 & 0xbfffef1fff700000L) != 0L || (active1 & 0x2efL) != 0L) + if ((active0 & 0x4000L) != 0L) + return 0; + if ((active0 & 0x7fffde3ffee00000L) != 0L || (active1 & 0x800001dfL) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 84; + jjmatchedKind = 106; jjmatchedPos = 1; } return 14; } - if ((active0 & 0x4000L) != 0L) - return 0; - if ((active0 & 0x4000100000800000L) != 0L || (active1 & 0x110L) != 0L) + if ((active0 & 0x8000200001000000L) != 0L || (active1 & 0x40000020L) != 0L) return 14; return -1; case 2: - if ((active0 & 0x2001400000400000L) != 0L || (active1 & 0x2c0L) != 0L) + if ((active0 & 0x4002800000800000L) != 0L || (active1 & 0x80000180L) != 0L) return 14; - if ((active0 & 0x9ffeaf1fff300000L) != 0L || (active1 & 0x3fL) != 0L) + if ((active0 & 0x3ffd5e3ffe600000L) != 0L || (active1 & 0x7fL) != 0L) { if (jjmatchedPos != 2) { - jjmatchedKind = 84; + jjmatchedKind = 106; jjmatchedPos = 2; } return 14; } return -1; case 3: - if ((active0 & 0x62810053000000L) != 0L || (active1 & 0xeL) != 0L) + if ((active0 & 0xc50200a6000000L) != 0L || (active1 & 0x1cL) != 0L) return 14; - if ((active0 & 0xbf9c2e1fac300000L) != 0L || (active1 & 0xb1L) != 0L) + if ((active0 & 0x7f385c3f58600000L) != 0L || (active1 & 0x163L) != 0L) { if (jjmatchedPos != 3) { - jjmatchedKind = 84; + jjmatchedKind = 106; jjmatchedPos = 3; } return 14; } return -1; case 4: - if ((active0 & 0xb6142c1f81200000L) != 0L || (active1 & 0x95L) != 0L) + if ((active0 & 0x1310040058200000L) != 0L || (active1 & 0x40L) != 0L) + return 14; + if ((active0 & 0x6c28583f02400000L) != 0L || (active1 & 0x12bL) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 106; jjmatchedPos = 4; return 14; } - if ((active0 & 0x98802002c100000L) != 0L || (active1 & 0x20L) != 0L) - return 14; return -1; case 5: - if ((active0 & 0x9014001801000000L) != 0L || (active1 & 0x11L) != 0L) + if ((active0 & 0x2028003002000000L) != 0L || (active1 & 0x23L) != 0L) return 14; - if ((active0 & 0x26002c0780200000L) != 0L || (active1 & 0x84L) != 0L) + if ((active0 & 0x4c00580f00400000L) != 0L || (active1 & 0x108L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 106; jjmatchedPos = 5; return 14; } return -1; case 6: - if ((active0 & 0x2000280780000000L) != 0L || (active1 & 0x84L) != 0L) + if ((active0 & 0x4000500f00000000L) != 0L || (active1 & 0x108L) != 0L) return 14; - if ((active0 & 0x600040000200000L) != 0L) + if ((active0 & 0xc00080000400000L) != 0L) { if (jjmatchedPos != 6) { - jjmatchedKind = 84; + jjmatchedKind = 106; jjmatchedPos = 6; } return 14; } return -1; case 7: - if ((active0 & 0x200040000200000L) != 0L) + if ((active0 & 0x400080000400000L) != 0L) return 14; - if ((active0 & 0x400000600000000L) != 0L) + if ((active0 & 0x800000c00000000L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 106; jjmatchedPos = 7; return 14; } return -1; case 8: - if ((active0 & 0x600000000L) != 0L) + if ((active0 & 0x800000000000000L) != 0L) + return 14; + if ((active0 & 0xc00000000L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 106; jjmatchedPos = 8; return 14; } - if ((active0 & 0x400000000000000L) != 0L) - return 14; return -1; case 9: - if ((active0 & 0x600000000L) != 0L) + if ((active0 & 0xc00000000L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 106; jjmatchedPos = 9; return 14; } return -1; case 10: - if ((active0 & 0x600000000L) != 0L) + if ((active0 & 0xc00000000L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 106; jjmatchedPos = 10; return 14; } @@ -441,126 +532,126 @@ static private final int jjMoveStringLiteralDfa0_1() switch(curChar) { case 33: - jjmatchedKind = 119; - return jjMoveStringLiteralDfa1_1(0x0L, 0x14000000000L, 0x0L); + jjmatchedKind = 75; + return jjMoveStringLiteralDfa1_1(0x0L, 0x5000000000000000L, 0x0L); case 35: return jjStopAtPos(0, 12); case 36: - return jjStartNfaWithStates_1(0, 118, 16); + return jjStartNfaWithStates_1(0, 74, 16); case 37: - jjmatchedKind = 134; - return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000L, 0x0L); + jjmatchedKind = 90; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x200L); case 38: - jjmatchedKind = 131; - return jjMoveStringLiteralDfa1_1(0x0L, 0x1000800000000000L, 0x0L); + jjmatchedKind = 87; + return jjMoveStringLiteralDfa1_1(0x0L, 0x10000L, 0x20L); case 40: - return jjStopAtPos(0, 88); + return jjStopAtPos(0, 110); case 41: - return jjStopAtPos(0, 89); + return jjStopAtPos(0, 111); case 42: - jjmatchedKind = 129; - return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000000L, 0x0L); + jjmatchedKind = 85; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x8L); case 43: - jjmatchedKind = 127; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000080000000000L, 0x0L); + jjmatchedKind = 83; + return jjMoveStringLiteralDfa1_1(0x0L, 0x20000L, 0x2L); case 44: - return jjStopAtPos(0, 95); + return jjStopAtPos(0, 117); case 45: - jjmatchedKind = 128; - return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x4000100000000000L, 0x0L); + jjmatchedKind = 84; + return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x40000L, 0x4L); case 46: - jjmatchedKind = 96; - return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000L, 0x0L); + jjmatchedKind = 118; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x100L); case 47: - jjmatchedKind = 130; - return jjMoveStringLiteralDfa1_1(0x4800L, 0x400000000000L, 0x0L); + jjmatchedKind = 86; + return jjMoveStringLiteralDfa1_1(0x4800L, 0x0L, 0x10L); case 58: - jjmatchedKind = 122; - return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x0L, 0x0L); + jjmatchedKind = 78; + return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x0L, 0x0L); case 59: - return jjStopAtPos(0, 94); + return jjStopAtPos(0, 116); case 60: - jjmatchedKind = 98; - return jjMoveStringLiteralDfa1_1(0x0L, 0x9000000000L, 0x480L); + jjmatchedKind = 120; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2400000008000000L, 0x800L); case 61: - jjmatchedKind = 106; - return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x20800000000L, 0x0L); + jjmatchedKind = 128; + return jjMoveStringLiteralDfa1_1(0x10000000000L, 0x8200000000000000L, 0x0L); case 62: - jjmatchedKind = 97; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000L, 0xb00L); + jjmatchedKind = 119; + return jjMoveStringLiteralDfa1_1(0x0L, 0x800000030000000L, 0x1000L); case 63: - jjmatchedKind = 121; + jjmatchedKind = 77; return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L); case 64: - return jjStopAtPos(0, 117); + return jjStopAtPos(0, 73); case 91: - return jjStopAtPos(0, 92); + return jjStopAtPos(0, 114); case 93: - return jjStopAtPos(0, 93); + return jjStopAtPos(0, 115); case 94: - jjmatchedKind = 133; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L); + jjmatchedKind = 89; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x80L); case 65: case 97: - return jjMoveStringLiteralDfa1_1(0x4000000004000000L, 0x200L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8000000008000000L, 0x80000000L, 0x0L); case 66: case 98: - return jjMoveStringLiteralDfa1_1(0x8000000L, 0x6L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x10000000L, 0xcL, 0x0L); case 67: case 99: - return jjMoveStringLiteralDfa1_1(0x70000100000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0xe0000200000L, 0x0L, 0x0L); case 68: case 100: - return jjMoveStringLiteralDfa1_1(0x180000000000L, 0x10L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x300000000000L, 0x20L, 0x0L); case 69: case 101: - return jjMoveStringLiteralDfa1_1(0x1e00200043000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x3c00400086000000L, 0x0L, 0x0L); case 70: case 102: - return jjMoveStringLiteralDfa1_1(0x2080400000200000L, 0x20L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x4100800000400000L, 0x40L, 0x0L); case 71: case 103: - return jjMoveStringLiteralDfa1_1(0x800800000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1001000000000L, 0x0L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_1(0x280800000L, 0xc0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x501000000L, 0x180L, 0x0L); case 76: case 108: - return jjMoveStringLiteralDfa1_1(0x10000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L); case 78: case 110: - return jjMoveStringLiteralDfa1_1(0x3000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x6000000000000L, 0x0L, 0x0L); case 79: case 111: - return jjMoveStringLiteralDfa1_1(0x0L, 0x101L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x40000002L, 0x0L); case 80: case 112: - return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x40000000L, 0x0L, 0x0L); case 82: case 114: - return jjMoveStringLiteralDfa1_1(0x4000500000000L, 0x8L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8000a00000000L, 0x10L, 0x0L); case 83: case 115: - return jjMoveStringLiteralDfa1_1(0x8018001000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x30002000000000L, 0x1L, 0x0L); case 84: case 116: - return jjMoveStringLiteralDfa1_1(0x60000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0xc0000000000000L, 0x0L, 0x0L); case 86: case 118: - return jjMoveStringLiteralDfa1_1(0x400000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x800000L, 0x0L, 0x0L); case 87: case 119: - return jjMoveStringLiteralDfa1_1(0x100000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x200000000000000L, 0x0L, 0x0L); case 123: - return jjStopAtPos(0, 90); + return jjStopAtPos(0, 112); case 124: - jjmatchedKind = 132; - return jjMoveStringLiteralDfa1_1(0x0L, 0x801000000000000L, 0x0L); + jjmatchedKind = 88; + return jjMoveStringLiteralDfa1_1(0x0L, 0x8000L, 0x40L); case 125: - return jjStopAtPos(0, 91); + return jjStopAtPos(0, 113); case 126: - jjmatchedKind = 120; - return jjMoveStringLiteralDfa1_1(0x0L, 0x10000000000000L, 0x0L); + jjmatchedKind = 76; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x400L); default : return jjMoveNfa_1(3, 0); } @@ -575,149 +666,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 & 0x10000L) != 0L) + return jjStopAtPos(1, 80); break; case 42: if ((active0 & 0x4000L) != 0L) return jjStartNfaWithStates_1(1, 14, 0); break; case 43: - if ((active1 & 0x2000000000000000L) != 0L) - return jjStopAtPos(1, 125); + if ((active1 & 0x20000L) != 0L) + return jjStopAtPos(1, 81); break; case 45: - if ((active1 & 0x4000000000000000L) != 0L) - return jjStopAtPos(1, 126); + if ((active1 & 0x40000L) != 0L) + return jjStopAtPos(1, 82); break; case 47: if ((active0 & 0x800L) != 0L) return jjStopAtPos(1, 11); break; case 58: - if ((active0 & 0x4000000000L) != 0L) - return jjStopAtPos(1, 38); + if ((active0 & 0x8000000000L) != 0L) + return jjStopAtPos(1, 39); break; case 60: - if ((active2 & 0x80L) != 0L) + if ((active1 & 0x8000000L) != 0L) { - jjmatchedKind = 135; + jjmatchedKind = 91; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x400L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x800L); case 61: - if ((active1 & 0x800000000L) != 0L) + if ((active1 & 0x200000000000000L) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 121; 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 ((active1 & 0x400000000000000L) != 0L) + return jjStopAtPos(1, 122); + else if ((active1 & 0x800000000000000L) != 0L) + return jjStopAtPos(1, 123); + else if ((active1 & 0x1000000000000000L) != 0L) { - jjmatchedKind = 102; + jjmatchedKind = 124; 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 & 0x2L) != 0L) + return jjStopAtPos(1, 129); + else if ((active2 & 0x4L) != 0L) + return jjStopAtPos(1, 130); + else if ((active2 & 0x8L) != 0L) + return jjStopAtPos(1, 131); + else if ((active2 & 0x10L) != 0L) + return jjStopAtPos(1, 132); + else if ((active2 & 0x20L) != 0L) + return jjStopAtPos(1, 133); + else if ((active2 & 0x40L) != 0L) + return jjStopAtPos(1, 134); + else if ((active2 & 0x80L) != 0L) + return jjStopAtPos(1, 135); + 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); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0xc000000000000000L, active2, 0L); 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 & 0x4000000000L) != 0L) + return jjStopAtPos(1, 38); + else if ((active0 & 0x10000000000L) != 0L) + return jjStopAtPos(1, 40); + else if ((active1 & 0x10000000L) != 0L) { - jjmatchedKind = 136; + jjmatchedKind = 92; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0xa00L); + else if ((active1 & 0x2000000000000000L) != 0L) + return jjStopAtPos(1, 125); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x20000000L, active2, 0x1000L); case 65: case 97: - return jjMoveStringLiteralDfa2_1(active0, 0x80010000400000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x100020000800000L, active1, 0L, active2, 0L); case 66: case 98: - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x1L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x2L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa2_1(active0, 0x40000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x80000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_1(active0, 0x5080500000000L, active1, 0x8L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0xa100a00000000L, active1, 0x10L, active2, 0L); case 70: case 102: - if ((active0 & 0x800000L) != 0L) - return jjStartNfaWithStates_1(1, 23, 14); + if ((active0 & 0x1000000L) != 0L) + return jjStartNfaWithStates_1(1, 24, 14); break; case 72: case 104: - return jjMoveStringLiteralDfa2_1(active0, 0x120000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x240000000000000L, active1, 0L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa2_1(active0, 0x10000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x20000000L, active1, 0L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa2_1(active0, 0x803100000L, active1, 0x20L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x1006200000L, active1, 0x40L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa2_1(active0, 0x1e00000280000000L, active1, 0x2c0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x3c00000500000000L, active1, 0x80000180L, active2, 0L); case 79: case 111: - if ((active0 & 0x100000000000L) != 0L) + if ((active0 & 0x200000000000L) != 0L) { - jjmatchedKind = 44; + jjmatchedKind = 45; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0x2000c60000000000L, active1, 0x16L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x40018c0000000000L, active1, 0x2cL, 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 & 0x40000000L) != 0L) + return jjStartNfaWithStates_1(1, 94, 14); + return jjMoveStringLiteralDfa2_1(active0, 0x80000058000000L, active1, 0L, active2, 0L); case 83: case 115: - if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_1(1, 62, 14); + if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_1(1, 63, 14); break; case 84: case 116: - return jjMoveStringLiteralDfa2_1(active0, 0x8000001000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x2000000000L, active1, 0x1L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa2_1(active0, 0xa000000200000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x14000000400000L, active1, 0L, active2, 0L); case 87: case 119: - return jjMoveStringLiteralDfa2_1(active0, 0x10000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x20000000000000L, active1, 0L, active2, 0L); case 88: case 120: - return jjMoveStringLiteralDfa2_1(active0, 0x200000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x400000000000L, active1, 0L, active2, 0L); case 124: - if ((active1 & 0x800000000000000L) != 0L) - return jjStopAtPos(1, 123); + if ((active1 & 0x8000L) != 0L) + return jjStopAtPos(1, 79); break; default : break; @@ -736,88 +827,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); + if ((active1 & 0x4000000000000000L) != 0L) + return jjStopAtPos(2, 126); + else if ((active1 & 0x8000000000000000L) != 0L) + return jjStopAtPos(2, 127); else if ((active2 & 0x800L) != 0L) return jjStopAtPos(2, 139); + else if ((active2 & 0x1000L) != 0L) + return jjStopAtPos(2, 140); break; case 62: - if ((active2 & 0x200L) != 0L) - return jjStopAtPos(2, 137); + if ((active1 & 0x20000000L) != 0L) + return jjStopAtPos(2, 93); break; case 65: case 97: - return jjMoveStringLiteralDfa3_1(active0, 0x1000100000L, active1, 0x8L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x2000200000L, active1, 0x10L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa3_1(active0, 0x280000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x500000000L, 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 & 0x80000000L) != 0L) + return jjStartNfaWithStates_1(2, 95, 14); + return jjMoveStringLiteralDfa3_1(active0, 0x3c00000000000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa3_1(active0, 0x8000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x10000000L, active1, 0L, active2, 0L); case 70: case 102: - return jjMoveStringLiteralDfa3_1(active0, 0x80000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x100000000000L, active1, 0L, active2, 0L); case 72: case 104: - return jjMoveStringLiteralDfa3_1(active0, 0x40000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x80000000L, active1, 0L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa3_1(active0, 0x130000020000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x260000040000000L, active1, 0L, active2, 0L); case 74: case 106: - return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x1L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x2L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_1(active0, 0x82000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x104000000000000L, active1, 0L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa3_1(active0, 0x60000200000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0xc0000400000L, active1, 0L, active2, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_1(active0, 0x800000000L, active1, 0x26L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x1000000000L, active1, 0x4cL, active2, 0L); case 80: case 112: - return jjMoveStringLiteralDfa3_1(active0, 0x8000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x10000000000000L, active1, 0L, active2, 0L); case 81: case 113: - return jjMoveStringLiteralDfa3_1(active0, 0x500000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0xa00000000L, 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 & 0x800000L) != 0L) + return jjStartNfaWithStates_1(2, 23, 14); + else if ((active0 & 0x800000000000L) != 0L) { - jjmatchedKind = 46; + jjmatchedKind = 47; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0xa000000004000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4000000008000000L, active1, 0x1L, active2, 0L); case 83: case 115: - return jjMoveStringLiteralDfa3_1(active0, 0x10013000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x20026000000L, active1, 0L, active2, 0L); case 84: case 116: - if ((active1 & 0x40L) != 0L) + if ((active1 & 0x80L) != 0L) { - jjmatchedKind = 70; + jjmatchedKind = 71; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x4a00000000000L, active1, 0x80L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x9400000000000L, active1, 0x100L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_1(active0, 0x40000000000000L, active1, 0x10L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x80000000000000L, active1, 0x20L, active2, 0L); case 87: case 119: - if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_1(2, 48, 14); + if ((active0 & 0x2000000000000L) != 0L) + return jjStartNfaWithStates_1(2, 49, 14); break; default : break; @@ -837,69 +928,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, 0x100018000000L, active1, 0x40L); case 66: case 98: - return jjMoveStringLiteralDfa4_1(active0, 0x800000000L, active1, 0x10L); + return jjMoveStringLiteralDfa4_1(active0, 0x1000000000L, active1, 0x20L); case 67: case 99: - return jjMoveStringLiteralDfa4_1(active0, 0x200000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x400000L, active1, 0L); case 69: case 101: - if ((active0 & 0x2000000L) != 0L) + if ((active0 & 0x4000000L) != 0L) { - jjmatchedKind = 25; + jjmatchedKind = 26; 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 & 0x20000000000L) != 0L) + return jjStartNfaWithStates_1(3, 41, 14); + else if ((active0 & 0x80000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 55, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x4010400002000000L, active1, 0x102L); case 70: case 102: - return jjMoveStringLiteralDfa4_1(active0, 0x1000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x2000000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa4_1(active0, 0x8800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x1000000000000000L, active1, 0x1L); case 76: case 108: - if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 49, 14); - else if ((active1 & 0x2L) != 0L) + if ((active0 & 0x4000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 50, 14); + else if ((active1 & 0x4L) != 0L) { - jjmatchedKind = 65; + jjmatchedKind = 66; jjmatchedPos = 3; } - else if ((active1 & 0x8L) != 0L) - return jjStartNfaWithStates_1(3, 67, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x100000280000000L, active1, 0x4L); + else if ((active1 & 0x10L) != 0L) + return jjStartNfaWithStates_1(3, 68, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x200000500000000L, active1, 0x8L); case 78: case 110: - return jjMoveStringLiteralDfa4_1(active0, 0x20000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x40000000L, 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 & 0x80000000L) != 0L) + return jjStartNfaWithStates_1(3, 31, 14); + else if ((active0 & 0x1000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 48, 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 & 0x40000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 54, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x900040000200000L, active1, 0L); case 84: case 116: - if ((active0 & 0x10000000L) != 0L) - return jjStartNfaWithStates_1(3, 28, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x10041000000000L, active1, 0L); + if ((active0 & 0x20000000L) != 0L) + return jjStartNfaWithStates_1(3, 29, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x20082000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa4_1(active0, 0x4000500000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x8000a00000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa4_1(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x400000000000000L, active1, 0L); default : break; } @@ -918,74 +1009,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, 0x4000001000000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa5_1(active0, 0x10000000000000L, active1, 0x1L); + return jjMoveStringLiteralDfa5_1(active0, 0x20000000000000L, active1, 0x2L); case 69: case 101: - if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 55, 14); - else if ((active0 & 0x100000000000000L) != 0L) + if ((active0 & 0x100000000000000L) != 0L) return jjStartNfaWithStates_1(4, 56, 14); - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L); + else if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 57, 14); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x8L); case 70: case 102: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 59, 14); + if ((active0 & 0x1000000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 60, 14); break; case 71: case 103: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x80L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x100L); case 72: case 104: - return jjMoveStringLiteralDfa5_1(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa5_1(active0, 0x41501000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x82a02000000L, active1, 0L); case 75: case 107: - if ((active0 & 0x8000000L) != 0L) - return jjStartNfaWithStates_1(4, 27, 14); + if ((active0 & 0x10000000L) != 0L) + return jjStartNfaWithStates_1(4, 28, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x20L); case 78: case 110: - return jjMoveStringLiteralDfa5_1(active0, 0x8000200000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x400000000000L, active1, 0x1L); case 79: case 111: - return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 51, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x4000000000000L, active1, 0L); + if ((active0 & 0x10000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 52, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x8000000000000L, active1, 0L); case 83: case 115: - if ((active0 & 0x100000L) != 0L) - return jjStartNfaWithStates_1(4, 20, 14); + if ((active0 & 0x200000L) != 0L) + return jjStartNfaWithStates_1(4, 21, 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 & 0x40000000L) != 0L) + return jjStartNfaWithStates_1(4, 30, 14); + else if ((active0 & 0x40000000000L) != 0L) + return jjStartNfaWithStates_1(4, 42, 14); + else if ((active1 & 0x40L) != 0L) + return jjStartNfaWithStates_1(4, 70, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x400000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa5_1(active0, 0x80280000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x100500000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L, active1, 0L); case 89: case 121: - if ((active0 & 0x4000000L) != 0L) - return jjStartNfaWithStates_1(4, 26, 14); + if ((active0 & 0x8000000L) != 0L) + return jjStartNfaWithStates_1(4, 27, 14); break; default : break; @@ -1005,57 +1096,57 @@ 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, 0x8L); case 67: case 99: - if ((active0 & 0x1000000000L) != 0L) - return jjStartNfaWithStates_1(5, 36, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x2000000000000000L, active1, 0L); + if ((active0 & 0x2000000000L) != 0L) + return jjStartNfaWithStates_1(5, 37, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x4000000000000000L, active1, 0L); case 68: case 100: - return jjMoveStringLiteralDfa6_1(active0, 0x200280000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x400500000000L, active1, 0L); case 69: case 101: - if ((active1 & 0x10L) != 0L) - return jjStartNfaWithStates_1(5, 68, 14); - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x80L); + if ((active1 & 0x20L) != 0L) + return jjStartNfaWithStates_1(5, 69, 14); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x100L); case 70: case 102: - if ((active0 & 0x1000000L) != 0L) - return jjStartNfaWithStates_1(5, 24, 14); + if ((active0 & 0x2000000L) != 0L) + return jjStartNfaWithStates_1(5, 25, 14); break; case 71: case 103: - if ((active0 & 0x8000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 63, 14); + if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_1(5, 64, 14); break; case 72: case 104: - if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 52, 14); + if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 53, 14); break; case 73: case 105: - return jjMoveStringLiteralDfa6_1(active0, 0x600000000200000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0xc00000000400000L, active1, 0L); case 76: case 108: - if ((active0 & 0x800000000L) != 0L) - return jjStartNfaWithStates_1(5, 35, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x80000000000L, active1, 0L); + if ((active0 & 0x1000000000L) != 0L) + return jjStartNfaWithStates_1(5, 36, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x100000000000L, 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 & 0x8000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 51, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x80000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 60, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x500000000L, active1, 0L); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 61, 14); + return jjMoveStringLiteralDfa6_1(active0, 0xa00000000L, active1, 0L); case 84: case 116: - if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_1(5, 64, 14); + if ((active1 & 0x2L) != 0L) + return jjStartNfaWithStates_1(5, 65, 14); break; default : break; @@ -1075,51 +1166,51 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long { case 69: case 101: - if ((active0 & 0x80000000L) != 0L) + if ((active0 & 0x100000000L) != 0L) { - jjmatchedKind = 31; + jjmatchedKind = 32; jjmatchedPos = 6; } - else if ((active0 & 0x100000000L) != 0L) + else if ((active0 & 0x200000000L) != 0L) { - jjmatchedKind = 32; + jjmatchedKind = 33; jjmatchedPos = 6; } - return jjMoveStringLiteralDfa7_1(active0, 0x600000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0xc00000000L, active1, 0L); case 72: case 104: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 61, 14); + if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 62, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa7_1(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x400000000000000L, active1, 0L); case 78: case 110: - if ((active1 & 0x4L) != 0L) - return jjStartNfaWithStates_1(6, 66, 14); + if ((active1 & 0x8L) != 0L) + return jjStartNfaWithStates_1(6, 67, 14); break; case 79: case 111: - return jjMoveStringLiteralDfa7_1(active0, 0x200000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x400000L, active1, 0L); case 82: case 114: - if ((active1 & 0x80L) != 0L) - return jjStartNfaWithStates_1(6, 71, 14); + if ((active1 & 0x100L) != 0L) + return jjStartNfaWithStates_1(6, 72, 14); break; case 83: case 115: - if ((active0 & 0x200000000000L) != 0L) - return jjStartNfaWithStates_1(6, 45, 14); + if ((active0 & 0x400000000000L) != 0L) + return jjStartNfaWithStates_1(6, 46, 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 & 0x100000000000L) != 0L) + return jjStartNfaWithStates_1(6, 44, 14); + return jjMoveStringLiteralDfa7_1(active0, 0x800000000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa7_1(active0, 0x40000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x80000000000L, active1, 0L); default : break; } @@ -1137,21 +1228,21 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long switch(curChar) { case 95: - return jjMoveStringLiteralDfa8_1(active0, 0x600000000L); + return jjMoveStringLiteralDfa8_1(active0, 0xc00000000L); case 67: case 99: - return jjMoveStringLiteralDfa8_1(active0, 0x400000000000000L); + return jjMoveStringLiteralDfa8_1(active0, 0x800000000000000L); 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 & 0x80000000000L) != 0L) + return jjStartNfaWithStates_1(7, 43, 14); + else if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_1(7, 58, 14); break; case 78: case 110: - if ((active0 & 0x200000L) != 0L) - return jjStartNfaWithStates_1(7, 21, 14); + if ((active0 & 0x400000L) != 0L) + return jjStartNfaWithStates_1(7, 22, 14); break; default : break; @@ -1171,12 +1262,12 @@ static private final int jjMoveStringLiteralDfa8_1(long old0, long active0) { case 72: case 104: - if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_1(8, 58, 14); + if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_1(8, 59, 14); break; case 79: case 111: - return jjMoveStringLiteralDfa9_1(active0, 0x600000000L); + return jjMoveStringLiteralDfa9_1(active0, 0xc00000000L); default : break; } @@ -1195,7 +1286,7 @@ static private final int jjMoveStringLiteralDfa9_1(long old0, long active0) { case 78: case 110: - return jjMoveStringLiteralDfa10_1(active0, 0x600000000L); + return jjMoveStringLiteralDfa10_1(active0, 0xc00000000L); default : break; } @@ -1214,7 +1305,7 @@ static private final int jjMoveStringLiteralDfa10_1(long old0, long active0) { case 67: case 99: - return jjMoveStringLiteralDfa11_1(active0, 0x600000000L); + return jjMoveStringLiteralDfa11_1(active0, 0xc00000000L); default : break; } @@ -1233,10 +1324,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) + if ((active0 & 0x400000000L) != 0L) return jjStartNfaWithStates_1(11, 34, 14); + else if ((active0 & 0x800000000L) != 0L) + return jjStartNfaWithStates_1(11, 35, 14); break; default : break; @@ -1250,7 +1341,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) { int[] nextStates; int startsAt = 0; - jjnewStateCnt = 70; + jjnewStateCnt = 64; int i = 1; jjstateSet[0] = startState; int j, kind = 0x7fffffff; @@ -1271,7 +1362,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) else if (curChar == 39) jjCheckNAddStates(7, 12); else if (curChar == 34) - jjCheckNAddStates(13, 20); + jjCheckNAddStates(13, 18); else if (curChar == 36) jjstateSet[jjnewStateCnt++] = 16; else if (curChar == 46) @@ -1280,15 +1371,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 2; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 74) - kind = 74; + if (kind > 96) + kind = 96; jjCheckNAddTwoStates(5, 6); } else if (curChar == 48) { - if (kind > 74) - kind = 74; - jjCheckNAddStates(21, 23); + if (kind > 96) + kind = 96; + jjCheckNAddStates(19, 21); } break; case 0: @@ -1306,15 +1397,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 > 96) + kind = 96; jjCheckNAddTwoStates(5, 6); break; case 5: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 96) + kind = 96; jjCheckNAddTwoStates(5, 6); break; case 7: @@ -1324,9 +1415,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 > 100) + kind = 100; + jjCheckNAddStates(22, 24); break; case 10: if ((0x280000000000L & l) != 0L) @@ -1335,15 +1426,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; + if (kind > 100) + kind = 100; jjCheckNAddTwoStates(11, 12); break; case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 84) - kind = 84; + if (kind > 106) + kind = 106; jjstateSet[jjnewStateCnt++] = 14; break; case 15: @@ -1353,8 +1444,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 140) - kind = 140; + if (kind > 141) + kind = 141; jjstateSet[jjnewStateCnt++] = 17; break; case 18: @@ -1368,16 +1459,16 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 20: if (curChar != 46) break; - if (kind > 78) - kind = 78; - jjCheckNAddStates(27, 29); + if (kind > 100) + kind = 100; + jjCheckNAddStates(25, 27); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; - jjCheckNAddStates(27, 29); + if (kind > 100) + kind = 100; + jjCheckNAddStates(25, 27); break; case 23: if ((0x280000000000L & l) != 0L) @@ -1386,8 +1477,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 24: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; + if (kind > 100) + kind = 100; jjCheckNAddTwoStates(24, 12); break; case 25: @@ -1401,13 +1492,13 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 28: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; + if (kind > 100) + kind = 100; jjCheckNAddTwoStates(28, 12); break; case 29: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(30, 32); + jjCheckNAddStates(28, 30); break; case 31: if ((0x280000000000L & l) != 0L) @@ -1420,91 +1511,85 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 33: if (curChar != 48) break; - if (kind > 74) - kind = 74; - jjCheckNAddStates(21, 23); + if (kind > 96) + kind = 96; + jjCheckNAddStates(19, 21); break; case 35: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 96) + kind = 96; jjCheckNAddTwoStates(35, 6); break; case 36: if ((0xff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 96) + kind = 96; jjCheckNAddTwoStates(36, 6); break; case 37: if (curChar == 34) - jjCheckNAddStates(13, 20); + jjCheckNAddStates(13, 18); break; case 38: - jjCheckNAddStates(33, 36); + if ((0xfffffffbffffffffL & l) != 0L) + jjCheckNAddStates(31, 33); break; case 39: if (curChar == 34) - jjCheckNAddStates(33, 36); + jjCheckNAddStates(31, 33); + break; + case 41: + if (curChar == 34 && kind > 102) + kind = 102; break; case 42: if ((0xfffffffbffffffffL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 43; + jjCheckNAddStates(34, 36); break; - case 44: - if (curChar == 34 && kind > 80) - kind = 80; + case 43: + if (curChar == 34) + jjCheckNAddStates(34, 36); break; case 45: - jjCheckNAddStates(37, 40); + if (curChar == 34 && kind > 103) + kind = 103; break; case 46: - if (curChar == 34) - jjCheckNAddStates(37, 40); - break; - case 49: - if ((0xfffffffbffffffffL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 50; - break; - case 51: - if (curChar == 34 && kind > 81) - kind = 81; - break; - case 52: if (curChar == 39) jjCheckNAddStates(7, 12); break; - case 53: + case 47: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(41, 43); + jjCheckNAddStates(37, 39); break; - case 54: + case 48: if (curChar == 39) - jjCheckNAddStates(41, 43); + jjCheckNAddStates(37, 39); break; - case 56: - if (curChar == 39 && kind > 80) - kind = 80; + case 50: + if (curChar == 39 && kind > 102) + kind = 102; break; - case 57: + case 51: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(44, 46); + jjCheckNAddStates(40, 42); break; - case 58: + case 52: if (curChar == 39) - jjCheckNAddStates(44, 46); + jjCheckNAddStates(40, 42); break; - case 60: - if (curChar == 39 && kind > 82) - kind = 82; + case 54: + if (curChar == 39 && kind > 104) + kind = 104; break; - case 62: - jjAddStates(47, 49); + case 56: + jjAddStates(43, 45); break; - case 66: - jjAddStates(50, 52); + case 60: + jjAddStates(46, 48); break; default : break; } @@ -1520,56 +1605,56 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 3: if ((0x87fffffe87fffffeL & l) != 0L) { - if (kind > 84) - kind = 84; + if (kind > 106) + kind = 106; jjCheckNAdd(14); } else if (curChar == 96) - jjCheckNAddStates(53, 58); + jjCheckNAddStates(49, 54); break; case 1: if (kind > 13) kind = 13; break; case 6: - if ((0x100000001000L & l) != 0L && kind > 74) - kind = 74; + if ((0x100000001000L & l) != 0L && kind > 96) + kind = 96; 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 > 100) + kind = 100; break; case 13: case 14: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 84) - kind = 84; + if (kind > 106) + kind = 106; jjCheckNAdd(14); break; case 16: case 17: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 140) - kind = 140; + if (kind > 141) + kind = 141; jjCheckNAdd(17); break; case 22: if ((0x2000000020L & l) != 0L) - jjAddStates(61, 62); + jjAddStates(57, 58); break; case 26: if ((0x2000000020L & l) != 0L) - jjAddStates(63, 64); + jjAddStates(59, 60); break; case 30: if ((0x2000000020L & l) != 0L) - jjAddStates(65, 66); + jjAddStates(61, 62); break; case 34: if ((0x100000001000000L & l) != 0L) @@ -1578,95 +1663,73 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 35: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 96) + kind = 96; jjCheckNAddTwoStates(35, 6); break; case 38: - jjCheckNAddStates(33, 36); + jjAddStates(31, 33); break; case 40: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 39; break; - case 41: - if (curChar == 123) - jjstateSet[jjnewStateCnt++] = 42; - break; case 42: - jjstateSet[jjnewStateCnt++] = 43; - break; - case 43: - if (curChar == 125) - jjCheckNAddStates(33, 36); - break; - case 45: - jjCheckNAddStates(37, 40); + jjAddStates(34, 36); break; - case 47: + case 44: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 46; + jjstateSet[jjnewStateCnt++] = 43; break; - case 48: - if (curChar == 123) - jjstateSet[jjnewStateCnt++] = 49; + case 47: + jjAddStates(37, 39); 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; + jjstateSet[jjnewStateCnt++] = 48; break; - case 57: - jjAddStates(44, 46); + case 51: + jjAddStates(40, 42); break; - case 59: + case 53: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 58; + jjstateSet[jjnewStateCnt++] = 52; break; - case 61: + case 55: if (curChar == 96) - jjCheckNAddStates(53, 58); + jjCheckNAddStates(49, 54); break; - case 62: + case 56: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(47, 49); + jjCheckNAddStates(43, 45); break; - case 63: + case 57: if (curChar == 96) - jjCheckNAddStates(47, 49); + jjCheckNAddStates(43, 45); break; - case 64: + case 58: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 63; + jjstateSet[jjnewStateCnt++] = 57; break; - case 65: - if (curChar == 96 && kind > 80) - kind = 80; + case 59: + if (curChar == 96 && kind > 102) + kind = 102; break; - case 66: + case 60: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(50, 52); + jjCheckNAddStates(46, 48); break; - case 67: + case 61: if (curChar == 96) - jjCheckNAddStates(50, 52); + jjCheckNAddStates(46, 48); break; - case 68: + case 62: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 67; + jjstateSet[jjnewStateCnt++] = 61; break; - case 69: - if (curChar == 96 && kind > 83) - kind = 83; + case 63: + if (curChar == 96 && kind > 105) + kind = 105; break; default : break; } @@ -1684,8 +1747,8 @@ 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 > 106) + kind = 106; jjCheckNAdd(14); break; case 1: @@ -1696,41 +1759,33 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 140) - kind = 140; + if (kind > 141) + kind = 141; jjCheckNAdd(17); break; case 38: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(33, 36); + jjAddStates(31, 33); break; case 42: if ((jjbitVec0[i2] & l2) != 0L) - jjstateSet[jjnewStateCnt++] = 43; - break; - case 45: - if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(37, 40); + jjAddStates(34, 36); break; - case 49: - if ((jjbitVec0[i2] & l2) != 0L) - jjstateSet[jjnewStateCnt++] = 50; - break; - case 53: + case 47: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(41, 43); + jjAddStates(37, 39); break; - case 57: + case 51: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(44, 46); + jjAddStates(40, 42); break; - case 62: + case 56: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(47, 49); + jjAddStates(43, 45); break; - case 66: + case 60: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(50, 52); + jjAddStates(46, 48); break; default : break; } @@ -1743,7 +1798,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 70 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 64 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -1754,6 +1809,9 @@ static private final int jjMoveStringLiteralDfa0_3() switch(curChar) { case 42: + return jjMoveStringLiteralDfa1_3(0x40000L); + case 84: + case 116: return jjMoveStringLiteralDfa1_3(0x20000L); default : return 1; @@ -1768,34 +1826,73 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) switch(curChar) { case 47: - if ((active0 & 0x20000L) != 0L) - return jjStopAtPos(1, 17); + if ((active0 & 0x40000L) != 0L) + return jjStopAtPos(1, 18); break; + case 79: + case 111: + return jjMoveStringLiteralDfa2_3(active0, 0x20000L); default : return 2; } return 2; } +static private final int jjMoveStringLiteralDfa2_3(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_3(active0, 0x20000L); + default : + return 3; + } +} +static private final int jjMoveStringLiteralDfa3_3(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 & 0x20000L) != 0L) + return jjStopAtPos(3, 17); + break; + default : + return 4; + } + return 4; +} 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, + 19, 20, 25, 26, 29, 30, 12, 47, 49, 50, 51, 53, 54, 38, 40, 41, + 42, 44, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, + 40, 41, 42, 44, 45, 47, 49, 50, 51, 53, 54, 56, 58, 59, 60, 62, + 63, 56, 58, 59, 60, 62, 63, 10, 11, 23, 24, 27, 28, 31, 32, }; 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, +"\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, 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", +null, null, null, null, null, null, null, null, "\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", 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", "\74\74\75", "\76\76\75", null, }; public static final String[] lexStateNames = { "DEFAULT", @@ -1805,28 +1902,28 @@ public static final String[] lexStateNames = { "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, 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, -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, }; static final long[] jjtoToken = { - 0xfffffffffff0001fL, 0xffffffffff1f47ffL, 0x1fffL, + 0xffffffffffe0001fL, 0xffffc7d1ffffffffL, 0x3fffL, }; static final long[] jjtoSkip = { - 0x7ffe0L, 0x0L, 0x0L, + 0xfffe0L, 0x0L, 0x0L, }; static final long[] jjtoSpecial = { - 0x7f800L, 0x0L, 0x0L, + 0xff800L, 0x0L, 0x0L, }; static final long[] jjtoMore = { - 0x80000L, 0x0L, 0x0L, + 0x100000L, 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[64]; +static private final int[] jjstateSet = new int[128]; static StringBuffer image; static int jjimageLen; static int lengthOfMatch; @@ -1853,7 +1950,7 @@ static private final void ReInitRounds() { int i; jjround = 0x80000001; - for (i = 70; i-- > 0;) + for (i = 64; i-- > 0;) jjrounds[i] = 0x80000000; } static public void ReInit(SimpleCharStream stream, int lexState) @@ -1940,27 +2037,27 @@ public static Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_2(); - if (jjmatchedPos == 0 && jjmatchedKind > 19) + if (jjmatchedPos == 0 && jjmatchedKind > 20) { - jjmatchedKind = 19; + jjmatchedKind = 20; } break; case 3: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_3(); - if (jjmatchedPos == 0 && jjmatchedKind > 19) + if (jjmatchedPos == 0 && jjmatchedKind > 20) { - jjmatchedKind = 19; + jjmatchedKind = 20; } break; case 4: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_4(); - if (jjmatchedPos == 0 && jjmatchedKind > 19) + if (jjmatchedPos == 0 && jjmatchedKind > 20) { - jjmatchedKind = 19; + jjmatchedKind = 20; } break; } @@ -1972,6 +2069,7 @@ public static Token getNextToken() { matchedToken = jjFillToken(); matchedToken.specialToken = specialToken; + TokenLexicalActions(matchedToken); if (jjnewLexState[jjmatchedKind] != -1) curLexState = jjnewLexState[jjmatchedKind]; return matchedToken; @@ -2042,8 +2140,51 @@ static void SkipLexicalActions(Token matchedToken) image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); input_stream.backup(1); break; + case 17 : + if (image == null) + image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); + else + image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); + PHPParser.createNewTask(); + break; default : break; } } +static void TokenLexicalActions(Token matchedToken) +{ + switch(jjmatchedKind) + { + case 1 : + if (image == null) + image = new StringBuffer(jjstrLiteralImages[1]); + else + image.append(jjstrLiteralImages[1]); + PHPParser.createNewHTMLCode(); + break; + case 2 : + if (image == null) + image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); + else + image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); + PHPParser.createNewHTMLCode(); + break; + case 3 : + if (image == null) + image = new StringBuffer(jjstrLiteralImages[3]); + else + image.append(jjstrLiteralImages[3]); + PHPParser.createNewHTMLCode(); + break; + case 4 : + if (image == null) + image = new StringBuffer(jjstrLiteralImages[4]); + else + image.append(jjstrLiteralImages[4]); + PHPParser.htmlStart = SimpleCharStream.getPosition(); + break; + default : + break; + } +} }