[Pydev-cvs] org.python.pydev.parser/src/org/python/pydev/parser/grammar25 PythonGrammar25.java, 1.7, 1.8 python.jjt, 1.8, 1.9

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/grammar25
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31596/src/org/python/pydev/parser/grammar25

Modified Files:
	PythonGrammar25.java python.jjt 
Log Message:


Index: PythonGrammar25.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/grammar25/PythonGrammar25.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PythonGrammar25.java	16 Sep 2006 20:13:38 -0000	1.7
--- PythonGrammar25.java	16 Sep 2006 20:24:50 -0000	1.8
***************
*** 3532,3535 ****
--- 3532,3536 ----
        label_24:
        while (true) {
+                   this.addSpecialToken(",");
          jj_consume_token(COMMA);
          old_test();
***************
*** 3545,3548 ****
--- 3546,3550 ----
        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
        case COMMA:
+                                                                      this.addSpecialToken(",");
          jj_consume_token(COMMA);
          break;

Index: python.jjt
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/grammar25/python.jjt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** python.jjt	16 Sep 2006 20:13:38 -0000	1.8
--- python.jjt	16 Sep 2006 20:24:50 -0000	1.9
***************
*** 1183,1187 ****
  //testlist_safe: old_test [(',' old_test)+ [',']]
  void testlist_safe()#void:{}
! {old_test()  [  (<COMMA> old_test() )+ [<COMMA>]  ]}
  
  //old_test: or_test | old_lambdef
--- 1183,1187 ----
  //testlist_safe: old_test [(',' old_test)+ [',']]
  void testlist_safe()#void:{}
! {old_test()  [  ({this.addSpecialToken(",");}<COMMA> old_test() )+ [{this.addSpecialToken(",");}<COMMA>]  ]}
  
  //old_test: or_test | old_lambdef