Merge pull request #498 from Pieter12345/master

Fix set_uncaught_exception_handler closure return behaviour

Author: LadyCailin

src/main/java/com/laytonsmith/PureUtilities/ZipReader.java

@@ -339,7 +339,7 @@ private void initList() throws IOException {
 		}
 		if(this.zipEntries == null) {
 			zipEntries = new ArrayList<>();
-			try (ZipInputStream zis = new ZipInputStream(new FileInputStream(topZip))){
+			try(ZipInputStream zis = new ZipInputStream(new FileInputStream(topZip))) {
 				ZipEntry entry;
 				while((entry = zis.getNextEntry()) != null) {
 					File f = new File(topZip, entry.getName());
@@ -440,8 +440,8 @@ public void recursiveCopy(File dstFolder, boolean create) throws IOException {
 			} else {
 				File newFile = new File(dstFolder, r.file.getName());
 				newFile.getParentFile().mkdir();
-				try (FileOutputStream fos = new FileOutputStream(newFile, false);
-						InputStream fis = r.getInputStream()){
+				try(FileOutputStream fos = new FileOutputStream(newFile, false);
+						InputStream fis = r.getInputStream()) {
 					StreamUtils.Copy(fis, fos);
 				}
 			}

src/main/java/com/laytonsmith/core/exceptions/ConfigRuntimeException.java

@@ -86,32 +86,35 @@ public static enum Reaction {
 	 * @return
 	 */
 	public static Reaction GetReaction(ConfigRuntimeException e, Environment env) {
-		//If there is an exception handler, call it to see what it says.
-		Reaction reaction = Reaction.REPORT;
+
+		// If there is an exception handler, call it to see what it says.
 		if(env.getEnv(GlobalEnv.class).GetExceptionHandler() != null) {
 			CClosure c = env.getEnv(GlobalEnv.class).GetExceptionHandler();
 			CArray ex = ObjectGenerator.GetGenerator().exception(e, env, Target.UNKNOWN);
 			if(e.getEnv() != null) {
 				MCCommandSender sender = e.getEnv().getEnv(CommandHelperEnvironment.class).GetCommandSender();
 				c.getEnv().getEnv(CommandHelperEnvironment.class).SetCommandSender(sender);
 			}
-			Construct ret = CNull.NULL;
 			try {
 				c.execute(new Construct[]{ex});
+				return Reaction.REPORT; // Closure returned nothing -> REPORT.
 			} catch (FunctionReturnException retException) {
-				ret = retException.getReturn();
-			}
-			if(ret instanceof CNull || Prefs.ScreamErrors()) {
-				reaction = Reaction.REPORT;
-			} else {
-				if(Static.getBoolean(ret, Target.UNKNOWN)) {
-					reaction = Reaction.IGNORE;
+				Construct ret = retException.getReturn();
+				if(ret instanceof CNull || Prefs.ScreamErrors()) {
+					return Reaction.REPORT; // Closure returned null or scream-errors was set in the config.
 				} else {
-					reaction = Reaction.FATAL;
+					// Closure returned a boolean. TRUE -> IGNORE and FALSE -> FATAL.
+					return (Static.getBoolean(ret, Target.UNKNOWN) ? Reaction.IGNORE : Reaction.FATAL);
 				}
+			} catch (ConfigRuntimeException cre) {
+
+				// A CRE occurred in the exception handler. Report both exceptions.
+				HandleUncaughtException(cre, env, Reaction.REPORT);
+				return Reaction.REPORT;
 			}
+		} else {
+			return Reaction.REPORT; // No exception handler set -> REPORT.
 		}
-		return reaction;
 	}
 
 	/**
@@ -166,8 +169,6 @@ private static void HandleUncaughtException(ConfigRuntimeException e, Environmen
 			ConfigRuntimeException.DoReport(e, env);
 		} else if(r == ConfigRuntimeException.Reaction.FATAL) {
 			ConfigRuntimeException.DoReport(e, env);
-			//Well, here goes nothing
-			throw e;
 		}
 	}
 
@@ -529,7 +530,7 @@ public CArray getObjectFor() {
 				if(getDefinedAt().file() != null) {
 					name = getDefinedAt().file().getAbsolutePath();
 				}
-				element.set("file", getDefinedAt().file().getAbsolutePath());
+				element.set("file", name);
 			}
 			element.set("line", new CInt(getDefinedAt().line(), Target.UNKNOWN), Target.UNKNOWN);
 			return element;

src/main/java/com/laytonsmith/tools/Interpreter.java

@@ -850,7 +850,8 @@ public static void install() {
 		if(null == OSUtils.GetOS()) {
 			StreamUtils.GetSystemErr().println("Cmdline MethodScript is only supported on Unix and Windows");
 			return;
-		} else switch(OSUtils.GetOS()) {
+		}
+		switch(OSUtils.GetOS()) {
 			case LINUX:
 			case MAC:
 				try {
@@ -883,7 +884,8 @@ public static void install() {
 				} catch (IOException e) {
 					StreamUtils.GetSystemErr().println("Cannot install. You must run the command with sudo for it to succeed, however, did you do that?");
 					return;
-				}	break;
+				}
+				break;
 			case WINDOWS:
 				Path tmp = null;
 				try {
@@ -892,13 +894,13 @@ public static void install() {
 					ZipReader zReader = new ZipReader(root);
 					tmp = Files.createTempDirectory("methodscript-installer", new FileAttribute[]{});
 					zReader.recursiveCopy(tmp.toFile(), false);
-					
+
 					// 2. Write the location of this jar to the registry
 					String me = ClassDiscovery.GetClassContainer(Interpreter.class).toExternalForm().substring(6);
 					String keyName = "Software\\MethodScript";
 					WinRegistry.createKey(WinRegistry.HKEY_CURRENT_USER, keyName);
 					WinRegistry.writeStringValue(WinRegistry.HKEY_CURRENT_USER, keyName, "JarLocation", me);
-					
+
 					// 3. Execute the setup.exe file
 					File setup = new File(tmp.toFile(), "setup.exe");
 					int setupResult = new CommandExecutor(new String[]{setup.getAbsolutePath()}).start().waitFor();
@@ -908,10 +910,11 @@ public static void install() {
 					} else {
 						StreamUtils.GetSystemOut().println("Setup has begun. Finish the installation in the GUI.");
 					}
-				} catch(IOException | InterruptedException | IllegalAccessException | InvocationTargetException ex) {
+				} catch (IOException | InterruptedException | IllegalAccessException | InvocationTargetException ex) {
 					ex.printStackTrace(StreamUtils.GetSystemErr());
 					System.exit(1);
-				}	break;
+				}
+				break;
 		}
 		StreamUtils.GetSystemOut().println("MethodScript has successfully been installed on your system. Note that you may need to rerun the install command"
 				+ " if you change locations of the jar, or rename it. Be sure to put \"#!" + INTERPRETER_INSTALLATION_LOCATION + "\" at the top of all your scripts,"
@@ -924,7 +927,8 @@ public static void uninstall() {
 		if(null == OSUtils.GetOS()) {
 			StreamUtils.GetSystemErr().println("Sorry, cmdline functionality is currently only supported on unix systems! Check back soon though!");
 			return;
-		} else switch(OSUtils.GetOS()) {
+		}
+		switch(OSUtils.GetOS()) {
 			case LINUX:
 			case MAC:
 				try {
@@ -935,7 +939,8 @@ public static void uninstall() {
 				} catch (IOException e) {
 					StreamUtils.GetSystemErr().println("Cannot uninstall. You must run the command with sudo for it to succeed, however, did you do that?");
 					return;
-				}	break;
+				}
+				break;
 			case WINDOWS:
 				StreamUtils.GetSystemOut().println("To uninstall on windows, please uninstall from the Add or Remove Programs application.");
 				return;