From db13cc6ec2b6f0fd3601c9c4075a0f24c503cf51 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 9 Jan 2014 23:43:46 +0400 Subject: [PATCH] =?UTF-8?q?OwnerKind.NAMESPACE=20=E2=86=92=20OwnerKind.PAC?= =?UTF-8?q?KAGE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/src/org/jetbrains/jet/codegen/AsmUtil.java | 2 +- .../src/org/jetbrains/jet/codegen/OwnerKind.java | 2 +- .../src/org/jetbrains/jet/codegen/PropertyCodegen.java | 10 +++++----- .../jetbrains/jet/codegen/context/CodegenContext.java | 2 +- .../jetbrains/jet/codegen/context/PackageContext.java | 2 +- .../org/jetbrains/jet/codegen/context/RootContext.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java index cb596f83c7f..8dc945690a4 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java @@ -150,7 +150,7 @@ public class AsmUtil { } public static boolean isStatic(OwnerKind kind) { - return kind == OwnerKind.NAMESPACE || kind == OwnerKind.TRAIT_IMPL; + return kind == OwnerKind.PACKAGE || kind == OwnerKind.TRAIT_IMPL; } public static int getMethodAsmFlags(FunctionDescriptor functionDescriptor, OwnerKind kind) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/OwnerKind.java b/compiler/backend/src/org/jetbrains/jet/codegen/OwnerKind.java index 44358cf9c1b..f7e590a3025 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/OwnerKind.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/OwnerKind.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.codegen; public enum OwnerKind { - NAMESPACE, + PACKAGE, IMPLEMENTATION, diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java index cd29cfeb183..5326784697b 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java @@ -86,7 +86,7 @@ public class PropertyCodegen extends GenerationStateAware { assert variableDescriptor instanceof PropertyDescriptor : "Property should have a property descriptor: " + variableDescriptor; PropertyDescriptor propertyDescriptor = (PropertyDescriptor) variableDescriptor; - assert kind == OwnerKind.NAMESPACE || kind == OwnerKind.IMPLEMENTATION || kind == OwnerKind.TRAIT_IMPL + assert kind == OwnerKind.PACKAGE || kind == OwnerKind.IMPLEMENTATION || kind == OwnerKind.TRAIT_IMPL : "Generating property with a wrong kind (" + kind + "): " + propertyDescriptor; @@ -184,7 +184,7 @@ public class PropertyCodegen extends GenerationStateAware { modifiers |= ACC_VOLATILE; } - if (kind == OwnerKind.NAMESPACE) { + if (kind == OwnerKind.PACKAGE) { modifiers |= ACC_STATIC; } @@ -204,7 +204,7 @@ public class PropertyCodegen extends GenerationStateAware { backingFieldContext = codegen.context; v.getSerializationBindings().put(STATIC_FIELD_IN_OUTER_CLASS, propertyDescriptor); } else { - if (kind != OwnerKind.NAMESPACE || isDelegate) { + if (kind != OwnerKind.PACKAGE || isDelegate) { modifiers |= ACC_PRIVATE; } } @@ -318,7 +318,7 @@ public class PropertyCodegen extends GenerationStateAware { PropertyDescriptor propertyDescriptor = callableDescriptor.getCorrespondingProperty(); int paramCode = 0; - if (codegen.context.getContextKind() != OwnerKind.NAMESPACE) { + if (codegen.context.getContextKind() != OwnerKind.PACKAGE) { v.load(0, OBJECT_TYPE); paramCode = 1; } @@ -361,7 +361,7 @@ public class PropertyCodegen extends GenerationStateAware { Call call = bindingContext.get(BindingContext.DELEGATED_PROPERTY_CALL, callableDescriptor); assert call != null : "Call should be recorded for delegate call " + signature.toString(); - if (codegen.context.getContextKind() != OwnerKind.NAMESPACE) { + if (codegen.context.getContextKind() != OwnerKind.PACKAGE) { v.load(0, OBJECT_TYPE); } 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 89861e3860b..99dd0a203b7 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java @@ -214,7 +214,7 @@ public abstract class CodegenContext { public FrameMap prepareFrame(JetTypeMapper mapper) { FrameMap frameMap = new FrameMap(); - if (getContextKind() != OwnerKind.NAMESPACE) { + if (getContextKind() != OwnerKind.PACKAGE) { frameMap.enterTemp(OBJECT_TYPE); // 0 slot for this } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/PackageContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/PackageContext.java index 32c811e80ad..8db603b3b8f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/PackageContext.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/PackageContext.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; public class PackageContext extends FieldOwnerContext { public PackageContext(@NotNull PackageFragmentDescriptor contextDescriptor, @Nullable CodegenContext parent) { - super(contextDescriptor, OwnerKind.NAMESPACE, parent, null, null, null); + super(contextDescriptor, OwnerKind.PACKAGE, parent, null, null, null); } @Override diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/RootContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/RootContext.java index 10808de8b36..44187e8b9f2 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/RootContext.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/RootContext.java @@ -28,7 +28,7 @@ import java.util.List; class RootContext extends CodegenContext { public RootContext() { - super(new FakeDescriptor(), OwnerKind.NAMESPACE, null, null, null, null); + super(new FakeDescriptor(), OwnerKind.PACKAGE, null, null, null, null); } @Override