[Pydev-cvs] org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/visitors FindScopeVisitor.java, 1.2, 1.3 AbstractVisitor.java, 1.3, 1.4

[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-serv22728/src_completions/org/python/pydev/editor/codecompletion/revisited/visitors

Modified Files:
	FindScopeVisitor.java AbstractVisitor.java 
Log Message:
Don't show assignments/imports after if __name__ == '__main__': in outline.

Index: AbstractVisitor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/visitors/AbstractVisitor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractVisitor.java	20 Apr 2007 02:16:13 -0000	1.3
--- AbstractVisitor.java	4 Aug 2007 23:14:59 -0000	1.4
***************
*** 14,22 ****
  import org.python.pydev.editor.codecompletion.revisited.modules.SourceToken;
  import org.python.pydev.parser.jython.SimpleNode;
- import org.python.pydev.parser.jython.ast.Compare;
- import org.python.pydev.parser.jython.ast.If;
  import org.python.pydev.parser.jython.ast.Import;
  import org.python.pydev.parser.jython.ast.ImportFrom;
- import org.python.pydev.parser.jython.ast.Name;
  import org.python.pydev.parser.jython.ast.NameTok;
  import org.python.pydev.parser.jython.ast.Str;
--- 14,19 ----
***************
*** 256,283 ****
      }
  
-     /**
-      * @param node
-      */
-     public static Str isIfMAinNode(If node) {
-         if (node.test instanceof Compare) {
-     		Compare compareNode = (Compare)node.test;
-     		// handcrafted structure walking
-     		if (compareNode.left instanceof Name 
-     			&& ((Name)compareNode.left).id.equals("__name__")
-     			&& compareNode.ops != null
-     			&& compareNode.ops.length == 1 
-     			&& compareNode.ops[0] == Compare.Eq){
-                 
-     		    if ( compareNode.comparators != null
-         			&& compareNode.comparators.length == 1
-         			&& compareNode.comparators[0] instanceof Str 
-         			&& ((Str)compareNode.comparators[0]).s.equals("__main__")){
-         			return (Str)compareNode.comparators[0];
-                 }
-     		}
-     	}
-         return null;
-     }
- 
  
  
--- 253,256 ----

Index: FindScopeVisitor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/visitors/FindScopeVisitor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FindScopeVisitor.java	10 Jun 2007 18:49:02 -0000	1.2
--- FindScopeVisitor.java	4 Aug 2007 23:14:59 -0000	1.3
***************
*** 14,17 ****
--- 14,18 ----
  import org.python.pydev.parser.jython.ast.Module;
  import org.python.pydev.parser.jython.ast.Str;
+ import org.python.pydev.parser.visitors.NodeUtils;
  
  /**
***************
*** 104,109 ****
       */
  	protected void checkIfMainNode(If node) {
! 		Str mainNode = isIfMAinNode(node);
!         if(mainNode != null){
              scope.setIfMainLine(node.beginLine);
          }
--- 105,110 ----
       */
  	protected void checkIfMainNode(If node) {
! 		boolean isIfMainNode = NodeUtils.isIfMAinNode(node);
!         if(isIfMainNode){
              scope.setIfMainLine(node.beginLine);
          }