WIP 1.9.13

Author: Philipp

Examples/demos/Snake Game

@@ -94,7 +94,7 @@ drawGrid = {
 
 	try {
 		exec "cls";
-		clearConsole;
+		gui.clear;
 	};
 
 

Examples/demos/hangman

@@ -9,7 +9,7 @@ blacklist = [];
 drawScreen = {
 	try {
 		exec cls;
-		clearConsole;
+		gui.clear;
 	};
 
 	allright = $true;
@@ -40,7 +40,7 @@ drawScreen = {
 drawEndScreen = {
 	try {
 		exec cls;
-		clearConsole;
+		gui.clear;
 	};
 
 	if $0 {
@@ -96,6 +96,7 @@ addToBlacklist = {
 	push $0 $blacklist;
 };
 
+gui.size 600 200;
 call $chooseWord;
 life = 10;
 loop {

Examples/demos/raycast

@@ -8,6 +8,8 @@
 
 MANUAL_CONTROL = $true;
 
+# Toogle fullscreen #
+gui.fullscreen $true;
 
 sizeX = 100;
 sizeY = 30;
@@ -260,7 +262,7 @@ loop {
 
 	try {
 		exec "cls";
-		clearConsole;
+		gui.clear;
 	};
 	call $drawScreen;
 

changelog.txt

@@ -11,10 +11,10 @@
 	- Added some additional commands to resize the console window or to clean the window
 		- gui.clear
 		- gui.setSize [sizeX] [sizeY]
-		- gui.fullscreen [true/false]
+		- gui.fullscreen [$true/$false]
 		(The command "clearConsole" is still available but will be removed in future releases by the "gui.clear" command)
-	- Started to make some plans to implement a simple graphics library to control java awt elements.
-	
+	- Started to make some plans to implement a simple graphics library to control java awt elements ;)
+
 1.9.12:
 	- DevScript can now property handle the null variable $null. (="undefined")
 	- Added an explanation for the "wait" command

src/com/devkev/devscript/raw/Block.java

@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 
-import com.devkev.devscript.raw.ProcessUtils.ExitCodes;
+import com.devkev.devscript.raw.ExecutionState.ExitCodes;
 
 public class Block { //So stupid...
 

src/com/devkev/devscript/raw/ExecutionState.java

@@ -0,0 +1,26 @@
+package com.devkev.devscript.raw;
+
+/**This class describes wether a script block execution was successful or not.
+ * Instead of calling the {@link Process#kill(Block, String)} method from within a block,
+ * a execution state is reported as a return value of the function that executed a specific block.
+ * Using this method, an exception can be thrown or controlled without specifying the {@link Block#setAsTryCatch()} method.*/
+public class ExecutionState {
+
+	public interface ExitCodes {
+		public byte DONE = 0;
+		public byte ERROR = 1;
+	}
+	
+	public final byte exitCode;
+	public final String stateMessage;
+	public final Block block;
+	
+	public ExecutionState(Block block, byte exitCode, String stateMessage) {
+		this.exitCode = exitCode;
+		this.block = block;
+		this.stateMessage = stateMessage;
+	}
+	
+	
+	
+}

src/com/devkev/devscript/raw/Process.java

@@ -10,7 +10,7 @@
 import java.util.Random;
 
 import com.devkev.devscript.nativecommands.NativeLibrary;
-import com.devkev.devscript.raw.ProcessUtils.ExitCodes;
+import com.devkev.devscript.raw.ExecutionState.ExitCodes;
 
 public class Process {
 
@@ -29,12 +29,11 @@ public class Process {
 
 	Block main;
 	//Main block is not never in the list, since the process gets terminated, if main is killed.
-	//private final ArrayList<Block> aliveBlocks = new ArrayList<Block>(1); 
 	boolean breakRequested = false;
 
 	public long maxRuntime = 0; //Runtime in ms. If < 0, allowed runtime is infinite
 	private long currentChar = 0;
-	public final String version = "1.9.12"; 
+	public final String version = "1.9.13"; 
 
 	private boolean caseSensitive = false;
 
@@ -545,10 +544,10 @@ public ArrayList<Object> interpretArguments(StringBuilder command, int start, bo
 	/**@param garbageCollector - If the process should remove variables after the block was executed.
 	 * Usually true, because the variables would not be accessible anymore anyway.
 	 * @param isConstructor - If the block is used as a constructor. This means, that variables created in this block are:
-	 * not garbegage collected and are isolated from other blocks.*/
+	 * not garbegage collected and are isolated from other blocks.
+	 * @return The execution state wether this block executed successful or with an exception*/
 	public void executeBlock(Block block, boolean garbageCollector, Object... args) {
 		if(block == null) block = getMain();
-		//if(block.alive) kill(block, "Block already running");
 
 		/*The arguments are just variables declared in the block - local scope and removed afterwards, if requested*/
 		if(block != null) {
@@ -664,18 +663,24 @@ public synchronized void kill(Block block, String errorMessage) {
 
 			finalizeExit(1, errorMessage);
 
-			/*for(int i = 0; i < aliveBlocks.size(); i++) {
-				aliveBlocks.get(i).cached.clear();
-				aliveBlocks.get(i).alive = false;
-				aliveBlocks.get(i).interrupted = true;
-			}*/
 			block.alive = false;
 			block.interrupted = true;
 			block.currentCommand = "";
 		}
 
+		try {
+			//Notify the stream, in case an input is still awaited and fire the 
+			synchronized (inputStream) {
+				inputStream.notify();
+			}
+			
+			inputStream.close();
+			
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		
 		block.exitCode = ExitCodes.ERROR;
-		//aliveBlocks.clear();
 		garbageCollection(main);
 	}
 

src/com/devkev/devscript/raw/ProcessUtils.java

@@ -3,11 +3,6 @@
 /**This class holds various constants etc for the script.*/
 public final class ProcessUtils {
 
-	public interface ExitCodes {
-		public byte DONE = 0;
-		public byte ERROR = 1;
-	}
-	
 	public enum Type {
 		//Base data types
 		NULL("null"), 

src/com/devkev/gui/Console.java

@@ -66,6 +66,12 @@ public void actionPerformed(ActionEvent arg0) {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				if(parent.p.isRunning()) {
+					
+					waitForEnter = false;
+					consoleText.setCaretColor(Color.black);
+					consoleStatus.setText("Running ...");
+					consoleText.setEditable(false);
+					
 					parent.p.kill(parent.p.getMain(), "Terminated by DevScript Console");
 					consolePane.getVerticalScrollBar().setValue(consolePane.getVerticalScrollBar().getMaximum());
 				}
@@ -82,7 +88,8 @@ public void actionPerformed(ActionEvent e) {
 		rerun.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				if(p.isRunning()) return;
+				if(p.isRunning()) 
+					p.kill(p.getMain(), "Rerunning script");;
 
 				consoleText.setText("");
 				toFront();
@@ -102,6 +109,8 @@ public void actionPerformed(ActionEvent e) {
 		contentPane.add(consolePane);
 
 		consoleText = new JTextArea();
+		consoleText.setEditable(false);
+		consoleText.setFont(new Font("Monospaced", Font.PLAIN, 11));
 		consolePane.setViewportView(consoleText);
 
 		consoleStatus = new JLabel("");

src/com/devkev/gui/Window.java

@@ -81,7 +81,7 @@ public class Window {
 
 	private static Font font;
 	private File openedFile = null; //Null means, creating a new file when saving.
-	private static String TITLE = "Devscript 1.9.12 Editor ";
+	private static String TITLE = "Devscript 1.9.13 Editor ";
 	private ArrayList<String> history = new ArrayList<String>();
 	private int historyIndex = 0;
 	public int maxHistorySize = 50;
@@ -145,8 +145,10 @@ public void awaitInput() {
 				waitForEnter = true;
 				console.setEnabled(true);
 				inputStart = console.consoleText.getText().length();
+				console.consoleText.setEditable(true);
 				console.consoleText.setCaretPosition(inputStart);
-				console.consoleText.setCaretColor(Color.black);
+				console.consoleText.setCaretColor(Color.green);
+				console.consoleStatus.setText("Waiting for input. Press ENTER");
 			}
 		};
 		p.setInput(input);
@@ -180,6 +182,18 @@ public Object execute(Object[] args, Process application, Block block) throws Ex
 							} else application.kill(block, "Argument 1 and 2 need to be positive integers");
 							return null;
 						}
+					},
+					
+					new Command("gui.fullscreen", "boolean", "Toggles fullscreen for the console window") {
+						@Override
+						public Object execute(Object[] args, Process application, Block block) throws Exception {
+							if(args[0].toString().equals("true")) {
+								console.setExtendedState(JFrame.MAXIMIZED_BOTH); 
+							} else {
+								console.setExtendedState(JFrame.NORMAL); 
+							}
+							return null;
+						}
 					}
 				};
 			}
@@ -197,6 +211,8 @@ public boolean dispatchKeyEvent(KeyEvent e) {
 					input.flush(console.consoleText.getText().substring(inputStart, console.consoleText.getCaretPosition()) + "\n");
 					waitForEnter = false;
 					console.consoleText.setCaretColor(Color.black);
+					console.consoleStatus.setText("Running ...");
+					console.consoleText.setEditable(false);
 				}
 				return false;
 			}