got static sketches working, misc fixes

Author: kazimuth

README.md

@@ -9,32 +9,33 @@ Inspired by the handsome [processing.py](https://github.com/jdf/processing.py).
 
 This is very much a work-in-progress. Don't expect it to work very well right now.
 
-To install: unzip PythonMode.zip into "{your sketchfolder}/modes/PythonMode" and restart Processing.
+To install: unzip PythonMode.zip into "{your sketch folder}/modes/PythonMode" and restart Processing.
 
 Check build.xml for building instructions.
 
 Done:
 - Basic functionality- running python code
 - Basic indentation & highlighting
+- Basic preprocessor
 
 Currently working on:
-- Preprocessor
+- Architechture
 
 Future work:
 - Better autoindent & syntax highlighting
+- Proper parser for the preprocessor
 - REPL for live coding
 
-As I don't have the preprocessor done, code isn't very pretty right now, but it works!
 A working sketch (copy and paste into the PDE to try it out!):
 
-	class Placeholder(PApplet):
-		def setup(self):
-			self.size(200, 200)
-			self.background(0)
-			self.noStroke()
-			self.ellipseMode(PApplet.CENTER)
+	def setup():
+		size(300, 300)
+		smooth()
+		stroke(255)
+		background(0)
 
-		def draw(self):
-			self.ellipse(self.mouseX, self.mouseY, 5, 5)
+	def draw():
+		line(mouseX+random(-40, 40), mouseY+random(-40, 40), mouseX, mouseY)
 
-	applet = Placeholder()
+	def keyPressed():
+		background(0)

release/PythonMode.zip

@@ -16,6 +16,8 @@
  * Class to handle the building of python files.
  * Given that python runs as an interpreter, all this does is handle preprocessing.
  * 
+ * See BUILD.md for notes.
+ * 
  */
 
 public class PythonBuild {
@@ -50,6 +52,7 @@ public void build() throws Exception{
 		SketchCode[] parts = sketch.getCode(); //fix'd
 
 		//concatenate code strings
+		//TODO do this in some sort of vaguely intelligent way
 		for(int i = parts.length-1; i >= 0; i--){	//iterate backwards... it seemed like a good idea at the time
 			program.append("\n");
 			program.append(parts[i].getProgram());
@@ -78,13 +81,16 @@ public void build() throws Exception{
 	//Things we don't need to reload every build
 	//Some regexes
 	//A hack, but much less work than a full parser, and we don't need to do very much
-	private static Pattern getSpecial;		//replace mousePressed / keyPressed with 
+	private static Pattern getSpecial;		//replace mousePressed / keyPressed /frameRate with getmousePressed, etc.
 	private static Pattern instanceVars;	//replace 'mouseX' with __applet__.mouseX, etc.
+	private static Pattern findSetup, indent;	//for static-mode sketches
 
 	static{
-		getSpecial = Pattern.compile("(?<!def\\s{1,1000})(mousePressed|keyPressed|frameRate)(?!\\s{0,1000}\\()");
+		getSpecial = Pattern.compile("(?<!def\\s{1,1000})(mousePressed|keyPressed|frameRate)(?![0-9a-zA-Z_])(?!\\s{0,1000}\\()");
 		instanceVars = Pattern.compile("(mouseX|mouseY|pmouseX|pmouseY|mouseButton|"
-				+"keyCode|key|pixels|width|height|displayWidth|displayHeight|focused|frameCount)");
+				+"keyCode|key|pixels|width|height|displayWidth|displayHeight|focused|frameCount)(?![0-9a-zA-Z_])");
+		findSetup = Pattern.compile("^def\\s+setup\\s*\\(\\s*\\)\\s*:", Pattern.MULTILINE);
+		indent = Pattern.compile("\r?\n");		
 	}
 
 
@@ -104,6 +110,20 @@ private String preprocess(StringBuilder program){
 
 			temp = regex.replaceAll("__applet__.$1");
 
+			regex = findSetup.matcher(temp);
+			
+			if(!regex.find()){
+				//no setup function; static mode sketch
+				//TODO handle bad indentation
+				program = new StringBuilder(temp);
+				program.append("\nnoLoop()\n");			//no need to call draw()
+				program.insert(0, "def setup():\n");	//put the whole function in setup()
+				
+				regex = indent.matcher(program);
+				
+				temp = regex.replaceAll("\n\t");		//indent everything a level! (except the first line)
+			}
+			
 			return temp;
 
 		}catch(Exception e){
@@ -169,7 +189,6 @@ public String getClassPath() {
 				+ "PythonMode"
 				+ File.separator
 				+ "mode";
-		System.out.println(jythonModeLib);
 		cp += Base.contentsToClassPath(new File(jythonModeLib));
 
 

src/info/sansgills/mode/python/PythonBuild.java

@@ -7,6 +7,8 @@
 
 import java.awt.*;
 import java.awt.event.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * 
@@ -79,17 +81,10 @@ public boolean keyPressed(KeyEvent event){
 
 		case 10: //return
 		case 13: //also return
-			char[] text = ptextarea.getText().toCharArray();	//text
-			int cursorLocation = ptextarea.getCaretPosition();	//location of element to be placed; may be out of bounds
+			String text = ptextarea.getText();	//text
+			int cursor = ptextarea.getCaretPosition();	//location of element to be placed; may be out of bounds
 
-			int tabs = getTabCount(cursorLocation, text);
-						
-			String insert = "\n";
-			for(int i=0; i<tabs; i++){
-				insert += "\t";
-			}
-			
-			ptextarea.setSelectedText(insert);
+			ptextarea.setSelectedText(getIndent(cursor, text));
 			break;
 		}
 
@@ -98,28 +93,36 @@ public boolean keyPressed(KeyEvent event){
 		return false;
 	}
 
-	//given an index and a block of text, find the number of tabs in the line containing the index
-	//TODO dirty hack
-	int getTabCount(int index, char[] text){
-		int prev = index-1; //the start of the line
+	private static Pattern findIndent = Pattern.compile("^((?: |\\t)*)");
+	private static Pattern incIndent = Pattern.compile(":( |\\t)*(#.*)?$"); //TODO fix; breaks on strings (":#"\n) and so on
+	
+	String getIndent(int cursor, String text){
+		if(cursor == 1) return "\n";
 
+		int lineStart, lineEnd;
+		int i;
+		for(i = cursor - 1; i>=0 && text.charAt(i)!='\n'; i--);
+		lineStart = i+1;
+		for(i = cursor - 1; i<text.length() && text.charAt(i)!='\n' ; i++);
+		lineEnd = i;
 
-		//walk till we find the beginning of the line (or text)
-		while(prev >= 0 && text[prev] != '\n'){
-			prev--;
-		}
-		//prev is now at the previous newline
-		prev++;
+		if(lineEnd <= lineStart) return "\n";
+		
+		String line = text.substring(lineStart, lineEnd);
 
-		//prev is now at the beginning of the line
-		//walk forward, counting tabs
-		int tabCount = 0;
-		while(prev < text.length && text[prev] == '\t'){
-			tabCount++;
-			prev++;
+		String indent;
+		Matcher f = findIndent.matcher(line);
+		
+		if(f.find()){
+			indent ='\n' + f.group();
+			
+			if (incIndent.matcher(line).find()){
+				indent += '\t';
+			}
+		}else{
+			indent = "\n";
 		}
 
-		return tabCount;
+		return indent;
 	}
-	
 }

src/info/sansgills/mode/python/PythonKeyListener.java

@@ -1,5 +1,6 @@
 package info.sansgills.mode.python.wrapper;
 
+import java.awt.GraphicsDevice;
 import java.util.Arrays;
 import java.util.Scanner;
 
@@ -26,8 +27,6 @@
  */
 
 public class ProcessingJythonWrapper {
-	
-	
 	//Read in some scripts from the jar (this is the only one-liner to read in a stream, don't you love java)
 	static final String prepend;
 	static final String scrub;
@@ -110,4 +109,13 @@ public static void run(String scriptPath, String[] params){
 			System.exit(1);
 		}
 	}
+	
+	public static void scrub(){
+		interp.exec(scrub);
+	}
+	
+	public static void runSketch(String[] params, PythonPApplet constructedApplet){
+		GraphicsDevice displayDevice;
+		
+	}
 }

src/info/sansgills/mode/python/wrapper/ProcessingJythonWrapper.java

@@ -9,14 +9,13 @@
 
 /**
  * 
- * Skeleton class to give applets something to inherit from.
- * May contain special things later.
+ * Class for python applets.
+ * Instead of overriding, they inject functions into it and it runs them.
+ * 
+ * Also provides information for creation of PApplet globals.
  *
  */
 
-// TODO fix keyPressed & other constants, not working right now (if keyPressed:
-// is always true and if keyPressed == True: is always false)
-// TODO this looks like naming conflict problems? print keyPressed returns a method...
 public class PythonPApplet extends PApplet {
 
 	//Accessed from prepend.py
@@ -87,7 +86,15 @@ public void inject(String name, PyFunction function){
 
 	@Override
 	public void setup(){
-		if(sketchFunctions.containsKey("setup")) sketchFunctions.get("setup").__call__();
+		try{
+			if(sketchFunctions.containsKey("setup")) sketchFunctions.get("setup").__call__();
+		}catch(PyException e){
+			if(e.getCause() instanceof RendererChangeException){
+				// Processing uses this to signal a change in renderer
+				// chuck it up the stack
+				throw (RendererChangeException) e.getCause();
+			}
+		}
 	}
 	@Override
 	public void draw(){