[Pydev-cvs] org.python.pydev.parser/src/org/python/pydev/parser/grammar24 python.jjt, 1.3, 1.4 PythonGrammar24.java, 1.3, 1.4

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

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

Modified Files:
	python.jjt PythonGrammar24.java 
Log Message:
Patche from PEPTIC applied.

Index: PythonGrammar24.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/grammar24/PythonGrammar24.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PythonGrammar24.java	14 Jan 2007 10:54:47 -0000	1.3
--- PythonGrammar24.java	19 Jan 2007 20:47:43 -0000	1.4
***************
*** 59,62 ****
--- 59,63 ----
              }
          }
+         t = convertStringToSpecialStr(t);
          peeked.addSpecial(t, after);
      }
***************
*** 139,145 ****
--- 140,157 ----
  
      private void addSpecialToken(Object o, int strategy) {
+         o = convertStringToSpecialStr(o);
          token_source.specialTokens.add(new Object[]{o, strategy});
      }
  
+         private Object convertStringToSpecialStr(Object o) {
+                 if (o instanceof String) {
+                         try {
+                                 o = createSpecialStr((String) o);
+                         } catch (ParseException e) {
+                         }
+                 }
+                 return o;
+         }
+ 
      private void addSpecialToken(Object o) {
          //the default is adding after the previous token
***************
*** 2775,2779 ****
             jjtc000 = false;
             jjtreeCloseNodeScope(jjtn000);
!           this.addToPeek("elif ",false);
      } finally {
      if (jjtc000) {
--- 2787,2791 ----
             jjtc000 = false;
             jjtreeCloseNodeScope(jjtn000);
!           this.addToPeek("elif",false);
      } finally {
      if (jjtc000) {

Index: python.jjt
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/grammar24/python.jjt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** python.jjt	14 Jan 2007 10:54:47 -0000	1.3
--- python.jjt	19 Jan 2007 20:47:43 -0000	1.4
***************
*** 80,83 ****
--- 80,84 ----
              }
          }
+         t = convertStringToSpecialStr(t);
          peeked.addSpecial(t, after);
      }
***************
*** 160,166 ****
--- 161,178 ----
  
      private void addSpecialToken(Object o, int strategy) {
+         o = convertStringToSpecialStr(o);    
          token_source.specialTokens.add(new Object[]{o, strategy});
      }
      
+ 	private Object convertStringToSpecialStr(Object o) {
+ 		if (o instanceof String) {
+ 			try {
+ 				o = createSpecialStr((String) o);
+ 			} catch (ParseException e) {
+ 			}
+ 		}
+ 		return o;
+ 	}    
+     
      private void addSpecialToken(Object o) {
          //the default is adding after the previous token
***************
*** 1083,1087 ****
  
  void begin_elif_stmt(): {}
! { <ELIF> {this.addToPeek("elif ",false);}
  }
  
--- 1095,1099 ----
  
  void begin_elif_stmt(): {}
! { <ELIF> {this.addToPeek("elif",false);}
  }