Minor refactoring in ReplInterpreter

GenerationState is now created with default configuration parameters
This commit is contained in:
Alexander Udalov
2012-10-05 16:00:59 +04:00
parent 96fe65bfea
commit 1f3586a151
@@ -222,21 +222,14 @@ public class ReplInterpreter {
return LineResult.error(errorCollector.getString()); return LineResult.error(errorCollector.getString());
} }
Progress backendProgress = new Progress() {
@Override
public void log(String message) {
}
};
List<Pair<ScriptDescriptor, JvmClassName>> earierScripts = Lists.newArrayList(); List<Pair<ScriptDescriptor, JvmClassName>> earierScripts = Lists.newArrayList();
for (EarlierLine earlierLine : earlierLines) { for (EarlierLine earlierLine : earlierLines) {
earierScripts.add(Pair.create(earlierLine.getScriptDescriptor(), earlierLine.getClassName())); earierScripts.add(Pair.create(earlierLine.getScriptDescriptor(), earlierLine.getClassName()));
} }
GenerationState generationState = new GenerationState(psiFile.getProject(), ClassBuilderFactories.binaries(false), backendProgress, GenerationState generationState = new GenerationState(psiFile.getProject(), ClassBuilderFactories.binaries(false),
AnalyzeExhaust.success(trace.getBindingContext(), injector.getModuleConfiguration()), Collections.singletonList(psiFile), AnalyzeExhaust.success(trace.getBindingContext(), injector.getModuleConfiguration()), Collections.singletonList(psiFile));
BuiltinToJavaTypesMapping.ENABLED);
generationState.getScriptCodegen().compileScript(psiFile.getScript(), scriptClassName, earierScripts, generationState.getScriptCodegen().compileScript(psiFile.getScript(), scriptClassName, earierScripts,
CompilationErrorHandler.THROW_EXCEPTION); CompilationErrorHandler.THROW_EXCEPTION);