Menu
▾
▴
[Jython-checkins] CVS: jython/org/python/parser PythonGrammar.java,2.9,2.10 PythonGrammarConstants.java,2.4,2.5 PythonGrammarTokenManager.java,2.8,2.9
|
From: Finn B. <bc...@us...> - 2000-12-12 21:16:16
|
Update of /cvsroot/jython/jython/org/python/parser In directory slayer.i.sourceforge.net:/tmp/cvs-serv4474 Modified Files: PythonGrammar.java PythonGrammarConstants.java PythonGrammarTokenManager.java Log Message: Commit generated files for last python.jjt change. Index: PythonGrammar.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammar.java,v retrieving revision 2.9 retrieving revision 2.10 diff -C2 -r2.9 -r2.10 *** PythonGrammar.java 2000/10/18 13:03:10 2.9 --- PythonGrammar.java 2000/12/12 21:16:12 2.10 *************** *** 54,58 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: simple_stmt(); break; --- 54,58 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: simple_stmt(); break; *************** *** 145,149 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: ; break; --- 145,149 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: ; break; *************** *** 191,195 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: stmt(); break; --- 191,195 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: stmt(); break; *************** *** 637,641 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: simple_stmt(); break; --- 637,641 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: simple_stmt(); break; *************** *** 699,703 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: expr_stmt(); break; --- 699,703 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: expr_stmt(); break; *************** *** 1340,1344 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: SmartTestList(); break; --- 1340,1344 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: SmartTestList(); break; *************** *** 1396,1400 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: test(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { --- 1396,1400 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: test(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { *************** *** 2123,2127 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: test(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { --- 2123,2127 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: test(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { *************** *** 2199,2203 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: simple_stmt(); break; --- 2199,2203 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: simple_stmt(); break; *************** *** 2244,2248 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: ; break; --- 2244,2248 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: ; break; *************** *** 2303,2307 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: and_test(); label_16: --- 2303,2307 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: and_test(); label_16: *************** *** 2441,2445 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: comparison(); break; --- 2441,2445 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: comparison(); break; *************** *** 3178,3182 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: power(); break; --- 3178,3182 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: power(); break; *************** *** 3377,3381 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: SmartTestList(); break; --- 3377,3381 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: SmartTestList(); break; *************** *** 3411,3415 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: listmaker(); break; --- 3411,3415 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: listmaker(); break; *************** *** 3465,3469 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: dictmaker(); break; --- 3465,3469 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: dictmaker(); break; *************** *** 3494,3499 **** } break; ! case 109: ! jj_consume_token(109); SmartTestList(); SimpleNode jjtn004 = new SimpleNode(JJTSTR_1OP); --- 3494,3499 ---- } break; ! case 113: ! jj_consume_token(113); SmartTestList(); SimpleNode jjtn004 = new SimpleNode(JJTSTR_1OP); *************** *** 3502,3506 **** jjtreeOpenNodeScope(jjtn004); try { ! jj_consume_token(109); } finally { if (jjtc004) { --- 3502,3506 ---- jjtreeOpenNodeScope(jjtn004); try { ! jj_consume_token(113); } finally { if (jjtc004) { *************** *** 3701,3705 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: SimpleNode jjtn002 = new SimpleNode(JJTSLICE); boolean jjtc002 = true; --- 3701,3705 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: SimpleNode jjtn002 = new SimpleNode(JJTSLICE); boolean jjtc002 = true; *************** *** 3793,3797 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: test(); break; --- 3793,3797 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: test(); break; *************** *** 3821,3825 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: test(); break; --- 3821,3825 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: test(); break; *************** *** 4284,4288 **** case TRIPLE_STRING: case TRIPLE_STRING2: ! case 109: normalargs(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { --- 4284,4288 ---- case TRIPLE_STRING: case TRIPLE_STRING2: ! case 113: normalargs(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { *************** *** 5424,5478 **** } - final private boolean jj_3R_40() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_61()) { - jj_scanpos = xsp; - if (jj_3R_62()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - final private boolean jj_3R_61() { - if (jj_3R_110()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - final private boolean jj_3_24() { - if (jj_3R_46()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_scan_token(EQUAL)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - final private boolean jj_3R_45() { - Token xsp; - xsp = jj_scanpos; - if (jj_3_24()) jj_scanpos = xsp; - else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_40()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - final private boolean jj_3_23() { - if (jj_scan_token(COMMA)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_45()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - - final private boolean jj_3R_44() { - if (jj_scan_token(MULTIPLY)) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - if (jj_3R_40()) return true; - if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; - return false; - } - final private boolean jj_3_22() { if (jj_3R_44()) return true; --- 5424,5427 ---- *************** *** 5712,5716 **** final private boolean jj_3R_137() { ! if (jj_scan_token(109)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; --- 5661,5665 ---- final private boolean jj_3R_137() { ! if (jj_scan_token(113)) return true; if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; return false; *************** *** 6543,6546 **** --- 6492,6546 ---- } + final private boolean jj_3R_40() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_61()) { + jj_scanpos = xsp; + if (jj_3R_62()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_61() { + if (jj_3R_110()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3_24() { + if (jj_3R_46()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_scan_token(EQUAL)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_45() { + Token xsp; + xsp = jj_scanpos; + if (jj_3_24()) jj_scanpos = xsp; + else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_40()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3_23() { + if (jj_scan_token(COMMA)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_45()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + + final private boolean jj_3R_44() { + if (jj_scan_token(MULTIPLY)) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + if (jj_3R_40()) return true; + if (jj_la == 0 && jj_scanpos == jj_lastpos) return false; + return false; + } + public PythonGrammarTokenManager token_source; ASCII_CharStream jj_input_stream; *************** *** 6556,6560 **** 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,0xfc000000,}; final private int[] jj_la1_2 = {0x1ebffdb9,0x1ebffdb9,0x1ebffdb9,0x0,0x800000,0x0,0x0,0x0,0x800000,0x0,0x0,0x800000,0x0,0x1ebffdb9,0x0,0x1ebffc00,0x0,0x0,0x0,0x0,0x0,0x400,0x47000,0x1e800000,0x0,0x0,0x1e800000,0x18000,0x0,0x0,0xffffff,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x1b9,0x4,0x2,0x2,0x2,0x40,0x2,0x240,0x0,0x1e800000,0x1ebffdb9,0x1ebffc00,0x0,0x1e800000,0x0,0x1e800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e800000,0x0,0x0,0x0,0x1e800000,0x1e800000,0x1e800000,0x0,0x1e800000,0x800000,0x0,0x0,0x1e800000,0x1e800000,0x1e800000,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x11,0x11,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1effffff,0x0,0x1e000000,0x0,0xffffff,}; ! final private int[] jj_la1_3 = {0x2078,0x2078,0x2078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2078,0x0,0x2078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2078,0x0,0x0,0x2078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2078,0x2078,0x2078,0x0,0x2078,0x0,0x2078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2078,0x0,0x0,0x0,0x2078,0x2078,0x2078,0x78,0x2078,0x0,0x0,0x0,0x2078,0x2078,0x2078,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2078,0x0,0x0,0x78,0x0,}; final private JJCalls[] jj_2_rtns = new JJCalls[24]; private boolean jj_rescan = false; --- 6556,6560 ---- 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,0xfc000000,}; final private int[] jj_la1_2 = {0x1ebffdb9,0x1ebffdb9,0x1ebffdb9,0x0,0x800000,0x0,0x0,0x0,0x800000,0x0,0x0,0x800000,0x0,0x1ebffdb9,0x0,0x1ebffc00,0x0,0x0,0x0,0x0,0x0,0x400,0x47000,0x1e800000,0x0,0x0,0x1e800000,0x18000,0x0,0x0,0xffffff,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x1b9,0x4,0x2,0x2,0x2,0x40,0x2,0x240,0x0,0x1e800000,0x1ebffdb9,0x1ebffc00,0x0,0x1e800000,0x0,0x1e800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e800000,0x0,0x0,0x0,0x1e800000,0x1e800000,0x1e800000,0x0,0x1e800000,0x800000,0x0,0x0,0x1e800000,0x1e800000,0x1e800000,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x11,0x11,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1effffff,0x0,0x1e000000,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,0x78,0x0,}; final private JJCalls[] jj_2_rtns = new JJCalls[24]; private boolean jj_rescan = false; *************** *** 6725,6730 **** final public ParseException generateParseException() { jj_expentries.removeAllElements(); ! boolean[] la1tokens = new boolean[110]; ! for (int i = 0; i < 110; i++) { la1tokens[i] = false; } --- 6725,6730 ---- final public ParseException generateParseException() { jj_expentries.removeAllElements(); ! boolean[] la1tokens = new boolean[114]; ! for (int i = 0; i < 114; i++) { la1tokens[i] = false; } *************** *** 6751,6755 **** } } ! for (int i = 0; i < 110; i++) { if (la1tokens[i]) { jj_expentry = new int[1]; --- 6751,6755 ---- } } ! for (int i = 0; i < 114; 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.4 retrieving revision 2.5 diff -C2 -r2.4 -r2.5 *** PythonGrammarConstants.java 2000/10/10 14:30:45 2.4 --- PythonGrammarConstants.java 2000/12/12 21:16:12 2.5 *************** *** 214,223 **** "\"\\\'\\\'\\\'\"", "\"\\\"\\\"\\\"\"", ! "<token of kind 103>", "<token of kind 104>", "\"\\\\\\\'\\\'\\\'\"", "\"\\\\\\\"\\\"\\\"\"", ! "<token of kind 107>", ! "<token of kind 108>", "\"`\"", }; --- 214,227 ---- "\"\\\'\\\'\\\'\"", "\"\\\"\\\"\\\"\"", ! "\"\\\\\\r\\n\"", "<token of kind 104>", + "<token of kind 105>", + "<token of kind 106>", "\"\\\\\\\'\\\'\\\'\"", "\"\\\\\\\"\\\"\\\"\"", ! "\"\\r\\n\"", ! "\"\\n\"", ! "\"\\r\"", ! "<token of kind 112>", "\"`\"", }; Index: PythonGrammarTokenManager.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarTokenManager.java,v retrieving revision 2.8 retrieving revision 2.9 diff -C2 -r2.8 -r2.9 *** PythonGrammarTokenManager.java 2000/10/13 19:29:58 2.8 --- PythonGrammarTokenManager.java 2000/12/12 21:16:12 2.9 *************** *** 52,67 **** { case 0: ! if ((active1 & 0x44000000000L) != 0L) { ! jjmatchedKind = 108; return -1; } return -1; case 1: ! if ((active1 & 0x44000000000L) != 0L) [...1068 lines suppressed...] + image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); + else + image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); + matchedToken.image = image.toString(); + break; + case 101 : + 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)))); + matchedToken.image = image.toString(); + break; + case 102 : + 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)))); + matchedToken.image = image.toString(); break; default : |
