Update of /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core/docutils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22132/src/org/python/pydev/core/docutils
Modified Files:
ParsingUtils.java StringUtils.java
Log Message:
FastParser handling attributes (still needs more testing).
Index: ParsingUtils.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core/docutils/ParsingUtils.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ParsingUtils.java 23 Jun 2008 01:18:25 -0000 1.21
--- ParsingUtils.java 5 Jul 2008 21:53:05 -0000 1.22
***************
*** 157,161 ****
if(c == '\'' || c == '"'){ //ignore comments or multiline comments...
! j = ParsingUtils.eatLiterals( cs, null, j-1)+1;
}else if(c == '#'){
--- 157,161 ----
if(c == '\'' || c == '"'){ //ignore comments or multiline comments...
! j = ParsingUtils.eatLiterals(cs, null, j-1)+1;
}else if(c == '#'){
Index: StringUtils.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core/docutils/StringUtils.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** StringUtils.java 23 Jun 2008 01:18:25 -0000 1.15
--- StringUtils.java 5 Jul 2008 21:53:05 -0000 1.16
***************
*** 57,63 ****
int j = 0;
! for (int i = 0; i < str.length(); i++) {
char c = str.charAt(i);
! if (c == '%' && i + 1 < str.length()) {
char nextC = str.charAt(i + 1);
if (nextC == 's') {
--- 57,64 ----
int j = 0;
! int len = str.length();
! for (int i = 0; i < len; i++) {
char c = str.charAt(i);
! if (c == '%' && i + 1 < len) {
char nextC = str.charAt(i + 1);
if (nextC == 's') {
|
