translator: translation state simplification

translator/.idea/compiler.xml

@@ -19,8 +19,8 @@
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
-      <module name="ast-kotlin_main" target="1.5" />
+      <module name="ast-kotlin_main" target="1.8" />
-      <module name="ast-kotlin_test" target="1.5" />
+      <module name="ast-kotlin_test" target="1.8" />
     </bytecodeTargetLevel>
   </component>
 </project>

translator/.idea/misc.xml

@@ -13,7 +13,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

translator/.idea/modules/ast-kotlin_main.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="ast-kotlin:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="ast-kotlin" external.system.module.type="sourceSet" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/../../build/classes/main" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/main">

translator/.idea/modules/ast-kotlin_test.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="ast-kotlin:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="ast-kotlin" external.system.module.type="sourceSet" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/test">

translator/build.gradle

@@ -13,8 +13,6 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'kotlin'
 
-sourceCompatibility = 1.5
-
 repositories {
     mavenCentral()
 }

translator/src/main/kotlin/main.kt

@@ -1,6 +1,6 @@
 import com.intellij.openapi.util.Disposer
 import org.kotlinnative.translator.FileTranslator
-import org.kotlinnative.translator.TranslationState
+import org.kotlinnative.translator.parseAndAnalyze
 
 fun main(args: Array<String>) {
 
@@ -10,7 +10,7 @@ fun main(args: Array<String>) {
     }
 
     val disposer = Disposer.newDisposable()
-    val state = TranslationState(args.asList(), disposer)
+    val state = parseAndAnalyze(args.asList(), disposer)
 
     val files = state.environment.getSourceFiles()
     if (files.isEmpty()) {

translator/src/main/kotlin/org/kotlinnative/translator/TranslationState.kt

@@ -20,17 +20,15 @@ import org.jetbrains.kotlin.utils.PathUtil
 import org.kotlinnative.translator.exceptions.TranslationException
 import java.util.*
 
+class TranslationState(val environment: KotlinCoreEnvironment, val bindingContext: BindingContext) {
 
-class TranslationState(sources: List<String>, disposer: Disposable) {
-
-    val environment: KotlinCoreEnvironment
-    val bindingContext: BindingContext
     var functions = HashMap<String, FunctionCodegen>()
     var classes = HashMap<String, ClassCodegen>()
-
     val variableManager = VariableManager()
+}
+
+fun parseAndAnalyze(sources: List<String>, disposer: Disposable): TranslationState {
 
-    init {
     val configuration = CompilerConfiguration()
     val messageCollector = GroupingMessageCollector(object : MessageCollector {
         private var hasError = false
@@ -48,8 +46,10 @@ class TranslationState(sources: List<String>, disposer: Disposable) {
 
     configuration.addKotlinSourceRoots(sources)
 
-        environment = KotlinCoreEnvironment.createForProduction(disposer, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
+    val environment = KotlinCoreEnvironment.createForProduction(disposer, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
-        bindingContext = analyze(environment)?.bindingContext ?: throw TranslationException()
+    val bindingContext = analyze(environment)?.bindingContext ?: throw TranslationException()
+
+    return TranslationState(environment, bindingContext)
 }
 
 fun analyze(environment: KotlinCoreEnvironment): AnalysisResult? {
@@ -81,4 +81,3 @@ class TranslationState(sources: List<String>, disposer: Disposable) {
     return if (analyzer.hasErrors()) null else analyzer.analysisResult
 }
 
-}