From 2b9225fdd4358d75c17fdaa4ada3cefe7dc2b5e2 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 21 Aug 2013 16:12:09 +0400 Subject: [PATCH] Extract descriptor.loader.java module from frontend.java Will be used in runtime to load reflected classes --- .idea/artifacts/KotlinPlugin.xml | 1 + .idea/modules.xml | 1 + build.xml | 3 ++ compiler/backend/backend.iml | 1 + compiler/cli/cli.iml | 1 + .../jet/cli/jvm/compiler/ClassPath.java | 39 +++++++++++++++++++ .../jvm/compiler}/CliVirtualFileFinder.java | 19 ++++++++- .../cli/jvm/compiler/JetCoreEnvironment.java | 1 - compiler/frontend.java/frontend.java.iml | 1 + .../jet/cli/jvm/compiler/ClassPath.java | 23 ----------- compiler/jet.as.java.psi/jet.as.java.psi.iml | 1 + compiler/tests/compiler-tests.iml | 1 + .../descriptor.loader.java.iml | 19 +++++++++ .../jet/lang/resolve/java/AbiVersionUtil.java | 0 .../lang/resolve/java/AsmTypeConstants.java | 1 - .../resolve/java/DescriptorSearchRule.java | 0 .../resolve/java/JavaBridgeConfiguration.java | 0 .../lang/resolve/java/JavaClassFinder.java | 0 .../resolve/java/JavaDescriptorResolver.java | 0 .../lang/resolve/java/JavaVisibilities.java | 0 .../jet/lang/resolve/java/JvmAbi.java | 0 .../lang/resolve/java/JvmAnnotationNames.java | 0 .../jet/lang/resolve/java/JvmClassName.java | 0 .../lang/resolve/java/JvmPrimitiveType.java | 0 .../lang/resolve/java/PackageClassUtils.java | 0 .../jet/lang/resolve/java/PsiClassFinder.java | 0 .../ClassDescriptorFromJvmBytecode.java | 0 .../JavaCallableMemberDescriptor.java | 0 .../java/descriptor/JavaMethodDescriptor.java | 0 .../descriptor/JavaNamespaceDescriptor.java | 0 .../descriptor/JavaPropertyDescriptor.java | 0 .../JavaPropertyDescriptorForObject.java | 0 .../java/descriptor/SamAdapterDescriptor.java | 0 .../descriptor/SamConstructorDescriptor.java | 0 .../java/mapping/JavaToKotlinClassMap.java | 0 .../mapping/JavaToKotlinClassMapBuilder.java | 0 .../java/mapping/KotlinToJavaTypesMap.java | 0 .../AnnotationDescriptorDeserializer.java | 10 +++-- .../resolver/DescriptorResolverUtils.java | 1 - .../DeserializedDescriptorResolver.java | 0 .../resolver/DeserializedResolverUtils.java | 0 .../resolve/java/resolver/ErrorReporter.java | 0 .../resolver/ExternalAnnotationResolver.java | 0 .../resolver/ExternalSignatureResolver.java | 0 .../FakeOverrideVisibilityResolver.java | 0 .../JavaAnnotationArgumentResolver.java | 0 .../java/resolver/JavaAnnotationResolver.java | 0 .../java/resolver/JavaClassResolver.java | 0 .../resolver/JavaConstructorResolver.java | 1 - .../java/resolver/JavaFunctionResolver.java | 0 .../java/resolver/JavaMemberResolver.java | 0 .../java/resolver/JavaNamespaceResolver.java | 0 .../java/resolver/JavaPropertyResolver.java | 0 .../java/resolver/JavaResolverCache.java | 0 .../java/resolver/JavaSupertypeResolver.java | 0 .../resolver/JavaTypeParameterResolver.java | 0 .../java/resolver/JavaTypeTransformer.java | 0 .../resolver/JavaValueParameterResolver.java | 0 .../java/resolver/KotlinClassFileHeader.java | 3 +- .../java/resolver/MethodSignatureChecker.java | 0 .../resolve/java/resolver/PostponedTasks.java | 0 .../java/resolver/ProgressChecker.java | 0 .../lang/resolve/java/resolver/TypeUsage.java | 0 .../java/resolver/TypeVariableResolver.java | 0 .../sam/SamAdapterConstructorDescriptor.java | 0 .../sam/SamAdapterFunctionDescriptor.java | 0 .../SamAdapterOverridabilityCondition.java | 0 .../java/sam/SingleAbstractMethodUtils.java | 5 +-- .../resolve/java/scope/JavaBaseScope.java | 0 .../java/scope/JavaClassMembersScope.java | 0 .../scope/JavaClassNonStaticMembersScope.java | 0 .../scope/JavaClassStaticMembersScope.java | 0 .../resolve/java/scope/JavaPackageScope.java | 0 .../lang/resolve/java/scope/MembersCache.java | 0 .../resolve/java/scope/MembersProvider.java | 0 .../lang/resolve/java/scope/NamedMembers.java | 0 .../java/structure/JavaAnnotation.java | 0 .../structure/JavaAnnotationArgument.java | 0 .../JavaAnnotationAsAnnotationArgument.java | 0 .../java/structure/JavaAnnotationOwner.java | 0 .../JavaArrayAnnotationArgument.java | 0 .../resolve/java/structure/JavaArrayType.java | 0 .../resolve/java/structure/JavaClass.java | 0 .../java/structure/JavaClassifier.java | 0 .../java/structure/JavaClassifierType.java | 0 .../resolve/java/structure/JavaElement.java | 0 .../java/structure/JavaElementFactory.java | 0 .../resolve/java/structure/JavaField.java | 0 .../JavaLiteralAnnotationArgument.java | 0 .../resolve/java/structure/JavaMember.java | 0 .../resolve/java/structure/JavaMethod.java | 0 .../java/structure/JavaModifierListOwner.java | 0 .../java/structure/JavaNamedElement.java | 0 .../resolve/java/structure/JavaPackage.java | 0 .../java/structure/JavaPrimitiveType.java | 0 .../JavaReferenceAnnotationArgument.java | 0 .../structure/JavaSignatureFormatter.java | 0 .../lang/resolve/java/structure/JavaType.java | 0 .../java/structure/JavaTypeParameter.java | 0 .../structure/JavaTypeParameterListOwner.java | 0 .../java/structure/JavaTypeProvider.java | 0 .../java/structure/JavaTypeSubstitutor.java | 0 .../java/structure/JavaValueParameter.java | 0 .../java/structure/JavaWildcardType.java | 0 .../java/vfilefinder/VirtualFileFinder.java | 0 generators/generators.iml | 1 + idea/idea.iml | 1 + 107 files changed, 97 insertions(+), 37 deletions(-) create mode 100644 compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/ClassPath.java rename compiler/{frontend.java/src/org/jetbrains/jet/lang/resolve/java/vfilefinder => cli/src/org/jetbrains/jet/cli/jvm/compiler}/CliVirtualFileFinder.java (75%) delete mode 100644 compiler/frontend.java/src/org/jetbrains/jet/cli/jvm/compiler/ClassPath.java create mode 100644 core/descriptor.loader.java/descriptor.loader.java.iml rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/AbiVersionUtil.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/AsmTypeConstants.java (97%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/DescriptorSearchRule.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinder.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/JvmAnnotationNames.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/JvmPrimitiveType.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinder.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/descriptor/ClassDescriptorFromJvmBytecode.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaCallableMemberDescriptor.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaMethodDescriptor.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaNamespaceDescriptor.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptor.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptorForObject.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMapBuilder.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java (98%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java (99%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedResolverUtils.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalAnnotationResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalSignatureResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/FakeOverrideVisibilityResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java (99%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeParameterResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeTransformer.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/KotlinClassFileHeader.java (98%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/MethodSignatureChecker.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/PostponedTasks.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/ProgressChecker.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/TypeUsage.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/resolver/TypeVariableResolver.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterConstructorDescriptor.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterFunctionDescriptor.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java (98%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassNonStaticMembersScope.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassStaticMembersScope.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/scope/MembersCache.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/scope/MembersProvider.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/scope/NamedMembers.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotation.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationArgument.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationAsAnnotationArgument.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationOwner.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgument.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayType.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifier.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierType.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElement.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactory.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaField.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaLiteralAnnotationArgument.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMember.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaModifierListOwner.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaNamedElement.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackage.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPrimitiveType.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaReferenceAnnotationArgument.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaType.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameter.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterListOwner.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProvider.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeSubstitutor.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameter.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardType.java (100%) rename {compiler/frontend.java => core/descriptor.loader.java}/src/org/jetbrains/jet/lang/resolve/java/vfilefinder/VirtualFileFinder.java (100%) diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml index a3c2307ad4b..301708fd5d3 100644 --- a/.idea/artifacts/KotlinPlugin.xml +++ b/.idea/artifacts/KotlinPlugin.xml @@ -8,6 +8,7 @@ + diff --git a/.idea/modules.xml b/.idea/modules.xml index 05cd23eb300..d7c163a6466 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -11,6 +11,7 @@ + diff --git a/build.xml b/build.xml index d11e3f85f0b..f5059e9c8f2 100644 --- a/build.xml +++ b/build.xml @@ -25,6 +25,7 @@ + @@ -43,6 +44,7 @@ + @@ -127,6 +129,7 @@ + diff --git a/compiler/backend/backend.iml b/compiler/backend/backend.iml index 0d10715226e..9ea3c720ae2 100644 --- a/compiler/backend/backend.iml +++ b/compiler/backend/backend.iml @@ -15,6 +15,7 @@ + diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml index f67af7c8ec3..d729c5ca03a 100644 --- a/compiler/cli/cli.iml +++ b/compiler/cli/cli.iml @@ -16,6 +16,7 @@ + diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/ClassPath.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/ClassPath.java new file mode 100644 index 00000000000..4fbeed74f3e --- /dev/null +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/ClassPath.java @@ -0,0 +1,39 @@ +/* + * Copyright 2010-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.cli.jvm.compiler; + +import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +public final class ClassPath implements Iterable { + + @NotNull + private final List roots = new ArrayList(); + + @Override + public Iterator iterator() { + return roots.iterator(); + } + + public void add(@NotNull VirtualFile root) { + roots.add(root); + } +} diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/vfilefinder/CliVirtualFileFinder.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java similarity index 75% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/vfilefinder/CliVirtualFileFinder.java rename to compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java index 08d00f88c5e..f6a34e58b0d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/vfilefinder/CliVirtualFileFinder.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java @@ -1,4 +1,20 @@ -package org.jetbrains.jet.lang.resolve.java.vfilefinder; +/* + * Copyright 2010-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.cli.jvm.compiler; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.GlobalSearchScope; @@ -6,6 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.cli.jvm.compiler.ClassPath; import org.jetbrains.jet.lang.resolve.java.resolver.KotlinClassFileHeader; +import org.jetbrains.jet.lang.resolve.java.vfilefinder.VirtualFileFinder; import org.jetbrains.jet.lang.resolve.name.FqName; public class CliVirtualFileFinder implements VirtualFileFinder { diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java index 318d9686172..e2847a23b4a 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java @@ -51,7 +51,6 @@ import org.jetbrains.jet.lang.parsing.JetParserDefinition; import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.JetFilesProvider; -import org.jetbrains.jet.lang.resolve.java.vfilefinder.CliVirtualFileFinder; import org.jetbrains.jet.lang.resolve.java.vfilefinder.VirtualFileFinder; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.utils.PathUtil; diff --git a/compiler/frontend.java/frontend.java.iml b/compiler/frontend.java/frontend.java.iml index 26f992661ef..275f6c2cfff 100644 --- a/compiler/frontend.java/frontend.java.iml +++ b/compiler/frontend.java/frontend.java.iml @@ -14,6 +14,7 @@ + diff --git a/compiler/frontend.java/src/org/jetbrains/jet/cli/jvm/compiler/ClassPath.java b/compiler/frontend.java/src/org/jetbrains/jet/cli/jvm/compiler/ClassPath.java deleted file mode 100644 index 0864f2aaeec..00000000000 --- a/compiler/frontend.java/src/org/jetbrains/jet/cli/jvm/compiler/ClassPath.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.jetbrains.jet.cli.jvm.compiler; - -import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -public final class ClassPath implements Iterable { - - @NotNull - private final List roots = new ArrayList(); - - @Override - public Iterator iterator() { - return roots.iterator(); - } - - public void add(@NotNull VirtualFile root) { - roots.add(root); - } -} diff --git a/compiler/jet.as.java.psi/jet.as.java.psi.iml b/compiler/jet.as.java.psi/jet.as.java.psi.iml index 7813f4a5f78..f4381227ffe 100644 --- a/compiler/jet.as.java.psi/jet.as.java.psi.iml +++ b/compiler/jet.as.java.psi/jet.as.java.psi.iml @@ -11,6 +11,7 @@ + diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml index d275ff90aa4..3b17231d513 100644 --- a/compiler/tests/compiler-tests.iml +++ b/compiler/tests/compiler-tests.iml @@ -18,6 +18,7 @@ + diff --git a/core/descriptor.loader.java/descriptor.loader.java.iml b/core/descriptor.loader.java/descriptor.loader.java.iml new file mode 100644 index 00000000000..281b0ba4b01 --- /dev/null +++ b/core/descriptor.loader.java/descriptor.loader.java.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AbiVersionUtil.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/AbiVersionUtil.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AbiVersionUtil.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/AbiVersionUtil.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypeConstants.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypeConstants.java similarity index 97% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypeConstants.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypeConstants.java index 531d2b70e66..83b1d2af566 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypeConstants.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypeConstants.java @@ -30,7 +30,6 @@ public class AsmTypeConstants { public static final Type JAVA_THROWABLE_TYPE = getType(Throwable.class); public static final Type JAVA_ARRAY_GENERIC_TYPE = getType(Object[].class); - public static final Type JET_NOTHING_TYPE = Type.getObjectType("jet/Nothing"); public static final Type JET_UNIT_TYPE = Type.getObjectType("jet/Unit"); public static final Type JET_FUNCTION0_TYPE = Type.getObjectType("jet/Function0"); public static final Type JET_FUNCTION1_TYPE = Type.getObjectType("jet/Function1"); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorSearchRule.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorSearchRule.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorSearchRule.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorSearchRule.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinder.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinder.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinder.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinder.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnnotationNames.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnnotationNames.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnnotationNames.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnnotationNames.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmPrimitiveType.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmPrimitiveType.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmPrimitiveType.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmPrimitiveType.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinder.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinder.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinder.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinder.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/ClassDescriptorFromJvmBytecode.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/ClassDescriptorFromJvmBytecode.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/ClassDescriptorFromJvmBytecode.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/ClassDescriptorFromJvmBytecode.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaCallableMemberDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaCallableMemberDescriptor.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaCallableMemberDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaCallableMemberDescriptor.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaMethodDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaMethodDescriptor.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaMethodDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaMethodDescriptor.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaNamespaceDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaNamespaceDescriptor.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaNamespaceDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaNamespaceDescriptor.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptor.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptor.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptorForObject.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptorForObject.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptorForObject.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptorForObject.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMapBuilder.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMapBuilder.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMapBuilder.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMapBuilder.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java index e7eed411bdb..265298c5409 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java @@ -32,7 +32,10 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.EnumValue; -import org.jetbrains.jet.lang.resolve.java.*; +import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; +import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; +import org.jetbrains.jet.lang.resolve.java.PsiClassFinder; import org.jetbrains.jet.lang.resolve.java.vfilefinder.VirtualFileFinder; import org.jetbrains.jet.lang.resolve.lazy.storage.LockBasedStorageManager; import org.jetbrains.jet.lang.resolve.lazy.storage.MemoizedFunctionToNotNull; @@ -40,7 +43,6 @@ import org.jetbrains.jet.lang.resolve.lazy.storage.StorageManager; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.utils.ExceptionUtils; import javax.inject.Inject; import java.io.IOException; @@ -71,7 +73,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer return loadMemberAnnotationsFromFile(file); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw new RuntimeException(e); } } }, StorageManager.ReferenceKind.STRONG); @@ -99,7 +101,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer return loadClassAnnotationsFromFile(virtualFile); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw new RuntimeException(e); } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java similarity index 99% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java index 2c565436e07..4c374a562af 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java @@ -36,7 +36,6 @@ import java.util.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumClassObject; public final class DescriptorResolverUtils { - private DescriptorResolverUtils() { } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedResolverUtils.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedResolverUtils.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedResolverUtils.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalAnnotationResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalAnnotationResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalAnnotationResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalAnnotationResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalSignatureResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalSignatureResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalSignatureResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalSignatureResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/FakeOverrideVisibilityResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/FakeOverrideVisibilityResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/FakeOverrideVisibilityResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/FakeOverrideVisibilityResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java similarity index 99% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java index 590e6129425..8ffb87a1b31 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java @@ -24,7 +24,6 @@ import org.jetbrains.jet.lang.descriptors.impl.ConstructorDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.java.JavaVisibilities; -import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor; import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayType; import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMemberResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeParameterResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeParameterResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeParameterResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeParameterResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeTransformer.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeTransformer.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeTransformer.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaTypeTransformer.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/KotlinClassFileHeader.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/KotlinClassFileHeader.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/KotlinClassFileHeader.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/KotlinClassFileHeader.java index 43a811aa69d..77d6121e907 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/KotlinClassFileHeader.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/KotlinClassFileHeader.java @@ -14,7 +14,6 @@ import org.jetbrains.jet.lang.resolve.java.AbiVersionUtil; import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.utils.ExceptionUtils; import java.io.IOException; import java.io.InputStream; @@ -40,7 +39,7 @@ public final class KotlinClassFileHeader { } } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw new RuntimeException(e); } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/MethodSignatureChecker.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/MethodSignatureChecker.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/MethodSignatureChecker.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/MethodSignatureChecker.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PostponedTasks.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PostponedTasks.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PostponedTasks.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PostponedTasks.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ProgressChecker.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ProgressChecker.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ProgressChecker.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ProgressChecker.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TypeUsage.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TypeUsage.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TypeUsage.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TypeUsage.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TypeVariableResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TypeVariableResolver.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TypeVariableResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TypeVariableResolver.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterConstructorDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterConstructorDescriptor.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterConstructorDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterConstructorDescriptor.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterFunctionDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterFunctionDescriptor.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterFunctionDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterFunctionDescriptor.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java index ab91dcee37c..4dcdb2bae93 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java @@ -35,7 +35,6 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import java.util.*; -import static org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils.erasure; import static org.jetbrains.jet.lang.types.Variance.INVARIANT; public class SingleAbstractMethodUtils { @@ -406,8 +405,8 @@ public class SingleAbstractMethodUtils { if (parameters1.size() != parameters2.size()) return false; for (Iterator it1 = parameters1.iterator(), it2 = parameters2.iterator(); it1.hasNext(); ) { - JavaType type1 = erasure(substitutor1.substitute(it1.next().getType()), substitutor1); - JavaType type2 = erasure(substitutor2.substitute(it2.next().getType()), substitutor2); + JavaType type1 = DescriptorResolverUtils.erasure(substitutor1.substitute(it1.next().getType()), substitutor1); + JavaType type2 = DescriptorResolverUtils.erasure(substitutor2.substitute(it2.next().getType()), substitutor2); if (!(type1 == null ? type2 == null : type1.equals(type2))) return false; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassNonStaticMembersScope.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassNonStaticMembersScope.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassNonStaticMembersScope.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassNonStaticMembersScope.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassStaticMembersScope.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassStaticMembersScope.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassStaticMembersScope.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassStaticMembersScope.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/MembersCache.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/MembersCache.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/MembersCache.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/MembersCache.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/MembersProvider.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/MembersProvider.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/MembersProvider.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/MembersProvider.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/NamedMembers.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/NamedMembers.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/NamedMembers.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/NamedMembers.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotation.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotation.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotation.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotation.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationArgument.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationArgument.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationArgument.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationArgument.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationAsAnnotationArgument.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationAsAnnotationArgument.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationAsAnnotationArgument.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationAsAnnotationArgument.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationOwner.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationOwner.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationOwner.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationOwner.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgument.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgument.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgument.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgument.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayType.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayType.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayType.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayType.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifier.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifier.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifier.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifier.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierType.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierType.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierType.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierType.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElement.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElement.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElement.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElement.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactory.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactory.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactory.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactory.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaField.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaField.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaField.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaField.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaLiteralAnnotationArgument.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaLiteralAnnotationArgument.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaLiteralAnnotationArgument.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaLiteralAnnotationArgument.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMember.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMember.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMember.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMember.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaModifierListOwner.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaModifierListOwner.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaModifierListOwner.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaModifierListOwner.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaNamedElement.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaNamedElement.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaNamedElement.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaNamedElement.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackage.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackage.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackage.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackage.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPrimitiveType.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPrimitiveType.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPrimitiveType.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPrimitiveType.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaReferenceAnnotationArgument.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaReferenceAnnotationArgument.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaReferenceAnnotationArgument.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaReferenceAnnotationArgument.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaType.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaType.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaType.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaType.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameter.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameter.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameter.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameter.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterListOwner.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterListOwner.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterListOwner.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterListOwner.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProvider.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProvider.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProvider.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProvider.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeSubstitutor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeSubstitutor.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeSubstitutor.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeSubstitutor.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameter.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameter.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameter.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameter.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardType.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardType.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardType.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardType.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/vfilefinder/VirtualFileFinder.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/vfilefinder/VirtualFileFinder.java similarity index 100% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/vfilefinder/VirtualFileFinder.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/vfilefinder/VirtualFileFinder.java diff --git a/generators/generators.iml b/generators/generators.iml index a3f41b52a46..3dcb254a678 100644 --- a/generators/generators.iml +++ b/generators/generators.iml @@ -16,6 +16,7 @@ + diff --git a/idea/idea.iml b/idea/idea.iml index e7d859397db..129a2218252 100644 --- a/idea/idea.iml +++ b/idea/idea.iml @@ -39,6 +39,7 @@ +