diff --git a/.gitmodules b/.gitmodules index df3b751b4fe..94104cf9a96 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "experiments/kotlin-ir"] - path = experiments/kotlin-ir + path = backend.native/kotlin-ir url = git@github.com:JetBrains/kotlin.git branch = rr/pdn_ir_prototype diff --git a/experiments/Interop/.idea/compiler.xml b/Interop/.idea/compiler.xml similarity index 100% rename from experiments/Interop/.idea/compiler.xml rename to Interop/.idea/compiler.xml diff --git a/experiments/Interop/.idea/gradle.xml b/Interop/.idea/gradle.xml similarity index 100% rename from experiments/Interop/.idea/gradle.xml rename to Interop/.idea/gradle.xml diff --git a/experiments/Interop/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_3.xml b/Interop/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_3.xml similarity index 100% rename from experiments/Interop/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_3.xml rename to Interop/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_3.xml diff --git a/experiments/Interop/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_3.xml b/Interop/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_3.xml similarity index 100% rename from experiments/Interop/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_3.xml rename to Interop/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_3.xml diff --git a/experiments/Interop/.idea/modules.xml b/Interop/.idea/modules.xml similarity index 100% rename from experiments/Interop/.idea/modules.xml rename to Interop/.idea/modules.xml diff --git a/experiments/Interop/.idea/modules/Indexer/Indexer.iml b/Interop/.idea/modules/Indexer/Indexer.iml similarity index 100% rename from experiments/Interop/.idea/modules/Indexer/Indexer.iml rename to Interop/.idea/modules/Indexer/Indexer.iml diff --git a/experiments/Interop/.idea/modules/Runtime/Runtime.iml b/Interop/.idea/modules/Runtime/Runtime.iml similarity index 100% rename from experiments/Interop/.idea/modules/Runtime/Runtime.iml rename to Interop/.idea/modules/Runtime/Runtime.iml diff --git a/experiments/Interop/.idea/modules/StubGenerator/StubGenerator.iml b/Interop/.idea/modules/StubGenerator/StubGenerator.iml similarity index 100% rename from experiments/Interop/.idea/modules/StubGenerator/StubGenerator.iml rename to Interop/.idea/modules/StubGenerator/StubGenerator.iml diff --git a/experiments/Interop/Indexer/build.gradle b/Interop/Indexer/build.gradle similarity index 100% rename from experiments/Interop/Indexer/build.gradle rename to Interop/Indexer/build.gradle diff --git a/experiments/Interop/Indexer/prebuilt/nativeInteropStubs/c/clangbridge.c b/Interop/Indexer/prebuilt/nativeInteropStubs/c/clangbridge.c similarity index 100% rename from experiments/Interop/Indexer/prebuilt/nativeInteropStubs/c/clangbridge.c rename to Interop/Indexer/prebuilt/nativeInteropStubs/c/clangbridge.c diff --git a/experiments/Interop/Indexer/prebuilt/nativeInteropStubs/kotlin/clang/Clang.kt b/Interop/Indexer/prebuilt/nativeInteropStubs/kotlin/clang/Clang.kt similarity index 100% rename from experiments/Interop/Indexer/prebuilt/nativeInteropStubs/kotlin/clang/Clang.kt rename to Interop/Indexer/prebuilt/nativeInteropStubs/kotlin/clang/Clang.kt diff --git a/experiments/Interop/Indexer/src/callback/c/callback.c b/Interop/Indexer/src/callback/c/callback.c similarity index 100% rename from experiments/Interop/Indexer/src/callback/c/callback.c rename to Interop/Indexer/src/callback/c/callback.c diff --git a/experiments/Interop/Indexer/src/main/kotlin/clang/Clang.def b/Interop/Indexer/src/main/kotlin/clang/Clang.def similarity index 100% rename from experiments/Interop/Indexer/src/main/kotlin/clang/Clang.def rename to Interop/Indexer/src/main/kotlin/clang/Clang.def diff --git a/experiments/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Callbacks.kt b/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Callbacks.kt similarity index 100% rename from experiments/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Callbacks.kt rename to Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Callbacks.kt diff --git a/experiments/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt b/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt similarity index 100% rename from experiments/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt rename to Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt diff --git a/experiments/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/NativeIndex.kt b/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/NativeIndex.kt similarity index 100% rename from experiments/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/NativeIndex.kt rename to Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/NativeIndex.kt diff --git a/experiments/Interop/README.md b/Interop/README.md similarity index 100% rename from experiments/Interop/README.md rename to Interop/README.md diff --git a/experiments/Interop/Runtime/build.gradle b/Interop/Runtime/build.gradle similarity index 100% rename from experiments/Interop/Runtime/build.gradle rename to Interop/Runtime/build.gradle diff --git a/experiments/Interop/Runtime/src/main/kotlin/kotlin_native/interop/Bridge.kt b/Interop/Runtime/src/main/kotlin/kotlin_native/interop/Bridge.kt similarity index 100% rename from experiments/Interop/Runtime/src/main/kotlin/kotlin_native/interop/Bridge.kt rename to Interop/Runtime/src/main/kotlin/kotlin_native/interop/Bridge.kt diff --git a/experiments/Interop/Runtime/src/main/kotlin/kotlin_native/interop/Types.kt b/Interop/Runtime/src/main/kotlin/kotlin_native/interop/Types.kt similarity index 100% rename from experiments/Interop/Runtime/src/main/kotlin/kotlin_native/interop/Types.kt rename to Interop/Runtime/src/main/kotlin/kotlin_native/interop/Types.kt diff --git a/experiments/Interop/Runtime/src/main/kotlin/kotlin_native/interop/Utils.kt b/Interop/Runtime/src/main/kotlin/kotlin_native/interop/Utils.kt similarity index 100% rename from experiments/Interop/Runtime/src/main/kotlin/kotlin_native/interop/Utils.kt rename to Interop/Runtime/src/main/kotlin/kotlin_native/interop/Utils.kt diff --git a/experiments/Interop/StubGenerator/build.gradle b/Interop/StubGenerator/build.gradle similarity index 100% rename from experiments/Interop/StubGenerator/build.gradle rename to Interop/StubGenerator/build.gradle diff --git a/experiments/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt similarity index 100% rename from experiments/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt rename to Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt diff --git a/experiments/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt similarity index 100% rename from experiments/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt rename to Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt diff --git a/experiments/InteropExample/build.gradle b/InteropExample/build.gradle similarity index 100% rename from experiments/InteropExample/build.gradle rename to InteropExample/build.gradle diff --git a/experiments/InteropExample/src/main/kotlin/llvm/LLVM.def b/InteropExample/src/main/kotlin/llvm/LLVM.def similarity index 100% rename from experiments/InteropExample/src/main/kotlin/llvm/LLVM.def rename to InteropExample/src/main/kotlin/llvm/LLVM.def diff --git a/experiments/InteropExample/src/main/kotlin/main.kt b/InteropExample/src/main/kotlin/main.kt similarity index 100% rename from experiments/InteropExample/src/main/kotlin/main.kt rename to InteropExample/src/main/kotlin/main.kt diff --git a/experiments/backend.native/README.md b/backend.native/README.md similarity index 100% rename from experiments/backend.native/README.md rename to backend.native/README.md diff --git a/experiments/backend.native/backend.native.iml b/backend.native/backend.native.iml similarity index 100% rename from experiments/backend.native/backend.native.iml rename to backend.native/backend.native.iml diff --git a/experiments/backend.native/backend.native.patch b/backend.native/backend.native.patch similarity index 100% rename from experiments/backend.native/backend.native.patch rename to backend.native/backend.native.patch diff --git a/experiments/backend.native/bc.frontend/bc.frontend.iml b/backend.native/bc.frontend/bc.frontend.iml similarity index 100% rename from experiments/backend.native/bc.frontend/bc.frontend.iml rename to backend.native/bc.frontend/bc.frontend.iml diff --git a/experiments/backend.native/bc.frontend/build.gradle b/backend.native/bc.frontend/build.gradle similarity index 100% rename from experiments/backend.native/bc.frontend/build.gradle rename to backend.native/bc.frontend/build.gradle diff --git a/experiments/backend.native/bc.frontend/src/org/jetbrains/kotlin/bc/analyze/TopDownAnalyzerFacadeForBC.kt b/backend.native/bc.frontend/src/org/jetbrains/kotlin/bc/analyze/TopDownAnalyzerFacadeForBC.kt similarity index 100% rename from experiments/backend.native/bc.frontend/src/org/jetbrains/kotlin/bc/analyze/TopDownAnalyzerFacadeForBC.kt rename to backend.native/bc.frontend/src/org/jetbrains/kotlin/bc/analyze/TopDownAnalyzerFacadeForBC.kt diff --git a/experiments/backend.native/build.gradle b/backend.native/build.gradle similarity index 100% rename from experiments/backend.native/build.gradle rename to backend.native/build.gradle diff --git a/experiments/backend.native/cli.bc/cli.bc.iml b/backend.native/cli.bc/cli.bc.iml similarity index 100% rename from experiments/backend.native/cli.bc/cli.bc.iml rename to backend.native/cli.bc/cli.bc.iml diff --git a/experiments/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt similarity index 100% rename from experiments/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt rename to backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt diff --git a/experiments/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.java b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.java similarity index 100% rename from experiments/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.java rename to backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2NativeCompilerArguments.java diff --git a/experiments/backend.native/compiler/build.gradle b/backend.native/compiler/build.gradle similarity index 100% rename from experiments/backend.native/compiler/build.gradle rename to backend.native/compiler/build.gradle diff --git a/experiments/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/NativeBackendFacade.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/NativeBackendFacade.kt similarity index 100% rename from experiments/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/NativeBackendFacade.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/NativeBackendFacade.kt diff --git a/experiments/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/NativeIrCodegenFactory.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/NativeIrCodegenFactory.kt similarity index 100% rename from experiments/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/NativeIrCodegenFactory.kt rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/NativeIrCodegenFactory.kt diff --git a/experiments/backend.native/fix_core_imports.patch b/backend.native/fix_core_imports.patch similarity index 100% rename from experiments/backend.native/fix_core_imports.patch rename to backend.native/fix_core_imports.patch diff --git a/experiments/backend.native/frontend.patch b/backend.native/frontend.patch similarity index 100% rename from experiments/backend.native/frontend.patch rename to backend.native/frontend.patch diff --git a/experiments/kotlin-ir b/backend.native/kotlin-ir similarity index 100% rename from experiments/kotlin-ir rename to backend.native/kotlin-ir diff --git a/experiments/backend.native/update_dependencies.xml.patch b/backend.native/update_dependencies.xml.patch similarity index 100% rename from experiments/backend.native/update_dependencies.xml.patch rename to backend.native/update_dependencies.xml.patch diff --git a/experiments/build.gradle b/build.gradle similarity index 100% rename from experiments/build.gradle rename to build.gradle diff --git a/experiments/buildSrc/build.gradle b/buildSrc/build.gradle similarity index 100% rename from experiments/buildSrc/build.gradle rename to buildSrc/build.gradle diff --git a/experiments/buildSrc/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy b/buildSrc/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy similarity index 100% rename from experiments/buildSrc/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy rename to buildSrc/src/main/groovy/org/jetbrains/kotlin/NativeInteropPlugin.groovy diff --git a/experiments/settings.gradle b/settings.gradle similarity index 100% rename from experiments/settings.gradle rename to settings.gradle