pydev-cvs

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

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14505/src/org/python/pydev/editor/model

Modified Files:
	ModelMaker.java 
Added Files:
	StrNode.java PassNode.java 
Log Message:
Code folding capabilities added.

--- NEW FILE: PassNode.java ---
/*
 * Created on Jul 19, 2004
 *
 * @author Fabio Zadrozny
 */
package org.python.pydev.editor.model;

import org.python.parser.ast.Pass;

/**
 * @author Fabio Zadrozny
 */
public class PassNode extends AbstractNode {

	Pass astNode;
	
	/**
	 * 
	 * @param parent
	 * @param astNode
	 */
	public PassNode(AbstractNode parent, Pass astNode) {
		super(parent);	
		this.astNode = astNode;
		this.setStart(new Location(astNode.beginLine-1, astNode.beginColumn-1));
		this.setEnd(new Location(astNode.beginLine-1, astNode.beginColumn + 22));
	}
	

    public String getName() {
		return "pass";
	}
}
--- NEW FILE: StrNode.java ---
/*
 * Created on Jul 19, 2004
 *
 * @author Fabio Zadrozny
 */
package org.python.pydev.editor.model;

import org.python.parser.ast.Str;

/**
 * @author Fabio Zadrozny
 */
public class StrNode extends AbstractNode {

	Str astNode;
	
	/**
	 * 
	 * @param parent
	 * @param astNode
	 */
	public StrNode(AbstractNode parent, Str astNode) {
		super(parent);	
		this.astNode = astNode;
		this.setStart(new Location(astNode.beginLine-1, astNode.beginColumn-1));
		this.setEnd(new Location(astNode.beginLine-1, astNode.beginColumn + 22));
	}
	

    public String getName() {
		return "astNode";
	}
}
Index: ModelMaker.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/model/ModelMaker.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ModelMaker.java	22 Apr 2004 10:35:22 -0000	1.3
--- ModelMaker.java	19 Jul 2004 18:05:54 -0000	1.4
***************
*** 139,142 ****
--- 139,150 ----
  		}
  
+ 		void processPass(Pass node) {
+ 			new PassNode(parent, node);
+ 		}
+ 
+ 		void processStr(Str node) {
+ 			new StrNode(parent, node);
+ 		}
+ 
  		private void processAttribute(Attribute node) {
  			new AttributeNode(parent, node, getLineText(node));
***************
*** 144,148 ****
  
  		protected Object unhandled_node(SimpleNode node) throws Exception {
! //			System.err.println("Unhandled: " + node.getClass().toString() + " L:" + Integer.toString(node.beginLine));
  			return null;
  		}
--- 152,156 ----
  
  		protected Object unhandled_node(SimpleNode node) throws Exception {
! 			System.err.println("Unhandled: " + node.getClass().toString() + " L:" + Integer.toString(node.beginLine));
  			return null;
  		}
***************
*** 152,155 ****
--- 160,173 ----
  		}
  
+ 		public Object visitPass(Pass node) throws Exception {
+ 			processPass(node);
+ 			return null;
+ 		}
+ 
+ 		public Object visitStr(Str node) throws Exception {
+ 			processStr(node);
+ 			return null;
+ 		}
+ 
  		public Object visitClassDef(ClassDef node) throws Exception {
  			processClassDef(node);