More work with functions

Author: bensku

src/main/java/ch/njol/skript/ScriptLoader.java

@@ -197,6 +197,7 @@ static ScriptInfo loadScripts() {
 		try {
 			Language.setUseLocal(false);
 
+			loadStructures(scriptsFolder);
 			i = loadScripts(scriptsFolder);
 
 			synchronized (loadedScripts) {
@@ -213,7 +214,6 @@ static ScriptInfo loadScripts() {
 			Skript.info(m_scripts_loaded.toString(i.files, i.triggers, i.commands, start.difference(new Date())));
 
 		SkriptEventHandler.registerBukkitEvents();
-		Functions.postCheck(); // Check that all functions which are called exist.
 
 		return i;
 	}
@@ -252,8 +252,6 @@ public final static ScriptInfo loadScripts(final File directory) {
 				Language.setUseLocal(true);
 		}
 
-		Functions.postCheck(); // Check that all functions which are called exist.
-		
 		return i;
 	}
 
@@ -283,8 +281,6 @@ public final static ScriptInfo loadScripts(final File[] files) {
 
 		SkriptEventHandler.registerBukkitEvents();
 
-		Functions.postCheck(); // Check that all functions which are called exist.
-		
 		return i;
 	}
 
@@ -576,10 +572,45 @@ public String run(final Matcher m) {
 	}
 
 	/**
-	 * Parses elements of a script.
+	 * Loads the specified scripts.
+	 * 
+	 * @param files
+	 */
+	public final static void loadStructures(final File[] files) {
+		Arrays.sort(files);
+		for (final File f : files) {
+			assert f != null : Arrays.toString(files);
+			loadStructure(f);
+		}
+	
+		
+		SkriptEventHandler.registerBukkitEvents();
+	}
+	
+	/**
+	 * Loads structures of all scripts in given directory.
+	 * 
+	 * @param directory
+	 */
+	public final static void loadStructures(final File directory) {
+		final File[] files = directory.listFiles(scriptFilter);
+		Arrays.sort(files);
+		for (final File f : files) {
+			if (f.isDirectory()) {
+				loadStructures(f);
+			} else {
+				loadStructure(f);
+			}
+		}
+	}
+	
+	/**
+	 * Loads structure of given script, currently only for functions. Must be called before
+	 * actually loading that script.
+	 * @param f Script
 	 */
 	@SuppressWarnings("unchecked")
-	private final static void loadElements(final File f) {
+	private final static void loadStructure(final File f) {
 		try {
 			final Config config = new Config(f, true, false, ":");
 			if (SkriptConfig.keepConfigsLoaded.value())
@@ -616,7 +647,7 @@ private final static void loadElements(final File f) {
 
 						setCurrentEvent("function", FunctionEvent.class);
 
-						final Signature<?> func = Functions.loadSignature(node);
+						final Signature<?> func = Functions.loadSignature(config.getFileName(), node);
 						if (func != null) {
 							numFunctions++;
 						}
@@ -673,7 +704,8 @@ private final static ScriptInfo unloadScripts_(final File folder) {
 	 */
 	final static ScriptInfo unloadScript(final File script) {
 		final ScriptInfo r = unloadScript_(script);
-		Functions.validateFunctions();
+		Functions.clearFunctions(script);
+		//Functions.validateFunctions();
 		return r;
 	}
 

src/main/java/ch/njol/skript/SkriptCommand.java

@@ -157,11 +157,13 @@ public boolean onCommand(final @Nullable CommandSender sender, final @Nullable C
 						}
 						reloading(sender, "script", f.getName());
 						ScriptLoader.unloadScript(f);
+						ScriptLoader.loadStructures(new File[] {f});
 						ScriptLoader.loadScripts(new File[] {f});
 						reloaded(sender, r, "script", f.getName());
 					} else {
 						reloading(sender, "scripts in folder", f.getName());
 						final int disabled = ScriptLoader.unloadScripts(f).files;
+						ScriptLoader.loadStructures(f);
 						final int enabled = ScriptLoader.loadScripts(f).files;
 						if (Math.max(disabled, enabled) == 0)
 							info(sender, "reload.empty folder", f.getName());
@@ -175,6 +177,7 @@ public boolean onCommand(final @Nullable CommandSender sender, final @Nullable C
 						info(sender, "enable.all.enabling");
 						final File[] files = toggleScripts(new File(Skript.getInstance().getDataFolder(), Skript.SCRIPTSFOLDER), true).toArray(new File[0]);
 						assert files != null;
+						ScriptLoader.loadStructures(files);
 						ScriptLoader.loadScripts(files);
 						if (r.numErrors() == 0) {
 							info(sender, "enable.all.enabled");
@@ -202,6 +205,7 @@ public boolean onCommand(final @Nullable CommandSender sender, final @Nullable C
 						}
 
 						info(sender, "enable.single.enabling", f.getName());
+						ScriptLoader.loadStructures(new File[] {f});
 						ScriptLoader.loadScripts(new File[] {f});
 						if (r.numErrors() == 0) {
 							info(sender, "enable.single.enabled", f.getName());
@@ -224,6 +228,8 @@ public boolean onCommand(final @Nullable CommandSender sender, final @Nullable C
 						info(sender, "enable.folder.enabling", f.getName(), scripts.size());
 						final File[] ss = scripts.toArray(new File[scripts.size()]);
 						assert ss != null;
+						
+						ScriptLoader.loadStructures(ss);
 						final ScriptInfo i = ScriptLoader.loadScripts(ss);
 						assert i.files == scripts.size();
 						if (r.numErrors() == 0) {

src/main/java/ch/njol/skript/lang/SkriptParser.java

@@ -752,13 +752,9 @@ public final <T> FunctionReference<T> parseFunction(final @Nullable Class<? exte
 //			}
 //			@SuppressWarnings("null")
 			final FunctionReference<T> e = new FunctionReference<T>(functionName, SkriptLogger.getNode(), ScriptLoader.currentScript != null ? ScriptLoader.currentScript.getFile() : null, types, params);//.toArray(new Expression[params.size()]));
-			if (SkriptConfig.allowFunctionsBeforeDefs.value()) {
-				Functions.addPostCheck(e); // Query function for post-checking
-			} else {
-				if (!e.validateFunction(true)) {
-					log.printError();
-					return null;
-				}
+			if (!e.validateFunction(true)) {
+				log.printError();
+				return null;
 			}
 			log.printLog();
 			return e;

src/main/java/ch/njol/skript/lang/function/FunctionReference.java

@@ -29,6 +29,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.SkriptAPIException;
 import ch.njol.skript.classes.ClassInfo;
 import ch.njol.skript.config.Node;
 import ch.njol.skript.lang.Expression;
@@ -47,6 +48,8 @@ public class FunctionReference<T> {
 
 	@Nullable
 	private Function<? extends T> function;
+	@Nullable
+	private Signature<? extends T> signature;
 
 	private boolean singleUberParam;
 	private final Expression<?>[] parameters;
@@ -70,9 +73,10 @@ public FunctionReference(final String functionName, final @Nullable Node node, @
 
 	@SuppressWarnings("unchecked")
 	public boolean validateFunction(final boolean first) {
+		final Signature<?> sign = Functions.getSignature(functionName);
 		final Function<?> newFunc = Functions.getFunction(functionName);
 		SkriptLogger.setNode(node);
-		if (newFunc == null) {
+		if (sign == null) {
 			if (first)
 				Skript.error("The function '" + functionName + "' does not exist.");
 			else
@@ -85,7 +89,7 @@ public boolean validateFunction(final boolean first) {
 
 		final Class<? extends T>[] returnTypes = this.returnTypes;
 		if (returnTypes != null) {
-			final ClassInfo<?> rt = newFunc.returnType;
+			final ClassInfo<?> rt = sign.returnType;
 			if (rt == null) {
 				if (first)
 					Skript.error("The function '" + functionName + "' doesn't return any value.");
@@ -96,31 +100,31 @@ public boolean validateFunction(final boolean first) {
 			}
 			if (!CollectionUtils.containsAnySuperclass(returnTypes, rt.getC())) {
 				if (first)
-					Skript.error("The returned value of the function '" + functionName + "', " + newFunc.returnType + ", is " + SkriptParser.notOfType(returnTypes) + ".");
+					Skript.error("The returned value of the function '" + functionName + "', " + sign.returnType + ", is " + SkriptParser.notOfType(returnTypes) + ".");
 				else
 					Skript.error("The function '" + functionName + "' was redefined with a different, incompatible return type, but is still used in other script(s)."
 							+ " These will continue to use the old version of the function until Skript restarts.");
 				return false;
 			}
 			if (first) {
-				single = newFunc.single;
-			} else if (single && !newFunc.single) {
+				single = sign.single;
+			} else if (single && !sign.single) {
 				Skript.error("The function '" + functionName + "' was redefined with a different, incompatible return type, but is still used in other script(s)."
 						+ " These will continue to use the old version of the function until Skript restarts.");
 				return false;
 			}
 		}
 
 		// check number of parameters only if the function does not have a single parameter that accepts multiple values
-		singleUberParam = newFunc.getMaxParameters() == 1 && !newFunc.parameters[0].single;
+		singleUberParam = sign.getMaxParameters() == 1 && !sign.parameters.get(0).single;
 		if (!singleUberParam) {
-			if (parameters.length > newFunc.getMaxParameters()) {
+			if (parameters.length > sign.getMaxParameters()) {
 				if (first) {
-					if (newFunc.getMaxParameters() == 0)
+					if (sign.getMaxParameters() == 0)
 						Skript.error("The function '" + functionName + "' has no arguments, but " + parameters.length + " are given."
 								+ " To call a function without parameters, just write the function name followed by '()', e.g. 'func()'.");
 					else
-						Skript.error("The function '" + functionName + "' has only " + newFunc.getMaxParameters() + " argument" + (newFunc.getMaxParameters() == 1 ? "" : "s") + ","
+						Skript.error("The function '" + functionName + "' has only " + sign.getMaxParameters() + " argument" + (sign.getMaxParameters() == 1 ? "" : "s") + ","
 								+ " but " + parameters.length + " are given."
 								+ " If you want to use lists in function calls, you have to use additional parentheses, e.g. 'give(player, (iron ore and gold ore))'");
 				} else {
@@ -130,17 +134,17 @@ public boolean validateFunction(final boolean first) {
 				return false;
 			}
 		}
-		if (parameters.length < newFunc.getMinParameters()) {
+		if (parameters.length < sign.getMinParameters()) {
 			if (first)
-				Skript.error("The function '" + functionName + "' requires at least " + newFunc.getMinParameters() + " argument" + (newFunc.getMinParameters() == 1 ? "" : "s") + ","
+				Skript.error("The function '" + functionName + "' requires at least " + sign.getMinParameters() + " argument" + (sign.getMinParameters() == 1 ? "" : "s") + ","
 						+ " but only " + parameters.length + " " + (parameters.length == 1 ? "is" : "are") + " given.");
 			else
 				Skript.error("The function '" + functionName + "' was redefined with a different, incompatible amount of arguments, but is still used in other script(s)."
 						+ " These will continue to use the old version of the function until Skript restarts.");
 			return false;
 		}
 		for (int i = 0; i < parameters.length; i++) {
-			final Parameter<?> p = newFunc.parameters[singleUberParam ? 0 : i];
+			final Parameter<?> p = sign.parameters.get(singleUberParam ? 0 : i);
 			final RetainingLogHandler log = SkriptLogger.startRetainingLog();
 			try {
 				final Expression<?> e = parameters[i].getConvertedExpression(p.type.getC());
@@ -160,16 +164,18 @@ public boolean validateFunction(final boolean first) {
 			}
 		}
 
-		function = (Function<? extends T>) newFunc;
+		signature = (Signature<? extends T>) sign;
+		function = (Function<? extends T>) newFunc; // Try this, in case it exists
 		Functions.registerCaller(this);
 
 		return true;
 	}
 
+	@SuppressWarnings("unchecked")
 	@Nullable
 	protected T[] execute(final Event e) {
 		if (function == null)
-			return null;
+			function = (Function<? extends T>) Functions.getFunction(functionName);
 
 		final Object[][] params = new Object[singleUberParam ? 1 : parameters.length][];
 		if (singleUberParam && parameters.length > 1) {
@@ -191,10 +197,12 @@ public boolean isSingle() {
 
 	@SuppressWarnings("unchecked")
 	public Class<? extends T> getReturnType() {
-		if (function == null)
-			return (Class<? extends T>) Void.class; // No function = no return
-		assert function != null;
-		ClassInfo<? extends T> ret = function.getReturnType();
+		if (signature == null) {
+			throw new SkriptAPIException("Signature of function is null when return type is asked!");
+		}
+		assert signature != null;
+		@SuppressWarnings("null") // Wait what, Eclipse? Already asserted this...
+		ClassInfo<? extends T> ret = signature.returnType;
 		return (Class<? extends T>) (ret == null ? Unknown.class : ret.getC());
 	}
 

src/main/java/ch/njol/skript/lang/function/Functions.java

@@ -109,9 +109,9 @@ public final static Function<?> loadFunction(final SectionNode node) {
 		//	return error("Invalid function definition. Please check for typos and that the function's name only contains letters and underscores. Refer to the documentation for more information.");
 		final String name = "" + m.group(1);
 		Signature<?> sign = signatures.get(name);
-		final List<Parameter<?>> params = sign.getParameters();
-		final ClassInfo<?> c = sign.getReturnType();
-		final NonNullPair<String, Boolean> p = sign.getDbgInfo();
+		final List<Parameter<?>> params = sign.parameters;
+		final ClassInfo<?> c = sign.returnType;
+		final NonNullPair<String, Boolean> p = sign.info;
 
 		if (Skript.debug() || node.debug())
 			Skript.debug("function " + name + "(" + StringUtils.join(params, ", ") + ")" + (c != null && p != null ? " :: " + Utils.toEnglishPlural(c.getCodeName(), p.getSecond()) : "") + ":");
@@ -123,14 +123,14 @@ public final static Function<?> loadFunction(final SectionNode node) {
 	}
 
 	@Nullable
-	public static Signature<?> loadSignature(final SectionNode node) {
+	public static Signature<?> loadSignature(String script, final SectionNode node) {
 		SkriptLogger.setNode(node);
 		final String definition = node.getKey();
 		assert definition != null;
 		final Matcher m = functionPattern.matcher(definition);
 		if (!m.matches())
-			error("Invalid function definition. Please check for typos and that the function's name only contains letters and underscores. Refer to the documentation for more information.");
-		final String name = "" + m.group(1);
+			return signError("Invalid function definition. Please check for typos and that the function's name only contains letters and underscores. Refer to the documentation for more information.");
+		final String name = "" + m.group(1); // TODO check for name uniqueness (currently functions with same name silently override each other)
 		final String args = m.group(2);
 		final String returnType = m.group(3);
 		final List<Parameter<?>> params = new ArrayList<Parameter<?>>();
@@ -181,7 +181,7 @@ public static Signature<?> loadSignature(final SectionNode node) {
 		}
 
 		@SuppressWarnings("unchecked")
-		Signature<?> sign = new Signature<Object>(name, params, (ClassInfo<Object>) c, p);
+		Signature<?> sign = new Signature<Object>(script, name, params, (ClassInfo<Object>) c, p, p == null ? false : !p.getSecond());
 		return sign;
 	}
 
@@ -225,6 +225,7 @@ public final static int clearFunctions(final File script) {
 			final FunctionData d = iter.next();
 			if (d.function instanceof ScriptFunction && script.equals(((ScriptFunction<?>) d.function).trigger.getScript())) {
 				iter.remove();
+				signatures.remove(d.function.name);
 				r++;
 				final Iterator<FunctionReference<?>> it = d.calls.iterator();
 				while (it.hasNext()) {
@@ -257,6 +258,7 @@ public final static void clearFunctions() {
 			else
 				d.calls.clear();
 		}
+		signatures.clear();
 		assert toValidate.isEmpty() : toValidate;
 		toValidate.clear();
 	}
@@ -266,23 +268,4 @@ public static Iterable<JavaFunction<?>> getJavaFunctions() {
 		return javaFunctions.values();
 	}
 
-	public final static void addPostCheck(FunctionReference<?> ref) {
-		postCheckNeeded.add(ref);
-	}
-	
-	public final static void postCheck() {
-		if (postCheckNeeded.isEmpty()) return;
-		
-		final ParseLogHandler log = SkriptLogger.startParseLogHandler();
-		for (final FunctionReference<?> ref : postCheckNeeded) {
-			if (!ref.validateFunction(true)) {
-				log.printError();
-			}
-		}
-		log.printLog();
-		
-		postCheckNeeded.clear();
-		log.stop();
-	}
-	
 }