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

Report CLASS_OBJECT_NOT_ALLOWED in LazyClassDescriptor

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-26 19:40:53 +04:00
parent e97c5379af
commit d97a5a0d63
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
+6 -1
View File
@@ -53,6 +53,7 @@ import org.jetbrains.jet.storage.StorageManager;
import java.util.*; import java.util.*;
import static org.jetbrains.jet.lang.diagnostics.Errors.CLASS_OBJECT_NOT_ALLOWED;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isSyntheticClassObject; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isSyntheticClassObject;
import static org.jetbrains.jet.lang.resolve.ModifiersChecker.*; import static org.jetbrains.jet.lang.resolve.ModifiersChecker.*;
import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName; import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName;
@@ -288,6 +289,10 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyEnti
@Nullable @Nullable
public JetClassLikeInfo getClassObjectInfo(JetClassObject classObject) { public JetClassLikeInfo getClassObjectInfo(JetClassObject classObject) {
if (classObject != null) { if (classObject != null) {
if (getKind() != ClassKind.CLASS && getKind() != ClassKind.TRAIT && getKind() != ClassKind.ANNOTATION_CLASS || isInner()) {
resolveSession.getTrace().report(CLASS_OBJECT_NOT_ALLOWED.on(classObject));
}
JetObjectDeclaration objectDeclaration = classObject.getObjectDeclaration(); JetObjectDeclaration objectDeclaration = classObject.getObjectDeclaration();
return JetClassInfoUtil.createClassLikeInfo(objectDeclaration); return JetClassInfoUtil.createClassLikeInfo(objectDeclaration);
} }
@@ -523,4 +528,4 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyEnti
private ScopeProvider getScopeProvider() { private ScopeProvider getScopeProvider() {
return resolveSession.getScopeProvider(); return resolveSession.getScopeProvider();
} }
} }