[Pydev-cvs] org.python.pydev.parser/src/org/python/pydev/parser/visitors/scope EasyASTIteratorVisitor.java, 1.10, 1.11 ASTEntry.java, 1.16, 1.17 SequencialASTIteratorVisitor.java, 1.3, 1.4 EasyAstIteratorBase.java, 1.22, 1.23

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

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

Modified Files:
	EasyASTIteratorVisitor.java ASTEntry.java 
	SequencialASTIteratorVisitor.java EasyAstIteratorBase.java 
Log Message:
Synching to latest changes:

Pydev
<ul>
<li><strong>Editor</strong>: Cursor settings no longer overridden</li>
<li><strong>Code-completion</strong>: If __all__ is defined with runtime elements (and not only in a single assign statement), it's ignored for code-completion purposes</li>
<li><strong>Debugger</strong>: Pythonpath the same in debug and regular modes (sys.path[0] is the same directory as the file run)</li>
<li><strong>Debugger</strong>: Persist choices done in the debugger when files from the debugger are not found</li>
<li><strong>Interpreter config</strong>: "email" automatically added to the "forced builtins"</li>
<li><strong>Parser</strong>: Correctly recognizing absolute import with 3 or more levels</li>
<li><strong>Syntax check</strong>: Option to do only on active editor</li>
</ul>

Also: tabs changed for spaces

Index: EasyASTIteratorVisitor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/visitors/scope/EasyASTIteratorVisitor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EasyASTIteratorVisitor.java	12 Apr 2006 01:38:02 -0000	1.10
--- EasyASTIteratorVisitor.java	27 Sep 2008 19:58:43 -0000	1.11
***************
*** 74,78 ****
                          Name n = (Name) a.value;
                          if (n.id.equals("self")){
! 		                    atomic(t);
                          }
                      }
--- 74,78 ----
                          Name n = (Name) a.value;
                          if (n.id.equals("self")){
!                             atomic(t);
                          }
                      }

Index: ASTEntry.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/visitors/scope/ASTEntry.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ASTEntry.java	24 Feb 2008 00:25:28 -0000	1.16
--- ASTEntry.java	27 Sep 2008 19:58:43 -0000	1.17
***************
*** 108,113 ****
                      buffer.append(((NameTok)names[i].name).id);
                      if(names[i].asname != null){
! 	                    buffer.append(" as ");
! 	                    buffer.append(((NameTok)names[i].asname).id);
                      }
                  }
--- 108,113 ----
                      buffer.append(((NameTok)names[i].name).id);
                      if(names[i].asname != null){
!                         buffer.append(" as ");
!                         buffer.append(((NameTok)names[i].asname).id);
                      }
                  }
***************
*** 164,168 ****
      }
  
! 	public SimpleNode getNameNode() {
          if (node instanceof ClassDef){
              return ((ClassDef)node).name;
--- 164,168 ----
      }
  
!     public SimpleNode getNameNode() {
          if (node instanceof ClassDef){
              return ((ClassDef)node).name;
***************
*** 172,231 ****
              
          } else{
!         	return node;
!         	
          }
! 	}
! 	
! 	@Override
! 	public String toString() {
! 		StringBuffer buffer = new StringBuffer();
! 		buffer.append("AstEntry<");
! 		buffer.append(getName());
! 		buffer.append(" (");
! 		buffer.append(FullRepIterable.getLastPart(node.getClass().getName()));
! 		buffer.append(" L=");
! 		buffer.append(node.beginLine);
! 		buffer.append(" C=");
! 		buffer.append(node.beginColumn);
! 		buffer.append(")");
! 		buffer.append(">");
! 		return buffer.toString();
! 	}
  
  
      
! 	@Override
! 	public int hashCode() {
! 	    int i=31;
! 	    String n = getName();
! 	    if(n != null){
! 	        i *= n.hashCode();
! 	    }
! 	    i += node.beginLine;
! 	    i *= node.beginColumn;
! 	    return i;
! 	}
! 	
! 	@Override
! 	public boolean equals(Object obj) {
! 	    if (!(obj instanceof ASTEntry)){
              return false;
          }
! 	    ASTEntry other = (ASTEntry) obj;
! 	    
! 	    if(node.beginColumn != other.node.beginColumn || node.beginLine != other.node.beginLine || 
              endCol != other.endCol || endLine != other.endLine){
! 	        return false;
! 	    }
! 	    
! 	    
! 	    //compare names (cannot be null)
! 	    String n = getName();
! 	    String oN = other.getName();
          if(!n.equals(oN)){
              return false;
          }
! 	    return true;
! 	}
! 	
  }
