[Pydev-cvs] org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/visitors LocalScope.java, 1.7, 1.8

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

Update of /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/visitors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21864/src_completions/org/python/pydev/editor/codecompletion/revisited/visitors

Modified Files:
	LocalScope.java 
Log Message:
FastParser handling attributes (still needs more testing).

Index: LocalScope.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/visitors/LocalScope.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** LocalScope.java	9 Apr 2008 00:17:19 -0000	1.7
--- LocalScope.java	5 Jul 2008 21:52:55 -0000	1.8
***************
*** 157,161 ****
                      for (int i = 0; i < body.length; i++) {
                          GlobalModelVisitor visitor = new GlobalModelVisitor(GlobalModelVisitor.GLOBAL_TOKENS, "");
!                         body[i].accept(visitor);
                          List<IToken> t = visitor.tokens;
                          for (Iterator<IToken> iterator = t.iterator(); iterator.hasNext();) {
--- 157,165 ----
                      for (int i = 0; i < body.length; i++) {
                          GlobalModelVisitor visitor = new GlobalModelVisitor(GlobalModelVisitor.GLOBAL_TOKENS, "");
!                         stmtType stmt = body[i];
!                         if(stmt == null){
!                             continue;
!                         }
!                         stmt.accept(visitor);
                          List<IToken> t = visitor.tokens;
                          for (Iterator<IToken> iterator = t.iterator(); iterator.hasNext();) {
***************
*** 229,234 ****
                  FunctionDef f = (FunctionDef) element;
                  for (int i = 0; i < f.body.length; i++) {
! 
!                     importedModules.addAll(GlobalModelVisitor.getTokens(f.body[i], GlobalModelVisitor.ALIAS_MODULES, moduleName, null));
                  }
              }
--- 233,240 ----
                  FunctionDef f = (FunctionDef) element;
                  for (int i = 0; i < f.body.length; i++) {
!                     stmtType stmt = f.body[i];
!                     if(stmt != null){
!                         importedModules.addAll(GlobalModelVisitor.getTokens(stmt, GlobalModelVisitor.ALIAS_MODULES, moduleName, null));
!                     }
                  }
              }