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

Cleanup after review

Browse Source
This commit is contained in:
Dmitry Petrov
2015-09-07 15:05:17 +03:00
parent bc5e29df9f
commit c18f87f0c7
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFileClassesProvider.kt
+1 -3
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.resolve.BindingContext
import java.util.*
public class CodegenFileClassesProvider private constructor(private val bindingContext: BindingContext) : JvmFileClassesProvider() {
public class CodegenFileClassesProvider private constructor(private val bindingContext: BindingContext) : JvmFileClassesProvider {
private val fileParts = hashMapOf<JetFile, JvmFileClassInfo>()
override fun getFileClassFqName(file: JetFile): FqName =
@@ -68,5 +68,3 @@ public class CodegenFileClassesProvider private constructor(private val bindingC
}
}
}
public class JvmMultifileFacadeClassInfo(public val facadeFqName: FqName, public val fileParts: List<JvmFileClassInfo>)
compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class KotlinCodegenFacade {
FqName name = ScriptNameUtil.classNameForScript(script);
Type type = AsmUtil.asmTypeByFqNameWithoutInnerClasses(name);
registerClassNameForScript(state.getBindingTrace(), script, type, state.getFileClassesManager());
registerClassNameForScript(state.getBindingTrace(), script, type, state.getFileClassesProvider());
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+4 -4
View File
@@ -74,7 +74,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
protected final PropertyCodegen propertyCodegen;
protected final JetTypeMapper typeMapper;
protected final BindingContext bindingContext;
protected final JvmFileClassesProvider fileClassesManager;
protected final JvmFileClassesProvider fileClassesProvider;
private final MemberCodegen<?> parentCodegen;
private final ReifiedTypeParametersUsages reifiedTypeParametersUsages = new ReifiedTypeParametersUsages();
protected final Collection<ClassDescriptor> innerClasses = new LinkedHashSet<ClassDescriptor>();
@@ -95,7 +95,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
this.state = state;
this.typeMapper = state.getTypeMapper();
this.bindingContext = state.getBindingContext();
this.fileClassesManager = state.getFileClassesManager();
this.fileClassesProvider = state.getFileClassesProvider();
this.element = element;
this.context = context;
this.v = builder;
@@ -290,7 +290,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
return typeMapper.mapType(((ClassContext) outermost).getContextDescriptor());
}
else if (outermost instanceof PackageContext && !(outermost instanceof PackageFacadeContext)) {
return fileClassesManager.getFileClassType(element.getContainingJetFile());
return fileClassesProvider.getFileClassType(element.getContainingJetFile());
}/*disabled cause of KT-7775
else if (outermost instanceof ScriptContext) {
return asmTypeForScriptDescriptor(bindingContext, ((ScriptContext) outermost).getScriptDescriptor());
@@ -312,7 +312,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
@NotNull
public NameGenerator getInlineNameGenerator() {
if (inlineNameGenerator == null) {
String prefix = InlineCodegenUtil.getInlineName(context, typeMapper, fileClassesManager);
String prefix = InlineCodegenUtil.getInlineName(context, typeMapper, fileClassesProvider);
inlineNameGenerator = new NameGenerator(prefix);
}
return inlineNameGenerator;
compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java
+2 -2
View File
@@ -312,7 +312,7 @@ public class PackageCodegen {
@Nullable
private ClassBuilder generate(@NotNull JetFile file, @NotNull Map<CallableMemberDescriptor, Runnable> generateCallableMemberTasks) {
boolean generatePackagePart = false;
Type packagePartType = state.getFileClassesManager().getFileClassType(file);
Type packagePartType = state.getFileClassesProvider().getFileClassType(file);
PackageContext packagePartContext = CodegenContext.STATIC.intoPackagePart(packageFragment, packagePartType);
for (JetDeclaration declaration : file.getDeclarations()) {
@@ -414,7 +414,7 @@ public class PackageCodegen {
public void generateClassOrObject(@NotNull JetClassOrObject classOrObject) {
JetFile file = classOrObject.getContainingJetFile();
Type packagePartType = state.getFileClassesManager().getFileClassType(file);
Type packagePartType = state.getFileClassesProvider().getFileClassType(file);
CodegenContext context = CodegenContext.STATIC.intoPackagePart(packageFragment, packagePartType);
MemberCodegen.genClassOrObject(context, classOrObject, state, null);
}
compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
+6 -5
View File
@@ -75,14 +75,14 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
private final BindingContext bindingContext;
private final GenerationState.GenerateClassFilter filter;
private final JvmRuntimeTypes runtimeTypes;
private final JvmFileClassesProvider fileClassesManager;
private final JvmFileClassesProvider fileClassesProvider;
public CodegenAnnotatingVisitor(@NotNull GenerationState state) {
this.bindingTrace = state.getBindingTrace();
this.bindingContext = state.getBindingContext();
this.filter = state.getGenerateDeclaredClassFilter();
this.runtimeTypes = state.getJvmRuntimeTypes();
this.fileClassesManager = state.getFileClassesManager();
this.fileClassesProvider = state.getFileClassesProvider();
}
@NotNull
@@ -335,7 +335,8 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
}
private void recordClosure(@NotNull ClassDescriptor classDescriptor, @NotNull String name) {
CodegenBinding.recordClosure(bindingTrace, classDescriptor, peekFromStack(classStack), Type.getObjectType(name), fileClassesManager);
CodegenBinding.recordClosure(bindingTrace, classDescriptor, peekFromStack(classStack), Type.getObjectType(name),
fileClassesProvider);
}
@Override
@@ -393,7 +394,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
else if (containingDeclaration instanceof PackageFragmentDescriptor) {
JetFile containingFile = DescriptorToSourceUtils.getContainingFile(descriptor);
assert containingFile != null : "File not found for " + descriptor;
return fileClassesManager.getFileClassInternalName(containingFile) + '$' + name;
return fileClassesProvider.getFileClassInternalName(containingFile) + '$' + name;
}
return null;
@@ -574,7 +575,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
}
}
return fileClassesManager.getFileClassInternalName(file);
return fileClassesProvider.getFileClassInternalName(file);
}
private static <T> T peekFromStack(@NotNull Stack<T> stack) {
compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+3 -3
View File
@@ -82,7 +82,7 @@ public class GenerationState jvmOverloads constructor(
}
}
public val fileClassesManager: CodegenFileClassesProvider =
public val fileClassesProvider: CodegenFileClassesProvider =
CodegenFileClassesProvider.createForCodegenTask(bindingContext, files, packagesWithObsoleteParts,
/* TODO */ multifileFacadesWithObsoleteParts = emptySet())
@@ -90,7 +90,7 @@ public class GenerationState jvmOverloads constructor(
public val bindingTrace: BindingTrace = DelegatingBindingTrace(bindingContext, "trace in GenerationState")
public val bindingContext: BindingContext = bindingTrace.getBindingContext()
public val typeMapper: JetTypeMapper =
JetTypeMapperWithOutDirectory(this.bindingContext, classBuilderMode, fileClassesManager, outDirectory)
JetTypeMapperWithOutDirectory(this.bindingContext, classBuilderMode, fileClassesProvider, outDirectory)
public val intrinsics: IntrinsicMethods = IntrinsicMethods()
public val samWrapperClasses: SamWrapperClasses = SamWrapperClasses(this)
public val inlineCycleReporter: InlineCycleReporter = InlineCycleReporter(diagnostics)
@@ -114,7 +114,7 @@ public class GenerationState jvmOverloads constructor(
init {
val optimizationClassBuilderFactory = OptimizationClassBuilderFactory(builderFactory, disableOptimization)
var interceptedBuilderFactory: ClassBuilderFactory = BuilderFactoryForDuplicateSignatureDiagnostics(
optimizationClassBuilderFactory, this.bindingContext, diagnostics, fileClassesManager)
optimizationClassBuilderFactory, this.bindingContext, diagnostics, fileClassesProvider)
interceptedBuilderFactory = BuilderFactoryForDuplicateClassNameDiagnostics(interceptedBuilderFactory, diagnostics);
compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java
+5 -5
View File
@@ -82,16 +82,16 @@ import static org.jetbrains.org.objectweb.asm.Opcodes.*;
public class JetTypeMapper {
private final BindingContext bindingContext;
private final ClassBuilderMode classBuilderMode;
private final JvmFileClassesProvider fileClassesManager;
private final JvmFileClassesProvider fileClassesProvider;
public JetTypeMapper(
@NotNull BindingContext bindingContext,
@NotNull ClassBuilderMode classBuilderMode,
@NotNull JvmFileClassesProvider fileClassesManager
@NotNull JvmFileClassesProvider fileClassesProvider
) {
this.bindingContext = bindingContext;
this.classBuilderMode = classBuilderMode;
this.fileClassesManager = fileClassesManager;
this.fileClassesProvider = fileClassesProvider;
}
@NotNull
@@ -168,7 +168,7 @@ public class JetTypeMapper {
///if (insideModule) {
JetFile file = DescriptorToSourceUtils.getContainingFile(descriptor);
if (file != null) {
return fileClassesManager.getFileClassInternalName(file);
return fileClassesProvider.getFileClassInternalName(file);
}
CallableMemberDescriptor directMember = getDirectMember(descriptor);
@@ -402,7 +402,7 @@ public class JetTypeMapper {
}
Type asmType = Type.getObjectType(computeAsmTypeImpl(klass));
assert PsiCodegenPredictor.checkPredictedNameFromPsi(klass, asmType, fileClassesManager);
assert PsiCodegenPredictor.checkPredictedNameFromPsi(klass, asmType, fileClassesProvider);
return asmType;
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java
+2 -2
View File
@@ -389,7 +389,7 @@ public class ReplInterpreter {
PsiElement jetScript = descriptorToDeclaration(earlierDescriptor);
if (jetScript != null) {
registerClassNameForScript(state.getBindingTrace(), (JetScript) jetScript, earlierClassType, state.getFileClassesManager());
registerClassNameForScript(state.getBindingTrace(), (JetScript) jetScript, earlierClassType, state.getFileClassesProvider());
earlierScriptDescriptors.add(earlierDescriptor);
}
}
@@ -404,7 +404,7 @@ public class ReplInterpreter {
@NotNull CompilationErrorHandler errorHandler
) {
registerEarlierScripts(state, earlierScripts);
registerClassNameForScript(state.getBindingTrace(), script, classType, state.getFileClassesManager());
registerClassNameForScript(state.getBindingTrace(), script, classType, state.getFileClassesProvider());
state.beforeCompile();
KotlinCodegenFacade.generatePackage(
compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassesProvider.kt
+4 -3
View File
@@ -21,12 +21,13 @@ import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import org.jetbrains.org.objectweb.asm.Type
public abstract class JvmFileClassesProvider {
public abstract fun getFileClassFqName(file: JetFile): FqName
public interface JvmFileClassesProvider {
public fun getFileClassFqName(file: JetFile): FqName
public fun getFileClassInternalName(file: JetFile): String =
JvmClassName.byFqNameWithoutInnerClasses(getFileClassFqName(file)).internalName
public fun getFileClassType(file: JetFile): Type =
Type.getObjectType(getFileClassInternalName(file))
}
}
compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/NoResolveFileClassesProvider.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.JetFile
public object NoResolveFileClassesProvider : JvmFileClassesProvider() {
public object NoResolveFileClassesProvider : JvmFileClassesProvider {
override fun getFileClassFqName(file: JetFile): FqName =
JvmFileClassUtil.getFileClassInfo(file, JvmFileClassUtil.parseJvmNameOnFileNoResolve(file)).fileClassFqName
}