[kotlin compiler][update] 1.1-20170724.005554-711

This commit is contained in:
Ilya Matveev
2017-07-24 11:50:02 +07:00
committed by ilmat192
parent 0ddc002b8d
commit 295ab0a679
2 changed files with 4 additions and 16 deletions
@@ -32,19 +32,6 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration
import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator
class NativeAnalyzer(
val environment: KotlinCoreEnvironment,
val sources: Collection<KtFile>,
val konanConfig: KonanConfig) : AnalyzerWithCompilerReport.Analyzer {
override fun analyze(): AnalysisResult {
return TopDownAnalyzerFacadeForKonan.analyzeFiles(sources, konanConfig);
}
override fun reportEnvironmentErrors() {
}
}
public fun runTopLevelPhases(konanConfig: KonanConfig, environment: KotlinCoreEnvironment) {
val config = konanConfig.configuration
@@ -69,8 +56,9 @@ public fun runTopLevelPhases(konanConfig: KonanConfig, environment: KotlinCoreEn
phaser.phase(KonanPhase.FRONTEND) {
// Build AST and binding info.
analyzerWithCompilerReport.analyzeAndReport(environment.getSourceFiles(),
NativeAnalyzer(environment, environment.getSourceFiles(), konanConfig))
analyzerWithCompilerReport.analyzeAndReport(environment.getSourceFiles()) {
TopDownAnalyzerFacadeForKonan.analyzeFiles(environment.getSourceFiles(), konanConfig)
}
if (analyzerWithCompilerReport.hasErrors()) {
throw KonanCompilationException()
}