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

JetConstructor renamed to avoid confusion

Browse Source
This commit is contained in:
Andrey Breslav
2011-11-12 22:18:55 +04:00
parent 537a9ba804
commit a322154477
15 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java
+2 -2
View File
@@ -101,7 +101,7 @@ public class JetControlFlowTest extends JetLiteFixture {
for (Pseudocode pseudocode : pseudocodes) {
JetElement correspondingElement = pseudocode.getCorrespondingElement();
String label = "";
assert (correspondingElement instanceof JetNamedDeclaration || correspondingElement instanceof JetConstructor || correspondingElement instanceof JetPropertyAccessor) :
assert (correspondingElement instanceof JetNamedDeclaration || correspondingElement instanceof JetSecondaryConstructor || correspondingElement instanceof JetPropertyAccessor) :
"Unexpected element class is pseudocode: " + correspondingElement.getClass();
if (correspondingElement instanceof JetFunctionLiteral) {
label = "anonymous_" + i++;
@@ -114,7 +114,7 @@ public class JetControlFlowTest extends JetLiteFixture {
String propertyName = ((JetProperty) correspondingElement.getParent()).getName();
label = (((JetPropertyAccessor) correspondingElement).isGetter() ? "get" : "set") + "_" + propertyName;
}
else if (correspondingElement instanceof JetConstructor) {
else if (correspondingElement instanceof JetSecondaryConstructor) {
label = "this";
}
compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
+1 -1
View File
@@ -684,7 +684,7 @@ public class JetTypeCheckerTest extends JetLiteFixture {
constructors,
null
);
for (JetConstructor constructor : classElement.getSecondaryConstructors()) {
for (JetSecondaryConstructor constructor : classElement.getSecondaryConstructors()) {
ConstructorDescriptorImpl functionDescriptor = classDescriptorResolver.resolveSecondaryConstructorDescriptor(memberDeclarations, classDescriptor, constructor);
functionDescriptor.setReturnType(classDescriptor.getDefaultType());
constructors.add(functionDescriptor);