ScriptModule: populate the return value last

This change allows the return value (named "result") to be overridden
as a declared, typed output parameter. Or if left undeclared, it
exists as an implicit output of type java.lang.Object.

This change hopefully prevents bugs surrounding (lack of) conversion
of an output named "result" to its declared type.

Author: ctrueden

src/main/java/org/scijava/script/ScriptModule.java

@@ -167,14 +167,11 @@ public void run() {
 		}
 
 		// execute script!
-		final ScriptLanguage language = getLanguage();
+		Object returnValue = null;
 		try {
 			final Reader reader = getInfo().getReader();
-			final Object returnValue;
 			if (reader == null) returnValue = engine.eval(new FileReader(path));
 			else returnValue = engine.eval(reader);
-			setOutput(RETURN_VALUE, language.decode(returnValue));
-			setResolved(RETURN_VALUE, true);
 		}
 		catch (Throwable e) {
 			while (e instanceof ScriptException && e.getCause() != null) {
@@ -188,6 +185,7 @@ public void run() {
 		}
 
 		// populate output values
+		final ScriptLanguage language = getLanguage();
 		for (final ModuleItem<?> item : getInfo().outputs()) {
 			final String name = item.getName();
 			if (isResolved(name)) continue;
@@ -197,6 +195,13 @@ public void run() {
 			setOutput(name, typed);
 		}
 
+		// populate the return value as a special output
+		// NB: This only occurs if there was no declared output called "result".
+		if (!isResolved(RETURN_VALUE)) {
+			setOutput(RETURN_VALUE, language.decode(returnValue));
+			setResolved(RETURN_VALUE, true);
+		}
+
 		// flush output and error streams
 		if (output != null) {
 			try {