removed some diagnostics, random fixes

Author: kazimuth

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

@@ -1,13 +1,14 @@
 package info.sansgills.mode.python;
 
-import java.awt.Point;
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 
+import java.util.Timer;
+
 import processing.app.exec.StreamRedirectThread;
-import processing.core.PApplet;
+
 
 /**
  * 
@@ -25,6 +26,8 @@ public class Communicator {
 
 	private PrintWriter toSketch;
 
+	private Timer sketchHanging; //TODO
+	
 	public Communicator (Process sketchProcess, PythonRunner runner){
 		this.sketchProcess = sketchProcess;
 		this.runner = runner;
@@ -46,9 +49,6 @@ public void destroy(){
 		toSketch = null;
 	}
 
-	
-	// communication methods
-	
 	/*
 	 * Tell sketch to close
 	 */
@@ -83,30 +83,23 @@ public MessageReceiverThread(InputStream messageStream, PythonRunner runner){
 			this.runner = runner;
 			this.running = true;
 		}
-		
+
 		public void run() {
 			try {
 				String currentLine;
-
 				// continually read messages
-				while ((currentLine = messageReader.readLine()) != null) {
-					if(!running){
-						System.out.println("Messenger thread no longer running");
-						return;
-					}
+				while ((currentLine = messageReader.readLine()) != null && running) {
 					if (currentLine.indexOf("__STOPPED__") != -1) {
-						// sketch telling us it stopped
 						runner.parallelStopped();
-						System.out.println("Stopped recieved.");
-						return;
-					}else if(currentLine.indexOf("__STARTED__") != -1){
+					} else if (currentLine.indexOf("__STARTED__") != -1) {
 						runner.parallelStarted();
-						System.out.println("Started recieved.");
-					} else{
+					} else {
 						System.err.println(currentLine);
 					}
 				}
-			} catch (Exception e) {e.printStackTrace();}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 		}
 	}
 }

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

