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

printScopeStructure() introduced for debugging

Browse Source
This commit is contained in:
Andrey Breslav
2013-11-19 16:00:49 +04:00
parent af68739e69
commit d9444fea09
18 changed files with 237 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/artifacts/KotlinPlugin.xml
Generated
+1
View File
@@ -40,6 +40,7 @@
<element id="module-output" name="preloader" />
<element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
<element id="extracted-dir" path="$PROJECT_DIR$/dependencies/cli-parser-1.1.1.jar" path-in-jar="/" />
<element id="module-output" name="util.runtime" />
</element>
</element>
<element id="library" level="project" name="kotlin-runtime" />
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java
+11
View File
@@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.storage.MemoizedFunctionToNotNull;
import org.jetbrains.jet.storage.NotNullLazyValue;
import org.jetbrains.jet.storage.StorageManager;
import org.jetbrains.jet.utils.Printer;
import java.util.*;
@@ -255,4 +256,14 @@ public abstract class DeserializedMemberScope implements JetScope {
boolean accept(T value);
}
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), " {");
p.pushIndent();
p.println("containingDeclaration = " + containingDeclaration);
p.popIndent();
p.println("}");
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java
+7 -1
View File
@@ -43,6 +43,7 @@ import org.jetbrains.jet.lang.types.expressions.DataFlowUtils;
import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.utils.Printer;
import javax.inject.Inject;
import java.util.ArrayList;
@@ -113,7 +114,12 @@ public class CallExpressionResolver {
public String toString() {
return "Scope for the type parameter on the left hand side of dot";
}
};
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(toString(), " for ", classifier);
}
};
return new NamespaceType(referencedName, scopeForStaticMembersResolution, NO_RECEIVER);
}
temporaryTrace.commit();
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java
+17
View File
@@ -22,6 +22,7 @@ import jet.Function0;
import jet.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetImportDirective;
@@ -32,6 +33,7 @@ import org.jetbrains.jet.lang.resolve.name.LabelName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.*;
import org.jetbrains.jet.storage.MemoizedFunctionToNotNull;
import org.jetbrains.jet.utils.Printer;
import java.util.Collection;
import java.util.Collections;
@@ -312,4 +314,19 @@ public class LazyImportScope implements JetScope {
public String toString() {
return "LazyImportScope: " + debugName;
}
@TestOnly
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), ": ", debugName, " {");
p.pushIndent();
p.println("packageDescriptor = ", packageDescriptor);
p.print("rootScope = ");
rootScope.printScopeStructure(p.withholdIndentOnce());
p.popIndent();
p.println("}");
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
+12
View File
@@ -35,6 +35,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.storage.MemoizedFunctionToNotNull;
import org.jetbrains.jet.storage.NotNullLazyValue;
import org.jetbrains.jet.storage.StorageManager;
import org.jetbrains.jet.utils.Printer;
import java.util.Collection;
import java.util.Collections;
@@ -329,4 +330,15 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
public Collection<DeclarationDescriptor> getOwnDeclaredDescriptors() {
return getAllDescriptors();
}
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), " {");
p.pushIndent();
p.println("thisDescriptor = ", thisDescriptor);
p.popIndent();
p.println("}");
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeUtils.java
+16 -1
View File
@@ -22,11 +22,12 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.DescriptorResolver;
import org.jetbrains.jet.lang.resolve.TraceBasedRedeclarationHandler;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.jet.utils.Printer;
import java.util.Collection;
import java.util.List;
@@ -130,4 +131,18 @@ public final class JetScopeUtils {
result.changeLockLevel(WritableScope.LockLevel.READING);
return result;
}
@TestOnly
@NotNull
public static String printStructure(@Nullable JetScope scope) {
StringBuilder out = new StringBuilder();
Printer p = new Printer(out);
if (scope == null) {
p.println("null");
}
else {
scope.printScopeStructure(p);
}
return out.toString();
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java
+9
View File
@@ -21,9 +21,11 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.LabelName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
import java.util.Collection;
import java.util.Set;
@@ -284,4 +286,11 @@ public class WriteThroughScope extends WritableScopeWithImports {
return getWorkerScope();
}
@TestOnly
@Override
protected void printAdditionalScopeStructure(@NotNull Printer p) {
p.print("writableWorker = ");
writableWorker.printScopeStructure(p.withholdIndentOnce());
}
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
+14
View File
@@ -18,11 +18,13 @@ package org.jetbrains.jet.lang.resolve.java.scope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaMemberResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.ProgressChecker;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl;
import org.jetbrains.jet.utils.Printer;
import java.util.*;
@@ -170,4 +172,16 @@ public abstract class JavaBaseScope extends JetScopeImpl {
}
return result;
}
@TestOnly
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), " {");
p.pushIndent();
p.println("descriptor = ", descriptor);
p.popIndent();
p.println("}");
}
}
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java
+15
View File
@@ -17,9 +17,11 @@
package org.jetbrains.jet.lang.resolve.scopes;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.LabelName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
import java.util.Collection;
import java.util.List;
@@ -98,4 +100,17 @@ public abstract class AbstractScopeAdapter implements JetScope {
public Collection<DeclarationDescriptor> getOwnDeclaredDescriptors() {
return getWorkerScope().getOwnDeclaredDescriptors();
}
@TestOnly
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), " {");
p.pushIndent();
p.print("worker =");
getWorkerScope().printScopeStructure(p.withholdIndentOnce());
p.popIndent();
p.println("}");
}
}
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java
+16
View File
@@ -19,9 +19,11 @@ package org.jetbrains.jet.lang.resolve.scopes;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.LabelName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
import java.util.Collection;
import java.util.Collections;
@@ -170,4 +172,18 @@ public class ChainedScope implements JetScope {
public String toString() {
return debugName;
}
@TestOnly
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), ": ", debugName, " {");
p.pushIndent();
for (JetScope scope : scopeChain) {
scope.printScopeStructure(p);
}
p.popIndent();
p.println("}");
}
}
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java
+15
View File
@@ -20,9 +20,11 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.LabelName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
import java.util.Collection;
import java.util.List;
@@ -108,4 +110,17 @@ public class FilteringScope implements JetScope {
public Collection<DeclarationDescriptor> getOwnDeclaredDescriptors() {
return Collections2.filter(workerScope.getOwnDeclaredDescriptors(), predicate);
}
@TestOnly
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), " {");
p.pushIndent();
p.print("workerScope = ");
workerScope.printScopeStructure(p.withholdIndentOnce());
p.popIndent();
p.println("}");
}
}
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java
+10
View File
@@ -19,9 +19,11 @@ package org.jetbrains.jet.lang.resolve.scopes;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.ReadOnly;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.LabelName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
import java.util.Collection;
import java.util.List;
@@ -38,6 +40,11 @@ public interface JetScope {
public String toString() {
return "EMPTY";
}
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println("EMPTY");
}
};
/**
@@ -93,4 +100,7 @@ public interface JetScope {
@NotNull
@ReadOnly
Collection<DeclarationDescriptor> getOwnDeclaredDescriptors();
@TestOnly
void printScopeStructure(@NotNull Printer p);
}
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java
+8 -1
View File
@@ -17,9 +17,11 @@
package org.jetbrains.jet.lang.resolve.scopes;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.LabelName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
import java.util.Collection;
import java.util.Collections;
@@ -88,4 +90,9 @@ public abstract class JetScopeImpl implements JetScope {
public Collection<DeclarationDescriptor> getOwnDeclaredDescriptors() {
return Collections.emptyList();
}
}
// This method should not be implemented here by default: every scope class has its unique structure pattern
@TestOnly
@Override
public abstract void printScopeStructure(@NotNull Printer p);
}
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java
+20
View File
@@ -20,10 +20,12 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.LabelName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.TypeSubstitutor;
import org.jetbrains.jet.utils.Printer;
import java.util.Collection;
import java.util.List;
@@ -150,4 +152,22 @@ public class SubstitutingScope implements JetScope {
public Collection<DeclarationDescriptor> getOwnDeclaredDescriptors() {
return substitute(workerScope.getOwnDeclaredDescriptors());
}
@TestOnly
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), " {");
p.pushIndent();
p.println("substitutor = ");
p.pushIndent();
p.println(substitutor);
p.popIndent();
p.print("workerScope = ");
workerScope.printScopeStructure(p.withholdIndentOnce());
p.popIndent();
p.println("}");
}
}
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
+8
View File
@@ -19,11 +19,13 @@ package org.jetbrains.jet.lang.resolve.scopes;
import com.google.common.collect.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.LabelName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.utils.CommonSuppliers;
import org.jetbrains.jet.utils.Printer;
import java.util.*;
@@ -507,4 +509,10 @@ public class WritableScopeImpl extends WritableScopeWithImports {
throw new IllegalStateException("unknown classifier: " + classifier);
}
}
@TestOnly
@Override
protected void printAdditionalScopeStructure(@NotNull Printer p) {
p.println("allDescriptorsDone = ", allDescriptorsDone);
}
}
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java
+34
View File
@@ -20,8 +20,10 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
import java.util.*;
@@ -249,4 +251,36 @@ public abstract class WritableScopeWithImports extends JetScopeAdapter implement
return getClass().getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(this)) + " " + debugName + " for " + getContainingDeclaration();
}
@TestOnly
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), ": ", debugName, " for ", getContainingDeclaration(), " {");
p.pushIndent();
p.println("lockLevel = ", lockLevel);
printAdditionalScopeStructure(p);
p.print("worker = ");
getWorkerScope().printScopeStructure(p.withholdIndentOnce());
if (getImports().isEmpty()) {
p.println("imports = {}");
}
else {
p.println("imports = {");
p.pushIndent();
for (JetScope anImport : getImports()) {
anImport.printScopeStructure(p);
}
p.popIndent();
p.println("}");
}
p.popIndent();
p.println("}");
}
@TestOnly
protected abstract void printAdditionalScopeStructure(@NotNull Printer p);
}
core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java
+11
View File
@@ -32,6 +32,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.error.ErrorClassDescriptor;
import org.jetbrains.jet.lang.types.error.ErrorSimpleFunctionDescriptorImpl;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.utils.Printer;
import java.util.Collection;
import java.util.Collections;
@@ -155,6 +156,11 @@ public class ErrorUtils {
public String toString() {
return "ErrorScope{" + debugMessage + '}';
}
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), ": ", debugMessage);
}
}
private static class ThrowingScope implements JetScope {
@@ -240,6 +246,11 @@ public class ErrorUtils {
public String toString() {
return "ThrowingScope{" + debugMessage + '}';
}
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), ": ", debugMessage);
}
}
private static final ErrorClassDescriptor ERROR_CLASS = new ErrorClassDescriptor("");
compiler/util/src/org/jetbrains/jet/utils/Printer.java → core/util.runtime/src/org/jetbrains/jet/utils/Printer.java
+13 -1
View File
@@ -31,6 +31,7 @@ public class Printer {
private String indent = "";
private int blankLineCountIncludingCurrent = 0;
private boolean withholdIndentOnce = false;
public Printer(@NotNull Appendable out) {
this(out, Integer.MAX_VALUE);
@@ -67,7 +68,12 @@ public class Printer {
@NotNull
public Printer print(Object... objects) {
append(indent);
if (withholdIndentOnce) {
withholdIndentOnce = false;
}
else {
append(indent);
}
printWithNoIndent(objects);
return this;
@@ -83,6 +89,12 @@ public class Printer {
return this;
}
@NotNull
public Printer withholdIndentOnce() {
withholdIndentOnce = true;
return this;
}
@NotNull
public Printer printlnWithNoIndent(Object... objects) {
printWithNoIndent(objects);