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

Typo fixed in the method name

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-19 17:53:42 +04:00
parent db73481fac
commit 9c3d13940e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class JetTypeConstraint extends JetElementImpl {
return visitor.visitTypeConstraint(this, data); return visitor.visitTypeConstraint(this, data);
} }
public boolean isClassObjectContraint() { public boolean isClassObjectConstraint() {
return findChildByType(JetTokens.CLASS_KEYWORD) != null && return findChildByType(JetTokens.CLASS_KEYWORD) != null &&
findChildByType(JetTokens.OBJECT_KEYWORD) != null; findChildByType(JetTokens.OBJECT_KEYWORD) != null;
} }
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+3 -3
View File
@@ -641,7 +641,7 @@ public class DescriptorResolver {
} }
} }
for (JetTypeConstraint constraint : declaration.getTypeConstraints()) { for (JetTypeConstraint constraint : declaration.getTypeConstraints()) {
if (constraint.isClassObjectContraint()) { if (constraint.isClassObjectConstraint()) {
trace.report(UNSUPPORTED.on(constraint, "Class objects constraints are not supported yet")); trace.report(UNSUPPORTED.on(constraint, "Class objects constraints are not supported yet"));
} }
@@ -656,7 +656,7 @@ public class DescriptorResolver {
if (boundTypeReference != null) { if (boundTypeReference != null) {
bound = typeResolver.resolveType(scope, boundTypeReference, trace, false); bound = typeResolver.resolveType(scope, boundTypeReference, trace, false);
deferredUpperBoundCheckerTasks deferredUpperBoundCheckerTasks
.add(new UpperBoundCheckerTask(boundTypeReference, bound, constraint.isClassObjectContraint())); .add(new UpperBoundCheckerTask(boundTypeReference, bound, constraint.isClassObjectConstraint()));
} }
if (typeParameterDescriptor == null) { if (typeParameterDescriptor == null) {
@@ -673,7 +673,7 @@ public class DescriptorResolver {
else { else {
trace.record(BindingContext.REFERENCE_TARGET, subjectTypeParameterName, typeParameterDescriptor); trace.record(BindingContext.REFERENCE_TARGET, subjectTypeParameterName, typeParameterDescriptor);
if (bound != null) { if (bound != null) {
if (constraint.isClassObjectContraint()) { if (constraint.isClassObjectConstraint()) {
typeParameterDescriptor.addClassObjectBound(bound); typeParameterDescriptor.addClassObjectBound(bound);
} }
else { else {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescri
if (classOrObject instanceof JetClass) { if (classOrObject instanceof JetClass) {
JetClass jetClass = (JetClass) classOrObject; JetClass jetClass = (JetClass) classOrObject;
for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstraints()) { for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstraints()) {
if (jetTypeConstraint.isClassObjectContraint() != forClassObject) continue; if (jetTypeConstraint.isClassObjectConstraint() != forClassObject) continue;
JetSimpleNameExpression constrainedParameterName = jetTypeConstraint.getSubjectTypeParameterName(); JetSimpleNameExpression constrainedParameterName = jetTypeConstraint.getSubjectTypeParameterName();
if (constrainedParameterName != null) { if (constrainedParameterName != null) {