--- 172,231 ----
              
          } else{
!             return node;
!             
          }
!     }
!     
!     @Override
!     public String toString() {
!         StringBuffer buffer = new StringBuffer();
!         buffer.append("AstEntry<");
!         buffer.append(getName());
!         buffer.append(" (");
!         buffer.append(FullRepIterable.getLastPart(node.getClass().getName()));
!         buffer.append(" L=");
!         buffer.append(node.beginLine);
!         buffer.append(" C=");
!         buffer.append(node.beginColumn);
!         buffer.append(")");
!         buffer.append(">");
!         return buffer.toString();
!     }
  
  
      
!     @Override
!     public int hashCode() {
!         int i=31;
!         String n = getName();
!         if(n != null){
!             i *= n.hashCode();
!         }
!         i += node.beginLine;
!         i *= node.beginColumn;
!         return i;
!     }
!     
!     @Override
!     public boolean equals(Object obj) {
!         if (!(obj instanceof ASTEntry)){
              return false;
          }
!         ASTEntry other = (ASTEntry) obj;
!         
!         if(node.beginColumn != other.node.beginColumn || node.beginLine != other.node.beginLine || 
              endCol != other.endCol || endLine != other.endLine){
!             return false;
!         }
!         
!         
!         //compare names (cannot be null)
!         String n = getName();
!         String oN = other.getName();
          if(!n.equals(oN)){
              return false;
          }
!         return true;
!     }
!     
  }

Index: EasyAstIteratorBase.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/visitors/scope/EasyAstIteratorBase.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** EasyAstIteratorBase.java	8 Apr 2008 23:05:44 -0000	1.22
--- EasyAstIteratorBase.java	27 Sep 2008 19:58:43 -0000	1.23
***************
*** 80,86 ****
       */
      protected ASTEntry before(SimpleNode node) {
!     	ASTEntry entry;
!     	entry = createEntry();
!     	
          entry.node = node;
  
--- 80,86 ----
       */
      protected ASTEntry before(SimpleNode node) {
!         ASTEntry entry;
!         entry = createEntry();
!         
          entry.node = node;
  
***************
*** 165,170 ****
       */
      protected ASTEntry atomic(SimpleNode node) {
!     	ASTEntry entry;
!     	entry = createEntry();
          entry.node = node;
          entry.endLine = NodeUtils.getLineEnd(node);
--- 165,170 ----
       */
      protected ASTEntry atomic(SimpleNode node) {
!         ASTEntry entry;
!         entry = createEntry();
          entry.node = node;
          entry.endLine = NodeUtils.getLineEnd(node);
***************
*** 179,186 ****
          ASTEntry entry;
          if(parents.size() > 0){
!     		entry = new ASTEntry(parents.peek());
!     	}else{
!     		entry = new ASTEntry(null);
!     	}
          return entry;
      }
--- 179,186 ----
          ASTEntry entry;
          if(parents.size() > 0){
!             entry = new ASTEntry(parents.peek());
!         }else{
!             entry = new ASTEntry(null);
!         }
          return entry;
      }

Index: SequencialASTIteratorVisitor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/visitors/scope/SequencialASTIteratorVisitor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SequencialASTIteratorVisitor.java	15 May 2006 13:47:28 -0000	1.3
--- SequencialASTIteratorVisitor.java	27 Sep 2008 19:58:43 -0000	1.4
***************
*** 6,12 ****
  
      protected Object unhandled_node(SimpleNode node) throws Exception {
!     	atomic(node);
!     	super.unhandled_node(node);
!     	return null;
      }
      
--- 6,12 ----
  
      protected Object unhandled_node(SimpleNode node) throws Exception {
!         atomic(node);
!         super.unhandled_node(node);
!         return null;
      }