|
@@ -96,7 +96,7 @@ public class ScriptingEngine {
|
96
|
96
|
FunctionParameter[] scriptParameters,
|
97
|
97
|
String... dependencies) throws ParseException
|
98
|
98
|
{
|
99
|
|
- return createScriptedModule(name, sources, bracketParser, scriptParameters, Throwable::printStackTrace, System.out::println , dependencies);
|
|
99
|
+ return createScriptedModule(name, sources, bracketParser, scriptParameters, Throwable::printStackTrace, System.out::println, sourceFile -> System.out.println("Loading " + sourceFile.getFilename()), dependencies);
|
100
|
100
|
}
|
101
|
101
|
|
102
|
102
|
public SemanticModule createScriptedModule(
|
|
@@ -106,14 +106,17 @@ public class ScriptingEngine {
|
106
|
106
|
FunctionParameter[] scriptParameters,
|
107
|
107
|
Consumer<CompileException> compileExceptionConsumer,
|
108
|
108
|
Consumer<ValidationLogEntry> validatorErrorConsumer,
|
|
109
|
+ Consumer<SourceFile> sourceFileConsumer,
|
109
|
110
|
String... dependencies) throws ParseException
|
110
|
111
|
{
|
111
|
112
|
Module scriptModule = new Module(name);
|
112
|
113
|
CompilingPackage scriptPackage = new CompilingPackage(new ZSPackage(space.rootPackage, name), scriptModule);
|
113
|
114
|
|
114
|
115
|
ParsedFile[] files = new ParsedFile[sources.length];
|
115
|
|
- for (int i = 0; i < sources.length; i++)
|
|
116
|
+ for (int i = 0; i < sources.length; i++) {
|
|
117
|
+ sourceFileConsumer.accept(sources[i]);
|
116
|
118
|
files[i] = ParsedFile.parse(scriptPackage, bracketParser, sources[i]);
|
|
119
|
+ }
|
117
|
120
|
|
118
|
121
|
SemanticModule[] dependencyModules = new SemanticModule[dependencies.length + 1];
|
119
|
122
|
dependencyModules[0] = space.getModule("stdlib");
|