Actually make preprocs work

JavaIntegration/src/main/java/org/openzen/zencode/java/PreProcessor.java

@@ -8,9 +8,9 @@ import java.util.function.*;
 public class PreProcessor implements Predicate<ParsedFile> {
     
     private final String name;
-    private final Supplier<Boolean> call;
+    private final Predicate<ParsedFile> call;
     
-    public PreProcessor(String name, Supplier<Boolean> call) {
+    public PreProcessor(String name, Predicate<ParsedFile> call) {
         this.name = name;
         this.call = call;
     }
@@ -19,7 +19,7 @@ public class PreProcessor implements Predicate<ParsedFile> {
     public boolean test(ParsedFile parsedFile) {
         try(BufferedReader reader = new BufferedReader(parsedFile.file.open())) {
             if(reader.lines().anyMatch(line -> line.trim().startsWith("#" + name))) {
-                return call.get();
+                return true;
             } else {
                 return false;
             }
@@ -30,5 +30,7 @@ public class PreProcessor implements Predicate<ParsedFile> {
     }
     
     
-    
+    public Predicate<ParsedFile> getCall() {
+        return call;
+    }
 }

JavaIntegration/src/main/java/org/openzen/zencode/java/ScriptingEngine.java

@@ -96,21 +96,23 @@ public class ScriptingEngine {
 		CompilingPackage scriptPackage = new CompilingPackage(new ZSPackage(space.rootPackage, name), scriptModule);
 		
 		List<ParsedFile> files = new ArrayList<>();
-        Predicate<ParsedFile> preProcessor = null;
-        for(PreProcessor processor : preProcessors) {
-            if(preProcessor == null) {
-                preProcessor = processor;
-                continue;
-            }
-            preProcessor = preProcessor.and(processor);
-        }
-		for (int i = 0; i < sources.length; i++) {
-			sourceFileConsumer.accept(sources[i]);
+        
+        for(int i = 0; i < sources.length; i++) {
+            boolean loadFile = true;
+            sourceFileConsumer.accept(sources[i]);
             ParsedFile parsed = ParsedFile.parse(scriptPackage, bracketParser, sources[i]);
-            if(preProcessor.test(parsed)){
+            for(PreProcessor processor : preProcessors) {
+                if(processor.test(parsed)) {
+                    if(!processor.getCall().test(parsed)) {
+                        loadFile = false;
+                    }
+                    // should we stop once we find we can't load it or go on??
+                }
+            }
+            if(loadFile) {
                 files.add(parsed);
             }
-		}
+        }
 		
 		SemanticModule[] dependencyModules = new SemanticModule[dependencies.length + 1];
 		dependencyModules[0] = space.getModule("stdlib");