From: Finn B. <bc...@us...> - 2001-04-25 18:56:21
|
Update of /cvsroot/jython/jython/org/python/parser In directory usw-pr-cvs1:/tmp/cvs-serv30119 Modified Files: PythonGrammar.java PythonGrammarConstants.java PythonGrammarTokenManager.java Log Message: Committing generated files for bug #410794. Index: PythonGrammar.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammar.java,v retrieving revision 2.11 retrieving revision 2.12 diff -C2 -r2.11 -r2.12 *** PythonGrammar.java 2000/12/12 21:23:17 2.11 --- PythonGrammar.java 2001/04/25 18:56:18 2.12 *************** *** 55,59 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: simple_stmt(); break; --- 55,59 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: simple_stmt(); break; *************** *** 147,151 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: ; break; --- 147,151 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: ; break; *************** *** 194,198 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: stmt(); break; --- 194,198 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: stmt(); break; *************** *** 644,648 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: simple_stmt(); break; --- 644,648 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: simple_stmt(); break; *************** *** 707,711 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: expr_stmt(); break; --- 707,711 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: expr_stmt(); break; *************** *** 1349,1353 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: SmartTestList(); break; --- 1349,1353 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: SmartTestList(); break; *************** *** 1406,1410 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: test(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { --- 1406,1410 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: test(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { *************** *** 2134,2138 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: test(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { --- 2134,2138 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: test(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { *************** *** 2211,2215 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: simple_stmt(); break; --- 2211,2215 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: simple_stmt(); break; *************** *** 2257,2261 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: ; break; --- 2257,2261 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: ; break; *************** *** 2317,2321 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: and_test(); label_16: --- 2317,2321 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: and_test(); label_16: *************** *** 2456,2460 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: comparison(); break; --- 2456,2460 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: comparison(); break; *************** *** 3194,3198 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: power(); break; --- 3194,3198 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: power(); break; *************** *** 3394,3398 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: SmartTestList(); break; --- 3394,3398 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: SmartTestList(); break; *************** *** 3429,3433 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: listmaker(); break; --- 3429,3433 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: listmaker(); break; *************** *** 3484,3488 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: dictmaker(); break; --- 3484,3488 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: dictmaker(); break; *************** *** 3513,3518 **** } break; ! case 113: ! jj_consume_token(113); SmartTestList(); SimpleNode jjtn004 = new SimpleNode(JJTSTR_1OP); --- 3513,3518 ---- } break; ! case 112: ! jj_consume_token(112); SmartTestList(); SimpleNode jjtn004 = new SimpleNode(JJTSTR_1OP); *************** *** 3521,3525 **** jjtreeOpenNodeScope(jjtn004); try { ! jj_consume_token(113); } finally { if (jjtc004) { --- 3521,3525 ---- jjtreeOpenNodeScope(jjtn004); try { ! jj_consume_token(112); } finally { if (jjtc004) { *************** *** 3723,3727 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: SimpleNode jjtn002 = new SimpleNode(JJTSLICE); boolean jjtc002 = true; --- 3723,3727 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: SimpleNode jjtn002 = new SimpleNode(JJTSLICE); boolean jjtc002 = true; *************** *** 3816,3820 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: test(); break; --- 3816,3820 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: test(); break; *************** *** 3845,3849 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: test(); break; --- 3845,3849 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: test(); break; *************** *** 4308,4312 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: normalargs(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { --- 4308,4312 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 112: normalargs(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { *************** *** 5700,5704 **** final private boolean jj_3R_139() { ! if (jj_scan_token(113)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; --- 5700,5704 ---- final private boolean jj_3R_139() { ! if (jj_scan_token(112)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; *************** *** 6612,6616 **** final private int[] jj_la1_1 = {0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x90000008,0x0,0x90000008,0x80,0x3ff8000,0x0,0x0,0x0,0x0,0x0,0x90000008,0x0,0x0,0x90000008,0x0,0x0,0x0,0xfc000000,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x4000000,0x90000008,0x8000000,0x10000008,0x70007f00,0x50007f00,0x20000000,0x20,0x10,0x40,0x3,0x3,0x0,0x0,0x4,0x4,0x8,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfc000008,0x0,0x0,0x0,0x0,0xfc000000,}; final private int[] jj_la1_2 = {0x1efffdb9,0x1efffdb9,0x1efffdb9,0x0,0xc00000,0x0,0x0,0x0,0xc00000,0x0,0x0,0xc00000,0x0,0x1efffdb9,0x0,0x1efffc00,0x0,0x0,0x0,0x0,0x0,0x400,0x47000,0x1ec00000,0x0,0x0,0x1ec00000,0x18000,0x0,0x0,0xffffff,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x1b9,0x4,0x2,0x2,0x2,0x40,0x2,0x240,0x0,0x1ec00000,0x1efffdb9,0x1efffc00,0x0,0x1ec00000,0x0,0x1ec00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1ec00000,0x0,0x0,0x0,0x1ec00000,0x1ec00000,0x1ec00000,0x0,0x1ec00000,0xc00000,0x0,0x0,0x1ec00000,0x1ec00000,0x1ec00000,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x11,0x11,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1effffff,0x0,0x1e000000,0xc00000,0x0,0xffffff,}; ! final private int[] jj_la1_3 = {0x20078,0x20078,0x20078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20078,0x0,0x20078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20078,0x0,0x0,0x20078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20078,0x20078,0x20078,0x0,0x20078,0x0,0x20078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20078,0x0,0x0,0x0,0x20078,0x20078,0x20078,0x78,0x20078,0x0,0x0,0x0,0x20078,0x20078,0x20078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20078,0x0,0x0,0x0,0x78,0x0,}; final private JJCalls[] jj_2_rtns = new JJCalls[24]; private boolean jj_rescan = false; --- 6612,6616 ---- final private int[] jj_la1_1 = {0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x90000008,0x0,0x90000008,0x80,0x3ff8000,0x0,0x0,0x0,0x0,0x0,0x90000008,0x0,0x0,0x90000008,0x0,0x0,0x0,0xfc000000,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x4000000,0x90000008,0x8000000,0x10000008,0x70007f00,0x50007f00,0x20000000,0x20,0x10,0x40,0x3,0x3,0x0,0x0,0x4,0x4,0x8,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x90000008,0x90000008,0x90000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfc000008,0x0,0x0,0x0,0x0,0xfc000000,}; final private int[] jj_la1_2 = {0x1efffdb9,0x1efffdb9,0x1efffdb9,0x0,0xc00000,0x0,0x0,0x0,0xc00000,0x0,0x0,0xc00000,0x0,0x1efffdb9,0x0,0x1efffc00,0x0,0x0,0x0,0x0,0x0,0x400,0x47000,0x1ec00000,0x0,0x0,0x1ec00000,0x18000,0x0,0x0,0xffffff,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x1b9,0x4,0x2,0x2,0x2,0x40,0x2,0x240,0x0,0x1ec00000,0x1efffdb9,0x1efffc00,0x0,0x1ec00000,0x0,0x1ec00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1ec00000,0x0,0x0,0x0,0x1ec00000,0x1ec00000,0x1ec00000,0x0,0x1ec00000,0xc00000,0x0,0x0,0x1ec00000,0x1ec00000,0x1ec00000,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x11,0x11,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1effffff,0x0,0x1e000000,0xc00000,0x0,0xffffff,}; ! final private int[] jj_la1_3 = {0x10078,0x10078,0x10078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10078,0x0,0x10078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10078,0x0,0x0,0x10078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10078,0x10078,0x10078,0x0,0x10078,0x0,0x10078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10078,0x0,0x0,0x0,0x10078,0x10078,0x10078,0x78,0x10078,0x0,0x0,0x0,0x10078,0x10078,0x10078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10078,0x0,0x0,0x0,0x78,0x0,}; final private JJCalls[] jj_2_rtns = new JJCalls[24]; private boolean jj_rescan = false; *************** *** 6781,6786 **** final public ParseException generateParseException() { jj_expentries.removeAllElements(); ! boolean[] la1tokens = new boolean[114]; ! for (int i = 0; i < 114; i++) { la1tokens[i] = false; } --- 6781,6786 ---- final public ParseException generateParseException() { jj_expentries.removeAllElements(); ! boolean[] la1tokens = new boolean[113]; ! for (int i = 0; i < 113; i++) { la1tokens[i] = false; } *************** *** 6807,6811 **** } } ! for (int i = 0; i < 114; i++) { if (la1tokens[i]) { jj_expentry = new int[1]; --- 6807,6811 ---- } } ! for (int i = 0; i < 113; i++) { if (la1tokens[i]) { jj_expentry = new int[1]; Index: PythonGrammarConstants.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarConstants.java,v retrieving revision 2.5 retrieving revision 2.6 diff -C2 -r2.5 -r2.6 *** PythonGrammarConstants.java 2000/12/12 21:16:12 2.5 --- PythonGrammarConstants.java 2001/04/25 18:56:18 2.6 *************** *** 218,227 **** "<token of kind 105>", "<token of kind 106>", - "\"\\\\\\\'\\\'\\\'\"", - "\"\\\\\\\"\\\"\\\"\"", "\"\\r\\n\"", "\"\\n\"", "\"\\r\"", ! "<token of kind 112>", "\"`\"", }; --- 218,226 ---- "<token of kind 105>", "<token of kind 106>", "\"\\r\\n\"", "\"\\n\"", "\"\\r\"", ! "<token of kind 110>", ! "<token of kind 111>", "\"`\"", }; Index: PythonGrammarTokenManager.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarTokenManager.java,v retrieving revision 2.9 retrieving revision 2.10 diff -C2 -r2.9 -r2.10 *** PythonGrammarTokenManager.java 2000/12/12 21:16:12 2.9 --- PythonGrammarTokenManager.java 2001/04/25 18:56:18 2.10 *************** *** 52,78 **** { case 0: ! if ((active1 & 0x104000000000L) != 0L) { ! jjmatchedKind = 112; return -1; } return -1; case 1: ! if ((active1 & 0x104000000000L) != 0L) ! { ! if (jjmatchedPos == 0) ! { ! jjmatchedKind = 112; ! jjmatchedPos = 0; ! } ! return -1; ! } ! return -1; ! case 2: ! if ((active1 & 0x104000000000L) != 0L) { if (jjmatchedPos == 0) { ! jjmatchedKind = 112; jjmatchedPos = 0; } --- 52,67 ---- { case 0: ! if ((active1 & 0x4000000000L) != 0L) { ! jjmatchedKind = 110; return -1; } return -1; case 1: ! if ((active1 & 0x4000000000L) != 0L) { if (jjmatchedPos == 0) { ! jjmatchedKind = 110; jjmatchedPos = 0; } *************** *** 107,118 **** { case 10: ! return jjStopAtPos(0, 110); case 13: ! jjmatchedKind = 111; ! return jjMoveStringLiteralDfa1_10(0x200000000000L); case 34: return jjMoveStringLiteralDfa1_10(0x4000000000L); - case 92: - return jjMoveStringLiteralDfa1_10(0x100000000000L); default : return jjMoveNfa_10(0, 0); --- 96,105 ---- { case 10: ! return jjStopAtPos(0, 108); case 13: ! jjmatchedKind = 109; ! return jjMoveStringLiteralDfa1_10(0x80000000000L); case 34: return jjMoveStringLiteralDfa1_10(0x4000000000L); default : return jjMoveNfa_10(0, 0); *************** *** 129,137 **** { case 10: ! if ((active1 & 0x200000000000L) != 0L) ! return jjStopAtPos(1, 109); break; case 34: ! return jjMoveStringLiteralDfa2_10(active1, 0x104000000000L); default : break; --- 116,124 ---- { case 10: ! if ((active1 & 0x80000000000L) != 0L) ! return jjStopAtPos(1, 107); break; case 34: ! return jjMoveStringLiteralDfa2_10(active1, 0x4000000000L); default : break; *************** *** 153,181 **** if ((active1 & 0x4000000000L) != 0L) return jjStopAtPos(2, 102); - return jjMoveStringLiteralDfa3_10(active1, 0x100000000000L); - default : break; - } - return jjStartNfa_10(1, 0L, active1); - } - private final int jjMoveStringLiteralDfa3_10(long old1, long active1) - { - if (((active1 &= old1)) == 0L) - return jjStartNfa_10(1, 0L, old1); - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { - jjStopStringLiteralDfa_10(2, 0L, active1); - return 3; - } - switch(curChar) - { - case 34: - if ((active1 & 0x100000000000L) != 0L) - return jjStopAtPos(3, 108); - break; default : break; } ! return jjStartNfa_10(2, 0L, active1); } private final void jjCheckNAdd(int state) --- 140,148 ---- if ((active1 & 0x4000000000L) != 0L) return jjStopAtPos(2, 102); break; default : break; } ! return jjStartNfa_10(1, 0L, active1); } private final void jjCheckNAdd(int state) *************** *** 216,220 **** int[] nextStates; int startsAt = 0; ! jjnewStateCnt = 1; int i = 1; jjstateSet[0] = startState; --- 183,187 ---- int[] nextStates; int startsAt = 0; ! jjnewStateCnt = 3; int i = 1; jjstateSet[0] = startState; *************** *** 232,237 **** { case 0: ! if ((0xffffffffffffdbffL & l) != 0L) ! kind = 112; break; default : break; --- 199,208 ---- { case 0: ! if ((0xffffffffffffdbffL & l) != 0L && kind > 110) ! kind = 110; ! break; ! case 2: ! if ((0xffffffffffffdbffL & l) != 0L && kind > 111) ! kind = 111; break; default : break; *************** *** 247,252 **** { case 0: ! kind = 112; break; default : break; } --- 218,234 ---- { case 0: ! if (kind > 110) ! kind = 110; ! if (curChar == 92) ! jjstateSet[jjnewStateCnt++] = 2; break; + case 1: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 2; + break; + case 2: + if (kind > 111) + kind = 111; + break; default : break; } *************** *** 262,267 **** { case 0: ! if ((jjbitVec0[i2] & l2) != 0L && kind > 112) ! kind = 112; break; default : break; --- 244,253 ---- { case 0: ! if ((jjbitVec0[i2] & l2) != 0L && kind > 110) ! kind = 110; ! break; ! case 2: ! if ((jjbitVec0[i2] & l2) != 0L && kind > 111) ! kind = 111; break; default : break; *************** *** 276,280 **** } ++curPos; ! if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } --- 262,266 ---- } ++curPos; ! if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } *************** *** 724,750 **** { case 0: ! if ((active1 & 0x82000000000L) != 0L) { ! jjmatchedKind = 112; return -1; } return -1; case 1: ! if ((active1 & 0x82000000000L) != 0L) ! { ! if (jjmatchedPos == 0) ! { ! jjmatchedKind = 112; ! jjmatchedPos = 0; ! } ! return -1; ! } ! return -1; ! case 2: ! if ((active1 & 0x82000000000L) != 0L) { if (jjmatchedPos == 0) { ! jjmatchedKind = 112; jjmatchedPos = 0; } --- 710,725 ---- { case 0: ! if ((active1 & 0x2000000000L) != 0L) { ! jjmatchedKind = 110; return -1; } return -1; case 1: ! if ((active1 & 0x2000000000L) != 0L) { if (jjmatchedPos == 0) { ! jjmatchedKind = 110; jjmatchedPos = 0; } *************** *** 773,784 **** { case 10: ! return jjStopAtPos(0, 110); case 13: ! jjmatchedKind = 111; ! return jjMoveStringLiteralDfa1_9(0x200000000000L); case 39: return jjMoveStringLiteralDfa1_9(0x2000000000L); - case 92: - return jjMoveStringLiteralDfa1_9(0x80000000000L); default : return jjMoveNfa_9(0, 0); --- 748,757 ---- { case 10: ! return jjStopAtPos(0, 108); case 13: ! jjmatchedKind = 109; ! return jjMoveStringLiteralDfa1_9(0x80000000000L); case 39: return jjMoveStringLiteralDfa1_9(0x2000000000L); default : return jjMoveNfa_9(0, 0); *************** *** 795,803 **** { case 10: ! if ((active1 & 0x200000000000L) != 0L) ! return jjStopAtPos(1, 109); break; case 39: ! return jjMoveStringLiteralDfa2_9(active1, 0x82000000000L); default : break; --- 768,776 ---- { case 10: ! if ((active1 & 0x80000000000L) != 0L) ! return jjStopAtPos(1, 107); break; case 39: ! return jjMoveStringLiteralDfa2_9(active1, 0x2000000000L); default : break; *************** *** 819,847 **** if ((active1 & 0x2000000000L) != 0L) return jjStopAtPos(2, 101); - return jjMoveStringLiteralDfa3_9(active1, 0x80000000000L); - default : - break; - } - return jjStartNfa_9(1, 0L, active1); - } - private final int jjMoveStringLiteralDfa3_9(long old1, long active1) - { - if (((active1 &= old1)) == 0L) - return jjStartNfa_9(1, 0L, old1); - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { - jjStopStringLiteralDfa_9(2, 0L, active1); - return 3; - } - switch(curChar) - { - case 39: - if ((active1 & 0x80000000000L) != 0L) - return jjStopAtPos(3, 107); break; default : break; } ! return jjStartNfa_9(2, 0L, active1); } private final int jjMoveNfa_9(int startState, int curPos) --- 792,800 ---- if ((active1 & 0x2000000000L) != 0L) return jjStopAtPos(2, 101); break; default : break; } ! return jjStartNfa_9(1, 0L, active1); } private final int jjMoveNfa_9(int startState, int curPos) *************** *** 849,853 **** int[] nextStates; int startsAt = 0; ! jjnewStateCnt = 1; int i = 1; jjstateSet[0] = startState; --- 802,806 ---- int[] nextStates; int startsAt = 0; ! jjnewStateCnt = 3; int i = 1; jjstateSet[0] = startState; *************** *** 865,871 **** { case 0: ! if ((0xffffffffffffdbffL & l) != 0L) ! kind = 112; break; default : break; } --- 818,828 ---- { case 0: ! if ((0xffffffffffffdbffL & l) != 0L && kind > 110) ! kind = 110; break; + case 2: + if ((0xffffffffffffdbffL & l) != 0L && kind > 111) + kind = 111; + break; default : break; } *************** *** 880,885 **** { case 0: ! kind = 112; break; default : break; } --- 837,853 ---- { case 0: ! if (kind > 110) ! kind = 110; ! if (curChar == 92) ! jjstateSet[jjnewStateCnt++] = 2; break; + case 1: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 2; + break; + case 2: + if (kind > 111) + kind = 111; + break; default : break; } *************** *** 895,901 **** { case 0: ! if ((jjbitVec0[i2] & l2) != 0L && kind > 112) ! kind = 112; break; default : break; } --- 863,873 ---- { case 0: ! if ((jjbitVec0[i2] & l2) != 0L && kind > 110) ! kind = 110; break; + case 2: + if ((jjbitVec0[i2] & l2) != 0L && kind > 111) + kind = 111; + break; default : break; } *************** *** 909,913 **** } ++curPos; ! if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } --- 881,885 ---- } ++curPos; ! if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } *************** *** 1206,1210 **** return jjMoveStringLiteralDfa1_0(0x40000000000000L, 0x0L); case 96: ! return jjStopAtPos(0, 113); case 97: return jjMoveStringLiteralDfa1_0(0x800000000000000L, 0x600000L); --- 1178,1182 ---- return jjMoveStringLiteralDfa1_0(0x40000000000000L, 0x0L); case 96: ! return jjStopAtPos(0, 112); case 97: return jjMoveStringLiteralDfa1_0(0x800000000000000L, 0x600000L); *************** *** 2414,2418 **** "\147\154\157\142\141\154", "\145\170\145\143", "\141\163\163\145\162\164", "\141\163", 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, "\140", }; public static final String[] lexStateNames = { "DEFAULT", --- 2386,2390 ---- "\147\154\157\142\141\154", "\145\170\145\143", "\141\163\163\145\162\164", "\141\163", 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, "\140", }; public static final String[] lexStateNames = { "DEFAULT", *************** *** 2433,2440 **** -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 7, 8, 9, 10, 0, ! 0, 0, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }; static final long[] jjtoToken = { ! 0xfffffffffffec1c1L, 0x200781effffffL, }; static final long[] jjtoSkip = { --- 2405,2412 ---- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 7, 8, 9, 10, 0, ! 0, 0, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }; static final long[] jjtoToken = { ! 0xfffffffffffec1c1L, 0x100781effffffL, }; static final long[] jjtoSkip = { *************** *** 2445,2449 **** }; static final long[] jjtoMore = { ! 0x0L, 0x1ff8780000000L, }; private ASCII_CharStream input_stream; --- 2417,2421 ---- }; static final long[] jjtoMore = { ! 0x0L, 0xff8780000000L, }; private ASCII_CharStream input_stream; *************** *** 2786,2790 **** image.setLength(image.length()-2); break; ! case 109 : if (image == null) image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen))); --- 2758,2762 ---- image.setLength(image.length()-2); break; ! case 107 : if (image == null) image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen))); *************** *** 2796,2800 **** image.setCharAt(l-2, '\n'); break; ! case 111 : if (image == null) image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen))); --- 2768,2772 ---- image.setCharAt(l-2, '\n'); break; ! case 109 : if (image == null) image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen))); |