azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OwnerKind.NAMESPACE → OwnerKind.PACKAGE

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-01-09 23:43:46 +04:00
parent 7e7908b831
commit db13cc6ec2
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java
+1 -1
View File
@@ -150,7 +150,7 @@ public class AsmUtil {
} }
public static boolean isStatic(OwnerKind kind) { 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) { public static int getMethodAsmFlags(FunctionDescriptor functionDescriptor, OwnerKind kind) {
compiler/backend/src/org/jetbrains/jet/codegen/OwnerKind.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.codegen; package org.jetbrains.jet.codegen;
public enum OwnerKind { public enum OwnerKind {
NAMESPACE, PACKAGE,
IMPLEMENTATION, IMPLEMENTATION,
compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
+5 -5
View File
@@ -86,7 +86,7 @@ public class PropertyCodegen extends GenerationStateAware {
assert variableDescriptor instanceof PropertyDescriptor : "Property should have a property descriptor: " + variableDescriptor; assert variableDescriptor instanceof PropertyDescriptor : "Property should have a property descriptor: " + variableDescriptor;
PropertyDescriptor propertyDescriptor = (PropertyDescriptor) 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; : "Generating property with a wrong kind (" + kind + "): " + propertyDescriptor;
@@ -184,7 +184,7 @@ public class PropertyCodegen extends GenerationStateAware {
modifiers |= ACC_VOLATILE; modifiers |= ACC_VOLATILE;
} }
if (kind == OwnerKind.NAMESPACE) { if (kind == OwnerKind.PACKAGE) {
modifiers |= ACC_STATIC; modifiers |= ACC_STATIC;
} }
@@ -204,7 +204,7 @@ public class PropertyCodegen extends GenerationStateAware {
backingFieldContext = codegen.context; backingFieldContext = codegen.context;
v.getSerializationBindings().put(STATIC_FIELD_IN_OUTER_CLASS, propertyDescriptor); v.getSerializationBindings().put(STATIC_FIELD_IN_OUTER_CLASS, propertyDescriptor);
} else { } else {
if (kind != OwnerKind.NAMESPACE || isDelegate) { if (kind != OwnerKind.PACKAGE || isDelegate) {
modifiers |= ACC_PRIVATE; modifiers |= ACC_PRIVATE;
} }
} }
@@ -318,7 +318,7 @@ public class PropertyCodegen extends GenerationStateAware {
PropertyDescriptor propertyDescriptor = callableDescriptor.getCorrespondingProperty(); PropertyDescriptor propertyDescriptor = callableDescriptor.getCorrespondingProperty();
int paramCode = 0; int paramCode = 0;
if (codegen.context.getContextKind() != OwnerKind.NAMESPACE) { if (codegen.context.getContextKind() != OwnerKind.PACKAGE) {
v.load(0, OBJECT_TYPE); v.load(0, OBJECT_TYPE);
paramCode = 1; paramCode = 1;
} }
@@ -361,7 +361,7 @@ public class PropertyCodegen extends GenerationStateAware {
Call call = bindingContext.get(BindingContext.DELEGATED_PROPERTY_CALL, callableDescriptor); Call call = bindingContext.get(BindingContext.DELEGATED_PROPERTY_CALL, callableDescriptor);
assert call != null : "Call should be recorded for delegate call " + signature.toString(); 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); v.load(0, OBJECT_TYPE);
} }
compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java
+1 -1
View File
@@ -214,7 +214,7 @@ public abstract class CodegenContext<T extends DeclarationDescriptor> {
public FrameMap prepareFrame(JetTypeMapper mapper) { public FrameMap prepareFrame(JetTypeMapper mapper) {
FrameMap frameMap = new FrameMap(); FrameMap frameMap = new FrameMap();
if (getContextKind() != OwnerKind.NAMESPACE) { if (getContextKind() != OwnerKind.PACKAGE) {
frameMap.enterTemp(OBJECT_TYPE); // 0 slot for this frameMap.enterTemp(OBJECT_TYPE); // 0 slot for this
} }
compiler/backend/src/org/jetbrains/jet/codegen/context/PackageContext.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
public class PackageContext extends FieldOwnerContext<PackageFragmentDescriptor> { public class PackageContext extends FieldOwnerContext<PackageFragmentDescriptor> {
public PackageContext(@NotNull PackageFragmentDescriptor contextDescriptor, @Nullable CodegenContext parent) { 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 @Override
compiler/backend/src/org/jetbrains/jet/codegen/context/RootContext.java
+1 -1
View File
@@ -28,7 +28,7 @@ import java.util.List;
class RootContext extends CodegenContext { class RootContext extends CodegenContext {
public RootContext() { public RootContext() {
super(new FakeDescriptor(), OwnerKind.NAMESPACE, null, null, null, null); super(new FakeDescriptor(), OwnerKind.PACKAGE, null, null, null, null);
} }
@Override @Override