[Pydev-cvs] org.python.pydev.parser/src/org/python/pydev/parser/jython/ast listcompType.java, 1.1, 1.2

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

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

Modified Files:
	listcompType.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: listcompType.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.parser/src/org/python/pydev/parser/jython/ast/listcompType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** listcompType.java	20 Mar 2006 19:37:35 -0000	1.1
--- listcompType.java	27 Sep 2008 19:58:43 -0000	1.2
***************
*** 7,69 ****
  
  public class listcompType extends SimpleNode {
! 	/**
       * 
       */
      private static final long serialVersionUID = 971434004466657577L;
      public exprType target;
! 	public exprType iter;
! 	public exprType[] ifs;
  
! 	public listcompType(exprType target, exprType iter, exprType[] ifs) {
! 		this.target = target;
! 		this.iter = iter;
! 		this.ifs = ifs;
! 	}
  
! 	public listcompType(exprType target, exprType iter, exprType[] ifs,
! 	SimpleNode parent) {
! 		this(target, iter, ifs);
! 		this.beginLine = parent.beginLine;
! 		this.beginColumn = parent.beginColumn;
! 	}
  
! 	public String toString() {
! 		StringBuffer sb = new StringBuffer("listcomp[");
! 		sb.append("target=");
! 		sb.append(dumpThis(this.target));
! 		sb.append(", ");
! 		sb.append("iter=");
! 		sb.append(dumpThis(this.iter));
! 		sb.append(", ");
! 		sb.append("ifs=");
! 		sb.append(dumpThis(this.ifs));
! 		sb.append("]");
! 		return sb.toString();
! 	}
  
! 	public void pickle(DataOutputStream ostream) throws IOException {
! 		pickleThis(48, ostream);
! 		pickleThis(this.target, ostream);
! 		pickleThis(this.iter, ostream);
! 		pickleThis(this.ifs, ostream);
! 	}
  
! 	public Object accept(VisitorIF visitor) throws Exception {
! 		traverse(visitor);
! 		return null;
! 	}
  
! 	public void traverse(VisitorIF visitor) throws Exception {
! 		if (target != null)
! 			target.accept(visitor);
! 		if (iter != null)
! 			iter.accept(visitor);
! 		if (ifs != null) {
! 			for (int i = 0; i < ifs.length; i++) {
! 				if (ifs[i] != null)
! 					ifs[i].accept(visitor);
! 			}
! 		}
! 	}
  
  }
--- 7,69 ----
  
  public class listcompType extends SimpleNode {
!     /**
       * 
       */
      private static final long serialVersionUID = 971434004466657577L;
      public exprType target;
!     public exprType iter;
!     public exprType[] ifs;
  
!     public listcompType(exprType target, exprType iter, exprType[] ifs) {
!         this.target = target;
!         this.iter = iter;
!         this.ifs = ifs;
!     }
  
!     public listcompType(exprType target, exprType iter, exprType[] ifs,
!     SimpleNode parent) {
!         this(target, iter, ifs);
!         this.beginLine = parent.beginLine;
!         this.beginColumn = parent.beginColumn;
!     }
  
!     public String toString() {
!         StringBuffer sb = new StringBuffer("listcomp[");
!         sb.append("target=");
!         sb.append(dumpThis(this.target));
!         sb.append(", ");
!         sb.append("iter=");
!         sb.append(dumpThis(this.iter));
!         sb.append(", ");
!         sb.append("ifs=");
!         sb.append(dumpThis(this.ifs));
!         sb.append("]");
!         return sb.toString();
!     }
  
!     public void pickle(DataOutputStream ostream) throws IOException {
!         pickleThis(48, ostream);
!         pickleThis(this.target, ostream);
!         pickleThis(this.iter, ostream);
!         pickleThis(this.ifs, ostream);
!     }
  
!     public Object accept(VisitorIF visitor) throws Exception {
!         traverse(visitor);
!         return null;
!     }
  
!     public void traverse(VisitorIF visitor) throws Exception {
!         if (target != null)
!             target.accept(visitor);
!         if (iter != null)
!             iter.accept(visitor);
!         if (ifs != null) {
!             for (int i = 0; i < ifs.length; i++) {
!                 if (ifs[i] != null)
!                     ifs[i].accept(visitor);
!             }
!         }
!     }
  
  }