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

Got rid of "namespace" word in compiler code.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-01-10 22:25:23 +04:00
parent 093afeb05c
commit b41a3f8558
55 changed files with 194 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+1 -1
View File
@@ -155,7 +155,7 @@ public final class JavaFunctionResolver {
signatureErrors.addAll(effectiveSignature.getErrors());
}
else {
throw new IllegalStateException("Unknown class or namespace descriptor: " + ownerDescriptor);
throw new IllegalStateException("Unknown class or package descriptor: " + ownerDescriptor);
}
functionDescriptorImpl.initialize(
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java
+1 -1
View File
@@ -263,7 +263,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
}
else if (isTrait(container) && kind == AnnotatedCallableKind.PROPERTY) {
PackageFragmentDescriptor containingPackage = DescriptorUtils.getParentOfType(container, PackageFragmentDescriptor.class);
assert containingPackage != null : "Trait must have a namespace among his parents: " + container;
assert containingPackage != null : "Trait must have a package fragment among his parents: " + container;
if (proto.hasExtension(JavaProtoBuf.implClassName)) {
Name tImplName = nameResolver.getName(proto.getExtension(JavaProtoBuf.implClassName));