From 94ef5cb19beee018fdf3a3a5455be32575be2727 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 9 Oct 2013 19:09:36 +0400 Subject: [PATCH] Rename: SIGNATURES -> LIGHT_CLASSES --- .../src/org/jetbrains/jet/codegen/ClassBuilderMode.java | 4 ++-- .../src/org/jetbrains/jet/codegen/FunctionCodegen.java | 4 ++-- .../org/jetbrains/jet/codegen/ImplementationBodyCodegen.java | 4 ++-- .../backend/src/org/jetbrains/jet/codegen/MemberCodegen.java | 2 +- .../src/org/jetbrains/jet/codegen/state/JetTypeMapper.java | 2 +- .../jetbrains/jet/asJava/KotlinLightClassBuilderFactory.java | 2 +- .../src/org/jetbrains/jet/asJava/LightClassUtil.java | 2 +- .../jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderMode.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderMode.java index 34f606385b9..9a4e61bc43a 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderMode.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBuilderMode.java @@ -22,7 +22,7 @@ public enum ClassBuilderMode { */ FULL, /** - * Only function signatures + * Generating light classes: Only function signatures */ - SIGNATURES, + LIGHT_CLASSES, } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java index ad91128f4f7..8416d07be06 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java @@ -119,7 +119,7 @@ public class FunctionCodegen extends GenerationStateAware { } AnnotationCodegen.forMethod(mv, typeMapper).genAnnotations(functionDescriptor); - if (state.getClassBuilderMode() == ClassBuilderMode.SIGNATURES) return; + if (state.getClassBuilderMode() == ClassBuilderMode.LIGHT_CLASSES) return; generateParameterAnnotations(functionDescriptor, mv, jvmSignature); @@ -493,7 +493,7 @@ public class FunctionCodegen extends GenerationStateAware { int flags = getVisibilityAccessFlag(constructorDescriptor); MethodVisitor mv = classBuilder.newMethod(null, flags, "", "()V", null, null); - if (state.getClassBuilderMode() == ClassBuilderMode.SIGNATURES) { + if (state.getClassBuilderMode() == ClassBuilderMode.LIGHT_CLASSES) { return; } else if (state.getClassBuilderMode() == ClassBuilderMode.FULL) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index 5f74e4e485d..1b8127f3222 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -151,8 +151,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { int access = 0; - if (state.getClassBuilderMode() == ClassBuilderMode.SIGNATURES && !DescriptorUtils.isTopLevelDeclaration(descriptor)) { - // ClassBuilderMode.SIGNATURES means we are generating light classes & looking at a nested or inner class + if (state.getClassBuilderMode() == ClassBuilderMode.LIGHT_CLASSES && !DescriptorUtils.isTopLevelDeclaration(descriptor)) { + // ClassBuilderMode.LIGHT_CLASSES means we are generating light classes & looking at a nested or inner class // Light class generation is implemented so that Cls-classes only read bare code of classes, // without knowing whether these classes are inner or not (see ClassStubBuilder.EMPTY_STRATEGY) // Thus we must write full accessibility flags on inner classes in this mode diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java index f5b1f42c35a..48d81bf99aa 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java @@ -88,7 +88,7 @@ public class MemberCodegen extends GenerationStateAware { ClassDescriptor descriptor = state.getBindingContext().get(BindingContext.CLASS, aClass); if (descriptor == null || ErrorUtils.isError(descriptor) || descriptor.getName().equals(JetPsiUtil.NO_NAME_PROVIDED)) { - if (state.getClassBuilderMode() != ClassBuilderMode.SIGNATURES) { + if (state.getClassBuilderMode() != ClassBuilderMode.LIGHT_CLASSES) { throw new IllegalStateException( "Generating bad descriptor in ClassBuilderMode = " + state.getClassBuilderMode() + ": " + descriptor); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java index d27cd83e27f..e053c9ef433 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java @@ -296,7 +296,7 @@ public class JetTypeMapper extends BindingTraceAware { } if (ErrorUtils.isError(descriptor)) { - if (classBuilderMode != ClassBuilderMode.SIGNATURES) { + if (classBuilderMode != ClassBuilderMode.LIGHT_CLASSES) { throw new IllegalStateException(generateErrorMessageForErrorType(descriptor)); } Type asmType = Type.getObjectType("error/NonExistentClass"); diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassBuilderFactory.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassBuilderFactory.java index f14476f617f..faab7c463f8 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassBuilderFactory.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassBuilderFactory.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.codegen.ClassBuilderMode; @NotNull @Override public ClassBuilderMode getClassBuilderMode() { - return ClassBuilderMode.SIGNATURES; + return ClassBuilderMode.LIGHT_CLASSES; } @Override diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java index e706458d0c8..62f2072f916 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java @@ -226,7 +226,7 @@ public class LightClassUtil { //noinspection unchecked if (PsiTreeUtil.getParentOfType(declaration, JetFunction.class, JetProperty.class) != null) { // Can't get wrappers for internal declarations. Their classes are not generated during calcStub - // with ClassBuilderMode.SIGNATURES mode, and this produces "Class not found exception" in getDelegate() + // with ClassBuilderMode.LIGHT_CLASSES mode, and this produces "Class not found exception" in getDelegate() return null; } diff --git a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java index a49ce9969dc..4104cf83ff9 100644 --- a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java @@ -289,7 +289,7 @@ public class JetJavaFacadeTest extends JetLightCodeInsightFixtureTestCase { assertNotNull(String.format("Failed to wrap jetClass '%s' to class", jetClass.getText()), lightClass); - // This invokes codegen with ClassBuilderMode = SIGNATURES + // This invokes codegen with ClassBuilderMode = LIGHT_CLASSES // No exception/error should happen here lightClass.getDelegate(); }