From 5119afae52e5ae08ca8e378e00895d824a179f03 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 18 Sep 2013 17:51:47 +0400 Subject: [PATCH] Extract 'descriptors' module --- .idea/artifacts/KotlinPlugin.xml | 1 + .idea/modules.xml | 1 + build.xml | 3 +++ compiler/frontend/frontend.iml | 1 + .../frontend/serialization/serialization.iml | 1 + core/descriptors/descriptors.iml | 16 ++++++++++++++++ .../jet/lang/DefaultModuleConfiguration.java | 0 .../jet/lang/ModuleConfiguration.java | 0 .../jet/lang/PlatformToKotlinClassMap.java | 0 .../lang/descriptors/CallableDescriptor.java | 0 .../descriptors/CallableMemberDescriptor.java | 0 .../jet/lang/descriptors/ClassDescriptor.java | 0 .../jet/lang/descriptors/ClassKind.java | 0 .../ClassOrNamespaceDescriptor.java | 0 .../descriptors/ClassifierDescriptor.java | 0 .../descriptors/ConstructorDescriptor.java | 0 .../descriptors/DeclarationDescriptor.java | 0 .../DeclarationDescriptorNonRoot.java | 0 .../DeclarationDescriptorVisitor.java | 0 .../DeclarationDescriptorWithVisibility.java | 0 .../lang/descriptors/FunctionDescriptor.java | 0 .../lang/descriptors/MemberDescriptor.java | 0 .../jet/lang/descriptors/Modality.java | 0 .../lang/descriptors/ModuleDescriptor.java | 0 .../descriptors/ModuleDescriptorImpl.java | 0 .../jetbrains/jet/lang/descriptors/Named.java | 0 .../lang/descriptors/NamespaceDescriptor.java | 0 .../PropertyAccessorDescriptor.java | 0 .../lang/descriptors/PropertyDescriptor.java | 0 .../descriptors/PropertyGetterDescriptor.java | 0 .../descriptors/PropertySetterDescriptor.java | 0 .../ReceiverParameterDescriptor.java | 0 .../lang/descriptors/ScriptDescriptor.java | 0 .../descriptors/SimpleFunctionDescriptor.java | 0 .../descriptors/TypeParameterDescriptor.java | 0 .../descriptors/ValueParameterDescriptor.java | 0 .../lang/descriptors/VariableDescriptor.java | 0 .../VariableDescriptorForObject.java | 0 .../jet/lang/descriptors/Visibilities.java | 0 .../jet/lang/descriptors/Visibility.java | 0 .../descriptors/annotations/Annotated.java | 0 .../annotations/AnnotatedImpl.java | 0 .../AnnotationArgumentVisitor.java | 0 .../annotations/AnnotationDescriptor.java | 0 .../AbstractLazyTypeParameterDescriptor.java | 0 .../impl/AbstractNamespaceDescriptorImpl.java | 0 .../AbstractReceiverParameterDescriptor.java | 0 .../impl/AnonymousFunctionDescriptor.java | 0 .../descriptors/impl/ClassDescriptorBase.java | 0 .../descriptors/impl/ClassDescriptorImpl.java | 0 .../impl/ConstructorDescriptorImpl.java | 0 .../impl/DeclarationDescriptorImpl.java | 0 .../DeclarationDescriptorNonRootImpl.java | 0 ...clarationDescriptorVisitorEmptyBodies.java | 0 .../impl/FunctionDescriptorImpl.java | 0 .../impl/LazySubstitutingClassDescriptor.java | 0 .../impl/MutableClassDescriptor.java | 0 .../impl/MutableClassDescriptorLite.java | 0 .../impl/NamespaceDescriptorImpl.java | 0 .../impl/NamespaceDescriptorParent.java | 0 .../impl/NamespaceLikeBuilder.java | 0 .../impl/NamespaceLikeBuilderDummy.java | 0 .../impl/PropertyAccessorDescriptorImpl.java | 0 .../impl/PropertyDescriptorForObjectImpl.java | 0 .../impl/PropertyDescriptorImpl.java | 0 .../impl/PropertyGetterDescriptorImpl.java | 0 .../impl/PropertySetterDescriptorImpl.java | 0 .../impl/ReceiverParameterDescriptorImpl.java | 0 .../impl/ScriptCodeDescriptor.java | 0 .../impl/SimpleFunctionDescriptorImpl.java | 0 .../impl/TypeParameterDescriptorImpl.java | 0 .../impl/ValueParameterDescriptorImpl.java | 0 .../impl/VariableDescriptorImpl.java | 0 .../jet/lang/resolve/DescriptorFactory.java | 0 .../jet/lang/resolve/DescriptorUtils.java | 0 .../ExternalOverridabilityCondition.java | 0 .../jet/lang/resolve/ImportPath.java | 0 .../jet/lang/resolve/OverridingUtil.java | 0 .../jet/lang/resolve/VisibilityUtil.java | 0 .../calls/inference/ConstraintPosition.java | 0 .../calls/inference/ConstraintSystem.java | 0 .../calls/inference/ConstraintSystemImpl.java | 19 ++++++++++--------- .../inference/ConstraintSystemStatus.java | 0 .../calls/inference/TypeConstraints.java | 0 .../calls/inference/TypeConstraintsImpl.java | 0 .../resolve/constants/AnnotationValue.java | 0 .../lang/resolve/constants/ArrayValue.java | 0 .../lang/resolve/constants/BooleanValue.java | 0 .../jet/lang/resolve/constants/ByteValue.java | 0 .../jet/lang/resolve/constants/CharValue.java | 0 .../constants/CompileTimeConstant.java | 0 .../lang/resolve/constants/DoubleValue.java | 0 .../jet/lang/resolve/constants/EnumValue.java | 0 .../lang/resolve/constants/ErrorValue.java | 0 .../lang/resolve/constants/FloatValue.java | 0 .../jet/lang/resolve/constants/IntValue.java | 0 .../resolve/constants/JavaClassValue.java | 0 .../jet/lang/resolve/constants/LongValue.java | 0 .../jet/lang/resolve/constants/NullValue.java | 0 .../constants/NumberValueTypeConstructor.java | 0 .../lang/resolve/constants/ShortValue.java | 0 .../lang/resolve/constants/StringValue.java | 0 .../lazy/storage/LockBasedStorageManager.java | 0 .../storage/MemoizedFunctionToNotNull.java | 0 .../storage/MemoizedFunctionToNullable.java | 0 .../lazy/storage/NotNullLazyValue.java | 0 .../lazy/storage/NullableLazyValue.java | 0 .../resolve/lazy/storage/StorageManager.java | 0 .../jet/lang/resolve/name/FqName.java | 0 .../jet/lang/resolve/name/FqNameBase.java | 0 .../jet/lang/resolve/name/FqNameUnsafe.java | 0 .../jet/lang/resolve/name/LabelName.java | 0 .../jetbrains/jet/lang/resolve/name/Name.java | 0 .../resolve/scopes/AbstractScopeAdapter.java | 0 .../jet/lang/resolve/scopes/ChainedScope.java | 0 .../resolve/scopes/ClassObjectMixinScope.java | 0 .../lang/resolve/scopes/FilteringScope.java | 0 .../scopes/InnerClassesScopeWrapper.java | 0 .../jet/lang/resolve/scopes/JetScope.java | 0 .../lang/resolve/scopes/JetScopeAdapter.java | 0 .../jet/lang/resolve/scopes/JetScopeImpl.java | 0 .../lang/resolve/scopes/LazyScopeAdapter.java | 0 .../resolve/scopes/RedeclarationHandler.java | 0 .../resolve/scopes/SubstitutingScope.java | 0 .../lang/resolve/scopes/WritableScope.java | 0 .../resolve/scopes/WritableScopeImpl.java | 0 .../scopes/WritableScopeWithImports.java | 0 .../receivers/AbstractReceiverValue.java | 0 .../scopes/receivers/ClassReceiver.java | 0 .../scopes/receivers/ExtensionReceiver.java | 0 .../scopes/receivers/ReceiverValue.java | 0 .../scopes/receivers/ScriptReceiver.java | 0 .../scopes/receivers/ThisReceiver.java | 0 .../scopes/receivers/TransientReceiver.java | 0 .../jet/lang/types/CommonSupertypes.java | 0 .../lang/types/CompositeTypeSubstitution.java | 0 .../jet/lang/types/DescriptorSubstitutor.java | 0 .../jetbrains/jet/lang/types/ErrorUtils.java | 0 .../types/IntersectionTypeConstructor.java | 0 .../org/jetbrains/jet/lang/types/JetType.java | 0 .../jetbrains/jet/lang/types/JetTypeImpl.java | 0 .../jet/lang/types/NamespaceType.java | 0 .../jet/lang/types/SubstitutionUtils.java | 0 .../jet/lang/types/TypeConstructor.java | 0 .../jet/lang/types/TypeConstructorImpl.java | 0 .../jet/lang/types/TypeProjection.java | 0 .../jet/lang/types/TypeSubstitution.java | 0 .../jet/lang/types/TypeSubstitutor.java | 0 .../jetbrains/jet/lang/types/TypeUtils.java | 0 .../jetbrains/jet/lang/types/Variance.java | 0 .../lang/types/checker/JetTypeChecker.java | 0 .../types/checker/TypeCheckingProcedure.java | 0 .../lang/types/checker/TypingConstraints.java | 0 .../types/error/ErrorClassDescriptor.java | 0 .../ErrorSimpleFunctionDescriptorImpl.java | 0 .../types/lang/BuiltInsSerializationUtil.java | 0 .../lang/BuiltinsNamespaceDescriptorImpl.java | 0 .../jet/lang/types/lang/KotlinBuiltIns.java | 0 .../jet/lang/types/lang/PrimitiveType.java | 0 .../jet/renderer/DescriptorRenderer.java | 0 .../renderer/DescriptorRendererBuilder.java | 0 .../jet/renderer/DescriptorRendererImpl.java | 0 .../jet/renderer/KeywordStringsGenerated.java | 0 .../org/jetbrains/jet/renderer/Renderer.java | 0 .../frontend/GenerateKeywordStrings.java | 2 +- 165 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 core/descriptors/descriptors.iml rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/ModuleConfiguration.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/PlatformToKotlinClassMap.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/CallableDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/CallableMemberDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/ClassKind.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/ClassOrNamespaceDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/ClassifierDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorNonRoot.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorWithVisibility.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/MemberDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/Modality.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/Named.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/ReceiverParameterDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/SimpleFunctionDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorForObject.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/Visibilities.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/Visibility.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/annotations/Annotated.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotatedImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationArgumentVisitor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/AbstractNamespaceDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/AbstractReceiverParameterDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/AnonymousFunctionDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/ConstructorDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorNonRootImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/FunctionDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorParent.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilder.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilderDummy.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/PropertyAccessorDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorForObjectImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/PropertyGetterDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/ReceiverParameterDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/ScriptCodeDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/SimpleFunctionDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/ValueParameterDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/descriptors/impl/VariableDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/ExternalOverridabilityCondition.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/ImportPath.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/VisibilityUtil.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintPosition.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java (95%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemStatus.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraints.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraintsImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/AnnotationValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/ArrayValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/BooleanValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/ByteValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/CharValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstant.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/DoubleValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/EnumValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/ErrorValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/FloatValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/IntValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/JavaClassValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/LongValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/NullValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/NumberValueTypeConstructor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/ShortValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/constants/StringValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedStorageManager.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/lazy/storage/MemoizedFunctionToNotNull.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/lazy/storage/MemoizedFunctionToNullable.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/lazy/storage/NotNullLazyValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/lazy/storage/NullableLazyValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/lazy/storage/StorageManager.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/name/FqName.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/name/FqNameBase.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/name/LabelName.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/name/Name.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeAdapter.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/receivers/AbstractReceiverValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ClassReceiver.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExtensionReceiver.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ReceiverValue.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ThisReceiver.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/resolve/scopes/receivers/TransientReceiver.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/CommonSupertypes.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/CompositeTypeSubstitution.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/DescriptorSubstitutor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/ErrorUtils.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/JetType.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/JetTypeImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/NamespaceType.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/TypeConstructor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/TypeProjection.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/TypeSubstitution.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/TypeUtils.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/Variance.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/checker/JetTypeChecker.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/checker/TypingConstraints.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/error/ErrorClassDescriptor.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/error/ErrorSimpleFunctionDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/lang/types/lang/PrimitiveType.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/renderer/DescriptorRenderer.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/renderer/DescriptorRendererBuilder.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java (100%) rename {compiler/frontend => core/descriptors}/src/org/jetbrains/jet/renderer/Renderer.java (100%) diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml index 2b330cf6985..a1364ea92f6 100644 --- a/.idea/artifacts/KotlinPlugin.xml +++ b/.idea/artifacts/KotlinPlugin.xml @@ -7,6 +7,7 @@ + diff --git a/.idea/modules.xml b/.idea/modules.xml index ce8b01f9be2..f1cc2f0995e 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -12,6 +12,7 @@ + diff --git a/build.xml b/build.xml index 51f917275c9..0dd685d3a8f 100644 --- a/build.xml +++ b/build.xml @@ -24,6 +24,7 @@ + @@ -44,6 +45,7 @@ + @@ -132,6 +134,7 @@ + diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml index 3753a2f48fa..de063267580 100644 --- a/compiler/frontend/frontend.iml +++ b/compiler/frontend/frontend.iml @@ -13,6 +13,7 @@ + diff --git a/compiler/frontend/serialization/serialization.iml b/compiler/frontend/serialization/serialization.iml index 3a14cef9af4..df9ea8ae178 100644 --- a/compiler/frontend/serialization/serialization.iml +++ b/compiler/frontend/serialization/serialization.iml @@ -14,6 +14,7 @@ + diff --git a/core/descriptors/descriptors.iml b/core/descriptors/descriptors.iml new file mode 100644 index 00000000000..b86bf878e49 --- /dev/null +++ b/core/descriptors/descriptors.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java b/core/descriptors/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java rename to core/descriptors/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/ModuleConfiguration.java b/core/descriptors/src/org/jetbrains/jet/lang/ModuleConfiguration.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/ModuleConfiguration.java rename to core/descriptors/src/org/jetbrains/jet/lang/ModuleConfiguration.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/PlatformToKotlinClassMap.java b/core/descriptors/src/org/jetbrains/jet/lang/PlatformToKotlinClassMap.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/PlatformToKotlinClassMap.java rename to core/descriptors/src/org/jetbrains/jet/lang/PlatformToKotlinClassMap.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/CallableDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/CallableDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/CallableDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/CallableDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/CallableMemberDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/CallableMemberDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/CallableMemberDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/CallableMemberDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassKind.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassKind.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassKind.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassKind.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassOrNamespaceDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassOrNamespaceDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassOrNamespaceDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassOrNamespaceDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassifierDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassifierDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassifierDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassifierDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorNonRoot.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorNonRoot.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorNonRoot.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorNonRoot.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorWithVisibility.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorWithVisibility.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorWithVisibility.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorWithVisibility.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MemberDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/MemberDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MemberDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/MemberDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Modality.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Modality.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Modality.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/Modality.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Named.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Named.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Named.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/Named.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/NamespaceDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ReceiverParameterDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ReceiverParameterDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ReceiverParameterDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/ReceiverParameterDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/SimpleFunctionDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/SimpleFunctionDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/SimpleFunctionDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/SimpleFunctionDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorForObject.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorForObject.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorForObject.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/VariableDescriptorForObject.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibilities.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibilities.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibilities.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibilities.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibility.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibility.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibility.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibility.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/annotations/Annotated.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/Annotated.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/annotations/Annotated.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/Annotated.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotatedImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotatedImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotatedImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotatedImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationArgumentVisitor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationArgumentVisitor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationArgumentVisitor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationArgumentVisitor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/AbstractNamespaceDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractNamespaceDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/AbstractNamespaceDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractNamespaceDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/AbstractReceiverParameterDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractReceiverParameterDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/AbstractReceiverParameterDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractReceiverParameterDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/AnonymousFunctionDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AnonymousFunctionDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/AnonymousFunctionDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AnonymousFunctionDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ConstructorDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ConstructorDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ConstructorDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ConstructorDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorNonRootImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorNonRootImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorNonRootImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorNonRootImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/FunctionDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/FunctionDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/FunctionDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/FunctionDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorParent.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorParent.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorParent.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorParent.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilder.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilder.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilder.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilder.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilderDummy.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilderDummy.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilderDummy.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilderDummy.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertyAccessorDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyAccessorDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertyAccessorDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyAccessorDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorForObjectImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorForObjectImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorForObjectImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorForObjectImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertyGetterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyGetterDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertyGetterDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyGetterDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ReceiverParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ReceiverParameterDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ReceiverParameterDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ReceiverParameterDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScriptCodeDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ScriptCodeDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScriptCodeDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ScriptCodeDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/SimpleFunctionDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SimpleFunctionDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/SimpleFunctionDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SimpleFunctionDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ValueParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ValueParameterDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ValueParameterDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ValueParameterDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/VariableDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/VariableDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/VariableDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/VariableDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ExternalOverridabilityCondition.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/ExternalOverridabilityCondition.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/ExternalOverridabilityCondition.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/ExternalOverridabilityCondition.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportPath.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/ImportPath.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportPath.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/ImportPath.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VisibilityUtil.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/VisibilityUtil.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/VisibilityUtil.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/VisibilityUtil.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintPosition.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintPosition.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintPosition.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintPosition.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java index 5ada9a9666e..0e6c1932a77 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java @@ -120,8 +120,9 @@ public class ConstraintSystemImpl implements ConstraintSystem { }; public ConstraintSystemImpl() { - this.resultingSubstitutor = createTypeSubstitutorWithDefaultForUnknownTypeParameter(new TypeProjection(CANT_INFER_TYPE_PARAMETER)); - this.currentSubstitutor = createTypeSubstitutorWithDefaultForUnknownTypeParameter(new TypeProjection(DONT_CARE)); + this.resultingSubstitutor = createTypeSubstitutorWithDefaultForUnknownTypeParameter(new TypeProjection( + TypeUtils.CANT_INFER_TYPE_PARAMETER)); + this.currentSubstitutor = createTypeSubstitutorWithDefaultForUnknownTypeParameter(new TypeProjection(TypeUtils.DONT_CARE)); } private TypeSubstitutor createTypeSubstitutorWithDefaultForUnknownTypeParameter(@Nullable final TypeProjection defaultTypeProjection) { @@ -134,7 +135,7 @@ public class ConstraintSystemImpl implements ConstraintSystem { if (typeParameterConstraints.containsKey(descriptor)) { JetType value = getTypeConstraints(descriptor).getValue(); - if (value != null && !TypeUtils.equalsOrContainsAsArgument(value, DONT_CARE)) { + if (value != null && !TypeUtils.equalsOrContainsAsArgument(value, TypeUtils.DONT_CARE)) { return new TypeProjection(value); } return defaultTypeProjection; @@ -202,7 +203,7 @@ public class ConstraintSystemImpl implements ConstraintSystem { @NotNull JetType subjectType, @NotNull ConstraintPosition constraintPosition ) { - if (constrainingType != null && noExpectedType(constrainingType)) return; + if (constrainingType != null && TypeUtils.noExpectedType(constrainingType)) return; if (constraintPosition == ConstraintPosition.EXPECTED_TYPE_POSITION) { systemWithoutExpectedTypeConstraint = copy(); @@ -262,11 +263,11 @@ public class ConstraintSystemImpl implements ConstraintSystem { } private boolean isErrorOrSpecialType(@Nullable JetType type) { - if (type == DONT_CARE || type == CANT_INFER_TYPE_PARAMETER) { + if (type == TypeUtils.DONT_CARE || type == TypeUtils.CANT_INFER_TYPE_PARAMETER) { return true; } - if (type == null || (type.isError() && type != PLACEHOLDER_FUNCTION_TYPE)) { + if (type == null || (type.isError() && type != TypeUtils.PLACEHOLDER_FUNCTION_TYPE)) { hasErrorInConstrainingTypes = true; return true; } @@ -284,10 +285,10 @@ public class ConstraintSystemImpl implements ConstraintSystem { if (isErrorOrSpecialType(subType) || isErrorOrSpecialType(superType)) return; assert subType != null && superType != null; - assert superType != PLACEHOLDER_FUNCTION_TYPE : "The type for " + constraintPosition + " shouldn't be a placeholder for function type"; + assert superType != TypeUtils.PLACEHOLDER_FUNCTION_TYPE : "The type for " + constraintPosition + " shouldn't be a placeholder for function type"; KotlinBuiltIns kotlinBuiltIns = KotlinBuiltIns.getInstance(); - if (subType == PLACEHOLDER_FUNCTION_TYPE) { + if (subType == TypeUtils.PLACEHOLDER_FUNCTION_TYPE) { if (!kotlinBuiltIns.isFunctionOrExtensionFunctionType(superType)) { if (isMyTypeVariable(superType)) { // a constraint binds type parameter and any function type, so there is no new info and no error @@ -303,7 +304,7 @@ public class ConstraintSystemImpl implements ConstraintSystem { // can be considered as extension function if one is expected // (special type constructor for function/ extension function should be introduced like PLACEHOLDER_FUNCTION_TYPE) if (constraintKind == SUB_TYPE && kotlinBuiltIns.isFunctionType(subType) && kotlinBuiltIns.isExtensionFunctionType(superType)) { - subType = createCorrespondingExtensionFunctionType(subType, DONT_CARE); + subType = createCorrespondingExtensionFunctionType(subType, TypeUtils.DONT_CARE); } // can be equal for the recursive invocations: diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemStatus.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemStatus.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemStatus.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemStatus.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraints.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraints.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraints.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraints.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraintsImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraintsImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraintsImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeConstraintsImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/AnnotationValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/AnnotationValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/AnnotationValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/AnnotationValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/ArrayValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ArrayValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/ArrayValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ArrayValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/BooleanValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/BooleanValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/BooleanValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/BooleanValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/ByteValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ByteValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/ByteValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ByteValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CharValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CharValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CharValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CharValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstant.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstant.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstant.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstant.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/DoubleValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/DoubleValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/DoubleValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/DoubleValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/EnumValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/EnumValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/EnumValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/EnumValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/ErrorValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ErrorValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/ErrorValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ErrorValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/FloatValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/FloatValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/FloatValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/FloatValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/IntValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/IntValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/JavaClassValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/JavaClassValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/JavaClassValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/JavaClassValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/LongValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/LongValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/LongValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/LongValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/NullValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NullValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/NullValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NullValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/NumberValueTypeConstructor.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NumberValueTypeConstructor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/NumberValueTypeConstructor.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NumberValueTypeConstructor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/ShortValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ShortValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/ShortValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ShortValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/StringValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/StringValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/StringValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/StringValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedStorageManager.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedStorageManager.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedStorageManager.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedStorageManager.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/MemoizedFunctionToNotNull.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/lazy/storage/MemoizedFunctionToNotNull.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/MemoizedFunctionToNotNull.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/lazy/storage/MemoizedFunctionToNotNull.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/MemoizedFunctionToNullable.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/lazy/storage/MemoizedFunctionToNullable.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/MemoizedFunctionToNullable.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/lazy/storage/MemoizedFunctionToNullable.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/NotNullLazyValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/lazy/storage/NotNullLazyValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/NotNullLazyValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/lazy/storage/NotNullLazyValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/NullableLazyValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/lazy/storage/NullableLazyValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/NullableLazyValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/lazy/storage/NullableLazyValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/StorageManager.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/lazy/storage/StorageManager.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/StorageManager.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/lazy/storage/StorageManager.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqName.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqName.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqNameBase.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameBase.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqNameBase.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameBase.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/LabelName.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/LabelName.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/LabelName.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/name/LabelName.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/Name.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/Name.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/Name.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/name/Name.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeAdapter.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeAdapter.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeAdapter.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeAdapter.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/AbstractReceiverValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/AbstractReceiverValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/AbstractReceiverValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/AbstractReceiverValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ClassReceiver.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ClassReceiver.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ClassReceiver.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ClassReceiver.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExtensionReceiver.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExtensionReceiver.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExtensionReceiver.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExtensionReceiver.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ReceiverValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ReceiverValue.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ReceiverValue.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ReceiverValue.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ThisReceiver.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ThisReceiver.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ThisReceiver.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ThisReceiver.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/TransientReceiver.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/TransientReceiver.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/TransientReceiver.java rename to core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/TransientReceiver.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/CommonSupertypes.java b/core/descriptors/src/org/jetbrains/jet/lang/types/CommonSupertypes.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/CommonSupertypes.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/CommonSupertypes.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/CompositeTypeSubstitution.java b/core/descriptors/src/org/jetbrains/jet/lang/types/CompositeTypeSubstitution.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/CompositeTypeSubstitution.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/CompositeTypeSubstitution.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/DescriptorSubstitutor.java b/core/descriptors/src/org/jetbrains/jet/lang/types/DescriptorSubstitutor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/DescriptorSubstitutor.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/DescriptorSubstitutor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java b/core/descriptors/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/JetType.java b/core/descriptors/src/org/jetbrains/jet/lang/types/JetType.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/JetType.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/JetType.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/JetTypeImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/types/JetTypeImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/JetTypeImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/JetTypeImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/NamespaceType.java b/core/descriptors/src/org/jetbrains/jet/lang/types/NamespaceType.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/NamespaceType.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/NamespaceType.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructor.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeProjection.java b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeProjection.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/TypeProjection.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/TypeProjection.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeSubstitution.java b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitution.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/TypeSubstitution.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitution.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/TypeUtils.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/Variance.java b/core/descriptors/src/org/jetbrains/jet/lang/types/Variance.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/Variance.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/Variance.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/checker/JetTypeChecker.java b/core/descriptors/src/org/jetbrains/jet/lang/types/checker/JetTypeChecker.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/checker/JetTypeChecker.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/checker/JetTypeChecker.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java b/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/checker/TypingConstraints.java b/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypingConstraints.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/checker/TypingConstraints.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypingConstraints.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/error/ErrorClassDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/types/error/ErrorClassDescriptor.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/error/ErrorClassDescriptor.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/error/ErrorClassDescriptor.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/error/ErrorSimpleFunctionDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/types/error/ErrorSimpleFunctionDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/error/ErrorSimpleFunctionDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/error/ErrorSimpleFunctionDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/PrimitiveType.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/PrimitiveType.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/lang/PrimitiveType.java rename to core/descriptors/src/org/jetbrains/jet/lang/types/lang/PrimitiveType.java diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRenderer.java b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRenderer.java rename to core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRenderer.java diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererBuilder.java b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererBuilder.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererBuilder.java rename to core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererBuilder.java diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java rename to core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java b/core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java rename to core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/Renderer.java b/core/descriptors/src/org/jetbrains/jet/renderer/Renderer.java similarity index 100% rename from compiler/frontend/src/org/jetbrains/jet/renderer/Renderer.java rename to core/descriptors/src/org/jetbrains/jet/renderer/Renderer.java diff --git a/generators/src/org/jetbrains/jet/generators/frontend/GenerateKeywordStrings.java b/generators/src/org/jetbrains/jet/generators/frontend/GenerateKeywordStrings.java index 83418338f00..a02d23c8cb9 100644 --- a/generators/src/org/jetbrains/jet/generators/frontend/GenerateKeywordStrings.java +++ b/generators/src/org/jetbrains/jet/generators/frontend/GenerateKeywordStrings.java @@ -31,7 +31,7 @@ import java.util.Iterator; import java.util.List; public class GenerateKeywordStrings { - public static final File DEST_FILE = new File("compiler/frontend/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java"); + public static final File DEST_FILE = new File("core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java"); @NotNull public static String generate() throws IOException {