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

Minor. Annotated with @Nullable/@NotNull.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-03-26 14:25:56 +04:00
parent a2b4f446b5
commit 4e0d408178
6 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/context/AnonymousClassContext.java
+9 -9
View File
@@ -16,6 +16,8 @@
package org.jetbrains.jet.codegen.context; package org.jetbrains.jet.codegen.context;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.codegen.OwnerKind; import org.jetbrains.jet.codegen.OwnerKind;
import org.jetbrains.jet.codegen.state.JetTypeMapper; import org.jetbrains.jet.codegen.state.JetTypeMapper;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -24,17 +26,15 @@ import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLOSURE;
public class AnonymousClassContext extends CodegenContext { public class AnonymousClassContext extends CodegenContext {
public AnonymousClassContext( public AnonymousClassContext(
JetTypeMapper typeMapper, @NotNull JetTypeMapper typeMapper,
ClassDescriptor contextDescriptor, @NotNull ClassDescriptor contextDescriptor,
OwnerKind contextKind, @NotNull OwnerKind contextKind,
CodegenContext parentContext, @Nullable CodegenContext parentContext,
LocalLookup localLookup @Nullable LocalLookup localLookup
) { ) {
//noinspection SuspiciousMethodCalls //noinspection SuspiciousMethodCalls
super(contextDescriptor, contextKind, parentContext, typeMapper.getBindingContext().get(CLOSURE, super(contextDescriptor, contextKind, parentContext, typeMapper.getBindingContext().get(CLOSURE, contextDescriptor),
contextDescriptor), contextDescriptor, localLookup);
contextDescriptor,
localLookup);
initOuterExpression(typeMapper, contextDescriptor); initOuterExpression(typeMapper, contextDescriptor);
} }
compiler/backend/src/org/jetbrains/jet/codegen/context/ClassContext.java
+9 -9
View File
@@ -16,6 +16,8 @@
package org.jetbrains.jet.codegen.context; package org.jetbrains.jet.codegen.context;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.codegen.OwnerKind; import org.jetbrains.jet.codegen.OwnerKind;
import org.jetbrains.jet.codegen.state.JetTypeMapper; import org.jetbrains.jet.codegen.state.JetTypeMapper;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -24,17 +26,15 @@ import static org.jetbrains.jet.codegen.binding.CodegenBinding.CLOSURE;
public class ClassContext extends CodegenContext { public class ClassContext extends CodegenContext {
public ClassContext( public ClassContext(
JetTypeMapper typeMapper, @NotNull JetTypeMapper typeMapper,
ClassDescriptor contextDescriptor, @NotNull ClassDescriptor contextDescriptor,
OwnerKind contextKind, @NotNull OwnerKind contextKind,
CodegenContext parentContext, @Nullable CodegenContext parentContext,
LocalLookup localLookup @Nullable LocalLookup localLookup
) { ) {
//noinspection SuspiciousMethodCalls //noinspection SuspiciousMethodCalls
super(contextDescriptor, contextKind, parentContext, typeMapper.getBindingContext().get(CLOSURE, super(contextDescriptor, contextKind, parentContext, typeMapper.getBindingContext().get(CLOSURE, contextDescriptor),
contextDescriptor), contextDescriptor, localLookup);
contextDescriptor,
localLookup);
initOuterExpression(typeMapper, contextDescriptor); initOuterExpression(typeMapper, contextDescriptor);
} }
compiler/backend/src/org/jetbrains/jet/codegen/context/ClosureContext.java
+6 -5
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.codegen.context; package org.jetbrains.jet.codegen.context;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.codegen.OwnerKind; import org.jetbrains.jet.codegen.OwnerKind;
import org.jetbrains.jet.codegen.state.JetTypeMapper; import org.jetbrains.jet.codegen.state.JetTypeMapper;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -29,11 +30,11 @@ class ClosureContext extends CodegenContext {
private final ClassDescriptor classDescriptor; private final ClassDescriptor classDescriptor;
public ClosureContext( public ClosureContext(
JetTypeMapper typeMapper, @NotNull JetTypeMapper typeMapper,
FunctionDescriptor contextDescriptor, @NotNull FunctionDescriptor contextDescriptor,
ClassDescriptor classDescriptor, @NotNull ClassDescriptor classDescriptor,
CodegenContext parentContext, @Nullable CodegenContext parentContext,
LocalLookup localLookup @Nullable LocalLookup localLookup
) { ) {
//noinspection SuspiciousMethodCalls //noinspection SuspiciousMethodCalls
super(contextDescriptor, OwnerKind.IMPLEMENTATION, parentContext, super(contextDescriptor, OwnerKind.IMPLEMENTATION, parentContext,
compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java
+2 -3
View File
@@ -17,7 +17,6 @@
package org.jetbrains.jet.codegen.context; package org.jetbrains.jet.codegen.context;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.codegen.OwnerKind; import org.jetbrains.jet.codegen.OwnerKind;
import org.jetbrains.jet.codegen.StackValue; import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -29,8 +28,8 @@ public class ConstructorContext extends MethodContext {
private static final StackValue local1 = StackValue.local(1, OBJECT_TYPE); private static final StackValue local1 = StackValue.local(1, OBJECT_TYPE);
public ConstructorContext( public ConstructorContext(
ConstructorDescriptor contextDescriptor, @NotNull ConstructorDescriptor contextDescriptor,
OwnerKind kind, @NotNull OwnerKind kind,
@NotNull CodegenContext parent @NotNull CodegenContext parent
) { ) {
super(contextDescriptor, kind, parent); super(contextDescriptor, kind, parent);
compiler/backend/src/org/jetbrains/jet/codegen/context/MethodContext.java
+2 -2
View File
@@ -29,8 +29,8 @@ import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor;
public class MethodContext extends CodegenContext { public class MethodContext extends CodegenContext {
public MethodContext( public MethodContext(
@NotNull FunctionDescriptor contextType, @NotNull FunctionDescriptor contextType,
OwnerKind contextKind, @NotNull OwnerKind contextKind,
CodegenContext parentContext @NotNull CodegenContext parentContext
) { ) {
super(contextType instanceof PropertyAccessorDescriptor super(contextType instanceof PropertyAccessorDescriptor
? ((PropertyAccessorDescriptor) contextType).getCorrespondingProperty() ? ((PropertyAccessorDescriptor) contextType).getCorrespondingProperty()
compiler/backend/src/org/jetbrains/jet/codegen/context/NamespaceContext.java
+2 -1
View File
@@ -17,11 +17,12 @@
package org.jetbrains.jet.codegen.context; package org.jetbrains.jet.codegen.context;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.codegen.OwnerKind; import org.jetbrains.jet.codegen.OwnerKind;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
public class NamespaceContext extends CodegenContext { public class NamespaceContext extends CodegenContext {
public NamespaceContext(@NotNull NamespaceDescriptor contextDescriptor, CodegenContext parent, @NotNull OwnerKind kind) { public NamespaceContext(@NotNull NamespaceDescriptor contextDescriptor, @Nullable CodegenContext parent, @NotNull OwnerKind kind) {
super(contextDescriptor, kind, parent, null, null, null); super(contextDescriptor, kind, parent, null, null, null);
} }