From: Finn B. <bc...@us...> - 2001-07-21 09:16:15
|
Update of /cvsroot/jython/jython/org/python/parser In directory usw-pr-cvs1:/tmp/cvs-serv498 Modified Files: PythonGrammarTokenManager.java Log Message: Commit generated files. Index: PythonGrammarTokenManager.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarTokenManager.java,v retrieving revision 2.11 retrieving revision 2.12 diff -C2 -r2.11 -r2.12 *** PythonGrammarTokenManager.java 2001/07/20 13:43:03 2.11 --- PythonGrammarTokenManager.java 2001/07/21 09:16:12 2.12 *************** *** 177,180 **** --- 177,183 ---- } static final long[] jjbitVec0 = { + 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL + }; + static final long[] jjbitVec2 = { 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL }; *************** *** 237,240 **** --- 240,246 ---- else { + int hiByte = (int)(curChar >> 8); + int i1 = hiByte >> 6; + long l1 = 1L << (hiByte & 077); int i2 = (curChar & 0xff) >> 6; long l2 = 1L << (curChar & 077); *************** *** 244,252 **** { case 0: ! if ((jjbitVec0[i2] & l2) != 0L && kind > 110) kind = 110; break; case 2: ! if ((jjbitVec0[i2] & l2) != 0L && kind > 111) kind = 111; break; --- 250,258 ---- { case 0: ! if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 110) kind = 110; break; case 2: ! if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 111) kind = 111; break; *************** *** 421,424 **** --- 427,433 ---- else { + int hiByte = (int)(curChar >> 8); + int i1 = hiByte >> 6; + long l1 = 1L << (hiByte & 077); int i2 = (curChar & 0xff) >> 6; long l2 = 1L << (curChar & 077); *************** *** 428,432 **** { case 0: ! if ((jjbitVec0[i2] & l2) != 0L && kind > 106) kind = 106; break; --- 437,441 ---- { case 0: ! if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 106) kind = 106; break; *************** *** 492,495 **** --- 501,507 ---- else { + int hiByte = (int)(curChar >> 8); + int i1 = hiByte >> 6; + long l1 = 1L << (hiByte & 077); int i2 = (curChar & 0xff) >> 6; long l2 = 1L << (curChar & 077); *************** *** 559,562 **** --- 571,577 ---- else { + int hiByte = (int)(curChar >> 8); + int i1 = hiByte >> 6; + long l1 = 1L << (hiByte & 077); int i2 = (curChar & 0xff) >> 6; long l2 = 1L << (curChar & 077); *************** *** 856,859 **** --- 871,877 ---- else { + int hiByte = (int)(curChar >> 8); + int i1 = hiByte >> 6; + long l1 = 1L << (hiByte & 077); int i2 = (curChar & 0xff) >> 6; long l2 = 1L << (curChar & 077); *************** *** 863,871 **** { case 0: ! if ((jjbitVec0[i2] & l2) != 0L && kind > 110) kind = 110; break; case 2: ! if ((jjbitVec0[i2] & l2) != 0L && kind > 111) kind = 111; break; --- 881,889 ---- { case 0: ! if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 110) kind = 110; break; case 2: ! if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 111) kind = 111; break; *************** *** 998,1001 **** --- 1016,1022 ---- else { + int hiByte = (int)(curChar >> 8); + int i1 = hiByte >> 6; + long l1 = 1L << (hiByte & 077); int i2 = (curChar & 0xff) >> 6; long l2 = 1L << (curChar & 077); *************** *** 1005,1009 **** { case 4: ! if ((jjbitVec0[i2] & l2) == 0L) break; if (kind > 16) --- 1026,1030 ---- { case 4: ! if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; if (kind > 16) *************** *** 1948,1951 **** --- 1969,1975 ---- else { + int hiByte = (int)(curChar >> 8); + int i1 = hiByte >> 6; + long l1 = 1L << (hiByte & 077); int i2 = (curChar & 0xff) >> 6; long l2 = 1L << (curChar & 077); *************** *** 1955,1959 **** { case 8: ! if ((jjbitVec0[i2] & l2) == 0L) break; if (kind > 16) --- 1979,1983 ---- { case 8: ! if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; if (kind > 16) *************** *** 2131,2134 **** --- 2155,2161 ---- else { + int hiByte = (int)(curChar >> 8); + int i1 = hiByte >> 6; + long l1 = 1L << (hiByte & 077); int i2 = (curChar & 0xff) >> 6; long l2 = 1L << (curChar & 077); *************** *** 2138,2142 **** { case 0: ! if ((jjbitVec0[i2] & l2) != 0L && kind > 105) kind = 105; break; --- 2165,2169 ---- { case 0: ! if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 105) kind = 105; break; *************** *** 2202,2205 **** --- 2229,2235 ---- else { + int hiByte = (int)(curChar >> 8); + int i1 = hiByte >> 6; + long l1 = 1L << (hiByte & 077); int i2 = (curChar & 0xff) >> 6; long l2 = 1L << (curChar & 077); *************** *** 2336,2339 **** --- 2366,2372 ---- else { + int hiByte = (int)(curChar >> 8); + int i1 = hiByte >> 6; + long l1 = 1L << (hiByte & 077); int i2 = (curChar & 0xff) >> 6; long l2 = 1L << (curChar & 077); *************** *** 2343,2347 **** { case 4: ! if ((jjbitVec0[i2] & l2) == 0L) break; if (kind > 16) --- 2376,2380 ---- { case 4: ! if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break; if (kind > 16) *************** *** 2371,2374 **** --- 2404,2419 ---- 33, 34, 37, 38, }; + private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) + { + switch(hiByte) + { + case 0: + return ((jjbitVec2[i2] & l2) != 0L); + default : + if ((jjbitVec0[i1] & l1) != 0L) + return true; + return false; + } + } public static final String[] jjstrLiteralImages = { "", null, null, null, null, null, null, null, null, null, null, null, null, |