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

fixes after merge

Browse Source
This commit is contained in:
Svetlana Isakova
2012-03-30 13:37:49 +04:00
parent c961613cf8
commit 4f30e12177
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+6 -6
View File
@@ -669,19 +669,19 @@ public class DescriptorResolver {
@NotNull @NotNull
/*package*/ static Visibility resolveVisibilityFromModifiers(@Nullable JetModifierList modifierList) { /*package*/ static Visibility resolveVisibilityFromModifiers(@Nullable JetModifierList modifierList) {
return resolveVisibilityFromModifiers(modifierList, Visibility.INTERNAL); return resolveVisibilityFromModifiers(modifierList, Visibilities.INTERNAL);
} }
@NotNull @NotNull
/*package*/ static Visibility resolveVisibilityFromModifiers(@Nullable JetModifierList modifierList, @NotNull Visibility defaultVisibility) { /*package*/ static Visibility resolveVisibilityFromModifiers(@Nullable JetModifierList modifierList, @NotNull Visibility defaultVisibility) {
if (modifierList == null) return defaultVisibility; if (modifierList == null) return defaultVisibility;
if (modifierList.hasModifier(JetTokens.PRIVATE_KEYWORD)) return Visibility.PRIVATE; if (modifierList.hasModifier(JetTokens.PRIVATE_KEYWORD)) return Visibilities.PRIVATE;
if (modifierList.hasModifier(JetTokens.PUBLIC_KEYWORD)) return Visibility.PUBLIC; if (modifierList.hasModifier(JetTokens.PUBLIC_KEYWORD)) return Visibilities.PUBLIC;
if (modifierList.hasModifier(JetTokens.PROTECTED_KEYWORD)) { if (modifierList.hasModifier(JetTokens.PROTECTED_KEYWORD)) {
if (modifierList.hasModifier(JetTokens.INTERNAL_KEYWORD)) { if (modifierList.hasModifier(JetTokens.INTERNAL_KEYWORD)) {
return Visibility.INTERNAL_PROTECTED; return Visibilities.INTERNAL_PROTECTED;
} }
return Visibility.PROTECTED; return Visibilities.PROTECTED;
} }
return defaultVisibility; return defaultVisibility;
} }
@@ -823,7 +823,7 @@ public class DescriptorResolver {
constructorDescriptor, constructorDescriptor,
parameterScope, parameterScope,
valueParameters, trace), valueParameters, trace),
resolveVisibilityFromModifiers(modifierList)); resolveVisibilityFromModifiers(modifierList, Visibilities.PUBLIC));
} }
@Nullable @Nullable
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+1 -1
View File
@@ -609,7 +609,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
checkSuper(receiver, resultingDescriptor, context.trace, selectorExpression); checkSuper(receiver, resultingDescriptor, context.trace, selectorExpression);
return resultingDescriptor.getType(); return resultingDescriptor.getType();
} }
if (resolutionResult.singleResult()) { if (resolutionResult.isSingleResult()) {
temporaryTrace.commit(); temporaryTrace.commit();
return resolutionResult.getResultingDescriptor().getReturnType(); return resolutionResult.getResultingDescriptor().getReturnType();
} }
compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
+2 -1
View File
@@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetDeclaration; import org.jetbrains.jet.lang.psi.JetDeclaration;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.parsing.JetParsingTest; import org.jetbrains.jet.parsing.JetParsingTest;
@@ -108,7 +109,7 @@ public class TestlibTest extends CodegenTestCase {
ClassDescriptor descriptor = (ClassDescriptor) session.getBindingContext().getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, jetClass); ClassDescriptor descriptor = (ClassDescriptor) session.getBindingContext().getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, jetClass);
Set<JetType> allSuperTypes = new THashSet<JetType>(); Set<JetType> allSuperTypes = new THashSet<JetType>();
CodegenUtil.addSuperTypes(descriptor.getDefaultType(), allSuperTypes); DescriptorUtils.addSuperTypes(descriptor.getDefaultType(), allSuperTypes);
for(JetType type : allSuperTypes) { for(JetType type : allSuperTypes) {
String internalName = typeMapper.mapType(type).getInternalName(); String internalName = typeMapper.mapType(type).getInternalName();