[Pydev-cvs] org.python.pydev.parser/src/org/python/parser PythonGrammar.java,1.14,1.15 SimpleNode.ja
Brought to you by:
fabioz
Menu
▾
▴
[Pydev-cvs] org.python.pydev.parser/src/org/python/parser PythonGrammar.java,1.14,1.15 SimpleNode.java,1.5,1.6 python.jjt,1.14,1.15 TreeBuilder.java,1.13,1.14
|
From: Fabio Z. <fa...@us...> - 2006-02-14 22:48:31
|
Update of /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23841/src/org/python/parser Modified Files: PythonGrammar.java SimpleNode.java python.jjt TreeBuilder.java Log Message: Index: PythonGrammar.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/PythonGrammar.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** PythonGrammar.java 14 Feb 2006 22:15:41 -0000 1.14 --- PythonGrammar.java 14 Feb 2006 22:48:23 -0000 1.15 *************** *** 5146,5149 **** --- 5146,5150 ---- try { jj_consume_token(MULTIPLY); + this.addSpecialToken("*", STRATEGY_ADD_NEXT); test(); } catch (Throwable jjte000) { *************** *** 5179,5186 **** --- 5180,5190 ---- case POWER: jj_consume_token(POWER); + this.addSpecialToken("**", STRATEGY_ADD_NEXT); break; case MULTIPLY: jj_consume_token(MULTIPLY); + this.addSpecialToken("*", STRATEGY_ADD_NEXT); jj_consume_token(MULTIPLY); + this.addSpecialToken("*", STRATEGY_ADD_NEXT); break; default: *************** *** 6314,6318 **** } ! final private boolean jj_3R_170() { if (jj_scan_token(HEXNUMBER)) return true; return false; --- 6318,6322 ---- } ! final private boolean jj_3R_171() { if (jj_scan_token(HEXNUMBER)) return true; return false; *************** *** 6322,6327 **** Token xsp; xsp = jj_scanpos; - if (jj_3R_170()) { - jj_scanpos = xsp; if (jj_3R_171()) { jj_scanpos = xsp; --- 6326,6329 ---- *************** *** 6330,6334 **** if (jj_3R_173()) { jj_scanpos = xsp; ! if (jj_3R_174()) return true; } } --- 6332,6338 ---- if (jj_3R_173()) { jj_scanpos = xsp; ! if (jj_3R_174()) { ! jj_scanpos = xsp; ! if (jj_3R_175()) return true; } } *************** *** 6349,6357 **** } - final private boolean jj_3R_169() { - if (jj_scan_token(MULTIPLY)) return true; - return false; - } - final private boolean jj_3_22() { if (jj_scan_token(COMMA)) return true; --- 6353,6356 ---- *************** *** 6385,6394 **** } final private boolean jj_3R_165() { Token xsp; xsp = jj_scanpos; ! if (jj_scan_token(33)) { jj_scanpos = xsp; ! if (jj_3R_169()) return true; } return false; --- 6384,6398 ---- } + final private boolean jj_3R_169() { + if (jj_scan_token(POWER)) return true; + return false; + } + final private boolean jj_3R_165() { Token xsp; xsp = jj_scanpos; ! if (jj_3R_169()) { jj_scanpos = xsp; ! if (jj_3R_170()) return true; } return false; *************** *** 7213,7222 **** } ! final private boolean jj_3R_182() { if (jj_scan_token(TRIPLE_USTRING2)) return true; return false; } ! final private boolean jj_3R_181() { if (jj_scan_token(TRIPLE_USTRING)) return true; return false; --- 7217,7226 ---- } ! final private boolean jj_3R_183() { if (jj_scan_token(TRIPLE_USTRING2)) return true; return false; } ! final private boolean jj_3R_182() { if (jj_scan_token(TRIPLE_USTRING)) return true; return false; *************** *** 7234,7248 **** } ! final private boolean jj_3R_180() { if (jj_scan_token(SINGLE_USTRING2)) return true; return false; } ! final private boolean jj_3R_179() { if (jj_scan_token(SINGLE_USTRING)) return true; return false; } ! final private boolean jj_3R_178() { if (jj_scan_token(TRIPLE_STRING2)) return true; return false; --- 7238,7257 ---- } ! final private boolean jj_3R_181() { if (jj_scan_token(SINGLE_USTRING2)) return true; return false; } ! final private boolean jj_3R_180() { if (jj_scan_token(SINGLE_USTRING)) return true; return false; } ! final private boolean jj_3R_170() { ! if (jj_scan_token(MULTIPLY)) return true; ! return false; ! } ! ! final private boolean jj_3R_179() { if (jj_scan_token(TRIPLE_STRING2)) return true; return false; *************** *** 7268,7282 **** } ! final private boolean jj_3R_177() { if (jj_scan_token(TRIPLE_STRING)) return true; return false; } ! final private boolean jj_3R_176() { if (jj_scan_token(SINGLE_STRING2)) return true; return false; } ! final private boolean jj_3R_175() { if (jj_scan_token(SINGLE_STRING)) return true; return false; --- 7277,7291 ---- } ! final private boolean jj_3R_178() { if (jj_scan_token(TRIPLE_STRING)) return true; return false; } ! final private boolean jj_3R_177() { if (jj_scan_token(SINGLE_STRING2)) return true; return false; } ! final private boolean jj_3R_176() { if (jj_scan_token(SINGLE_STRING)) return true; return false; *************** *** 7286,7291 **** Token xsp; xsp = jj_scanpos; - if (jj_3R_175()) { - jj_scanpos = xsp; if (jj_3R_176()) { jj_scanpos = xsp; --- 7295,7298 ---- *************** *** 7300,7304 **** if (jj_3R_181()) { jj_scanpos = xsp; ! if (jj_3R_182()) return true; } } --- 7307,7313 ---- if (jj_3R_181()) { jj_scanpos = xsp; ! if (jj_3R_182()) { ! jj_scanpos = xsp; ! if (jj_3R_183()) return true; } } *************** *** 7336,7340 **** } ! final private boolean jj_3R_174() { if (jj_scan_token(COMPLEX)) return true; return false; --- 7345,7349 ---- } ! final private boolean jj_3R_175() { if (jj_scan_token(COMPLEX)) return true; return false; *************** *** 7362,7366 **** } ! final private boolean jj_3R_173() { if (jj_scan_token(FLOAT)) return true; return false; --- 7371,7375 ---- } ! final private boolean jj_3R_174() { if (jj_scan_token(FLOAT)) return true; return false; *************** *** 7382,7386 **** } ! final private boolean jj_3R_172() { if (jj_scan_token(DECNUMBER)) return true; return false; --- 7391,7395 ---- } ! final private boolean jj_3R_173() { if (jj_scan_token(DECNUMBER)) return true; return false; *************** *** 7433,7437 **** } ! final private boolean jj_3R_171() { if (jj_scan_token(OCTNUMBER)) return true; return false; --- 7442,7446 ---- } ! final private boolean jj_3R_172() { if (jj_scan_token(OCTNUMBER)) return true; return false; Index: python.jjt =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/python.jjt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** python.jjt 14 Feb 2006 22:15:41 -0000 1.14 --- python.jjt 14 Feb 2006 22:48:23 -0000 1.15 *************** *** 1129,1136 **** void ExtraArgValueList(): {} ! { <MULTIPLY> test() } void ExtraKeywordValueList(): {} ! { (<POWER>|<MULTIPLY> <MULTIPLY>) test() } --- 1129,1136 ---- void ExtraArgValueList(): {} ! { <MULTIPLY> {this.addSpecialToken("*", STRATEGY_ADD_NEXT);}test() } void ExtraKeywordValueList(): {} ! { (<POWER>{this.addSpecialToken("**", STRATEGY_ADD_NEXT);}|<MULTIPLY>{this.addSpecialToken("*", STRATEGY_ADD_NEXT);} <MULTIPLY>{this.addSpecialToken("*", STRATEGY_ADD_NEXT);}) test() } Index: SimpleNode.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/SimpleNode.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SimpleNode.java 11 Feb 2006 14:30:13 -0000 1.5 --- SimpleNode.java 14 Feb 2006 22:48:23 -0000 1.6 *************** *** 69,73 **** // System.out.println("Adding:"+special+" after:"+after+" to:"+a.parameter); // }else{ ! // System.out.println("Adding:"+special+" after:"+after+" to:"+this); // } } --- 69,73 ---- // System.out.println("Adding:"+special+" after:"+after+" to:"+a.parameter); // }else{ ! System.out.println("Adding:"+special+" after:"+after+" to:"+this); // } } Index: TreeBuilder.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/parser/TreeBuilder.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** TreeBuilder.java 14 Feb 2006 02:08:02 -0000 1.13 --- TreeBuilder.java 14 Feb 2006 22:48:23 -0000 1.14 *************** *** 286,294 **** l = arity - 1; if (l > 0 && peekNode().getId() == JJTEXTRAKEYWORDVALUELIST) { ! kwargs = ((ExtraArgValue) popNode()).value; l--; } if (l > 0 && peekNode().getId() == JJTEXTRAARGVALUELIST) { ! starargs = ((ExtraArgValue) popNode()).value; l--; } --- 286,298 ---- l = arity - 1; if (l > 0 && peekNode().getId() == JJTEXTRAKEYWORDVALUELIST) { ! ExtraArgValue nkwargs = (ExtraArgValue) popNode(); ! kwargs = nkwargs.value; ! this.addSpecials(nkwargs, kwargs); l--; } if (l > 0 && peekNode().getId() == JJTEXTRAARGVALUELIST) { ! ExtraArgValue nstarargs = (ExtraArgValue) popNode(); ! starargs = nstarargs.value; ! this.addSpecials(nstarargs, starargs); l--; } |