Browse Source

WIP: Loggers, added parsing logger

kindlich 5 years ago
parent
commit
5374b6f716
No known key found for this signature in database

+ 5
- 2
JavaIntegration/src/main/java/org/openzen/zencode/java/ScriptingEngine.java View File

96
 			FunctionParameter[] scriptParameters,
96
 			FunctionParameter[] scriptParameters,
97
 			String... dependencies) throws ParseException
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
 	public SemanticModule createScriptedModule(
102
 	public SemanticModule createScriptedModule(
106
 			FunctionParameter[] scriptParameters,
106
 			FunctionParameter[] scriptParameters,
107
 			Consumer<CompileException> compileExceptionConsumer,
107
 			Consumer<CompileException> compileExceptionConsumer,
108
 			Consumer<ValidationLogEntry> validatorErrorConsumer,
108
 			Consumer<ValidationLogEntry> validatorErrorConsumer,
109
+			Consumer<SourceFile> sourceFileConsumer,
109
 			String... dependencies) throws ParseException
110
 			String... dependencies) throws ParseException
110
 	{
111
 	{
111
 		Module scriptModule = new Module(name);
112
 		Module scriptModule = new Module(name);
112
 		CompilingPackage scriptPackage = new CompilingPackage(new ZSPackage(space.rootPackage, name), scriptModule);
113
 		CompilingPackage scriptPackage = new CompilingPackage(new ZSPackage(space.rootPackage, name), scriptModule);
113
 		
114
 		
114
 		ParsedFile[] files = new ParsedFile[sources.length];
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
 			files[i] = ParsedFile.parse(scriptPackage, bracketParser, sources[i]);
118
 			files[i] = ParsedFile.parse(scriptPackage, bracketParser, sources[i]);
119
+		}
117
 		
120
 		
118
 		SemanticModule[] dependencyModules = new SemanticModule[dependencies.length + 1];
121
 		SemanticModule[] dependencyModules = new SemanticModule[dependencies.length + 1];
119
 		dependencyModules[0] = space.getModule("stdlib");
122
 		dependencyModules[0] = space.getModule("stdlib");

Loading…
Cancel
Save