@@ -101,6 +101,7 @@ private String preprocess(StringBuilder program){
 			return "def setup():\n\tpass\n\n"; //empty sketch; TODO fix hack
 		}
 		try{
+			program.append("\n"); //to be safe
 			PyPdeLexer lexer = new PyPdeLexer(new ANTLRInputStream(program.toString()));
 			CommonTokenStream tokens = new CommonTokenStream(lexer);
 			PyPdeParser parser = new PyPdeParser(tokens);

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

@@ -52,10 +52,8 @@ public void run() {
 	 */
 	public void launch(PythonBuild build, boolean present) {
 		needsReboot = build.usesOpenGL;
-		System.out.println("we need to reboot: "+needsReboot);
 		ensureParallel();
 		String[] a = buildSketchArgs(build, present);
-		System.out.println(a);
 		communicator.sendSketch(a);
 	}
 
@@ -74,7 +72,6 @@ public void internalClose() {
 	 * Sketch process died; get ready to reboot it
 	 */
 	private void prepareReboot(){
-		System.out.println("rebooting");
 		if(!dying){
 			sketchProcess = null;
 			communicator.destroy();
@@ -86,7 +83,6 @@ private void prepareReboot(){
 	 * Force sketch process to restart
 	 */
 	public void forceReboot(){
-		System.out.println("Forcing reboot.");
 		if(sketchProcess != null) sketchProcess.destroy();
 	}
 
@@ -102,7 +98,7 @@ private void ensureParallel(){
 				public void run(){
 					try{
 						int result = sketchProcess.waitFor();
-						System.out.println("parallel process killed");
+						System.err.println("parallel process died with code "+result);
 						prepareReboot();
 					}catch(InterruptedException e){
 						System.err.println("someone interrupted the deathwatch thread");
@@ -121,9 +117,8 @@ public void parallelStopped() {
 		}
 	}
 	public void parallelStarted(){
-		
 	}
-
+	
 	/*
 	 * Command to start the companion process
 	 */

src/info/sansgills/mode/python/preproc/PyPdeConverter.java

@@ -20,7 +20,7 @@ public class PyPdeConverter extends PyPdeBaseListener {
 			"width","height","displayWidth","displayHeight","focused","frameCount"
 	}));
 	static final Set<String> wonkyVars = new HashSet<String>(Arrays.asList(new String[]{
-			"mousePressed", "keyPressed", "frameRate"
+			"mousePressed", "keyPressed"
 	}));
 
 	TokenStream tokens;
@@ -81,6 +81,26 @@ public void enterAtom(PyPdeParser.AtomContext ctx){
 				//can't do __applet__.mousePressed Jython thinks that refers to the function
 				rewriter.insertBefore(id.IDENTIFIER().getSymbol(), "get");
 				rewriter.insertAfter(id.IDENTIFIER().getSymbol(), "()");
+			}else if(text.equals("frameRate")){ 
+				//special handling; if it's a call, use it as frameRate()
+				//if it's not, use it as a call to getframeRate()
+				boolean isCall;
+				for(int i = id.start.getTokenIndex(); ; i++){
+					int type = tokens.get(i+1).getType();
+					if(type == PyPdeParser.LPAREN){
+						isCall = true;
+						break;
+					}else if(type == PyPdeParser.WS){
+						continue;
+					}else{
+						isCall = false;
+						break;
+					}
+				}
+				if(!isCall){
+					rewriter.insertBefore(id.IDENTIFIER().getSymbol(), "get");
+					rewriter.insertAfter(id.IDENTIFIER().getSymbol(), "()");
+				}
 			}
 		}
 	}
@@ -89,9 +109,7 @@ public void enterAtom(PyPdeParser.AtomContext ctx){
 	@Override
 	public void enterCall(PyPdeParser.CallContext ctx) {
 		if (ctx.primary() instanceof PyPdeParser.PrimaryAtomContext) {
-			System.out.println("found a funcall");
 			if (ctx.primary().getText().equals("size")) {
-				System.out.println("found size");
 				if(getArgs.matcher(ctx.getText()).find()){
 					usesOpenGL = true;
 				}

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

@@ -1,7 +1,5 @@
 package info.sansgills.mode.python.wrapper;
 
-import info.sansgills.mode.python.PythonEditor;
-
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Frame;
@@ -76,7 +74,16 @@ public class ProcessingJythonWrapper {
 	 * in which case we get ready to connect and pass messages, or it's not, in
 	 * which case this is a one-shot job and nobody's listening
 	 */
-	public static void main(String[] args) {		
+	public static void main(String[] args) {
+		//kill ourselves if something bad happens
+		Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler(){
+			public void uncaughtException(Thread t, Throwable e){
+				e.printStackTrace();
+				System.exit(0);
+			}
+		});
+		
+		
 		// the PDE will have this as the only arument if we're running paired
 		parallel = args[0].indexOf("--parallel") != -1;
 
@@ -109,27 +116,26 @@ public static void prepare() {
 		sys = Py.getSystemState(); // python 'sys' variable
 
 		PySystemState.add_package("info.sansgills.mode.python.wrapper");
-		//PySystemState.add_package("processing.core");
-		//PySystemState.add_package("processing.opengl");
-		//PySystemState.add_package("processing.event");
-		//PySystemState.add_package("processing.data");
 
 		ready = true;
 	}
 
-	public static void sendStarted(){
-		System.err.println("__STARTED__");
-		System.out.println("started sent");
+	public static void sendStarted() {
+		if (parallel) {
+			System.err.println("__STARTED__");
+			System.err.flush();
+		}
 	}
 	public static void sendStopped(){
-		System.err.println("__STOPPED__");
-		System.out.println("stopped sent");
+		if (parallel) {
+			System.err.println("__STOPPED__");
+			System.err.flush();
+		}
 	}
 
-	
 	public static void startSketch(String[] args){
 		if(applet != null){
-			applet.exit();
+			terminateSketch();
 
 			while(applet != null){
 				try{
@@ -141,7 +147,7 @@ public static void startSketch(String[] args){
 		while (!ready) {
 			try {
 				Thread.sleep(50);
-			} catch (Exception e){}
+			} catch (InterruptedException e){}
 		}
 
 		//applet is now null
@@ -580,5 +586,4 @@ public void run() {
 			}
 		}
 	}
-
 }

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

@@ -93,7 +93,6 @@ public void setup(){
 			if(e.getCause() instanceof RendererChangeException){
 				// Processing uses this to signal a change in renderer
 				// chuck it up the stack
-				System.out.println("renderer changing");
 				throw (RendererChangeException) e.getCause();
 			}else{
 				throw e;
@@ -169,14 +168,10 @@ public float getframeRate(){
 	@Override
 	public void dispose(){
 		if (!disposed) {
-			System.out.println("disposing sketch");
 			disposed = true;
 			super.dispose();
 			frame.dispose();
-
 			ProcessingJythonWrapper.sketchDisposed();
-			
-			System.out.println("done disposing");
 		}
 	}