From e8d0022406258634acebf76ae47626efab1753dd Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 11 Jun 2013 20:04:27 +0400 Subject: [PATCH] Typo. --- .../jetbrains/jet/codegen/ExpressionCodegen.java | 16 ++++++++-------- .../jet/codegen/ImplementationBodyCodegen.java | 4 ++-- .../jet/codegen/context/CodegenContext.java | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index 3cc14ad907f..8ec6fe63a3c 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -1629,7 +1629,7 @@ public class ExpressionCodegen extends JetVisitor implem expression.getReferencedNameElementType() == JetTokens.FIELD_IDENTIFIER && contextKind() != OwnerKind.TRAIT_IMPL; JetExpression r = getReceiverForSelector(expression); boolean isSuper = r instanceof JetSuperExpression; - propertyDescriptor = accessablePropertyDescriptor(propertyDescriptor); + propertyDescriptor = accessiblePropertyDescriptor(propertyDescriptor); StackValue iValue = intermediateValueForProperty(propertyDescriptor, directToField, isSuper ? (JetSuperExpression) r : null); if (directToField) { @@ -1800,7 +1800,7 @@ public class ExpressionCodegen extends JetVisitor implem } } - propertyDescriptor = accessablePropertyDescriptor(propertyDescriptor); + propertyDescriptor = accessiblePropertyDescriptor(propertyDescriptor); if (propertyDescriptor.getGetter() != null) { callableGetter = typeMapper @@ -1865,7 +1865,7 @@ public class ExpressionCodegen extends JetVisitor implem throw new UnsupportedOperationException("unknown type of callee descriptor: " + funDescriptor); } - funDescriptor = accessableFunctionDescriptor((FunctionDescriptor) funDescriptor); + funDescriptor = accessibleFunctionDescriptor((FunctionDescriptor) funDescriptor); if (funDescriptor instanceof ConstructorDescriptor) { return generateNewCall(expression, resolvedCall, receiver); @@ -1944,13 +1944,13 @@ public class ExpressionCodegen extends JetVisitor implem } @NotNull - private PropertyDescriptor accessablePropertyDescriptor(PropertyDescriptor propertyDescriptor) { - return context.accessablePropertyDescriptor(propertyDescriptor); + private PropertyDescriptor accessiblePropertyDescriptor(PropertyDescriptor propertyDescriptor) { + return context.accessiblePropertyDescriptor(propertyDescriptor); } @NotNull - protected FunctionDescriptor accessableFunctionDescriptor(FunctionDescriptor fd) { - return context.accessableFunctionDescriptor(fd); + protected FunctionDescriptor accessibleFunctionDescriptor(FunctionDescriptor fd) { + return context.accessibleFunctionDescriptor(fd); } @NotNull @@ -1972,7 +1972,7 @@ public class ExpressionCodegen extends JetVisitor implem } } - fd = accessableFunctionDescriptor(fd); + fd = accessibleFunctionDescriptor(fd); Callable callable = resolveToCallable(fd, superCall); if (callable instanceof CallableMethod) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index bcdd7a43ffe..d448c99aed9 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -996,7 +996,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { if (state.getClassBuilderMode() == ClassBuilderMode.FULL) { ConstructorDescriptor constructorDescriptor = DescriptorUtils.getConstructorOfSingletonObject(fieldTypeDescriptor); ExpressionCodegen codegen = createOrGetClInitCodegen(); - FunctionDescriptor fd = codegen.accessableFunctionDescriptor(constructorDescriptor); + FunctionDescriptor fd = codegen.accessibleFunctionDescriptor(constructorDescriptor); generateMethodCallTo(fd, codegen.v); field.store(field.type, codegen.v); } @@ -1112,7 +1112,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { //generate object$ parentCodegen.genInitSingleton(descriptor, StackValue.singleton(descriptor, typeMapper)); parentCodegen.generateInitializers(parentCodegen.createOrGetClInitCodegen(), - myClass.getDeclarations(), bindingContext, state); + myClass.getDeclarations(), bindingContext, state); } else { generateInitializers(codegen, myClass.getDeclarations(), bindingContext, state); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java index 32bd32ac879..aaef6ff3338 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java @@ -317,12 +317,12 @@ public abstract class CodegenContext { } @NotNull - public PropertyDescriptor accessablePropertyDescriptor(PropertyDescriptor propertyDescriptor) { + public PropertyDescriptor accessiblePropertyDescriptor(PropertyDescriptor propertyDescriptor) { return (PropertyDescriptor) accessibleDescriptorIfNeeded(propertyDescriptor, true); } @NotNull - public FunctionDescriptor accessableFunctionDescriptor(FunctionDescriptor fd) { + public FunctionDescriptor accessibleFunctionDescriptor(FunctionDescriptor fd) { return (FunctionDescriptor) accessibleDescriptorIfNeeded(fd, true); }