From 179597156f6d33febba18e746fcae5d7120a3dec Mon Sep 17 00:00:00 2001 From: Alex Tkachman Date: Thu, 23 Aug 2012 14:41:33 +0300 Subject: [PATCH] weaken declaration access as suggested by IDEA --- .../jet/cli/jvm/compiler/TipsManager.java | 2 +- .../jet/codegen/AnnotationCodegen.java | 6 ++--- .../jet/codegen/ClassBodyCodegen.java | 2 +- .../jet/codegen/ClassFileFactory.java | 2 +- .../jetbrains/jet/codegen/ClosureCodegen.java | 4 ++-- .../jet/codegen/CodegenContexts.java | 2 +- .../jet/codegen/ExpressionCodegen.java | 6 ++--- .../jet/codegen/GenerationState.java | 2 +- .../codegen/ImplementationBodyCodegen.java | 4 ++-- .../jetbrains/jet/codegen/JetTypeMapper.java | 10 ++++----- .../jet/codegen/NamespaceCodegen.java | 2 +- .../jet/codegen/ObjectOrClosureCodegen.java | 2 +- .../org/jetbrains/jet/codegen/OwnerKind.java | 2 +- .../jetbrains/jet/codegen/ScriptCodegen.java | 2 +- .../org/jetbrains/jet/codegen/StackValue.java | 6 ++--- .../codegen/intrinsics/IntrinsicMethods.java | 22 +++++++++---------- .../signature/BothSignatureWriter.java | 8 +++---- 17 files changed, 42 insertions(+), 42 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/cli/jvm/compiler/TipsManager.java b/compiler/backend/src/org/jetbrains/jet/cli/jvm/compiler/TipsManager.java index e5252f6b26d..544133a19eb 100644 --- a/compiler/backend/src/org/jetbrains/jet/cli/jvm/compiler/TipsManager.java +++ b/compiler/backend/src/org/jetbrains/jet/cli/jvm/compiler/TipsManager.java @@ -131,7 +131,7 @@ public final class TipsManager { return Collections.emptyList(); } - public static Collection excludePrivateDescriptors( + private static Collection excludePrivateDescriptors( @NotNull Collection descriptors ) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AnnotationCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/AnnotationCodegen.java index 3a647608f89..6a28429571f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/AnnotationCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/AnnotationCodegen.java @@ -44,10 +44,10 @@ import java.util.Map; * @author alex.tkachman */ public abstract class AnnotationCodegen { - final JetTypeMapper typeMapper; - final BindingContext bindingContext; + private final JetTypeMapper typeMapper; + private final BindingContext bindingContext; - protected AnnotationCodegen(JetTypeMapper mapper) { + private AnnotationCodegen(JetTypeMapper mapper) { typeMapper = mapper; bindingContext = typeMapper.bindingContext; } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java index a5c1543356a..603d2c156b8 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java @@ -48,7 +48,7 @@ public abstract class ClassBodyCodegen { protected final List staticInitializerChunks = new ArrayList(); - public ClassBodyCodegen(JetClassOrObject aClass, CodegenContext context, ClassBuilder v, GenerationState state) { + protected ClassBodyCodegen(JetClassOrObject aClass, CodegenContext context, ClassBuilder v, GenerationState state) { this.state = state; descriptor = state.getBindingContext().get(BindingContext.CLASS, aClass); myClass = aClass; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java index dbd73749039..e1e0a209a75 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java @@ -29,7 +29,7 @@ import java.util.*; */ public class ClassFileFactory { private ClassBuilderFactory builderFactory; - public GenerationState state; + private GenerationState state; private final Map ns2codegen = new HashMap(); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java index b959752ac0d..e3851170d85 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java @@ -61,7 +61,7 @@ public class ClosureCodegen extends ObjectOrClosureCodegen { closureAnnotator = typeMapper.getClosureAnnotator(); } - public static JvmMethodSignature erasedInvokeSignature(FunctionDescriptor fd) { + private static JvmMethodSignature erasedInvokeSignature(FunctionDescriptor fd) { BothSignatureWriter signatureWriter = new BothSignatureWriter(BothSignatureWriter.Mode.METHOD, false); @@ -106,7 +106,7 @@ public class ClosureCodegen extends ObjectOrClosureCodegen { getInternalClassName(fd), receiverParameterType, getInternalClassName(fd).getAsmType()); } - public JvmMethodSignature invokeSignature(FunctionDescriptor fd) { + protected JvmMethodSignature invokeSignature(FunctionDescriptor fd) { return typeMapper.mapSignature(Name.identifier("invoke"), fd); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContexts.java b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContexts.java index 6b8a997226b..3a8d1701836 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContexts.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenContexts.java @@ -91,7 +91,7 @@ public class CodegenContexts { return "ROOT"; } }; - protected static final StackValue local1 = StackValue.local(1, JetTypeMapper.TYPE_OBJECT); + private static final StackValue local1 = StackValue.local(1, JetTypeMapper.TYPE_OBJECT); public abstract static class ReceiverContext extends CodegenContext { final CallableDescriptor receiverDescriptor; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index e2e40ba1284..1320afc5c1a 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -1287,7 +1287,7 @@ public class ExpressionCodegen extends JetVisitor { return myFrameMap.getIndex(descriptor); } - public void invokeFunctionNoParams(FunctionDescriptor functionDescriptor, Type expectedType, InstructionAdapter v) { + protected void invokeFunctionNoParams(FunctionDescriptor functionDescriptor, Type expectedType, InstructionAdapter v) { DeclarationDescriptor containingDeclaration = functionDescriptor.getOriginal().getContainingDeclaration(); boolean isStatic = containingDeclaration instanceof NamespaceDescriptor; functionDescriptor = functionDescriptor.getOriginal(); @@ -1449,7 +1449,7 @@ public class ExpressionCodegen extends JetVisitor { return propertyDescriptor; } - static boolean isOverrideForTrait(CallableMemberDescriptor propertyDescriptor) { + private static boolean isOverrideForTrait(CallableMemberDescriptor propertyDescriptor) { if (propertyDescriptor.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) { final Set overriddenDescriptors = propertyDescriptor.getOverriddenDescriptors(); for (CallableMemberDescriptor descriptor : overriddenDescriptors) { @@ -1632,7 +1632,7 @@ public class ExpressionCodegen extends JetVisitor { invokeMethodWithArguments(callableMethod, resolvedCall, call, receiver); } - public void invokeMethodWithArguments( + protected void invokeMethodWithArguments( @NotNull CallableMethod callableMethod, @NotNull ResolvedCall resolvedCall, @NotNull Call call, diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java b/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java index 27c40a60959..8ba19e82bae 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java @@ -134,7 +134,7 @@ public class GenerationState { return Pair.create(className, getFactory().forAnonymousSubclass(className)); } - public NamespaceCodegen forNamespace(FqName fqName, Collection jetFiles) { + protected NamespaceCodegen forNamespace(FqName fqName, Collection jetFiles) { return getFactory().forNamespace(fqName, jetFiles); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index 2eb5e27fe8a..8bed93a6c47 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -55,7 +55,7 @@ import static org.jetbrains.jet.codegen.JetTypeMapper.TYPE_OBJECT; * @author alex.tkachman */ public class ImplementationBodyCodegen extends ClassBodyCodegen { - public static final String VALUES = "$VALUES"; + private static final String VALUES = "$VALUES"; private JetDelegationSpecifier superCall; private String superClass; @Nullable // null means java/lang/Object @@ -1232,7 +1232,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { * Return pairs of descriptors. First is member of this that should be implemented by delegating to trait, * second is member of trait that contain implementation. */ - public static List> getTraitImplementations(@NotNull ClassDescriptor classDescriptor) { + private static List> getTraitImplementations(@NotNull ClassDescriptor classDescriptor) { List> r = Lists.newArrayList(); root: diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java index fb1ab4def96..776ea0a5817 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java @@ -64,8 +64,8 @@ public class JetTypeMapper { public static final Type JL_NUMBER_TYPE = Type.getObjectType("java/lang/Number"); public static final Type JL_STRING_BUILDER = Type.getObjectType("java/lang/StringBuilder"); public static final Type JL_STRING_TYPE = Type.getObjectType("java/lang/String"); - public static final Type JL_ENUM_TYPE = Type.getObjectType("java/lang/Enum"); - public static final Type JL_CHAR_SEQUENCE_TYPE = Type.getObjectType("java/lang/CharSequence"); + private static final Type JL_ENUM_TYPE = Type.getObjectType("java/lang/Enum"); + private static final Type JL_CHAR_SEQUENCE_TYPE = Type.getObjectType("java/lang/CharSequence"); private static final Type JL_COMPARABLE_TYPE = Type.getObjectType("java/lang/Comparable"); private static final Type JL_ITERABLE_TYPE = Type.getObjectType("java/lang/Iterable"); private static final Type JL_ITERATOR_TYPE = Type.getObjectType("java/util/Iterator"); @@ -245,7 +245,7 @@ public class JetTypeMapper { } } - public static MapTypeMode ownerKindToMapTypeMode(OwnerKind kind) { + private static MapTypeMode ownerKindToMapTypeMode(OwnerKind kind) { if (kind == OwnerKind.IMPLEMENTATION || kind == OwnerKind.NAMESPACE || kind instanceof OwnerKind.StaticDelegateKind) { return MapTypeMode.IMPL; } @@ -561,7 +561,7 @@ public class JetTypeMapper { return asmType; } - public static void writeSimpleType(BothSignatureWriter visitor, Type asmType, boolean nullable) { + private static void writeSimpleType(BothSignatureWriter visitor, Type asmType, boolean nullable) { visitor.writeAsmType(asmType, nullable); } @@ -1081,7 +1081,7 @@ public class JetTypeMapper { || className.getFqName().getFqName().equals("java.lang.Comparable"); } - public static boolean isGenericsArray(JetType type) { + private static boolean isGenericsArray(JetType type) { return JetStandardLibraryNames.ARRAY.is(type) && type.getArguments().get(0).getType().getConstructor().getDeclarationDescriptor() instanceof TypeParameterDescriptor; } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java index 9063e470cba..6c64b92ccbe 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java @@ -204,7 +204,7 @@ public class NamespaceCodegen { return false; } - public static void checkAllFilesHaveSameNamespace(Collection namespaceFiles) { + private static void checkAllFilesHaveSameNamespace(Collection namespaceFiles) { FqName commonFqName = null; for (JetFile file : namespaceFiles) { FqName fqName = JetPsiUtil.getFQName(file); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ObjectOrClosureCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ObjectOrClosureCodegen.java index 16985a2ef7a..b2bad195bd4 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ObjectOrClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ObjectOrClosureCodegen.java @@ -36,7 +36,7 @@ public class ObjectOrClosureCodegen { protected Type captureReceiver; public final GenerationState state; - protected final ExpressionCodegen exprContext; + private final ExpressionCodegen exprContext; protected final CodegenContext context; protected ClassBuilder cv = null; public JvmClassName name = null; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/OwnerKind.java b/compiler/backend/src/org/jetbrains/jet/codegen/OwnerKind.java index 000fe15c9fa..2afa8c5228e 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/OwnerKind.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/OwnerKind.java @@ -22,7 +22,7 @@ package org.jetbrains.jet.codegen; public class OwnerKind { private final String name; - public OwnerKind(String name) { + protected OwnerKind(String name) { this.name = name; } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java index e275480126f..cfb208677e0 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java @@ -243,7 +243,7 @@ public class ScriptCodegen { this.earlierScripts = earlierScriptDescriptors; } - public int getScriptIndex(@NotNull ScriptDescriptor scriptDescriptor) { + protected int getScriptIndex(@NotNull ScriptDescriptor scriptDescriptor) { int index = earlierScripts.indexOf(scriptDescriptor); if (index < 0) { throw new IllegalStateException("Unregistered script: " + scriptDescriptor); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java index c974f1573b8..773bc942672 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java @@ -45,7 +45,7 @@ public abstract class StackValue { @NotNull public final Type type; - public StackValue(@NotNull Type type) { + protected StackValue(@NotNull Type type) { this.type = type; } @@ -75,7 +75,7 @@ public abstract class StackValue { * @param v the visitor used to generate the instructions * @param depth the number of new values put onto the stack */ - public void moveToTopOfStack(Type type, InstructionAdapter v, int depth) { + protected void moveToTopOfStack(Type type, InstructionAdapter v, int depth) { put(type, v); } @@ -231,7 +231,7 @@ public abstract class StackValue { } } - protected static void pop(Type type, InstructionAdapter v) { + private static void pop(Type type, InstructionAdapter v) { if (type.getSize() == 1) { v.pop(); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java index 797cb0983cc..74cc5522b8e 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java @@ -51,19 +51,19 @@ public class IntrinsicMethods { private static final IntrinsicMethod DEC = new Increment(-1); private static final IntrinsicMethod HASH_CODE = new HashCode(); - public static final IntrinsicMethod ARRAY_SIZE = new ArraySize(); - public static final IntrinsicMethod ARRAY_INDICES = new ArrayIndices(); - public static final Equals EQUALS = new Equals(); - public static final IdentityEquals IDENTITY_EQUALS = new IdentityEquals(); - public static final IteratorNext ITERATOR_NEXT = new IteratorNext(); - public static final ArraySet ARRAY_SET = new ArraySet(); - public static final ArrayGet ARRAY_GET = new ArrayGet(); - public static final StringPlus STRING_PLUS = new StringPlus(); + private static final IntrinsicMethod ARRAY_SIZE = new ArraySize(); + private static final IntrinsicMethod ARRAY_INDICES = new ArrayIndices(); + private static final Equals EQUALS = new Equals(); + private static final IdentityEquals IDENTITY_EQUALS = new IdentityEquals(); + private static final IteratorNext ITERATOR_NEXT = new IteratorNext(); + private static final ArraySet ARRAY_SET = new ArraySet(); + private static final ArrayGet ARRAY_GET = new ArrayGet(); + private static final StringPlus STRING_PLUS = new StringPlus(); public static final String KOTLIN_JAVA_CLASS_FUNCTION = "kotlin.javaClass.function"; public static final String KOTLIN_ARRAYS_ARRAY = "kotlin.arrays.array"; - public static final String KOTLIN_JAVA_CLASS_PROPERTY = "kotlin.javaClass.property"; - public static final EnumValues ENUM_VALUES = new EnumValues(); - public static final EnumValueOf ENUM_VALUE_OF = new EnumValueOf(); + private static final String KOTLIN_JAVA_CLASS_PROPERTY = "kotlin.javaClass.property"; + private static final EnumValues ENUM_VALUES = new EnumValues(); + private static final EnumValueOf ENUM_VALUE_OF = new EnumValueOf(); private final Map namedMethods = new HashMap(); private static final IntrinsicMethod ARRAY_ITERATOR = new ArrayIterator(); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java b/compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java index 85cb02cf88a..afc80f7f8f3 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java @@ -458,7 +458,7 @@ public class BothSignatureWriter { @NotNull - public Method makeAsmMethod(String name) { + protected Method makeAsmMethod(String name) { List jvmParameterTypes = new ArrayList(kotlinParameterTypes.size()); for (JvmMethodParameterSignature p : kotlinParameterTypes) { jvmParameterTypes.add(p.getAsmType()); @@ -476,19 +476,19 @@ public class BothSignatureWriter { } @NotNull - public List makeKotlinParameterTypes() { + protected List makeKotlinParameterTypes() { checkState(State.METHOD_END); // TODO: return nulls if equal to #makeJavaString return kotlinParameterTypes; } @NotNull - public String makeKotlinReturnTypeSignature() { + protected String makeKotlinReturnTypeSignature() { checkState(State.METHOD_END); return kotlinReturnType; } - public String makeKotlinMethodTypeParameters() { + protected String makeKotlinMethodTypeParameters() { checkState(State.METHOD_END); return kotlinClassParameters; }